shoulda-matchers 4.5.0 → 4.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0268da0cff119fb6c9128b70f1826451b582bdc2495acf382f4e512a6636d0c8'
-  data.tar.gz: bf0698ed7605d8a8ef6b7e78bdc198bfa9502e1f2df134e3c5f524d1809b82da
+  metadata.gz: a62f760706ab97ba90edd181dbdf330ce6e8203c8ec3ec37a258022e202a53a6
+  data.tar.gz: 68f333b57646a8a437b73ff43f617efa9231674fb92f68de73365eb1408932f0
 SHA512:
-  metadata.gz: 407cc79fc367dd4f02b346a199a8d9a9c4ecc5f2d814b98b25989489d96fd2d02308459e2d3a086aeacd67cbd5a9e91e7e237f3fe04efb64c196307dd53abe71
-  data.tar.gz: a4eb04356408c22c7606ef403e1d4a042461e5323a9459875ad6a67f9f5cbc2944dee295d6086e6f1bea5b1d4fd7cace0fc5b701a4ba0199c75f7f002939f47a
+  metadata.gz: ea01851ee8521ff08ab6b1caea192c161e34286e5fd361cbceb6b84404813fa952acb73c70481c3140b2c5116ffce8bb386bf1feea70754f827a3918292b1bfb
+  data.tar.gz: 286ac5e78d534651889c5e3ed3843e1afa50d0fd77ed896c4ca3cf3622596cb7e1f47d2ae053e38100ce443dbfd80fbf1a8d099ecdfbbcf8d70912dbe3f42ad3

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

@@ -1397,7 +1397,7 @@ module Shoulda
           if options.key?(:foreign_key) && !foreign_key_correct?
             @missing = foreign_key_failure_message(klass, options[:foreign_key])
             false
-          elsif !column_names_for(klass).include?(foreign_key)
+          elsif !has_column?(klass, foreign_key)
             @missing = foreign_key_failure_message(klass, foreign_key)
             false
           else
@@ -1405,6 +1405,15 @@ module Shoulda
           end
         end
 
+        def has_column?(klass, column)
+          case column
+          when Array
+            column.all? { |c| has_column?(klass, c) }
+          else
+            column_names_for(klass).include?(column)
+          end
+        end
+
         def foreign_key_correct?
           option_verifier.correct_for_string?(
             :foreign_key,
@@ -1434,12 +1443,18 @@ module Shoulda
         end
 
         def foreign_key
-          if foreign_key_reflection
-            if foreign_key_reflection.respond_to?(:foreign_key)
-              foreign_key_reflection.foreign_key.to_s
-            else
-              foreign_key_reflection.primary_key_name.to_s
-            end
+          key = if foreign_key_reflection
+                  if foreign_key_reflection.respond_to?(:foreign_key)
+                    foreign_key_reflection.foreign_key
+                  else
+                    foreign_key_reflection.primary_key_name
+                  end
+                end
+
+          if key.is_a?(Array)
+            key.map(&:to_s)
+          else
+            key.to_s
           end
         end
 

data/lib/shoulda/matchers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoulda-matchers
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.5.1
 platform: ruby
 authors:
 - Tammer Saleh
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-11 00:00:00.000000000 Z
+date: 2021-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport