json_rspec_match_maker 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b5b140faa0ef46843473e4c028a1d612bfb0321cd63538d36277f97cf9b129e
-  data.tar.gz: b59d16bc22e7f57d7f2b6fadc5faf71aaa1e2a2b0daf902ae194d656eefba551
+  metadata.gz: 83c5e58109202a9bd7a7d6f698c385606cf251c5c9c9223cfba56ab27e83e53c
+  data.tar.gz: c16a2b47609595be0913e35c2ce6016c041764d18786ef1657abc2da97b5776e
 SHA512:
-  metadata.gz: c9f543a7915141e2faf82ba1e4da26f0c347be97ac87ec44e5c3b2635807f4e1c8b774d4d13c480d1364de61b85c1ea3248523e963a093bdcfd4c787d9c1fe41
-  data.tar.gz: e64e5696fb2227dff2483c48dea976a9e8934aaf3bb529e776a73abc17c010d7fa2e2cfc6cf581d5bec05df24a21b4ae94aab5050cd07fb2c540c8f9d6558776
+  metadata.gz: a7afba823f316b6c071b7d5ca3ed2cd2d1c909b7a38e17fb5484152e960a4c38ae46fa5c36c04bbcb344bbad744edfac741d7317e125e5860b8459d64f365ab7
+  data.tar.gz: 3b1a1f3380e69441a2b9df21e4cb4fb05f3cc5c5bc8aa5523da39412d89013879718fc0f3b97d3f1511b28f0adf034dad90e3d7db0bb9e77cc72cae558563a30

data/Gemfile.lock

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

data/lib/json_rspec_match_maker/base.rb

@@ -24,10 +24,11 @@ module JsonRspecMatchMaker
     # @example
     #   JsonRspecMatchMaker.new(active_record_model)
     #   JsonRspecMatchMaker.new(presenter_instance)
-    def initialize(expected, match_definition)
+    def initialize(expected, match_definition, prefix: '')
       @expected = expected
       @match_definition = expand_definition(match_definition)
       @errors = {}
+      @prefix = prefix
     end
 
     # Match method called by RSpec
@@ -126,7 +127,7 @@ module JsonRspecMatchMaker
     # the index if iterating through a list, otherwise nil
     # @return [nil] returns nothing, adds to error list as side effect
     def check_values(key_prefix, error_key, match_function, expected_instance = expected)
-      expected_value = ExpectedValue.new(match_function, expected_instance, error_key)
+      expected_value = ExpectedValue.new(match_function, expected_instance, error_key, @prefix)
       target_value = TargetValue.new([key_prefix, error_key].compact.join('.'), target)
       add_error(expected_value, target_value) unless expected_value == target_value
     end

data/lib/json_rspec_match_maker/expected_value.rb

@@ -4,8 +4,8 @@ module JsonRspecMatchMaker
   # Handles fetching the expected value from the expected instance
   class ExpectedValue
     attr_reader :value
-    def initialize(match_function, expected_instance, error_key)
-      @value = fetch_expected_value(expected_instance, match_function, error_key)
+    def initialize(match_function, expected_instance, error_key, prefix)
+      @value = fetch_expected_value(expected_instance, match_function, error_key, prefix)
     end
 
     def ==(other)
@@ -15,10 +15,10 @@ module JsonRspecMatchMaker
 
     private
 
-    def fetch_expected_value(instance, function, key)
+    def fetch_expected_value(instance, function, key, prefix)
       if function == :default
-        key.split('.').inject(instance) do |expected, k|
-          expected&.send k
+        key.split('.').inject(instance) do |expected, method_name|
+          method_name == prefix ? expected : expected&.send(method_name)
         rescue NoMethodError
           nil
         end

data/lib/json_rspec_match_maker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JsonRspecMatchMaker
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json_rspec_match_maker
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Patrick McGee