jsonpath 0.4.1 → 0.4.2

data/README.md

@@ -1,6 +1,6 @@
 # Jsonpath
 
-This is an implementation of http://goessner.net/articles/JsonPath/. 
+This is an implementation of http://goessner.net/articles/JsonPath/.
 
 ## Usage
 
@@ -15,7 +15,7 @@ As well, you can include it as a library.
 
 ~~~~~ {ruby}
     object = JSON.parse(<<-HERE_DOC)
-    {"store": 
+    {"store":
       {"bicycle":
         {"price":19.95, "color":"red"},
         "book":[
@@ -30,10 +30,10 @@ As well, you can include it as a library.
 
     JsonPath.new('$..price').on(object)
     # => [19.95, 8.95, 12.99, 8.99, 22.99]
-  
+
     JsonPath.on(object, '$..author')
     # => ["Nigel Rees", "Evelyn Waugh", "Herman Melville", "J. R. R. Tolkien"]
-  
+
     JsonPath.new('$..book[::2]').on(object)
     # => [{"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"}]
 

data/lib/jsonpath.rb

@@ -17,7 +17,7 @@ class JsonPath
         @path << token
       elsif token = scanner.scan(/@/)
         @path << token
-      elsif token = scanner.scan(/[a-zA-Z_]+/)
+      elsif token = scanner.scan(/[a-zA-Z0-9_]+/)
         @path << "['#{token}']"
       elsif token = scanner.scan(/'(.*?)'/)
         @path << "[#{token}]"
@@ -38,8 +38,11 @@ class JsonPath
       elsif token = scanner.scan(/\.\./)
         @path << token
       elsif scanner.scan(/\./)
+        nil
       elsif token = scanner.scan(/\*/)
         @path << token
+      elsif token = scanner.scan(/[><=] \d+/)
+        @path.last << token
       elsif token = scanner.scan(/./)
         @path.last << token
       end

data/lib/jsonpath/enumerable.rb

@@ -67,7 +67,7 @@ class JsonPath
 
     private
     def yield_value(blk, context, key)
-      @substitute_with = nil 
+      @substitute_with = nil
       case @mode
       when nil
         blk.call(key ? context[key] : context)

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.4.1' unless const_defined?(:VERSION)
+  VERSION = '0.4.2' unless const_defined?(:VERSION)
 end

data/test/test_jsonpath.rb

@@ -44,17 +44,23 @@ class TestJsonpath < MiniTest::Unit::TestCase
   def test_recognize_filters
     assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new("$..book[?(@['isbn'])]").on(@object)
     assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] < 10)]").on(@object)
+    assert_equal [@object['store']['book'][0], @object['store']['book'][2]], JsonPath.new("$..book[?(@['price'] == 9)]").on(@object)
+    assert_equal [@object['store']['book'][3]], JsonPath.new("$..book[?(@['price'] > 20)]").on(@object)
     assert_equal [@object['store']['book'][2], @object['store']['book'][3]], JsonPath.new("$..book[?(@.isbn)]").on(@object)
   end
 
   def test_no_eval
     assert_equal [], JsonPath.new('$..book[(@.length-2)]', :allow_eval => false).on(@object)
   end
-  
+
   def test_paths_with_underscores
     assert_equal [@object['store']['bicycle']['catalogue_number']], JsonPath.new('$.store.bicycle.catalogue_number').on(@object)
   end
 
+  def test_paths_with_numbers
+    assert_equal [@object['store']['bicycle']['2seater']], JsonPath.new('$.store.bicycle.2seater').on(@object)
+  end
+
   def test_recognize_array_with_evald_index
     assert_equal [@object['store']['book'][2]], JsonPath.new('$..book[(@.length-2)]').on(@object)
   end
@@ -64,7 +70,7 @@ class TestJsonpath < MiniTest::Unit::TestCase
   end
 
   def test_counting
-    assert_equal 29, JsonPath.new('$..*').on(@object).to_a.size
+    assert_equal 30, JsonPath.new('$..*').on(@object).to_a.size
   end
 
   def test_space_in_path
@@ -128,7 +134,8 @@ class TestJsonpath < MiniTest::Unit::TestCase
     "bicycle"=> {
       "color"=> "red",
       "price"=> 20,
-      "catalogue_number" => 12345 }
+      "catalogue_number" => 12345,
+      "2seater" => "yes"}
     } }
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jsonpath
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-26 00:00:00 -07:00
+date: 2011-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency