poller-json 0.1.6 → 0.2.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFlMmMyZjQwNmNkZjdlYjkxMTI0MmU5MDEzYjY2YWFjOWFhODcyMg==
+    ODM1YTM4NzhlY2NmMGZjMTJlM2Q1NGE5NmY3ZGM5ZTAyYzI4Mjg5Nw==
   data.tar.gz: !binary |-
-    ZjA1MjE1NWRhMzNlMjBhMWJhZGM4MzFjNjhlYmJjY2NlYzMxYmQ4Yg==
+    ZjBkZjYzNWU3NzgwZDYzZDVjYWYyYzE4MzM4YmY1YmI3MDgwYmNlNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YmI1NzAzZGZjMGFlYzNiM2UxYTIyZmI1NzA4NDUyNzhlYjMzYTIwZjZhZDdm
-    MWU5ZjQ0NmVmZWVkNTg2YWYyZTM5YTRkYmI5ZTUyNWU4MzMwN2VmYWJmM2Nl
-    YjhhNjhlYTZkYmMxNmIwMjIwZWE0MDA4OGZjMDdlNWRiOTEyOWY=
+    YTgzZDQwNmE2MjZmMmM3MDE2ZDdiNTU0NDdhMjhlODYwNzllYWM1ZDAyMWIx
+    ZDYzYzU3ZTAxZDRmODg2NGE5ZWE3N2NhYTcxMzA3NDcyYThhNGIxZTA0YTRk
+    Y2U0M2E4MTE5ZjNhMDQwOGNjYzcwOGY1MDNjNDQzMjQ0NjI1NTc=
   data.tar.gz: !binary |-
-    NzgzZjI0YmMxMTg1N2MyZmNiNDRjMWIyMjIyMzBmMTg2NjY4YjJmYWNhNjlh
-    ZmQ0MmYxNmRhMmFjNmY5YjI4NzIwYzM2MzBlNDE0ZDhkMzRiMTExYjgwMDFh
-    NTcwYzkzM2YzODhkMDAyYTg1MTBiN2RjMTczMTBkMDZmMmVlNDA=
+    ODk5ZDM1NjJlZDBkMmE4NDEyZjY4YzYwNmJiNWU2Y2ZhZTlhNzJlMzJhN2Nl
+    MDdmMmI3MjZiMDljOGNmNWMwZDYzZmZhYjJjYjBiZTNjYjhlNjMzYzM4OGFk
+    Mzk4MTI2OTU5NGM0MThkNDM3NmZjODZlY2U1N2E2NDZkZjY1MTA=

data/lib/matchers/json/json_path.rb

@@ -26,8 +26,7 @@ module Matchers
       end
 
       # TODO: the regular expressions below will catch very few errors
-      def json_path_valid?(path)                       
-        # TODO: figure out how groups could be extracted and then looked at individually (each do)
+      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

data/lib/matchers/json/json_path_has_array.rb

@@ -2,15 +2,10 @@ module Matchers
   module JSON
     class JSONPathHasArray
       include JSONPath
+      include JSONPathHasThing
 
       def initialize(json_path, json_array)
-        @json_path = json_path
-        @json_array = json_array.is_a?(Array) ? json_array : ::JSON.parse(json_array)
-      end
-
-      def matches?(document_s)
-        json_hash = ::JSON.parse(document_s)
-        value_on_path(json_hash, @json_path) == @json_array
+        super(json_path, json_array)
       end
     end
   end

data/lib/matchers/json/json_path_has_object.rb

@@ -2,15 +2,10 @@ module Matchers
   module JSON
     class JSONPathHasObject
       include JSONPath
+      include JSONPathHasThing
 
       def initialize(json_path, json_object)
-        @json_path = json_path
-        @json_object = json_object.is_a?(Hash) ? json_object : ::JSON.parse(json_object)
-      end
-
-      def matches?(document_s)
-        json_hash = ::JSON.parse(document_s)
-        value_on_path(json_hash, @json_path) == @json_object
+        super(json_path, json_object)
       end
     end
   end

data/lib/matchers/json/json_path_has_thing.rb

@@ -0,0 +1,22 @@
+module Matchers
+  module JSON
+    module JSONPathHasThing
+
+      def initialize(json_path, json_thing)
+        @json_path = json_path
+        @json_thing = discriminate json_thing
+      end
+
+      def matches?(document_s)
+        json_doc_hash = ::JSON.parse document_s
+        value_on_path(json_doc_hash, @json_path) == @json_thing
+      end
+
+      private
+      def discriminate(thing)
+        return thing if [Array, Hash].include? thing.class
+        ::JSON.parse thing
+      end
+    end
+  end
+end

data/lib/poller/json/version.rb

@@ -1,5 +1,5 @@
 module Poller
   module JSON
-    VERSION = '0.1.6'
+    VERSION = '0.2.0'
   end
 end

data/lib/poller/poller_json.rb

@@ -2,6 +2,7 @@ require 'json'
 require 'poller'
 require 'matchers/json/json_path'
 require 'matchers/json/document_contains_json_path'
+require 'matchers/json/json_path_has_thing'
 require 'matchers/json/json_path_has_value'
 require 'matchers/json/json_path_has_object'
 require 'matchers/json/json_path_has_array'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poller-json
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.0
 platform: ruby
 authors:
 - Markus Krogemann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: poller
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ files:
 - lib/matchers/json/json_path.rb
 - lib/matchers/json/json_path_has_array.rb
 - lib/matchers/json/json_path_has_object.rb
+- lib/matchers/json/json_path_has_thing.rb
 - lib/matchers/json/json_path_has_value.rb
 - lib/poller/json/version.rb
 - lib/poller/poller_json.rb