poller-json 0.1.1 → 0.1.2

data/lib/matchers/json/document_contains_json_path.rb

@@ -8,7 +8,7 @@ module Matchers
       end
 
       # @param document_s [String] - the document given as String
-      # Exceptions caught by JSON Parserwill be thrown up the stack
+      # Exceptions caught by JSON Parser will be thrown up the stack
       # ::JSON::ParserError in the case of invalid JSON
       def matches?(document_s)
         json_hash = ::JSON.parse(document_s)

data/lib/matchers/json/json_path.rb

@@ -9,29 +9,57 @@
 module Matchers
   module JSON
     module JSONPath
+
       def value_on_path(json_hash, path)
-        path = path[1..-1] if path.start_with?('$') # TODO: check jsonpath syntax and raise error
-        path_items = path.split('.')
-        child_node = json_hash
-          path_items.each do |path_item|
-            path_item = path_item.sub('[\'', '').sub('\']', '') if path_item.start_with?('[\'')
-            path_item, index = path_item.split('[')
-            begin
-              child_node = child_node.send(:fetch, path_item)
-            rescue IndexError
-              return nil
-            end
-            if index
-              index = index[0..-2].to_i
-              begin
-                child_node = child_node.send(:fetch, index)
-              rescue IndexError
-                return nil
-              end
-            end
+        raise ArgumentError, "Invalid json path: #{path}" unless json_path_valid?(path)
+        path = translate_to_dot_notation(path)
+        current_node = json_hash # start traversal at document root
+        path_items(path).each do |path_item|
+          element, index = decompose_path_item(path_item)
+          begin
+            current_node = fetch(current_node, element, index)
+          rescue IndexError
+            return nil
           end
-        child_node
+        end
+        current_node
+      end
+
+      # TODO: the regular expressions below will catch very few errors
+      def json_path_valid?(path)
+        notation = path.include?('[\'') ? :bracket : :dot
+        path_regex = /^\$[a-zA-Z0-9_(\[\d\])\.]*[^\.]$/ if notation == :dot
+        path_regex = /^\$[a-zA-Z0-9_(\[\d\])\.\']*[^\.]$/ if notation == :bracket
+        path_regex.match(path)
+      end
+
+      def translate_to_dot_notation(path)
+        path = path.gsub('[\'', '').gsub('\']', '') if path.include?('[\'')
+        path
+      end
+      private :translate_to_dot_notation
+
+      def path_items(path)
+        path[1..-1].split('.') # removing the leading '$'
+      end
+      private :path_items
+
+      def fetch(current_node, element, index)
+        current_node = current_node.send(:fetch, element)
+        current_node = current_node.send(:fetch, index) if index
+        current_node
       end
+      private :fetch
+
+      # if the path item contains an index (eg 'sample[3]') then the index will be returned
+      # if not, second return value will be nil [element,index]
+      def decompose_path_item(path_item)
+        element, index = path_item.split('[')
+        index = index[0..-2].to_i if index
+        [element, index]
+      end
+      private :decompose_path_item
+
     end
   end
 end

data/lib/poller/json/version.rb

@@ -1,5 +1,5 @@
 module Poller
   module JSON
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poller-json
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poller
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement