activerecord-bixformer 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 975aa8d7deb6a1db994d840cef88a84548505449
-  data.tar.gz: 18b1ef10ebe9d3a1973468ff4de5899769db39e6
+  metadata.gz: ebdeb4d0ee7e10859c4a8d348ebcc505bf286d19
+  data.tar.gz: 805e0d16206bd0b33fad2e78dd412a3c300541d9
 SHA512:
-  metadata.gz: 0e29358781db9fc618679e1f82816bcdfbbb91527df9a19037058f2ae0bb4007744b97151b0a9a7b76cf0d5c45e2bcfd105a81e8da246b74dfea21b45f864b68
-  data.tar.gz: ecc108217d93c7c574d2df66f143e45ed905abe266772ebc6f11358784625fa4dc41008652edf67e5f7ca3a2501e26f199a7ea7885710e09b492a059d8e70286
+  metadata.gz: 8b179a6a9c55b795c791fdb8e746d9b05e772f32dbd2f3241d52da8e36c96e2945b011eb38fe9309a5410e341e0bd46989c4165144f43882142dae3da980c318
+  data.tar.gz: 41e2e7330629c0d28fd899e587a3bf0264e128d1c23b9d48f1fb3bdbc5dafa1a8e5a1a3995f3e83bfc15f06b99209d7a007cebfbcd40e61d365f05338a8af766

data/lib/activerecord-bixformer/attribute/formatted_foreign_key.rb

@@ -39,10 +39,10 @@ module ActiveRecord
         def import(value)
           return nil unless value.present?
 
-          parser    = @options[:parser]
-          find_by   = @options[:find_by] || :find_by
-          scope     = @options[:scope] || :all
-          creator   = @options[:creator] || :save
+          parser  = @options[:parser]
+          find_by = @options[:find_by]
+          scope   = @options[:scope] || :all
+          creator = @options[:creator] || :save
 
           condition = if parser.is_a?(::Proc)
                         parser.call(value)
@@ -60,8 +60,14 @@ module ActiveRecord
 
           foreign_record = if find_by.is_a?(::Proc)
                              find_by.call(scoped_relation, condition)
-                           else
+                           elsif find_by
                              scoped_relation.__send__(find_by, condition)
+                           elsif scoped_relation.respond_to?(:find_by)
+                             scoped_relation.find_by(condition)
+                           else
+                             scoped_relation.find do |r|
+                               condition.all? { |k, v| r.__send__(k) == v rescue false }
+                             end
                            end
 
           if ! foreign_record && @options[:create]

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.4.5"
+    VERSION = "0.4.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Hiroaki Otsu