notification-settings 1.2.5 → 1.2.6

data/lib/notification_settings/notification_scopes.rb

@@ -1,30 +1,28 @@
-require 'notification-handler'
-require 'active_support'
-
-module NotificationSettings
-    module NotificationScopes
-
-        extend ActiveSupport::Concern
-
-        included do
-            include NotificationSettings::NotificationScopes::InstanceMethods
-        end
-
-        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
-end
+# frozen_string_literal: true
+
+require 'notification-handler'
+require 'active_support'
+
+module NotificationSettings
+  module NotificationScopes
+    extend ActiveSupport::Concern
+
+    included do
+      include NotificationSettings::NotificationScopes::InstanceMethods
+    end
+
+    module InstanceMethods
+      def method_missing(method, *args)
+        if method.to_s[/(.+)_category/]
+          where(category: $1.singularize.classify)
+        else
+          super
+        end
+      end
+
+      def respond_to_missing?(method, include_private = false)
+        super || method.to_s[/(.+)_category/]
+      end
+    end
+  end
+end

data/lib/notification_settings/setting_library.rb

@@ -1,28 +1,60 @@
-require 'active_support'
-
-module NotificationSettings
-    module SettingLibrary
-
-        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
-
-        end
-
-    end
-end
+# frozen_string_literal: true
+
+require 'active_support'
+
+module NotificationSettings
+  module SettingLibrary
+    extend ActiveSupport::Concern
+
+    included do
+      include NotificationSettings::SettingLibrary::InstanceMethods
+    end
+
+    module InstanceMethods
+      def status
+        if idle? && !offline?
+          default = 'idle'
+        elsif offline?
+          default = 'offline'
+        else
+          'online'
+        end
+        self[:status] || default
+      end
+
+      private
+
+      def idle?
+        return unless time_since_last_seen_round
+
+        time_since_last_seen_round >= idle_after
+      end
+
+      def offline?
+        return unless time_since_last_seen_round
+
+        time_since_last_seen_round >= offline_after
+      end
+
+      def time_since_last_seen_round
+        time_since_last_seen&.round
+      end
+
+      def time_since_last_seen
+        return unless object.respond_to?(
+          NotificationSettings.configuration.last_seen
+        )
+
+        Time.now - object.send(NotificationSettings.configuration.last_seen)
+      end
+
+      def idle_after
+        NotificationSettings.configuration.idle_after
+      end
+
+      def offline_after
+        NotificationSettings.configuration.offline_after
+      end
+    end
+  end
+end

data/lib/notification_settings/subscribable.rb

@@ -1,42 +1,50 @@
-require 'active_support'
-
-module NotificationSettings
-    module Subscribable
-
-        extend ActiveSupport::Concern
-
-        included do
-            has_many :notification_subscriptions, as: :subscribable, class_name: 'NotificationSettings::Subscription', dependent: :destroy
-            has_many :notification_subscribers, through: :notification_subscriptions, source: :subscriber
-
-            include NotificationSettings::Subscribable::InstanceMethods
-        end
-
-        module InstanceMethods
-
-            def notify_subscribers options = {}
-                options[:object] = self
-                subscribers = notify_dependents options.delete(:dependents)
-                self.notification_subscribers&.each { |subscriber| subscribers << subscriber }
-                subscribers.to_a.uniq&.each do |subscriber|
-                    subscriber.notify options
-                end
-            end
-
-            def notify_dependents dependents
-                subscribers = []
-                dependents ||= self.notification_dependents
-                dependents&.each { |dependent| dependent.notification_subscribers&.each { |subscriber| subscribers << subscriber } }
-                subscribers
-            end
-
-            private
-
-            def notification_dependents
-                []
-            end
-
-        end
-
-    end
-end
+# frozen_string_literal: true
+
+require 'active_support'
+
+module NotificationSettings
+  module Subscribable
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :notification_subscriptions,
+               as: :subscribable,
+               class_name: 'NotificationSettings::Subscription',
+               dependent: :destroy
+      has_many :notification_subscribers,
+               through: :notification_subscriptions, source: :subscriber
+
+      include NotificationSettings::Subscribable::InstanceMethods
+    end
+
+    module InstanceMethods
+      def notify_subscribers(options = {})
+        options[:object] = self
+        subscribers = notify_dependents(options.delete(:dependents))
+        notification_subscribers&.each do |subscriber|
+          subscribers << subscriber
+        end
+        subscribers.to_a.uniq&.each do |subscriber|
+          subscriber.notify(options)
+        end
+      end
+
+      def notify_dependents(dependents)
+        subscribers = []
+        dependents ||= notification_dependents
+        dependents&.each do |dependent|
+          dependent.notification_subscribers&.each do |subscriber|
+            subscribers << subscriber
+          end
+        end
+        subscribers
+      end
+
+      private
+
+      def notification_dependents
+        []
+      end
+    end
+  end
+end

data/lib/notification_settings/subscriber.rb

@@ -1,30 +1,35 @@
-require 'active_support'
-
-module NotificationSettings
-    module Subscriber
-
-        extend ActiveSupport::Concern
-
-        included do
-            has_many :notification_subscriptions, as: :subscriber, class_name: 'NotificationSettings::Subscription', dependent: :destroy
-            has_many :notification_subscribables, through: :notification_subscriptions, source: :subscribable
-
-            include NotificationSettings::Subscriber::InstanceMethods
-        end
-
-        module InstanceMethods
-
-            def subscribe subscribable, options = {}
-                options[:subscribable] = subscribable
-                self.notification_subscriptions.create options
-            end
-
-            def unsubscribe subscribable
-                subscription = self.notification_subscriptions.find_by subscribable_id: subscribable.id, subscribable_type: subscribable.class.name
-                subscription.destroy
-            end
-
-        end
-
-    end
-end
+# frozen_string_literal: true
+
+require 'active_support'
+
+module NotificationSettings
+  module Subscriber
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :notification_subscriptions,
+               as: :subscriber,
+               class_name: 'NotificationSettings::Subscription',
+               dependent: :destroy
+      has_many :notification_subscribables,
+               through: :notification_subscriptions, source: :subscribable
+
+      include NotificationSettings::Subscriber::InstanceMethods
+    end
+
+    module InstanceMethods
+      def subscribe(subscribable, options = {})
+        options[:subscribable] = subscribable
+        notification_subscriptions.create(options)
+      end
+
+      def unsubscribe(subscribable)
+        subscription = notification_subscriptions.find_by(
+          subscribable_id: subscribable.id,
+          subscribable_type: subscribable.class.name
+        )
+        subscription.destroy
+      end
+    end
+  end
+end

data/lib/notification_settings/subscription_library.rb

@@ -1,25 +1,23 @@
-require 'active_support'
-
-module NotificationSettings
-    module SubscriptionLibrary
-
-        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
-end
+# frozen_string_literal: true
+
+require 'active_support'
+
+module NotificationSettings
+  module SubscriptionLibrary
+    extend ActiveSupport::Concern
+
+    included do
+      after_create_commit :create_notification_setting
+
+      include NotificationSettings::SubscriptionLibrary::InstanceMethods
+    end
+
+    module InstanceMethods
+      private
+
+      def create_notification_setting
+        notification_setting.create!
+      end
+    end
+  end
+end

data/lib/notification_settings/target.rb

@@ -1,26 +1,27 @@
-require 'active_support'
-
-module NotificationSettings
-    module Target
-
-        extend ActiveSupport::Concern
-
-        included do
-            has_one :notification_setting, as: :object, class_name: 'NotificationSettings::Setting', dependent: :destroy
-            before_create :create_notification_setting
-
-            include NotificationSettings::Target::InstanceMethods
-        end
-
-        module InstanceMethods
-
-            private
-
-            def create_notification_setting
-                self.build_notification_setting
-            end
-
-        end
-
-    end
-end
+# frozen_string_literal: true
+
+require 'active_support'
+
+module NotificationSettings
+  module Target
+    extend ActiveSupport::Concern
+
+    included do
+      has_one :notification_setting,
+              as: :object,
+              class_name: 'NotificationSettings::Setting',
+              dependent: :destroy
+      before_create :create_notification_setting
+
+      include NotificationSettings::Target::InstanceMethods
+    end
+
+    module InstanceMethods
+      private
+
+      def create_notification_setting
+        build_notification_setting
+      end
+    end
+  end
+end

metadata

@@ -1,99 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: notification-settings
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: notification-handler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 1.2.6
 - !ruby/object:Gem::Dependency
-  name: notification-handler
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.5
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0'
 description: Integrates with your authentication solution to craft a personalized
   user notification platform.
 email: me@jonhue.me
@@ -101,13 +115,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - LICENSE
 - README.md
 - app/models/notification_settings/setting.rb
 - app/models/notification_settings/subscription.rb
 - lib/generators/notification_settings/install_generator.rb
-- lib/generators/templates/install/README.md
 - lib/generators/templates/install/initializer.rb
 - lib/generators/templates/install/notifications_migration.rb.erb
 - lib/notification-settings.rb
@@ -132,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -140,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.4
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Integrates with your authentication solution to craft a personalized user