notification-settings 1.2.6 → 2.0.0

data/lib/notification_settings/target.rb

@@ -7,21 +7,8 @@ module NotificationSettings
     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
+      include NotificationSettings::Settings
+      include NotificationSettings::Status
     end
   end
 end

metadata

@@ -1,73 +1,143 @@
 --- !ruby/object:Gem::Specification
 name: notification-settings
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 2.0.0
 platform: ruby
 authors:
 - Jonas Hübotter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-22 00:00:00.000000000 Z
+date: 2019-06-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: notification-handler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.6
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: factory_bot
+  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: '5.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: rails
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
 description: Integrates with your authentication solution to craft a personalized
   user notification platform.
 email: me@jonhue.me
@@ -117,20 +201,22 @@ extra_rdoc_files: []
 files:
 - 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/initializer.rb
 - lib/generators/templates/install/notifications_migration.rb.erb
 - lib/notification-settings.rb
+- lib/notification_settings/category_preferences_form.rb
 - lib/notification_settings/configuration.rb
+- lib/notification_settings/delivery_method_preferences_form.rb
 - lib/notification_settings/engine.rb
-- lib/notification_settings/notification_library.rb
+- lib/notification_settings/notification_lib.rb
 - lib/notification_settings/notification_scopes.rb
-- lib/notification_settings/setting_library.rb
+- lib/notification_settings/preferences_form.rb
+- lib/notification_settings/settings.rb
+- lib/notification_settings/status.rb
 - lib/notification_settings/subscribable.rb
 - lib/notification_settings/subscriber.rb
-- lib/notification_settings/subscription_library.rb
 - lib/notification_settings/target.rb
 homepage: https://github.com/jonhue/notifications-rails/tree/master/notification-settings
 licenses:
@@ -151,8 +237,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integrates with your authentication solution to craft a personalized user

data/app/models/notification_settings/setting.rb

@@ -1,15 +0,0 @@
-# frozen_string_literal: true
-
-module NotificationSettings
-  class Setting < ActiveRecord::Base
-    self.table_name = 'notification_settings_settings'
-
-    include NotificationSettings::SettingLibrary
-
-    serialize :settings, Hash
-    serialize :category_settings, Hash
-
-    belongs_to :object, polymorphic: true, optional: true
-    belongs_to :subscription, optional: true
-  end
-end

data/lib/notification_settings/notification_library.rb

@@ -1,144 +0,0 @@
-# frozen_string_literal: true
-
-require 'notification-handler'
-require 'active_support'
-
-module NotificationSettings
-  module NotificationLibrary
-    extend ActiveSupport::Concern
-
-    included do
-      before_create :validate_create
-
-      belongs_to :subscription,
-                 class_name: 'NotificationSettings::Subscription',
-                 optional: true
-
-      include NotificationSettings::NotificationLibrary::InstanceMethods
-    end
-
-    module InstanceMethods
-      def category
-        self[:category] || NotificationSettings.configuration.default_category
-      end
-
-      private
-
-      def validate_create
-        throw(:abort) unless can_create?
-      end
-
-      def can_create?
-        if target.notification_setting.present?
-          unless status_allows_create? &&
-                 settings_allow_create? &&
-                 category_settings_allow_create?
-            return false
-          end
-        end
-        true
-      end
-
-      def status_allows_create?
-        !do_not_notify_statuses.include?(target.notification_setting.status)
-      end
-
-      def settings_allow_create?
-        target.notification_setting.settings.dig(:enabled)
-      end
-
-      def category_settings_allow_create?
-        target.notification_setting.category_settings.dig(
-          category.to_sym,
-          :enabled
-        )
-      end
-
-      def initialize_pusher
-        return unless can_push?
-        super
-      end
-
-      def can_push?
-        if target.notification_setting.present?
-          return false unless status_allows_push?
-
-          if push.is_a?(Array)
-            return false unless can_use_pushers?(push)
-          else
-            return false unless can_use_pusher?(push)
-          end
-        end
-        true
-      end
-
-      def can_use_pushers?(pushers)
-        pushers.each do |pusher|
-          return false unless can_use_pusher?(pusher)
-        end
-        true
-      end
-
-      def can_use_pusher?(pusher)
-        unless settings_allow_push?(pusher) &&
-               category_settings_allow_push?(pusher)
-          return false
-        end
-        true
-      end
-
-      def status_allows_push?
-        !do_not_push_statuses.include?(target.notification_setting.status)
-      end
-
-      def settings_allow_push?(pusher)
-        return global_settings_allow_push? unless local_pusher_settings?(pusher)
-        local_settings_allow_push?(pusher)
-      end
-
-      def local_pusher_settings?(pusher)
-        local_settings_allow_push?(pusher).present?
-      end
-
-      def local_settings_allow_push?(pusher)
-        target.notification_setting.settings.dig(pusher.to_sym)
-      end
-
-      def global_settings_allow_push?
-        target.notification_setting.settings.dig(:index)
-      end
-
-      def category_settings_allow_push?(pusher)
-        if local_pusher_category_settings?(pusher)
-          local_category_settings_allow_push?(pusher)
-        else
-          global_category_settings_allow_push?
-        end
-      end
-
-      def local_pusher_category_settings?(pusher)
-        local_category_settings_allow_push?(pusher).present?
-      end
-
-      def local_category_settings_allow_push?(pusher)
-        target.notification_setting.category_settings.dig(
-          category.to_sym, pusher.to_sym
-        )
-      end
-
-      def global_category_settings_allow_push?
-        target.notification_setting.category_settings.dig(
-          category.to_sym, :index
-        )
-      end
-
-      def do_not_notify_statuses
-        NotificationSettings.configuration.do_not_notify_statuses
-      end
-
-      def do_not_push_statuses
-        NotificationSettings.configuration.do_not_push_statuses
-      end
-    end
-  end
-end

data/lib/notification_settings/subscription_library.rb

@@ -1,23 +0,0 @@
-# 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