json_rspec_match_maker 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6250d92c058590c2cd7c686df5a699043f44f6c967e8d39ef52bdc11bbc7f90c
-  data.tar.gz: 923b242752395042a5d6d6a1f58c042445f88a710d936b1931fa631420f34a52
+  metadata.gz: 4bae227cfdefaa6a79eb4f3000bd7288dbfe98d1959245811f5e5bdf831838e5
+  data.tar.gz: c4bb1ec682a23d791ee73caba8775242c3a6c90e64a10e77887556b244cc841b
 SHA512:
-  metadata.gz: e8c43634f75ca2f13c4076089e159777c603d26befc90e40268087c14d54f6287185b35d5fda45dcc42fe9b1ba997e39c462f37b4713f5e5e357e01fad6fdeda
-  data.tar.gz: 7b23c90a5d8a6cae7f6188ee6f6cac003f8a99007d90e46f1e9a831af98b3ab4d7fa8249626321d8ebc3a82af752d78abd75a897bf7e97f2765f7c061b8047da
+  metadata.gz: 98cd96ca937e649b76f97957c7291344e1b64a968548dba869641f6499bbfb207f3e7b8e21b4c0dc179808e6c9bfc78c39dff7711c6004af4de24edd4b3ff8d7
+  data.tar.gz: 78f0bb747f35df684811b0b2c94814e1f542af1c9e2c0ae12c8c780bb8afc8881b09a4aedac45b4c611c74a0107db7c994a637016af08ef0bd8b14912b7b0b9c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    json_rspec_match_maker (0.1.0)
+    json_rspec_match_maker (0.1.2)
 
 GEM
   remote: https://rubygems.org/

data/lib/json_rspec_match_maker/base.rb

@@ -66,11 +66,16 @@ module JsonRspecMatchMaker
     # @return [nil] returns nothing, adds to error list as side effect
     def check_target_against_expected
       raise MatchDefinitionNotFound, self.class.name unless @match_definition
-      @match_definition.each do |error_key, match_def|
+      check_definition(@match_definition)
+    end
+
+    def check_definition(definition, current_expected = expected, current_key = nil)
+      definition.each do |error_key, match_def|
+        key = [current_key, error_key].compact.join('.')
         if match_def.respond_to? :call
-          check_values(error_key, match_def)
+          check_values(key, match_def, current_expected)
         else
-          check_each(error_key, match_def)
+          check_each(key, match_def, current_expected)
         end
       end
     end
@@ -84,13 +89,11 @@ module JsonRspecMatchMaker
     #   :each is a function that returns the list of items
     #   :attributes is a hash with the same structure as the top-level match_def hash
     # @return [nil] returns nothing, adds to error list as side effect
-    def check_each(error_key, each_definition)
-      enumerable = each_definition[:each].call(expected)
+    def check_each(error_key, each_definition, current_expected)
+      enumerable = each_definition[:each].call(current_expected)
       enumerable.each_with_index do |each_instance, idx|
-        each_definition[:attributes].each do |attr_error_key, match_function|
-          each_opts = { idx: idx, error_key: attr_error_key }
-          check_values(error_key, match_function, each_instance, each_opts)
-        end
+        full_key = [error_key, idx].join('.')
+        check_definition(each_definition[:attributes], each_instance, full_key)
       end
     end
 
@@ -108,9 +111,9 @@ module JsonRspecMatchMaker
     #    :error_key the subfield reported in the error
     # the index if iterating through a list, otherwise nil
     # @return [nil] returns nothing, adds to error list as side effect
-    def check_values(error_key, match_function, expected_instance = expected, each_opts = nil)
+    def check_values(error_key, match_function, expected_instance = expected)
       expected_value = ExpectedValue.new(match_function, expected_instance)
-      target_value = TargetValue.new(error_key, each_opts, target)
+      target_value = TargetValue.new(error_key, target)
       add_error(expected_value, target_value) unless expected_value == target_value
     end
 

data/lib/json_rspec_match_maker/target_value.rb

@@ -3,33 +3,25 @@ module JsonRspecMatchMaker
   class TargetValue
     attr_reader :error_key, :value
 
-    def initialize(key, each_opts, target)
-      @error_key = full_error_key(key, each_opts)
-      @value = fetch_value(key, each_opts, target)
-    end
-
-    def full_error_key(key, each_opts)
-      return key if each_opts.nil?
+    NUMBER = /^\d+$/
 
-      "#{key}[#{each_opts[:idx]}].#{each_opts[:error_key]}"
+    def initialize(key, target)
+      @error_key = key
+      @value = value_for_key(key, target)
     end
 
-    def fetch_value(key, each_opts, target)
-      return value_for_key(key, target) if each_opts.nil?
-
-      targets = value_for_key(key, target)
-      specific_target = targets[each_opts[:idx]]
-      value_for_key(each_opts[:error_key], specific_target)
+    def ==(other)
+      raise ArgumentError unless other.is_a? ExpectedValue
+      other.value == value
     end
 
+    private
+
     def value_for_key(key, json)
-      value = key.split('.').reduce(json) { |j, k| j.fetch(k, {}) }
+      value = key.split('.').reduce(json) do |j, k|
+        k.match?(NUMBER) ? (j[k.to_i] || {}) : j.fetch(k, {})
+      end
       value == {} ? nil : value
     end
-
-    def ==(other)
-      raise ArgumentError unless other.is_a? ExpectedValue
-      other.value == value
-    end
   end
 end

data/lib/json_rspec_match_maker/version.rb

@@ -1,3 +1,3 @@
 module JsonRspecMatchMaker
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json_rspec_match_maker
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Patrick McGee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-17 00:00:00.000000000 Z
+date: 2018-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler