axn 0.1.0.pre.alpha.2.5.1 → 0.1.0.pre.alpha.2.5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcb1f58a7413ccbfe7bca31932fb0b65a13c0e45dd1dcdb2c8477da829aa45d2
-  data.tar.gz: a26387dca45e8cd121ec50d39a137c9297a2f17b6d8270758a0212a0de42b450
+  metadata.gz: 42cc1a4a04b3e66593f20e8c705d21b18d0805b335ecc0f466aadbe66a4b34b1
+  data.tar.gz: 6e402f557bac045b01271a782a549264b52435a31ce4422b9023df3305cc378d
 SHA512:
-  metadata.gz: a07a81a6525e3c08ac68579166b782e0c589e41be6a0714cd4275f3f3b44d88570bd1ce43d7fac2596529d508a57cf52e6c0b4339f48ddfa8395848a9e67b899
-  data.tar.gz: f90dab3ada8f0fbb047227699e9a41ca43abf183b407af0b002bb58a033cd10ac09061353983b067d31a4ccee2802f3da705b210ece7be298cc921f5e8384553
+  metadata.gz: 2dc07f5c6be221dc0d46961c8ea2810ed42a8b17d5bc195f4b695b782695f489259f6e9f6c4369b2e13e2b87f1a779db7fb71dbf8fd59b5712169512bac2c217
+  data.tar.gz: d772ed5b642945eaa6ed3c09d0161b26e7763ec692e481d70df893b88a9d1779018978806fb10459d84f8479eb2a5616a56e4c109723dc610227ec0e41998502

data/.rubocop.yml

@@ -33,17 +33,20 @@ Style/DoubleNegation:
 Metrics/BlockLength:
   Enabled: false
 
+Metrics/ModuleLength:
+  Enabled: false
+
 Metrics/MethodLength:
   Max: 60
 
 Metrics/PerceivedComplexity:
-  Max: 15
+  Max: 16
 
 Metrics/AbcSize:
   Max: 60
 
 Metrics/CyclomaticComplexity:
-  Max: 14
+  Max: 16
 
 Lint/EmptyBlock:
   Enabled: false

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.1.0-alpha.2.5.1.2
+* [BUGFIX] Subfield expectations: now support hashes with string keys (using with_indifferent_access)
+* [BUGFIX] Subfield expectations: Model reader fields now cache initial value (otherwise get fresh instance each call, cannot make in-memory changes)
+
+## 0.1.0-alpha.2.5.1.1
+* [BUGFIX] TypeValidator must handle anonymous classes when determining if given argument is an RSpec mock
+
 ## 0.1.0-alpha.2.5.1
 * Added new `model` validator for expectations
 * [FEAT] Extended `expects` with the `on:` key to allow declaring nested data shapes/validations

data/lib/action/core/contract.rb

@@ -109,6 +109,17 @@ module Action
         end
       end
 
+      def define_memoized_reader_method(field, &block)
+        define_method(field) do
+          ivar = :"@_memoized_reader_#{field}"
+          cached_val = instance_variable_get(ivar)
+          return cached_val if cached_val.present?
+
+          value = instance_exec(&block)
+          instance_variable_set(ivar, value)
+        end
+      end
+
       def _define_field_reader(field)
         # Allow local access to explicitly-expected fields -- even externally-expected needs to be available locally
         # (e.g. to allow success message callable to reference exposed fields)
@@ -120,7 +131,7 @@ module Action
         raise ArgumentError, "Model validation expects to be given a field ending in _id (given: #{field})" unless field.to_s.end_with?("_id")
         raise ArgumentError, "Failed to define model reader - #{name} is already defined" if method_defined?(name)
 
-        define_method(name) do
+        define_memoized_reader_method(name) do
           Validators::ModelValidator.instance_for(field:, klass:, id: public_send(field))
         end
       end

data/lib/action/core/contract_for_subfields.rb

@@ -82,22 +82,11 @@ module Action
         raise ArgumentError, "expects does not support duplicate sub-keys (i.e. `#{field}` is already defined)" if method_defined?(field)
 
         define_memoized_reader_method(field) do
-          public_send(on).fetch(field)
+          Action::Validation::Subfields.extract(field, public_send(on))
         end
 
         _define_model_reader(field, validations[:model]) if validations.key?(:model)
       end
-
-      def define_memoized_reader_method(field, &block)
-        define_method(field) do
-          ivar = :"@_memoized_reader_#{field}"
-          cached_val = instance_variable_get(ivar)
-          return cached_val if cached_val.present?
-
-          value = instance_exec(&block)
-          instance_variable_set(ivar, value)
-        end
-      end
     end
 
     module InstanceMethods

data/lib/action/core/validation/validators/type_validator.rb

@@ -19,7 +19,7 @@ module Action
             value.is_a?(String) && value.match?(/\A[0-9a-f]{8}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{4}-?[0-9a-f]{12}\z/i)
           else
             # NOTE: allow mocks to pass type validation by default (much easier testing ergonomics)
-            next true if Action.config.env.test? && value.class.name.start_with?("RSpec::Mocks::")
+            next true if Action.config.env.test? && value.class.name&.start_with?("RSpec::Mocks::")
 
             value.is_a?(type)
           end

data/lib/axn/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Axn
-  VERSION = "0.1.0-alpha.2.5.1"
+  VERSION = "0.1.0-alpha.2.5.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axn
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha.2.5.1
+  version: 0.1.0.pre.alpha.2.5.1.2
 platform: ruby
 authors:
 - Kali Donovan