shoulda-matchers 6.3.1 → 6.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7de031f9a61f686180773f3541fe1b46124cd62dbc04198ed401d251594df5c5
-  data.tar.gz: 7c237464b869b7bdbe9e567546852e3d84650d0b1d45c6d8c4b582598599f1eb
+  metadata.gz: 0a3a788cc37a73b615004a4e88dacb051413e00f9a752b78f00cfa8b529e4149
+  data.tar.gz: 99e5319049435d5ae107d068cecacd547bbd5135e1f1966bf8e15c40e5cde84f
 SHA512:
-  metadata.gz: 3d96634f823c0f5ca1dd6c934e1117dfc30e87074cae350b3aeebb634733147a6add1be704e710039054cbd8819f4bd2e9eff9eebdd6864e2aacb1e78ab905e1
-  data.tar.gz: 56e5672313e8c941ead528cf4c6f25884d29205624d9ee5fee2e562d97ffce52b5619fa5b8fb38ebc84c43b6068ee976084847ec2a9ec0804228e914940b258e
+  metadata.gz: 5f2b4708f133c2e0a790c99de4608d976d8dfe8704436adeea539e816a18bc6bca7612e7ff669bc4830f8f617550a0db7a70574f611a791dc27879d66f6ed09c
+  data.tar.gz: 460ac28a8c3833b30ec3171f62a5d5225712132837caeb1c620df49cdcc1fc2d92614a8a652ac93f7707b06d4fe24c5c9ee70fc9759b8b34a3929f845931a2b5

data/README.md

@@ -167,9 +167,9 @@ end
 Most of the matchers provided by this gem are useful in a Rails context, and as
 such, can be used for different parts of a Rails app:
 
-* [database models backed by ActiveRecord](#activemodel-matchers)
+* [database models backed by ActiveRecord](#activerecord-matchers)
 * [non-database models, form objects, etc. backed by
-  ActiveModel](#activerecord-matchers)
+  ActiveModel](#activemodel-matchers)
 * [controllers](#actioncontroller-matchers)
 * [routes](#routing-matchers) (RSpec only)
 * [Rails-specific features like `delegate`](#independent-matchers)

data/lib/shoulda/matchers/active_record/association_matchers/counter_cache_matcher.rb

@@ -19,10 +19,7 @@ module Shoulda
           def matches?(subject)
             self.subject = ModelReflector.new(subject, name)
 
-            if option_verifier.correct_for_string?(
-              :counter_cache,
-              counter_cache,
-            )
+            if correct_value?
               true
             else
               self.missing_option = "#{name} should have #{description}"
@@ -34,9 +31,42 @@ module Shoulda
 
           attr_accessor :subject, :counter_cache, :name
 
+          def correct_value?
+            expected = normalize_value
+
+            if expected.is_a?(Hash)
+              option_verifier.correct_for_hash?(
+                :counter_cache,
+                expected,
+              )
+            else
+              option_verifier.correct_for_string?(
+                :counter_cache,
+                expected,
+              )
+            end
+          end
+
           def option_verifier
             @_option_verifier ||= OptionVerifier.new(subject)
           end
+
+          def normalize_value
+            if Rails::VERSION::STRING >= '7.2'
+              case counter_cache
+              when true
+                { active: true, column: nil }
+              when String, Symbol
+                { active: true, column: counter_cache.to_s }
+              when Hash
+                { active: true, column: nil }.merge(counter_cache)
+              else
+                raise ArgumentError, 'Invalid counter_cache option'
+              end
+            else
+              counter_cache
+            end
+          end
         end
       end
     end

data/lib/shoulda/matchers/active_record/define_enum_for_matcher.rb

@@ -655,11 +655,22 @@ module Shoulda
         end
 
         def actual_default_value
-          attribute_schema = model.attributes_to_define_after_schema_loads[attribute_name.to_s]
+          attribute_schema = if model.respond_to?(:_default_attributes)
+                               model._default_attributes[attribute_name.to_s]
+                             else
+                               model.attributes_to_define_after_schema_loads[attribute_name.to_s]
+                             end
+
+          if Kernel.const_defined?('ActiveModel::Attribute::UserProvidedDefault') &&
+             attribute_schema.is_a?(::ActiveModel::Attribute::UserProvidedDefault)
+            attribute_schema = attribute_schema.marshal_dump
+          end
 
           value = case attribute_schema
                   in [_, { default: default_value } ]
                     default_value
+                  in [_, default_value, *]
+                    default_value
                   in [_, default_value]
                     default_value
                   end

data/lib/shoulda/matchers/version.rb

@@ -1,6 +1,6 @@
 module Shoulda
   module Matchers
     # @private
-    VERSION = '6.3.1'.freeze
+    VERSION = '6.4.0'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 6.3.1
+  version: 6.4.0
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-13 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport