jsonpath 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c8e5023499ffb2c83cb4eeed6d400f55f28bf8f
-  data.tar.gz: 81cb76411fd07a5d0ce6ef227d72682de7c9c4b6
+  metadata.gz: 4c81ddcbb6e1a1224f9a068866f731a119a26806
+  data.tar.gz: 7147c3700e548741223faf65f81c570a8d3e1790
 SHA512:
-  metadata.gz: e3475b1e4bdf85fcc9da42a353f81db379a41cc8baf01680096083ffda68a40deee85872632f1470ff94285295830e7933d8656cf59e8a4ff48cc860d89049e1
-  data.tar.gz: 7a89006179792222b0222a599fae3ceb4548d49b73f9cd89867716f29b567547f36edd5251bd1bc9d7ddb58f0d4150f87f9860021b587b04c0cff0183b45ddb5
+  metadata.gz: c3d4e55012e0ab3e1b969e89bb8ac3e4450178c0954710eaf06b214a4973a796186a1cd976f6fbc211723ca7061e74f0e600650f2252d77b87c8b40109fa5494
+  data.tar.gz: e993c5f494bc2910728d3da43ab3e0933808a5824c7d057c23ba0fa38ce04cd72fa76898058c5c48702ae8418ead5eb898b9dbd38d643f630bcc3423992aa881

data/Gemfile

@@ -1,2 +1,3 @@
 source "http://rubygems.org"
-gemspec
+gemspec
+gem 'simplecov', :require => false, :group => :test

data/README.md

@@ -22,7 +22,7 @@ There is stand-alone usage through the binary `jsonpath`
 
 To use JsonPath as a library simply include and get goin'!
 
-~~~~~ {ruby}
+```ruby
 require 'jsonpath'
 
 json = <<-HERE_DOC
@@ -38,94 +38,116 @@ json = <<-HERE_DOC
   }
 }
 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" }.
@@ -133,8 +155,8 @@ o = JsonPath.for(json).
   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!
+Please feel free to submit an Issue or a Pull Request any time you feel like you would like to contribute. Thank you!

data/Rakefile

@@ -1,3 +1,8 @@
+require 'simplecov'
+SimpleCov.start do
+  add_filter '/test/'
+end
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/jsonpath.rb

@@ -16,7 +16,7 @@ class JsonPath
     scanner = StringScanner.new(path)
     @path = []
     until scanner.eos?
-      if token = scanner.scan(/\$|@\B|\*|\.\./)
+      if token = scanner.scan(/\$\B|@\B|\*|\.\./)
         @path << token
       elsif token = scanner.scan(/[\$@a-zA-Z0-9:_-]+/)
         @path << "['#{token}']"

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
 end

data/test/test_jsonpath.rb

@@ -64,10 +64,16 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [@object['store']['book'][3]], JsonPath.new("$..book[?(@['price'] > 20)]").on(@object)
   end
 
-  if RUBY_VERSION[/^1\.9/]
-    def test_recognize_filters_on_val
-      assert_equal [@object['store']['book'][1]['price'], @object['store']['book'][3]['price'], @object['store']['bicycle']['price']], JsonPath.new('$..price[?(@ > 10)]').on(@object)
-    end
+  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
 
   def test_no_eval
@@ -99,7 +105,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_counting
-    assert_equal 50, JsonPath.new('$..*').on(@object).to_a.size
+    assert_equal 54, JsonPath.new('$..*').on(@object).to_a.size
   end
 
   def test_space_in_path
@@ -231,6 +237,21 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal [], JsonPath.new("$.data[?(@.type == 'admins')]").on(data)
   end
 
+  def test_support_at_sign_in_member_names
+    assert_equal [@object['store']['@id']], JsonPath.new("$.store.@id").on(@object)
+  end
+
+  def test_support_dollar_sign_in_member_names
+    assert_equal [@object['store']['$meta-data']],
+      JsonPath.new("$.store.$meta-data").on(@object)
+  end
+
+  def test_support_underscore_in_member_names
+    assert_equal [@object['store']['_links']],
+      JsonPath.new("$.store._links").on(@object)
+  end
+
+
   def example_object
     { 'store' => {
       'book' => [
@@ -278,7 +299,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
         'single-speed' => 'no',
         '2seater' => 'yes',
         'make:model' => 'Zippy Sweetwheeler'
-      }
+      },
+      "@id" => "http://example.org/store/42",
+      "$meta-data" => "whatevs",
+      "_links" => { "self" => {} }
     } }
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-02 00:00:00.000000000 Z
+date: 2017-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json