shoulda-matchers 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f55ad44dc8280d7bb9598c809562c5d4b4bd174e78bdc8323898bdb7a3e8665a
-  data.tar.gz: 80ddb4b8e6c0ab63c4b9225a1a75789d058d1e664c1b2248680469868072e724
+  metadata.gz: 686cc1117dd1671c3c3a6bed33c00f935dfc423eb74e640495b931965ba6ddbb
+  data.tar.gz: 0716b77fbb4bf86d7bc0b526a6d070081f753bff94af8bdd043415d3b71aa54d
 SHA512:
-  metadata.gz: b912596ee8e4a25b1cbd98bca2878ac52cc19b54ab6014bbff0952b7449294e26a6d82b21a6d871b897eb23b26fb82bbc7b328d4de28bb73191fccf53e4e9c1b
-  data.tar.gz: 168c002e0ed67d1a2dfde0465e2f48c2fcd4177810479f9c4d5970949f4fbec7db7cb5c71c33b7a341174d5c97fbbfb0782b18ada9f30695048bf25c64777875
+  metadata.gz: 35aeea48a5feeb86342ebaf93b8ae9621bd3255e12344c040e7c832f0a603073b7f7c95e4fd70029bc64c4daf49ca7bcd4193fc7b751d71c68e8ab1467503f18
+  data.tar.gz: d401a3db95f35d08b7cd1decc6adbea2acc338576ca48f233fe55ea9f6287535cbf7f6d0115a115931d69911e31c510d235bbc1689c98cf2d301dd65fcf6e52d

data/README.md

@@ -19,7 +19,7 @@ complex, and error-prone.
 
 ## Quick links
 
-📖 **[Read the documentation for the latest version (4.1.1)][rubydocs].**  
+📖 **[Read the documentation for the latest version (4.1.2)][rubydocs].**  
 📢 **[See what's changed in a recent version][news].**
 
 [rubydocs]: http://matchers.shoulda.io/docs

data/lib/shoulda/matchers/active_model/validate_presence_of_matcher.rb

@@ -314,10 +314,11 @@ validation for you? Instead of using `validate_presence_of`, try
         def attribute_accepts_string_values?
           if association?
             false
-          elsif attribute_serializer
-            attribute_serializer.object_class == String
+          elsif attribute_serialization_coder.respond_to?(:object_class)
+            attribute_serialization_coder.object_class == String
           else
-            attribute_type.try(:type) == :string
+            RailsShim.supports_full_attributes_api?(model) &&
+              attribute_type.try(:type) == :string
           end
         end
 
@@ -355,12 +356,8 @@ validation for you? Instead of using `validate_presence_of`, try
           end
         end
 
-        def attribute_serializer
-          if attribute_type.respond_to?(:coder)
-            attribute_type.coder
-          else
-            nil
-          end
+        def attribute_serialization_coder
+          RailsShim.attribute_serialization_coder_for(model, @attribute)
         end
 
         def attribute_type

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

@@ -183,15 +183,11 @@ module Shoulda
         end
 
         def attribute_is_serialized?
-          serialized_attributes.include?(@name)
+          !!serialization_coder
         end
 
         def serialization_coder
-          serialized_attributes[@name]
-        end
-
-        def serialized_attributes
-          Shoulda::Matchers::RailsShim.serialized_attributes_for(model)
+          RailsShim.attribute_serialization_coder_for(model, @name)
         end
 
         def model

data/lib/shoulda/matchers/rails_shim.rb

@@ -69,21 +69,20 @@ module Shoulda
         end
 
         def serialized_attributes_for(model)
-          if defined?(::ActiveRecord::Type::Serialized)
-            # Rails 5+
-            serialized_columns = model.columns.select do |column|
-              model.type_for_attribute(column.name).is_a?(
-                ::ActiveRecord::Type::Serialized,
-              )
+          attribute_types_for(model).
+            inject({}) do |hash, (attribute_name, attribute_type)|
+              if attribute_type.is_a?(::ActiveRecord::Type::Serialized)
+                hash.merge(attribute_name => attribute_type.coder)
+              else
+                hash
+              end
             end
+        rescue NotImplementedError
+          {}
+        end
 
-            serialized_columns.inject({}) do |hash, column|
-              hash[column.name.to_s] = model.type_for_attribute(column.name).coder
-              hash
-            end
-          else
-            model.serialized_attributes
-          end
+        def attribute_serialization_coder_for(model, attribute_name)
+          serialized_attributes_for(model)[attribute_name.to_s]
         end
 
         def type_cast_default_for(model, column)
@@ -156,14 +155,35 @@ module Shoulda
           nil
         end
 
+        def attribute_types_for(model)
+          if model.respond_to?(:attribute_types)
+            model.attribute_types
+          elsif model.respond_to?(:type_for_attribute)
+            model.columns.inject({}) do |hash, column|
+              key = column.name.to_s
+              value = model.type_for_attribute(column.name)
+              hash.merge(key => value)
+            end
+          else
+            raise NotImplementedError
+          end
+        end
+
         def attribute_type_for(model, attribute_name)
-          if supports_full_attributes_api?(model)
-            model.attribute_types[attribute_name.to_s]
+          attribute_types_for(model)[attribute_name.to_s]
+        rescue NotImplementedError
+          if model.respond_to?(:type_for_attribute)
+            model.type_for_attribute(attribute_name)
           else
-            LegacyAttributeType.new(model, attribute_name)
+            FakeAttributeType.new(model, attribute_name)
           end
         end
 
+        def supports_full_attributes_api?(model)
+          defined?(::ActiveModel::Attributes) &&
+            model.respond_to?(:attribute_types)
+        end
+
         private
 
         def simply_generate_validation_message(
@@ -188,23 +208,14 @@ module Shoulda
           I18n.translate(primary_translation_key, translate_options)
         end
 
-        def supports_full_attributes_api?(model)
-          defined?(::ActiveModel::Attributes) &&
-            model.respond_to?(:attribute_types)
-        end
-
-        class LegacyAttributeType
+        class FakeAttributeType
           def initialize(model, attribute_name)
             @model = model
             @attribute_name = attribute_name
           end
 
           def coder
-            if model.respond_to?(:serialized_attributes)
-              ActiveSupport::Deprecation.silence do
-                model.serialized_attributes[attribute_name.to_s]
-              end
-            end
+            nil
           end
 
           private

data/lib/shoulda/matchers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-15 00:00:00.000000000 Z
+date: 2019-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport