activerecord-bixformer 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dd4ea598a0c120a784bbeb9f5a296471a5385f57
-  data.tar.gz: 7078cc54cd2675e0081362d897ee7ff74985b2c8
+  metadata.gz: 565674ba58147fc9345db47ffd3948b310a1b42b
+  data.tar.gz: fb55615709f7d11e1e17bb7eac0ec215b247bd72
 SHA512:
-  metadata.gz: 868cd4eba053a212776bb8c5b1ea4b1c25d0da8c5dcddd5f0e48cd302e13db17bd4ed4d497f4b9f157544de472d22b46a3462ae97b814fa16a8d69f6cc8f2f20
-  data.tar.gz: 2856bb8d614bbd9e64bbf6c4bd47d85e7c064123d0603dec9d236478580dd93b30225e8cbc25d6c327fc98f402e269592ebadc4863dcaf5d432a4ae345d3d00a
+  metadata.gz: 80893b6689eddf6315186104099449bf752bdd7ca66399eeeded3e8c1dbe3a30580f2f047de48ca72d797b12328e3598aa9bb8befa471abd36b796b032737e6c
+  data.tar.gz: aea5af76daaa004464480f4c155bb1f9f7502b02fe0c558c5518b011ea80ad8c36213e3b606920e0ff59b6d703fea7ab84b51cc28a2704d8947d6a7525d24382

data/lib/activerecord-bixformer/model/base.rb

@@ -91,9 +91,9 @@ module ActiveRecord
           values     = {}.with_indifferent_access
           normalizer = ::ActiveRecord::Bixformer::AssignableAttributesNormalizer.new(plan, self, parent_record_id)
 
-          run_callback :import, type: :attribute do
+          run_bixformer_callback :import, type: :attribute do
             @attributes.each do |attr|
-              attribute_value = run_callback :import, on: attr.name do
+              attribute_value = run_bixformer_callback :import, on: attr.name do
                 block.call(attr)
               end
 
@@ -123,9 +123,9 @@ module ActiveRecord
         def make_each_association_import_value(values, &block)
           self_record_id = values[activerecord_constant.primary_key]
 
-          run_callback :import, type: :association do
+          run_bixformer_callback :import, type: :association do
             @associations.each do |association|
-              association_value = run_callback :import, on: association.name do
+              association_value = run_bixformer_callback :import, on: association.name do
                 block.call(association, self_record_id)
               end
 

data/lib/activerecord-bixformer/model/csv/base.rb

@@ -4,12 +4,12 @@ module ActiveRecord
       module Csv
         class Base < ::ActiveRecord::Bixformer::Model::Base
           def export(record_or_records)
-            run_callback :export do
-              values = run_callback :export, type: :attribute do
+            run_bixformer_callback :export do
+              values = run_bixformer_callback :export, type: :attribute do
                 # has_one でしか使わない想定なので record_or_records は ActiveRecord::Base のはず
                 @attributes.map do |attr|
                   attribute_value = if record_or_records
-                                      run_callback :export, on: attr.name do
+                                      run_bixformer_callback :export, on: attr.name do
                                         attr.export(record_or_records)
                                       end
                                     end
@@ -18,10 +18,10 @@ module ActiveRecord
                 end.to_h.with_indifferent_access
               end
 
-              run_callback :export, type: :association do
+              run_bixformer_callback :export, type: :association do
                 @associations.inject(values) do |each_values, association|
                   association_value = if record_or_records
-                                        run_callback :export, on: association.name do
+                                        run_bixformer_callback :export, on: association.name do
                                           record_or_records.__send__(association.name)
                                         end
                                       end
@@ -35,7 +35,7 @@ module ActiveRecord
           end
 
           def import(csv_body_row, parent_record_id = nil)
-            run_callback :import do
+            run_bixformer_callback :import do
               values = make_each_attribute_import_value(parent_record_id) do |attr|
                 csv_value = csv_body_row[csv_title(attr.name)]
 

data/lib/activerecord-bixformer/model_callback.rb

@@ -4,15 +4,12 @@ module ActiveRecord
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :__bixformer_export_callbacks
-        class_attribute :__bixformer_import_callbacks
-
-        self.__bixformer_export_callbacks = {}
-        self.__bixformer_import_callbacks = {}
+        class_attribute :__bixformer_export_callbacks, instance_writer: false
+        class_attribute :__bixformer_import_callbacks, instance_writer: false
 
         private
 
-        def self.callback_store_key(options)
+        def self.bixformer_callback_key(options)
           if options[:on]
             "on:#{options[:on]}"
           elsif options[:type]
@@ -27,14 +24,15 @@ module ActiveRecord
         [:export, :import].each do |target|
           [:before, :around, :after].each do |timing|
             define_method "bixformer_#{timing}_#{target}" do |*callback, &block|
-              callback_store = self.__send__("__bixformer_#{target}_callbacks")[timing] ||= {}
+              unless __send__("__bixformer_#{target}_callbacks")
+                __send__("__bixformer_#{target}_callbacks=", {})
+              end
 
+              store   = __send__("__bixformer_#{target}_callbacks")[timing] ||= {}
               options = callback.extract_options!.with_indifferent_access
-              key     = callback_store_key(options)
+              key     = bixformer_callback_key(options)
 
-              callback_store[key] = options.merge(
-                body: block ? block : options[:body] || callback.first
-              )
+              store[key] = options.merge(body: block ? block : options[:body] || callback.first)
             end
           end
         end
@@ -42,50 +40,53 @@ module ActiveRecord
 
       private
 
-      def run_callback(target, options = {}, &body)
-        options = options.with_indifferent_access
+      def run_bixformer_callback(target, options = {}, &body)
+        fetcher = -> (timing) do
+          return unless __send__("__bixformer_#{target}_callbacks")
 
-        before_callback = callback(target, :before, options)
-        if before_callback
-          return nil unless invoke_callback(before_callback)
-        end
+          store  = __send__("__bixformer_#{target}_callbacks")[timing] || {}
+          key    = self.class.bixformer_callback_key(options)
+          values = store[key] || {}
 
-        around_callback = callback(target, :around, options)
-        result          = invoke_callback(around_callback, &body)
+          values[:body]
+        end
 
-        after_callback = callback(target, :after, options)
-        invoke_callback(after_callback, args_required: true, args_value: result) if after_callback
+        invoker = -> (callback, args_required: false, args_value: nil, &block) do
+          if callback.is_a?(::Proc)
+            if block
+              self.instance_exec block, &callback
+            elsif args_required
+              self.instance_exec args_value, &callback
+            else
+              self.instance_exec &callback
+            end
+          elsif callback.is_a?(::Symbol) || callback.is_a?(::String)
+            if block
+              self.__send__(callback, &block)
+            elsif args_required
+              self.__send__(callback, args_value)
+            else
+              self.__send__(callback)
+            end
+          elsif block
+            yield block
+          end
+        end
 
-        result
-      end
+        options = options.with_indifferent_access
 
-      def invoke_callback(callback, args_required: false, args_value: nil, &block)
-        if callback.is_a?(::Proc)
-          if block
-            self.instance_exec block, &callback
-          elsif args_required
-            self.instance_exec args_value, &callback
-          else
-            self.instance_exec &callback
-          end
-        elsif callback.is_a?(::Symbol) || callback.is_a?(::String)
-          if block
-            self.__send__(callback, &block)
-          elsif args_required
-            self.__send__(callback, args_value)
-          else
-            self.__send__(callback)
-          end
-        elsif block
-          yield block
+        before_callback = fetcher.call(:before)
+        if before_callback
+          return nil unless invoker.call(before_callback)
         end
-      end
 
-      def callback(target, timing, options)
-        callback_store  = self.__send__("__bixformer_#{target}_callbacks")[timing] || {}
-        callback_values = callback_store[self.class.callback_store_key(options)] || {}
+        around_callback = fetcher.call(:around)
+        result          = invoker.call(around_callback, &body)
 
-        callback_values[:body]
+        after_callback = fetcher.call(:after)
+        invoker.call(after_callback, args_required: true, args_value: result) if after_callback
+
+        result
       end
     end
   end

data/lib/activerecord-bixformer/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Bixformer
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-bixformer
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Hiroaki Otsu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord