README.md in jsonpath-0.7.0 vs README.md in jsonpath-0.7.1

@@ -20,11 +20,11 @@
 
 ### Library
 
 To use JsonPath as a library simply include and get goin'!
 
-~~~~~ {ruby}
+```ruby
 require 'jsonpath'
 
 json = <<-HERE_DOC
 {"store":
   {"bicycle":
@@ -36,105 +36,127 @@
       {"price":22.99, "category":"fiction", "isbn":"0-395-19395-8", "title":"The Lord of the Rings", "author":"Tolkien"}
     ]
   }
 }
 HERE_DOC
-~~~~~
+```
 
 Now that we have a JSON object, let's get all the prices present in the object. We create an object for the path
 in the following way.
 
-~~~~~ {ruby}
+```ruby
 path = JsonPath.new('$..price')
-~~~~~
+```
 
 Now that we have a path, let's apply it to the object above.
 
-~~~~~ {ruby}
+```ruby
 path.on(json)
 # => [19.95, 8.95, 12.99, 8.99, 22.99]
-~~~~~
+```
 
 Or on some other object ...
 
-~~~~~ {ruby}
+```ruby
 path.on('{"books":[{"title":"A Tale of Two Somethings","price":18.88}]}')
 # => [18.88]
-~~~~~
+```
 
 You can also just combine this into one mega-call with the convenient `JsonPath.on` method.
 
-~~~~~ {ruby}
+```ruby
 JsonPath.on(json, '$..author')
 # => ["Nigel Rees", "Evelyn Waugh", "Herman Melville", "Tolkien"]
-~~~~~
+```
 
 Of course the full JsonPath syntax is supported, such as array slices
 
-~~~~~ {ruby}
+```ruby
 JsonPath.new('$..book[::2]').on(json)
 # => [
 #      {"price"=>8.95, "category"=>"reference", "author"=>"Nigel Rees", "title"=>"Sayings of the Century"},
 #      {"price"=>8.99, "category"=>"fiction", "author"=>"Herman Melville", "title"=>"Moby Dick", "isbn"=>"0-553-21311-3"}
 #    ]
-~~~~~
+```
 
 ...and evals.
 
-~~~~~ {ruby}
+```ruby
 JsonPath.new('$..price[?(@ < 10)]').on(json)
 # => [8.95, 8.99]
-~~~~~
+```
 
 There is a convenience method, `#first` that gives you the first element for a JSON object and path.
 
-~~~~~ {ruby}
+```ruby
 JsonPath.new('$..color').first(object)
 # => "red"
-~~~~~
+```
 
 As well, we can directly create an `Enumerable` at any time using `#[]`. 
 
-~~~~~ {ruby}
+```ruby
 enum = JsonPath.new('$..color')[object]
 # => #<JsonPath::Enumerable:...>
 enum.first
 # => "red"
 enum.any?{ |c| c == 'red' }
 # => true
-~~~~~
+```
 
 You can optionally prevent eval from being called on sub-expressions by passing in :allow_eval => false to the constructor.
 
-### More examples
+### More examples
 
 For more usage examples and variations on paths, please visit the tests. There are some more complex ones as well.
 
+### Conditional Operators Are Also Supported
+
+```ruby
+  def test_or_operator
+    assert_equal [@object['store']['book'][1], @object['store']['book'][3]], JsonPath.new("$..book[?(@['price'] == 13 || @['price'] == 23)]").on(@object)
+  end
+
+  def test_and_operator
+    assert_equal [], JsonPath.new("$..book[?(@['price'] == 13 && @['price'] == 23)]").on(@object)
+  end
+
+  def test_and_operator_with_more_results
+    assert_equal [@object['store']['book'][1]], JsonPath.new("$..book[?(@['price'] < 23 && @['price'] > 9)]").on(@object)
+  end
+```
+
+### Running an individual test
+
+```ruby
+ruby -Ilib:../lib test/test_jsonpath.rb --name test_wildcard_on_intermediary_element_v6
+```
+
 ### Manipulation
 
 If you'd like to do substitution in a json object, you can use `#gsub` or `#gsub!` to modify the object in place.
 
-~~~~~ {ruby}
+```ruby
 JsonPath.for('{"candy":"lollipop"}').gsub('$..candy') {|v| "big turks" }.to_hash
-~~~~~
+```
 
 The result will be
 
-~~~~~ {ruby}
+```ruby
 {'candy' => 'big turks'}
-~~~~~
+```
 
 If you'd like to remove all nil keys, you can use `#compact` and `#compact!`. To remove all keys under a certain path, use `#delete` or `#delete!`. You can even chain these methods together as follows:
 
-~~~~~ {ruby}
+```ruby
 json = '{"candy":"lollipop","noncandy":null,"other":"things"}'
 o = JsonPath.for(json).
   gsub('$..candy') {|v| "big turks" }.
   compact.
   delete('$..other').
   to_hash
 # => {"candy" => "big turks"}
-~~~~~
+```
 
 # Contributions
 
-Please feel free to submit an Issue or a Pull Request any time you feel like you would like to contribute. Thank you!
\ No newline at end of file
+Please feel free to submit an Issue or a Pull Request any time you feel like you would like to contribute. Thank you!