jsonpath 0.5.6 → 0.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e79054a49cb41c74e7f3c80aea631b9428d9eb
-  data.tar.gz: a1275b379060bda2a6f8e9a8872e0dcc2755c5cd
+  metadata.gz: 127831bc4a7219000b806933626b26c2b9b80bc6
+  data.tar.gz: bd1962f8d0359b92bef9d0cf907c313ff0178089
 SHA512:
-  metadata.gz: 78e515046dc02914e92a601dfa2cad52538bba73dde9bba215e66ec7fa3acff2617652beaf09a63f8db160c5aedd3daeaffddc548264eafb3c5b4f2a45a2af05
-  data.tar.gz: 0d9d0bb8399233186eaca833a5b6d0731a69c7a08f113681258b21eb3032ee928639da6c46b262fc212c394815057d77ee1e2c48f13738ad70f950b87f75c4c0
+  metadata.gz: ff10144fa37514160843c0e62f4a0775795cf18705805cc0beff2ea6b24178d80e22cbd4b486deda1c6d65a4afa1027c1c501797a6bb3f8cd56e5ff34b547d3d
+  data.tar.gz: d1fe3eda2c940d8f047322cec32dcb0a0777a2fe6c90257c6ff07b4fbeba89181cdbf39b2cd169dc9e6aa60c510884d04d4c0ef05b3629884db7d695494573a8

data/bin/jsonpath

@@ -1,4 +1,4 @@
-#!/usr/local/env ruby
+#!/usr/bin/env ruby
 
 require 'jsonpath'
 require 'multi_json'

data/lib/jsonpath.rb

@@ -8,13 +8,12 @@ class JsonPath
 
   PATH_ALL = '$..*'
 
-  attr_reader :path
+  attr_accessor :path
 
   def initialize(path, opts = nil)
     @opts = opts
     scanner = StringScanner.new(path)
     @path = []
-    bracket_count = 0
     while not scanner.eos?
       if token = scanner.scan(/\$/)
         @path << token
@@ -33,11 +32,15 @@ class JsonPath
           elsif t = scanner.scan(/\]/)
             token << t
             count -= 1
-          elsif t = scanner.scan(/[^\[\]]*/)
+          elsif t = scanner.scan(/[^\[\]]+/)
             token << t
+          elsif scanner.eos?
+            raise ArgumentError, 'unclosed bracket'
           end
         end
         @path << token
+      elsif token = scanner.scan(/\]/)
+        raise ArgumentError, 'unmatched closing bracket'
       elsif token = scanner.scan(/\.\./)
         @path << token
       elsif scanner.scan(/\./)
@@ -52,6 +55,12 @@ class JsonPath
     end
   end
 
+  def join(join_path)
+    res = deep_clone
+    res.path += JsonPath.new(join_path).path
+    res
+  end
+
   def on(obj_or_str)
     enum_on(obj_or_str).to_a
   end
@@ -77,4 +86,8 @@ class JsonPath
   def self.process_object(obj_or_str)
     obj_or_str.is_a?(String) ? MultiJson.decode(obj_or_str) : obj_or_str
   end
+
+  def deep_clone
+    Marshal.load Marshal.dump(self)
+  end
 end

data/lib/jsonpath/version.rb

@@ -1,3 +1,3 @@
 class JsonPath
-  VERSION = '0.5.6'
+  VERSION = '0.5.7'
 end

data/test/test_jsonpath.rb

@@ -5,6 +5,15 @@ class TestJsonpath < MiniTest::Unit::TestCase
     @object2 = example_object
   end
 
+  def test_bracket_matching
+    assert_raises(ArgumentError) {
+      JsonPath.new('$.store.book[0')
+    }
+    assert_raises(ArgumentError) {
+      JsonPath.new('$.store.book[0]]')
+    }
+  end
+
   def test_lookup_direct_path
     assert_equal 4, JsonPath.new('$.store.*').on(@object).first['book'].size
   end
@@ -94,6 +103,10 @@ class TestJsonpath < MiniTest::Unit::TestCase
     assert_equal JsonPath.new('$..author').on(@object), JsonPath.on(@object, '$..author')
   end
 
+  def test_join
+    assert_equal JsonPath.new('$.store.book..author').on(@object), JsonPath.new('$.store').join('book..author').on(@object)
+  end
+
   def test_gsub
     @object2['store']['bicycle']['price'] += 10
     @object2['store']['book'][0]['price'] += 10

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: jsonpath
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors:
 - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-29 00:00:00.000000000 Z
+date: 2015-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: code_stats
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: phocus
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Ruby implementation of http://goessner.net/articles/JsonPath/.
@@ -102,10 +102,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .gemtest
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gemtest"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - README.md
 - Rakefile
@@ -123,22 +123,22 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: jsonpath
-rubygems_version: 2.1.11
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby implementation of http://goessner.net/articles/JsonPath/