notifyor 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 742a90cca44dd0b2f507c27e846d11c0d047ea44
-  data.tar.gz: 932c46302c78abb4e7d1f9f8eedd77696f5b210b
+  metadata.gz: 5e2af9cf84f314cc89eea5ec1bdc046317eb0aa9
+  data.tar.gz: d22706af902794c30a161d2cccb016d7a0b04e42
 SHA512:
-  metadata.gz: a16ef2815d2d67a8ba97024244302154c027a59ea6f4441bb7fee25e1c310e6435da9da758033f764a8d129b877182172547ebf7efc417ac2f9786e4e2cd9706
-  data.tar.gz: b7111ccbd9a3555339e17480f8b2e408767eef23ce645c12bf4321574031fbb8ddb9a663ffeaf045e63a1ad572458b18437f2597b31afd8ef25d177a405672b0
+  metadata.gz: 130e1deffdfac923fa61893c61fb500734f95f1e60e104d908f84954046c3052ef6dfef145178581e167ef0e459be88c15253bf7982f9c42ca70d4e083829363
+  data.tar.gz: 685db19e8f1259cd7ff5f4995d610f124cfaddebb73124cd6d3522ddf4be9558ac374638e0bea88d089c96039de8bb2f2a67368b7ddae3fb2802e701d3d9e9dc

data/lib/notifyor/plugin.rb

@@ -5,39 +5,11 @@ module Notifyor
     extend ::ActiveSupport::Concern
 
     included do
-      after_commit :notifyor_create_callback, on: :create, if: :on_create?
-      after_commit :notifyor_update_callback, on: :update, if: :on_update?
-      after_destroy :notifyor_destroy_callback, if: :on_destroy?
-    end
-
-    def on_create?
-      self.class.plugin_configuration[:only].include? :create
-    end
-
-    def on_update?
-      self.class.plugin_configuration[:only].include? :update
-    end
-
-    def on_destroy?
-      self.class.plugin_configuration[:only].include? :destroy
-    end
-
-    def notifyor_create_callback
-      self.class.notifyor_events << self.class.plugin_configuration[:messages][:create].call(self)
-    end
-
-    def notifyor_update_callback
-      self.class.notifyor_events << self.class.plugin_configuration[:messages][:update].call(self)
-    end
-
-    def notifyor_destroy_callback
-      self.class.notifyor_events << self.class.plugin_configuration[:messages][:destroy].call(self)
     end
 
     module ClassMethods
       attr_accessor :notifyor_events
       attr_accessor :notifyor_models
-      attr_accessor :plugin_configuration
 
       def notifyor(options = {})
         configure_plugin(options)
@@ -47,7 +19,23 @@ module Notifyor
       end
 
       def configure_plugin(options = {})
-        self.plugin_configuration = default_configuration.deep_merge(options)
+        configuration = default_configuration.deep_merge(options)
+        append_callbacks(configuration)
+      end
+
+      def append_callbacks(configuration)
+        configuration[:only].each do |action|
+          case action
+            when :create
+              self.after_commit -> { self.class.notifyor_events << configuration[:messages][:create].call(self) }, on: :create, if: -> { configuration[:only].include? :create}
+            when :update
+              self.after_commit -> {self.class.notifyor_events << configuration[:messages][:update].call(self) }, on: :update, if: -> { configuration[:only].include? :update}
+            when :destroy
+              self.before_destroy -> {self.class.notifyor_events << configuration[:messages][:destroy].call(self)}, if: -> { configuration[:only].include? :destroy}
+            else
+              #nop
+          end
+        end
       end
 
       def default_configuration

data/lib/notifyor/version.rb

@@ -1,3 +1,3 @@
 module Notifyor
-  VERSION = "0.4.1"
+  VERSION = "0.4.2"
 end

data/spec/test_app/log/development.log

@@ -179,3 +179,17 @@ Migrating to CreateUsers (20160404044940)
   User Load (0.4ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
    (0.4ms)  begin transaction
    (0.2ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (1.5ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 19:14:13.047557"], ["updated_at", "2016-04-05 19:14:13.047557"]]
+   (2.2ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (1.7ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 19:14:43.252506"], ["updated_at", "2016-04-05 19:14:43.252506"]]
+   (1.8ms)  commit transaction
+  User Load (0.5ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.3ms)  begin transaction
+  SQL (0.7ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 4]]
+   (2.7ms)  commit transaction
+  User Load (0.8ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.3ms)  begin transaction
+  SQL (1.6ms)  UPDATE "users" SET "first_name" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["first_name", "erwin"], ["updated_at", "2016-04-05 19:15:08.874646"], ["id", 5]]
+   (2.3ms)  commit transaction

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifyor
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Erwin Schens