notification-pusher 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ff67c2e1435a9b631aab3aec4ccdf4f940ce0a2d351a8336f161122d5b43dd
-  data.tar.gz: 8f4b3f51430152f3c1aff871abe8a716be6dbb9c6277cece73f8622ca4bc596a
+  metadata.gz: c7bd278a400f98567d17b9e39887e5e8960ddbfd99b9c2ad9edb6a462cf12f7c
+  data.tar.gz: bcd25f7e997fae9a09a75cec3b8994bacd4ba15c7500b786db314efff13b3f81
 SHA512:
-  metadata.gz: dab9452ca10ad43a2b7b79f803718c4b239389e44c2b608e35f3f18a6c03ceeab222b4ad4099f0b4a23f3aac0a5cb10a585f73e2b4a0a6fbc18fb7576ed57e66
-  data.tar.gz: 8c388e9c1b8a79e42f4d115dc8f16de6932504afbf6d5bf9c20c53c1a87f292851c0ac57b4eddb49ce57dbadbcc93c291703c238236e0186555f3da1da1061ec
+  metadata.gz: 9188a46b341e911a926f67256f9ce958bc4fa20bd2dca0fd6d1dffb14374e89c4fc2634e07cb01851c195ad914edf76d03de9c8187a3e94bd98340f5eb37190c
+  data.tar.gz: f6a1df4e1b7640c06682282b01bb983f6f0a81ddb97e613e9ab3314c453733ab8d5d41dbd51aab73c20c09558db84f8162b5ead8645ffc49a1eda4d7c18a3afb

data/lib/notification_pusher/configuration.rb

@@ -12,8 +12,7 @@ module NotificationPusher
     class Configuration
 
         def define_pusher name, options = {}
-            options[:name] = name
-            ::NotificationPusher::Pusher.new options
+            ::NotificationPusher::Pusher.new name, options
         end
 
     end

data/lib/notification_pusher/notification_library.rb

@@ -1,37 +1,47 @@
 module NotificationPusher
     module NotificationLibrary
 
-        attr_accessor :push
-        attr_accessor :push_options
+        extend ActiveSupport::Concern
 
-        after_create_commit :initialize_pusher
+        included do
+            attr_accessor :push
+            attr_accessor :push_options
 
-        def push name, options = {}
-            self.push = class_name
-            self.push_options = options
-            self.initialize_pusher
+            after_create_commit :initialize_pusher
+
+            include NotificationPusher::NotificationLibrary::InstanceMethods
         end
 
-        private
+        module InstanceMethods
+
+            def push name, options = {}
+                self.push = class_name
+                self.push_options = options
+                self.initialize_pusher
+            end
+
+            private
 
-        def initialize_pusher
-            unless self.push.nil?
-                if self.push.kind_of(Array)
-                    self.push.each do |class_name|
-                        pusher = NotificationPusher::Pusher.find_by_name(class_name).last
+            def initialize_pusher
+                unless self.push.nil?
+                    if self.push.kind_of(Array)
+                        self.push.each do |class_name|
+                            pusher = NotificationPusher::Pusher.find_by_name(class_name).last
+                            if defined?(NotificationPusher.const_get(pusher.name))
+                                options = pusher.options.merge! self.push_options[class_name.to_sym]
+                                pusher.instances << NotificationPusher.const_get(pusher.name).new self, options
+                            end
+                        end
+                    else
+                        pusher = NotificationPusher::Pusher.find_by_name(self.push).last
                         if defined?(NotificationPusher.const_get(pusher.name))
-                            options = pusher.options.merge! self.push_options[class_name.to_sym]
-                            pusher.instances << NotificationPusher.const_get(pusher.name).new options
+                            options = pusher.options.merge! self.push_options
+                            pusher.instances << NotificationPusher.const_get(pusher.name).new self, options
                         end
                     end
-                else
-                    pusher = NotificationPusher::Pusher.find_by_name(self.push).last
-                    if defined?(NotificationPusher.const_get(pusher.name))
-                        options = pusher.options.merge! self.push_options
-                        pusher.instances << NotificationPusher.const_get(pusher.name).new self, options
-                    end
                 end
             end
+
         end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notification-pusher
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Jonas Hübotter
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta8
+        version: 1.0.0.beta9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta8
+        version: 1.0.0.beta9
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement