shoulda-matchers 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1856891b0a96aaa5ed99a48490288b2bbd3547c7779ab1d8477a33b61cbb0c7d
-  data.tar.gz: b3768f6532318b37de78e6959a1c7be2e28e19b4618d966a7ca0dab0cfa96ceb
+  metadata.gz: f55ad44dc8280d7bb9598c809562c5d4b4bd174e78bdc8323898bdb7a3e8665a
+  data.tar.gz: 80ddb4b8e6c0ab63c4b9225a1a75789d058d1e664c1b2248680469868072e724
 SHA512:
-  metadata.gz: dc99bd232c8f9a3eeff2ea7b82b36821339b20090b40c750c282b48d413b99028fcb69ec775ecb37a43d7e6d59a0c090213c35ede384ed95303d010a5e00ed90
-  data.tar.gz: 56dbd1bd6978b59743e6936118a535e276b7672f12a0b46b69b3baf164b6dcac0688ee26ec66ccb11b2d0af8d1374567d401ef1f46d3f54bd6d3ccee8cf55085
+  metadata.gz: b912596ee8e4a25b1cbd98bca2878ac52cc19b54ab6014bbff0952b7449294e26a6d82b21a6d871b897eb23b26fb82bbc7b328d4de28bb73191fccf53e4e9c1b
+  data.tar.gz: 168c002e0ed67d1a2dfde0465e2f48c2fcd4177810479f9c4d5970949f4fbec7db7cb5c71c33b7a341174d5c97fbbfb0782b18ada9f30695048bf25c64777875

data/README.md

@@ -19,7 +19,7 @@ complex, and error-prone.
 
 ## Quick links
 
-📖 **[Read the documentation for the latest version (4.1.0)][rubydocs].**  
+📖 **[Read the documentation for the latest version (4.1.1)][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

@@ -170,7 +170,7 @@ module Shoulda
               allows_and_double_checks_value_of!(value)
             end
           else
-            (expects_to_allow_nil? && !allows_value_of(nil)) ||
+            (expects_to_allow_nil? && disallows_value_of(nil)) ||
               disallowed_values.any? do |value|
                 allows_original_or_typecast_value?(value)
               end
@@ -234,12 +234,14 @@ validation for you? Instead of using `validate_presence_of`, try
         end
 
         def disallowed_values
-          if collection?
+          if collection_association?
             [Array.new]
+          elsif attachment?
+            [nil]
           else
             values = []
 
-            if !association_being_validated?
+            if attribute_accepts_string_values?
               values << ''
             end
 
@@ -251,16 +253,6 @@ validation for you? Instead of using `validate_presence_of`, try
           end
         end
 
-        def collection?
-          if association_reflection
-            [:has_many, :has_and_belongs_to_many].include?(
-              association_reflection.macro,
-            )
-          else
-            false
-          end
-        end
-
         def should_add_footnote_about_belongs_to?
           belongs_to_association_being_validated? &&
             presence_validation_exists_on_attribute?
@@ -316,12 +308,33 @@ validation for you? Instead of using `validate_presence_of`, try
         end
 
         def belongs_to_association_being_validated?
-          association_being_validated? &&
-            association_reflection.macro == :belongs_to
+          association? && association_reflection.macro == :belongs_to
+        end
+
+        def attribute_accepts_string_values?
+          if association?
+            false
+          elsif attribute_serializer
+            attribute_serializer.object_class == String
+          else
+            attribute_type.try(:type) == :string
+          end
+        end
+
+        def association?
+          association_reflection.present?
         end
 
-        def association_being_validated?
-          !!association_reflection
+        def collection_association?
+          association? && association_reflection.macro.in?(
+            [:has_many, :has_and_belongs_to_many],
+          )
+        end
+
+        def attachment?
+          model_has_associations?(
+            ["#{@attribute}_attachment", "#{@attribute}_attachments"],
+          )
         end
 
         def association_name
@@ -333,8 +346,25 @@ validation for you? Instead of using `validate_presence_of`, try
         end
 
         def association_reflection
-          model.respond_to?(:reflect_on_association) &&
-            model.reflect_on_association(@attribute)
+          model.try(:reflect_on_association, @attribute)
+        end
+
+        def model_has_associations?(associations)
+          associations.any? do |association|
+            !!model.try(:reflect_on_association, association)
+          end
+        end
+
+        def attribute_serializer
+          if attribute_type.respond_to?(:coder)
+            attribute_type.coder
+          else
+            nil
+          end
+        end
+
+        def attribute_type
+          RailsShim.attribute_type_for(model, @attribute)
         end
 
         def presence_validation_exists_on_attribute?

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

@@ -2,7 +2,7 @@ module Shoulda
   module Matchers
     module ActiveRecord
       # The `define_enum_for` matcher is used to test that the `enum` macro has
-      # been used to decorate an attribute with enum methods.
+      # been used to decorate an attribute with enum capabilities.
       #
       #     class Process < ActiveRecord::Base
       #       enum status: [:running, :stopped, :suspended]
@@ -22,8 +22,8 @@ module Shoulda
       #
       # ##### with_values
       #
-      # Use `with_values` to test that the attribute has been defined with a
-      # certain set of possible values.
+      # Use `with_values` to test that the attribute can only receive a certain
+      # set of possible values.
       #
       #     class Process < ActiveRecord::Base
       #       enum status: [:running, :stopped, :suspended]
@@ -43,10 +43,37 @@ module Shoulda
       #         with_values([:running, :stopped, :suspended])
       #     end
       #
+      # If the values backing your enum attribute are arbitrary instead of a
+      # series of integers starting from 0, pass a hash to `with_values` instead
+      # of an array:
+      #
+      #     class Process < ActiveRecord::Base
+      #       enum status: {
+      #         running: 0,
+      #         stopped: 1,
+      #         suspended: 3,
+      #         other: 99
+      #       }
+      #     end
+      #
+      #     # RSpec
+      #     RSpec.describe Process, type: :model do
+      #       it do
+      #         should define_enum_for(:status).
+      #           with_values(running: 0, stopped: 1, suspended: 3, other: 99)
+      #       end
+      #     end
+      #
+      #     # Minitest (Shoulda)
+      #     class ProcessTest < ActiveSupport::TestCase
+      #       should define_enum_for(:status).
+      #         with_values(running: 0, stopped: 1, suspended: 3, other: 99)
+      #     end
+      #
       # ##### backed_by_column_of_type
       #
-      # Use `backed_by_column_of_type` to test that the attribute is of a
-      # certain column type. (The default is `:integer`.)
+      # Use `backed_by_column_of_type` when the column backing your column type
+      # is a string instead of an integer:
       #
       #     class LoanApplication < ActiveRecord::Base
       #       enum status: {

data/lib/shoulda/matchers/rails_shim.rb

@@ -156,6 +156,14 @@ module Shoulda
           nil
         end
 
+        def attribute_type_for(model, attribute_name)
+          if supports_full_attributes_api?(model)
+            model.attribute_types[attribute_name.to_s]
+          else
+            LegacyAttributeType.new(model, attribute_name)
+          end
+        end
+
         private
 
         def simply_generate_validation_message(
@@ -179,6 +187,30 @@ module Shoulda
             { default: default_translation_keys }.merge(options)
           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
+          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
+          end
+
+          private
+
+          attr_reader :model, :attribute_name
+        end
       end
     end
   end

data/lib/shoulda/matchers/version.rb

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

metadata

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