notification-settings 1.0.0.beta8 → 1.0.0.beta9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c6748a47ba24fc38efaed92649a142f688537217140e71ef268b014ff11616f
-  data.tar.gz: 035a8c191f4bb07d312dbaa68206f22a13bd8952d202ee6f53c0d4863a5cc1ea
+  metadata.gz: a96b455489b18330a958d378c99aa07dfbc858c25f3dd5ebc4228496f02e8b77
+  data.tar.gz: d5d0533972dfcc08f5d5c319a9039b12d5fde349e16d9145f4ee7a5207fd338d
 SHA512:
-  metadata.gz: 28780647fa27e65dcceef08074e516669d2aad42c2f201f10409374993cc7f6ac7eb2d67ccf1c5c0235397430f6df81397953375a831cc7b8e9bb2f7be38ff2c
-  data.tar.gz: 53cb1b35d39609291b4f462c1735a2d7235b01e3cce8248133f957c9c3f9ea8e512585cef0f55880ca36773d4236fc81b8112ac3a237a654cccb7de3d7774c3f
+  metadata.gz: 1187ae4d6b1216cd9d240707b33847eda8e2a8ea8116f7586ccd812ca7d8f047f96ec1e797ee00a939b434d3cbfc4c58d4620363a6f7deede9d212eb1017f5eb
+  data.tar.gz: 2f075eff8cf618128fa87f8a11cf2175653bea835fc9fbb1b3f536f0bae1e2edbc2e54cb1fe4b90a51929fe0b993b4bd4a841a53aa9e5f7ac6647ba5538a4cc6

data/lib/notification_settings/notification_library.rb

@@ -1,59 +1,68 @@
 module NotificationSettings
     module NotificationLibrary
 
-        before_create :validate_create
+        extend ActiveSupport::Concern
 
-        belongs_to :subscription, class_name: 'NotificationSettings::Subscription', optional: true
+        included do
+            before_create :validate_create
+            belongs_to :subscription, class_name: 'NotificationSettings::Subscription', optional: true
 
-        def category
-            self[:category] || NotificationRenderer.configuration.default_category
+            include NotificationSettings::NotificationLibrary::InstanceMethods
         end
 
-        private
+        module InstanceMethods
 
-        def validate_create
-            valid = true
+            def category
+                self[:category] || NotificationRenderer.configuration.default_category
+            end
 
-            if self.target.notification_setting.present?
-                # Status
-                valid = false if NotificationSettings.configuration.do_not_notify_statuses.include?(self.target.notification_setting.status)
+            private
 
-                # Settings
-                valid = false if !self.target.notification_setting.settings.dig(:enabled)
-                ## Category
-                valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, :enabled)
-            end
+            def validate_create
+                valid = true
 
-            valid
-        end
+                if self.target.notification_setting.present?
+                    # Status
+                    valid = false if NotificationSettings.configuration.do_not_notify_statuses.include?(self.target.notification_setting.status)
+
+                    # Settings
+                    valid = false if !self.target.notification_setting.settings.dig(:enabled)
+                    ## Category
+                    valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, :enabled)
+                end
 
-        def validate_push
-            valid = true
+                valid
+            end
+
+            def validate_push
+                valid = true
 
-            if self.target.notification_setting.present?
-                # Status
-                valid = false if NotificationSettings.configuration.do_not_push_statuses.include?(self.target.notification_setting.status)
+                if self.target.notification_setting.present?
+                    # Status
+                    valid = false if NotificationSettings.configuration.do_not_push_statuses.include?(self.target.notification_setting.status)
 
-                # Settings
-                if self.push.kind_of?(Array)
-                    self.push.each do |pusher|
-                        valid = false if !self.target.notification_setting.settings.dig(pusher.to_sym) || ( !self.target.notification_setting.settings.dig(:index) && self.target.notification_setting.settings.dig(pusher.to_sym).nil? )
+                    # Settings
+                    if self.push.kind_of?(Array)
+                        self.push.each do |pusher|
+                            valid = false if !self.target.notification_setting.settings.dig(pusher.to_sym) || ( !self.target.notification_setting.settings.dig(:index) && self.target.notification_setting.settings.dig(pusher.to_sym).nil? )
+                            ## Category
+                            valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, pusher.to_sym) || ( !self.target.notification_setting.category_settings.dig(self.category.to_sym, :index) && self.target.notification_setting.category_settings.dig(self.category.to_sym, pusher.to_sym).nil? )
+                        end
+                    else
+                        valid = false if !self.target.notification_setting.settings.dig(self.push.to_sym) || ( !self.target.notification_setting.settings.dig(:index) && self.target.notification_setting.settings.dig(self.push.to_sym).nil? )
                         ## Category
-                        valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, pusher.to_sym) || ( !self.target.notification_setting.category_settings.dig(self.category.to_sym, :index) && self.target.notification_setting.category_settings.dig(self.category.to_sym, pusher.to_sym).nil? )
+                        valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, self.push.to_sym) || ( !self.target.notification_setting.category_settings.dig(self.category.to_sym, :index) && self.target.notification_setting.category_settings.dig(self.category.to_sym, self.push.to_sym).nil? )
                     end
-                else
-                    valid = false if !self.target.notification_setting.settings.dig(self.push.to_sym) || ( !self.target.notification_setting.settings.dig(:index) && self.target.notification_setting.settings.dig(self.push.to_sym).nil? )
-                    ## Category
-                    valid = false if !self.target.notification_setting.category_settings.dig(self.category.to_sym, self.push.to_sym) || ( !self.target.notification_setting.category_settings.dig(self.category.to_sym, :index) && self.target.notification_setting.category_settings.dig(self.category.to_sym, self.push.to_sym).nil? )
                 end
+
+                valid
             end
 
-            valid
-        end
+            def initialize_pusher
+                return unless validate_push
+                super
+            end
 
-        def initialize_pusher
-            return unless validate_push
-            super
         end
 
     end

data/lib/notification_settings/notification_scopes.rb

@@ -1,16 +1,26 @@
 module NotificationSettings
     module NotificationScopes
 
-        def method_missing m, *args
-            if m.to_s[/(.+)_category/]
-                where category: $1.singularize.classify
-            else
-                super
-            end
+        extend ActiveSupport::Concern
+
+        included do
+            include NotificationSettings::NotificationScopes::InstanceMethods
         end
 
-        def respond_to? m, include_private = false
-            super || m.to_s[/(.+)_category/]
+        module InstanceMethods
+
+            def method_missing m, *args
+                if m.to_s[/(.+)_category/]
+                    where category: $1.singularize.classify
+                else
+                    super
+                end
+            end
+
+            def respond_to? m, include_private = false
+                super || m.to_s[/(.+)_category/]
+            end
+
         end
 
     end

data/lib/notification_settings/setting_library.rb

@@ -1,15 +1,25 @@
 module NotificationSettings
     module SettingLibrary
 
-        def status
-            if self.object.respond_to?(NotificationSettings.configuration.last_seen) && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round >= NotificationSettings.configuration.idle_after && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round < NotificationSettings.configuration.offline_after
-                default = 'idle'
-            elsif self.object.respond_to?(NotificationSettings.configuration.last_seen) && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round >= NotificationSettings.configuration.offline_after
-                default = 'offline'
-            else
-                'online'
+        extend ActiveSupport::Concern
+
+        included do
+            include NotificationSettings::SettingLibrary::InstanceMethods
+        end
+
+        module InstanceMethods
+
+            def status
+                if self.object.respond_to?(NotificationSettings.configuration.last_seen) && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round >= NotificationSettings.configuration.idle_after && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round < NotificationSettings.configuration.offline_after
+                    default = 'idle'
+                elsif self.object.respond_to?(NotificationSettings.configuration.last_seen) && ( Time.now - self.object.send(NotificationSettings.configuration.last_seen) ).round >= NotificationSettings.configuration.offline_after
+                    default = 'offline'
+                else
+                    'online'
+                end
+                self[:status] || default
             end
-            self[:status] || default
+
         end
 
     end

data/lib/notification_settings/subscriber.rb

@@ -5,8 +5,7 @@ module NotificationSettings
         has_many :notification_subscribables, through: :notification_subscriptions, source: :subscribable
 
         def subscribe options = {}
-            options[:subscriber] = self
-            NotificationSettings::Subscription.create options
+            self.notification_subscriptions.create options
         end
 
         def unsubscribe subscribable

data/lib/notification_settings/subscription_library.rb

@@ -1,12 +1,22 @@
 module NotificationSettings
     module SubscriptionLibrary
-        
-        after_create_commit :create_notification_setting
-        
-        private
-        
-        def create_notification_setting
-            self.notification_setting.create!
+
+        extend ActiveSupport::Concern
+
+        included do
+            after_create_commit :create_notification_setting
+
+            include NotificationSettings::SubscriptionLibrary::InstanceMethods
+        end
+
+        module InstanceMethods
+
+            private
+
+            def create_notification_setting
+                self.notification_setting.create!
+            end
+
         end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notification-settings
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta8
+  version: 1.0.0.beta9
 platform: ruby
 authors:
 - Jonas Hübotter
@@ -30,14 +30,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