activerecord-bixformer 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 06d5ab39dfcb860914026975b5d9418dbbb6a117
-  data.tar.gz: 50d3b1bd924cfa110b72fe9a28d9a1786fd5b78a
+  metadata.gz: 03b0d7b8164b9a2d8df5a3b32a1e6f360a70ef3f
+  data.tar.gz: 8c3134805d7d5ac55d0a9d4905ff3a461a1c07ec
 SHA512:
-  metadata.gz: 8afbb90d65a314967ae67dedb8aacef4d1e6d3552d469bf4b080ee971268ac0f9b38846e6a0052969544b2829eda3a2067a193b7b222c20cd0d9d8c6bbb8a53b
-  data.tar.gz: 610b36b3f7660c350fe9342a5d4985137197c77112c86bf8cef56aeab93c4c7f1a5a49467635d251a6749e59b77c9f98bf833912795235fb9e4cd18d6637fb46
+  metadata.gz: f5fb1111352e1fe5839f74b477944f64c1072f671d3a65243391e73ce6c72a1879bd22cdb02d4c41e0fc1ec786c2f3ecfb644fb3d2949a1bbb76071364f7866f
+  data.tar.gz: f848f2b7b9ad05f9bb235cabca4a8dacb76880527cc4f297385612e10c63bd3cc2d783aa56da99a049ed67f81150b81d383b97497ceadbaa3d465911a6662a5b

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

@@ -30,7 +30,7 @@ module ActiveRecord
           formatter = @options[:by]
 
           if formatter.is_a?(::Proc)
-            self.instance_exec foreign_record, &formatter
+            formatter.call(foreign_record)
           else
             foreign_record.__send__(formatter)
           end
@@ -39,13 +39,13 @@ module ActiveRecord
         def import(value)
           return nil unless value.present?
 
-          find_by = @options[:find_by]
-          scope   = @options[:scope] || :all
-          finder  = @options[:finder] || :find_by
-          creator = @options[:creator] || :save
+          find_by   = @options[:find_by]
+          scope     = @options[:scope] || :all
+          finder    = @options[:finder] || :find_by
+          creator   = @options[:creator] || :save
 
           condition = if find_by.is_a?(::Proc)
-                        self.instance_exec value, &find_by
+                        find_by.call(value)
                       else
                         { find_by => value }
                       end
@@ -53,20 +53,20 @@ module ActiveRecord
           return nil unless condition
 
           foreign_record = if scope.is_a?(::Proc)
-                             self.instance_exec(&scope).__send__(finder, condition)
+                             scope.call.__send__(finder, condition)
                            else
                              foreign_constant.__send__(scope).__send__(finder, condition)
                            end
 
           if ! foreign_record && @options[:create]
             foreign_record = if scope.is_a?(::Proc)
-                               self.instance_exec(&scope).build(condition)
+                               scope.call.build(condition)
                              else
                                foreign_constant.__send__(scope).build(condition)
                              end
 
             if creator.is_a?(::Proc)
-              self.instance_exec foreign_record, &creator
+              creator.call(foreign_record)
             else
               foreign_record.__send__(creator)
             end

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.3.10"
+    VERSION = "0.3.11"
   end
 end

metadata

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