kushojin 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06f7c8d3b7b0fe28792b4c01bc6af184a25cca40b5c70ab0f2916acc3d696b6a
-  data.tar.gz: 59b0051cf2b0d30e5d6f468621fcb8719e35cc167eca2774cf638ff5a2cc97f6
+  metadata.gz: aded25303e7f5437b7c4ff30cf00786404573a9b348e41ec717ed3fe2ba91a12
+  data.tar.gz: 7a2475384378eebc452d62d2ad969c8d5c792599aa59265b47dc9ad9d08b388b
 SHA512:
-  metadata.gz: 90c9302c8beca1dcbefff47f30fe97713ce31e232480fcb2718817efa775d696745b9de15c0242330035ade1fc78a81ccd21129264adae27f503df35098f3e52
-  data.tar.gz: e7626085b763c4c2ec0ca83bd68da28c0fb4484eeada3ee56150d595720b60a38bef0e7601fac96268336efb9008acec7c2d52129ba2d24301460f060004db33
+  metadata.gz: d1c3a9cb1b8ae4cd2e07b0e2da45583b1a2f38f18d9a96bddaa1c7d74ee9dd9483059b0ca007754cdaac349fcae758f13840f0d391f26233dc59742cc9317faf
+  data.tar.gz: 7b00fca7decfed5b27caf9e357c8cbf0813a13d1d80ea8e399dad7c12d841485cc8f4f09e2776b809242bead4dbb58338b17dd1567d85bad56887b917dd0c4fb

data/.travis.yml

@@ -1,5 +1,5 @@
 sudo: false
 language: ruby
 rvm:
-  - 2.4.2
-before_install: gem install bundler -v 1.15.4
+  - 2.5.3
+before_install: gem install bundler -v 1.17.1

data/README.md

@@ -57,10 +57,10 @@ Custom callback object can be used with `:callbacks` option.
 
 ```ruby
 class CustomCallbacks
-  # Must respond to after_create, after_update, and before_destroy.
+  # Must respond to after_create, after_update, and after_destroy.
   def after_create(record); end
   def after_update(record); end
-  def before_destroy(record); end
+  def after_destroy(record); end
 end
 
 class User < ApplicationRecord

data/bin/console

@@ -7,8 +7,8 @@ require "kushojin"
 # with your gem easier. You can also use a different console, if you like.
 
 # (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+require "pry"
+Pry.start
 
-require "irb"
-IRB.start(__FILE__)
+# require "irb"
+# IRB.start(__FILE__)

data/lib/kushojin/model_methods/callback.rb

@@ -1,7 +1,7 @@
 module Kushojin
   module ModelMethods
     module Callback
-      RECORD_EVENTS = %i[before_destroy after_create after_update].freeze
+      RECORD_EVENTS = %i[after_create after_update after_destroy].freeze
 
       module ClassMethods
         def self.extended(klass)
@@ -22,10 +22,10 @@ module Kushojin
         # Custom callback object can be used with +:callbacks+ option.
         #
         #   class CustomCallbacks
-        #     # Must respond to after_create, after_update, and before_destroy.
+        #     # Must respond to after_create, after_update, and after_destroy.
         #     def after_create(record); end
         #     def after_update(record); end
-        #     def before_destroy(record); end
+        #     def after_destroy(record); end
         #   end
         #
         #   class User < ApplicationRecord

data/lib/kushojin/model_methods/change.rb

@@ -1,18 +1,37 @@
 module Kushojin
   module ModelMethods
     class Change
-      attr_reader :event, :model, :changes
+      attr_reader :event, :model
 
       delegate :primary_key, :table_name, to: "@model.class"
 
       def initialize(event, model)
         @event = event
-        @model = model.class.new(model.attributes).freeze
-        @changes = model.saved_changes.freeze
+        @model = take_copy_of(model).freeze
+      end
+
+      def changes
+        @model.saved_changes
       end
 
       def changes_without_primary_key
-        @changes.reject { |attr_name, _| attr_name == primary_key }
+        changes.reject { |attr_name, _| attr_name == primary_key }
+      end
+
+      private
+
+      class_attribute :copy_ivars, instance_writer: false
+      self.copy_ivars = %i[
+        @attributes
+        @mutations_before_last_save
+      ]
+
+      def take_copy_of(model)
+        model.class.new do |copy|
+          copy_ivars.each do |ivar|
+            copy.instance_variable_set(ivar, model.instance_variable_get(ivar).deep_dup)
+          end
+        end
       end
     end
   end

data/lib/kushojin/model_methods/record_changes_callbacks.rb

@@ -2,10 +2,22 @@ module Kushojin
   module ModelMethods
     class RecordChangesCallbacks
       Callback::RECORD_EVENTS.each do |event|
+        callback = event.to_s.split(/_/).last
+
         class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def #{event}(model)                                                          # def after_create(model)
-          Recorder.record(:#{event.to_s.split(/_/).last}, model) if Recorder.current #   Recorder.record(:create, model) if Recorder.current
-        end                                                                          # end
+          def #{event}(model)                           # def after_create(model)
+            return unless Recorder.current              #   return unless Recorder.current
+                                                        #
+            change = build_change_on_#{callback}(model) #   change = build_change_on_create(model)
+            Recorder.record(change)                     #   Recorder.record(change)
+          end                                           # end
+        RUBY
+
+        class_eval <<-RUBY, __FILE__, __LINE__ + 1
+          def build_change_on_#{callback}(model)          # def build_change_on_create(model)
+            ModelMethods::Change.new(:#{callback}, model) #   ModelMethods::Change.new(:create, model)
+          end                                             # end
+          private :build_change_on_#{callback}            # private :build_change_on_create
         RUBY
       end
     end

data/lib/kushojin/recorder.rb

@@ -22,8 +22,8 @@ module Kushojin
       @changes = []
     end
 
-    def record(event, model)
-      @changes << ModelMethods::Change.new(event, model)
+    def record(change)
+      @changes << change
     end
   end
 end

data/lib/kushojin/sender/each_sender.rb

@@ -17,17 +17,6 @@ module Kushojin
       def tag(controller)
         "#{controller.controller_name}.#{controller.action_name}"
       end
-
-      def map(change, controller:)
-        changes = change.changes_without_primary_key.reject { |attr_name, _| ignore_columns.include?(attr_name) }
-        {
-          "event"            => change.event.to_s,
-          "request_id"       => controller.request.request_id,
-          "table_name"       => change.table_name,
-          change.primary_key => change.model.id,
-          "changes"          => changes,
-        }
-      end
     end
   end
 end

data/lib/kushojin/version.rb

@@ -1,3 +1,3 @@
 module Kushojin
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kushojin
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Loose coupling
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord