notifyor 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b88f4d48ae4b7758ab569a17cc9eda783f55457
-  data.tar.gz: 69fe16ade2ea0daf253428f6fb780bc6e2bf82d2
+  metadata.gz: 742a90cca44dd0b2f507c27e846d11c0d047ea44
+  data.tar.gz: 932c46302c78abb4e7d1f9f8eedd77696f5b210b
 SHA512:
-  metadata.gz: 71449baa37d765212df0bff3b1dc766ed146e2241769e7fdb6dc7ec992ddabfe8f191d019e81a9c44536945205213a282ca521dce6efcf1e96b6ef36af08789e
-  data.tar.gz: 696c42006ed41665c296fa06e5bfb8f071afdfa2bbd6b0d0e23901ffb972e4a71d995272c193be3d70c4ae61700f0505c8a094d04029c351281b2518da665e75
+  metadata.gz: a16ef2815d2d67a8ba97024244302154c027a59ea6f4441bb7fee25e1c310e6435da9da758033f764a8d129b877182172547ebf7efc417ac2f9786e4e2cd9706
+  data.tar.gz: b7111ccbd9a3555339e17480f8b2e408767eef23ce645c12bf4321574031fbb8ddb9a663ffeaf045e63a1ad572458b18437f2597b31afd8ef25d177a405672b0

data/lib/notifyor/plugin.rb

@@ -5,11 +5,39 @@ 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)
@@ -19,36 +47,20 @@ module Notifyor
       end
 
       def configure_plugin(options = {})
-        configuration = default_configuration.update(options)
-        append_callbacks(configuration)
+        self.plugin_configuration = default_configuration.deep_merge(options)
       end
 
       def default_configuration
         {
             only: [:create, :destroy, :update],
             messages: {
-                create: I18n.t('notifyor.model.create', model: self.model_name.human),
-                update: I18n.t('notifyor.model.update', model: self.model_name.human),
-                destroy: I18n.t('notifyor.model.destroy', model: self.model_name.human)
+                create: -> (model) { I18n.t('notifyor.model.create', model: model.class.model_name.human) },
+                update: -> (model) { I18n.t('notifyor.model.update', model: model.class.model_name.human) },
+                destroy: -> (model) { I18n.t('notifyor.model.destroy', model: model.class.model_name.human) }
             }
         }
       end
 
-      def append_callbacks(configuration)
-        configuration[:only].each do |action|
-          case action
-            when :create
-              self.after_commit -> { self.class.notifyor_events << configuration[:messages][:create] }, on: :create
-            when :update
-              self.after_commit -> { self.class.notifyor_events << configuration[:messages][:update] }, on: :update
-            when :destroy
-              self.before_destroy -> { self.class.notifyor_events << configuration[:messages][:destroy] }
-            else
-              #nop
-          end
-        end
-      end
-
     end
   end
 end

data/lib/notifyor/version.rb

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

data/spec/test_app/app/models/user.rb

@@ -1,3 +1,5 @@
 class User < ActiveRecord::Base
-  notifyor
+  notifyor messages: {
+      create: -> (model) { "Benutzer mit der ID: #{model.id} wurde im System angelegt" }
+  }, only: [:create, :update]
 end

data/spec/test_app/log/development.log

@@ -94,3 +94,88 @@ Migrating to CreateUsers (20160404044940)
    (0.1ms)  begin transaction
   SQL (1.2ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 12]]
    (1.6ms)  commit transaction
+  User Load (0.2ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.2ms)  begin transaction
+  SQL (0.9ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:00:24.280508"], ["updated_at", "2016-04-05 18:00:24.280508"]]
+   (2.2ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (1.0ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:04:41.987829"], ["updated_at", "2016-04-05 18:04:41.987829"]]
+   (1.9ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:05:44.281350"], ["updated_at", "2016-04-05 18:05:44.281350"]]
+   (1.9ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:06:49.024943"], ["updated_at", "2016-04-05 18:06:49.024943"]]
+   (1.9ms)  commit transaction
+   (0.1ms)  begin transaction
+  SQL (0.5ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:07:23.055850"], ["updated_at", "2016-04-05 18:07:23.055850"]]
+   (2.2ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (1.5ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:10:52.859359"], ["updated_at", "2016-04-05 18:10:52.859359"]]
+   (2.3ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (1.4ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:19:21.661658"], ["updated_at", "2016-04-05 18:19:21.661658"]]
+   (2.1ms)  commit transaction
+   (0.5ms)  begin transaction
+  SQL (1.4ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:19:45.533232"], ["updated_at", "2016-04-05 18:19:45.533232"]]
+   (2.2ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (0.8ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:20:31.390529"], ["updated_at", "2016-04-05 18:20:31.390529"]]
+   (2.2ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (1.0ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:20:54.522113"], ["updated_at", "2016-04-05 18:20:54.522113"]]
+   (2.3ms)  commit transaction
+   (0.4ms)  begin transaction
+  SQL (0.7ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:21:47.990711"], ["updated_at", "2016-04-05 18:21:47.990711"]]
+   (2.4ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (1.2ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:24:43.607938"], ["updated_at", "2016-04-05 18:24:43.607938"]]
+   (2.3ms)  commit transaction
+  User Load (0.3ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+  User Load (0.2ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.3ms)  begin transaction
+  SQL (0.7ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:35:50.375698"], ["updated_at", "2016-04-05 18:35:50.375698"]]
+   (1.8ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (1.4ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:37:11.011346"], ["updated_at", "2016-04-05 18:37:11.011346"]]
+   (9.3ms)  commit transaction
+   (0.1ms)  begin transaction
+   (0.3ms)  begin transaction
+  SQL (0.6ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:41:51.102773"], ["updated_at", "2016-04-05 18:41:51.102773"]]
+   (2.3ms)  commit transaction
+   (0.2ms)  begin transaction
+  SQL (0.9ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:42:30.160601"], ["updated_at", "2016-04-05 18:42:30.160601"]]
+   (2.1ms)  commit transaction
+  User Load (0.6ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.6ms)  begin transaction
+   (0.7ms)  rollback transaction
+  User Load (0.8ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.4ms)  begin transaction
+   (0.1ms)  rollback transaction
+  User Load (0.3ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.3ms)  begin transaction
+  SQL (0.7ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:45:03.776150"], ["updated_at", "2016-04-05 18:45:03.776150"]]
+   (2.3ms)  commit transaction
+  User Load (0.8ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+  User Load (0.6ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+  User Load (0.6ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.3ms)  begin transaction
+  SQL (2.0ms)  UPDATE "users" SET "email" = ?, "updated_at" = ? WHERE "users"."id" = ?  [["email", "erwinschens"], ["updated_at", "2016-04-05 18:47:01.481115"], ["id", 4]]
+   (2.5ms)  commit transaction
+  User Load (0.5ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.2ms)  begin transaction
+  SQL (1.2ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 29]]
+   (2.3ms)  commit transaction
+  User Load (0.6ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" DESC LIMIT 1
+   (0.2ms)  begin transaction
+  SQL (0.6ms)  DELETE FROM "users" WHERE "users"."id" = ?  [["id", 28]]
+   (2.1ms)  commit transaction
+  User Load (0.5ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.3ms)  begin transaction
+   (0.3ms)  commit transaction
+   (0.3ms)  begin transaction
+  SQL (3.1ms)  INSERT INTO "users" ("created_at", "updated_at") VALUES (?, ?)  [["created_at", "2016-04-05 18:51:43.543751"], ["updated_at", "2016-04-05 18:51:43.543751"]]
+   (2.9ms)  commit transaction
+  User Load (0.4ms)  SELECT  "users".* FROM "users"  ORDER BY "users"."id" ASC LIMIT 1
+   (0.4ms)  begin transaction
+   (0.2ms)  commit transaction

metadata

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