activerecord-bixformer 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73a43f010ea22167ff68efdc1d5f561d3715956c
-  data.tar.gz: e75ab454c783669f0fd9b122960d368f0b31880b
+  metadata.gz: 7fb89bcee1a68dc2fa2dc3b9be84e4d5720ff8db
+  data.tar.gz: 397f458b9bb776d27f195b0a702905b1cb0506d6
 SHA512:
-  metadata.gz: 28bba0a9adcef771c75f9977c10dcceb0f696d346aa67935842b4fea7600b619d919dfc2c16eef55a40845618bb3f5249dcc3d0753d34a6b58b84a50a2db9371
-  data.tar.gz: 9cbe63b03d90559515b32e5cc054249181f5b6c87d5e3895c726641af886a16664529d3153197037f50e47358cf7871a5b4f8779a0371b0ea9be2d1ab925b71c
+  metadata.gz: 96adb2970166144d0b9990a6d87e86a644f323f1f45450addb342a98c16631bc84091cd82bfb11a9b044e8a898d30384dd8cc0d3830ada53e1d1e61ecdb106d3
+  data.tar.gz: e629bb57d0c732495c8ecc304fa2a34f4c658918665dfbba4074b2566cd317190e7d57f36d4d67a0de3b167bec0b7ac85c502a962e6eb5c7cea0586b034985ff

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

@@ -5,16 +5,16 @@ module ActiveRecord
         def initialize(model, attribute_name, options)
           super
 
-          unless @options[:by]
-            raise ArgumentError.new 'Not configured required options : by'
+          unless @options[:formatter]
+            raise ArgumentError.new 'Not configured required options : formatter'
           end
 
-          @options[:find_by] ||= if @options[:by].is_a?(::String) || @options[:by].is_a?(::Symbol)
-                                   @options[:by]
-                                 end
+          @options[:parser] ||= if @options[:formatter].is_a?(::String) || @options[:formatter].is_a?(::Symbol)
+                                  -> (v) { { @options[:formatter] => v } }
+                                end
 
-          unless @options[:find_by]
-            raise ArgumentError.new 'Not configured required options : find_by'
+          unless @options[:parser]
+            raise ArgumentError.new 'Not configured required options : parser'
           end
         end
 
@@ -27,7 +27,7 @@ module ActiveRecord
 
           return nil unless foreign_record
 
-          formatter = @options[:by]
+          formatter = @options[:formatter]
 
           if formatter.is_a?(::Proc)
             formatter.call(foreign_record)
@@ -39,31 +39,33 @@ module ActiveRecord
         def import(value)
           return nil unless value.present?
 
-          find_by   = @options[:find_by]
+          parser    = @options[:parser]
+          find_by   = @options[:find_by] || :find_by
           scope     = @options[:scope] || :all
-          finder    = @options[:finder] || :find_by
           creator   = @options[:creator] || :save
 
-          condition = if find_by.is_a?(::Proc)
-                        find_by.call(value)
+          condition = if parser.is_a?(::Proc)
+                        parser.call(value)
                       else
-                        { find_by => value }
+                        foreign_constant.__send__(parser, value)
                       end
 
           return nil unless condition
 
-          foreign_record = if scope.is_a?(::Proc)
-                             scope.call.__send__(finder, condition)
+          scoped_relation = if scope.is_a?(::Proc)
+                              scope.call
+                            else
+                              foreign_constant.__send__(scope)
+                            end
+
+          foreign_record = if find_by.is_a?(::Proc)
+                             find_by.call(scoped_relation, condition)
                            else
-                             foreign_constant.__send__(scope).__send__(finder, condition)
+                             scoped_relation.__send__(find_by, condition)
                            end
 
           if ! foreign_record && @options[:create]
-            foreign_record = if scope.is_a?(::Proc)
-                               scope.call.build(condition)
-                             else
-                               foreign_constant.__send__(scope).build(condition)
-                             end
+            foreign_record = scoped_relation.build(condition)
 
             if creator.is_a?(::Proc)
               creator.call(foreign_record)

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.4.3"
+    VERSION = "0.4.4"
   end
 end

metadata

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