jsonpath 0.8.7 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4dc5e8947c2c9855c34c7d0f25fb750393002f9
-  data.tar.gz: 5ee652f3eed9380f357d19a0ff53dfa2dd9d64e2
+  metadata.gz: 401aa3e206ffa2419b6d577e09e721a5d2a0eb5d
+  data.tar.gz: 2fbf9f702bd048b551b494768c31a0e9aef8c361
 SHA512:
-  metadata.gz: 3a462c34b402670a1b627c5de62147ad08e33db5a014cd37dfa53bb6c6a89ce3cc63e272e8c993a5b28ccae29a1069aa27636127bc594e4e0414d6da22c4e0f5
-  data.tar.gz: 50ac0441287012f54454e843eab9881f24eeec91d8e7b6b7796f5155dc7b520bd64d8df0e468d52130ad3c68f8d8e560b04e494cd835c8c2a86e689e0ea2523a
+  metadata.gz: c2bba3a7ff2c1e8cde53b60fdc49ab579e55eb7064a059a2f5c622088bbadc304db26741c371aa46a3e97a1e6d85e6a942ccd8f3727ca0522972d094f41f72e0
+  data.tar.gz: ace0993e371d6365967652e3e8240860a197e736c8f91870341bed2163e940fcc0035ad91598a7581bb0285408c2250c3488890eeb1b722060bf6a0de9ee3495

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
   - 2.1.6
   - 2.3.1
-  - jruby
+  - ruby-head
+  - jruby-head

data/lib/jsonpath/parser.rb

@@ -22,7 +22,7 @@ class JsonPath
     end
 
     def parse_exp(exp)
-      exp = exp.gsub(/@/, '').gsub(/[\(\)]/, '').gsub(/"/, '\'').strip
+      exp = exp.sub(/@/, '').gsub(/[\(\)]/, '').gsub(/"/, '\'').strip
       scanner = StringScanner.new(exp)
       elements = []
       until scanner.eos?
@@ -32,7 +32,7 @@ class JsonPath
           num = scanner.scan(/\d+/)
           return @_current_node.send(sym.to_sym).send(op.to_sym, num.to_i)
         end
-        if t = scanner.scan(/\['\w+'\]+/)
+        if t = scanner.scan(/\['[a-zA-Z@&\*\/\$%\^\?]+'\]+/)
           elements << t.gsub(/\[|\]|'|\s+/, '')
         elsif t = scanner.scan(/(\s+)?[<>=][<>=]?(\s+)?/)
           operator = t

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.8.7'.freeze
+  VERSION = '0.8.8'.freeze
 end

data/test/test_jsonpath.rb

@@ -295,6 +295,56 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal([{"type"=>"users", "id"=>"123"}], JsonPath.new("$.foo[?(@.id == '123')]").on(data))
   end
 
+  def test_at_in_filter
+    jsonld = {
+      "mentions" => [
+         {
+            "name" => "Delimara Powerplant",
+            "identifier" => "krzana://took/powerstation/Delimara Powerplant",
+            "@type" => "Place",
+            "geo" => {
+               "latitude" => 35.83020073454,
+               "longitude" => 14.55602645874
+            }
+         }
+      ]
+   }
+   assert_equal(['Place'], JsonPath.new("$..mentions[?(@['@type'] == 'Place')].@type").on(jsonld))
+  end
+
+  def test_dollar_in_filter
+    jsonld = {
+      "mentions" => [
+         {
+            "name" => "Delimara Powerplant",
+            "identifier" => "krzana://took/powerstation/Delimara Powerplant",
+            "$type" => "Place",
+            "geo" => {
+               "latitude" => 35.83020073454,
+               "longitude" => 14.55602645874
+            }
+         }
+      ]
+   }
+   assert_equal(['Place'], JsonPath.new("$..mentions[?(@['$type'] == 'Place')].$type").on(jsonld))
+  end
+
+  def test_at_in_value
+    jsonld = {
+      "mentions" =>
+         {
+            "name" => "Delimara Powerplant",
+            "identifier" => "krzana://took/powerstation/Delimara Powerplant",
+            "type" => "@Place",
+            "geo" => {
+               "latitude" => 35.83020073454,
+               "longitude" => 14.55602645874
+            }
+         }
+   }
+   assert_equal(['@Place'], JsonPath.new("$..mentions.type[?(@ == '@Place')]").on(jsonld))
+  end  
+
   def example_object
     { 'store' => {
       'book' => [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.8.7
+  version: 0.8.8
 platform: ruby
 authors:
 - Joshua Hull
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json