activity_notification 1.6.1 → 1.7.0

data/spec/jobs/notify_all_job_spec.rb

@@ -0,0 +1,23 @@
+describe ActivityNotification::NotifyAllJob, type: :job do
+  before do
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+    @author_user = create(:confirmed_user)
+    @user        = create(:confirmed_user)
+    @article     = create(:article, user: @author_user)
+    @comment     = create(:comment, article: @article, user: @user)
+  end
+
+  describe "#perform_later" do
+    it "generates notifications" do
+      expect {
+        ActivityNotification::NotifyAllJob.perform_later([@author_user, @user], @comment)
+      }.to have_enqueued_job
+    end
+
+    it "generates notifications once" do
+      ActivityNotification::NotifyAllJob.perform_later([@author_user, @user], @comment)
+      expect(ActivityNotification::NotifyAllJob).to have_been_enqueued.exactly(:once)
+    end
+  end
+end

data/spec/jobs/notify_job_spec.rb

@@ -0,0 +1,23 @@
+describe ActivityNotification::NotifyJob, type: :job do
+  before do
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+    @author_user = create(:confirmed_user)
+    @user        = create(:confirmed_user)
+    @article     = create(:article, user: @author_user)
+    @comment     = create(:comment, article: @article, user: @user)
+  end
+
+  describe "#perform_later" do
+    it "generates notifications" do
+      expect {
+        ActivityNotification::NotifyJob.perform_later('users', @comment)
+      }.to have_enqueued_job
+    end
+
+    it "generates notifications once" do
+      ActivityNotification::NotifyJob.perform_later('users', @comment)
+      expect(ActivityNotification::NotifyJob).to have_been_enqueued.exactly(:once)
+    end
+  end
+end

data/spec/jobs/notify_to_job_spec.rb

@@ -0,0 +1,23 @@
+describe ActivityNotification::NotifyToJob, type: :job do
+  before do
+    ActiveJob::Base.queue_adapter = :test
+    ActiveJob::Base.queue_adapter.enqueued_jobs.clear
+    @author_user = create(:confirmed_user)
+    @user        = create(:confirmed_user)
+    @article     = create(:article, user: @author_user)
+    @comment     = create(:comment, article: @article, user: @user)
+  end
+
+  describe "#perform_later" do
+    it "generates notification" do
+      expect {
+        ActivityNotification::NotifyToJob.perform_later(@user, @comment)
+      }.to have_enqueued_job
+    end
+
+    it "generates notification once" do
+      ActivityNotification::NotifyToJob.perform_later(@user, @comment)
+      expect(ActivityNotification::NotifyToJob).to have_been_enqueued.exactly(:once)
+    end
+  end
+end

data/spec/rails_app/app/controllers/comments_controller.rb

@@ -7,7 +7,10 @@ class CommentsController < ApplicationController
     @comment.user = current_user
 
     if @comment.save
-      @comment.notify :users
+      @comment.notify_later :users, key: 'comment.create.later'
+      # @comment.notify       :users, key: 'comment.create.later', notify_later: true
+      @comment.notify_now   :users, key: 'comment.create.now'
+      # @comment.notify       :users, key: 'comment.create.now'
       redirect_to @comment.article, notice: 'Comment was successfully created.'
     else
       redirect_to @comment.article

data/spec/rails_app/app/models/dummy/dummy_base.rb

@@ -5,6 +5,7 @@ else
   class Dummy::DummyBase
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
   end
 end

data/spec/rails_app/app/models/dummy/dummy_group.rb

@@ -7,6 +7,7 @@ else
   class Dummy::DummyGroup
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Group
     field :title, type: String

data/spec/rails_app/app/models/dummy/dummy_notifiable.rb

@@ -7,6 +7,7 @@ else
   class Dummy::DummyNotifiable
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Notifiable
     field :title, type: String

data/spec/rails_app/app/models/dummy/dummy_notifiable_target.rb

@@ -8,6 +8,7 @@ else
   class Dummy::DummyNotifiableTarget
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     field :email, type: String, default: ""
     field :name,  type: String
 

data/spec/rails_app/app/models/dummy/dummy_notifier.rb

@@ -7,6 +7,7 @@ else
   class Dummy::DummyNotifier
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Notifier
     field :name,  type: String

data/spec/rails_app/app/models/dummy/dummy_subscriber.rb

@@ -7,6 +7,7 @@ else
   class Dummy::DummySubscriber
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     acts_as_target email: 'dummy@example.com', email_allowed: true, batch_email_allowed: true, subscription_allowed: true
   end

data/spec/rails_app/app/models/dummy/dummy_target.rb

@@ -7,6 +7,7 @@ else
   class Dummy::DummyTarget
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Target
     field :email, type: String, default: ""

data/spec/rails_app/config/initializers/activity_notification.rb

@@ -41,6 +41,9 @@ ActivityNotification.configure do |config|
   # Configure the parent class responsible to send e-mails.
   # config.parent_mailer = 'ActionMailer::Base'
 
+  # Configure the parent job class for delayed notifications.
+  # config.parent_job = 'ActiveJob::Base'
+
   # Configure the parent class for activity_notification controllers.
   # config.parent_controller = 'ApplicationController'
 
@@ -50,4 +53,7 @@ ActivityNotification.configure do |config|
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 
+  # Configure ActiveJob queue name for delayed notifications.
+  config.active_job_queue = :activity_notification
+
 end

data/spec/rails_app/db/migrate/{20160715050433_create_test_tables.rb → 20160716000000_create_test_tables.rb}

@@ -1,4 +1,4 @@
-class CreateTestTables < ActiveRecord::Migration[5.1]
+class CreateTestTables < ActiveRecord::Migration[5.2]
   def change
     create_table :users do |t|
       # Devise

data/spec/rails_app/db/migrate/{20160715050420_create_activity_notification_tables.rb → 20181209000000_create_activity_notification_tables.rb}

@@ -1,5 +1,5 @@
 # Migration responsible for creating a table with notifications
-class CreateActivityNotificationTables < ActiveRecord::Migration[5.1]
+class CreateActivityNotificationTables < ActiveRecord::Migration[5.2]
   # Create tables
   def change
     create_table :notifications do |t|
@@ -12,7 +12,7 @@ class CreateActivityNotificationTables < ActiveRecord::Migration[5.1]
       t.text       :parameters
       t.datetime   :opened_at
 
-      t.timestamps
+      t.timestamps null: false
     end
 
     create_table :subscriptions do |t|
@@ -26,7 +26,7 @@ class CreateActivityNotificationTables < ActiveRecord::Migration[5.1]
       t.datetime   :unsubscribed_to_email_at
       t.text       :optional_targets
 
-      t.timestamps
+      t.timestamps null: false
     end
     add_index :subscriptions, [:target_type, :target_id, :key], unique: true
   end

data/spec/rails_app/db/schema.rb

@@ -10,51 +10,51 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20160715050433) do
+ActiveRecord::Schema.define(version: 2018_12_09_000000) do
 
   create_table "admins", force: :cascade do |t|
-    t.integer  "user_id"
-    t.string   "phone_number"
-    t.string   "slack_username"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "user_id"
+    t.string "phone_number"
+    t.string "slack_username"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["user_id"], name: "index_admins_on_user_id"
   end
 
   create_table "articles", force: :cascade do |t|
-    t.integer  "user_id"
-    t.string   "title"
-    t.string   "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "user_id"
+    t.string "title"
+    t.string "body"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["user_id"], name: "index_articles_on_user_id"
   end
 
   create_table "comments", force: :cascade do |t|
-    t.integer  "user_id"
-    t.integer  "article_id"
-    t.string   "body"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.integer "user_id"
+    t.integer "article_id"
+    t.string "body"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["article_id"], name: "index_comments_on_article_id"
     t.index ["user_id"], name: "index_comments_on_user_id"
   end
 
   create_table "notifications", force: :cascade do |t|
-    t.string   "target_type",     null: false
-    t.integer  "target_id",       null: false
-    t.string   "notifiable_type", null: false
-    t.integer  "notifiable_id",   null: false
-    t.string   "key",             null: false
-    t.string   "group_type"
-    t.integer  "group_id"
-    t.integer  "group_owner_id"
-    t.string   "notifier_type"
-    t.integer  "notifier_id"
-    t.text     "parameters"
+    t.string "target_type", null: false
+    t.integer "target_id", null: false
+    t.string "notifiable_type", null: false
+    t.integer "notifiable_id", null: false
+    t.string "key", null: false
+    t.string "group_type"
+    t.integer "group_id"
+    t.integer "group_owner_id"
+    t.string "notifier_type"
+    t.integer "notifier_id"
+    t.text "parameters"
     t.datetime "opened_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["group_owner_id"], name: "index_notifications_on_group_owner_id"
     t.index ["group_type", "group_id"], name: "index_notifications_on_group_type_and_group_id"
     t.index ["notifiable_type", "notifiable_id"], name: "index_notifications_on_notifiable_type_and_notifiable_id"
@@ -63,32 +63,32 @@ ActiveRecord::Schema.define(version: 20160715050433) do
   end
 
   create_table "subscriptions", force: :cascade do |t|
-    t.string   "target_type",                             null: false
-    t.integer  "target_id",                               null: false
-    t.string   "key",                                     null: false
-    t.boolean  "subscribing",              default: true, null: false
-    t.boolean  "subscribing_to_email",     default: true, null: false
+    t.string "target_type", null: false
+    t.integer "target_id", null: false
+    t.string "key", null: false
+    t.boolean "subscribing", default: true, null: false
+    t.boolean "subscribing_to_email", default: true, null: false
     t.datetime "subscribed_at"
     t.datetime "unsubscribed_at"
     t.datetime "subscribed_to_email_at"
     t.datetime "unsubscribed_to_email_at"
-    t.text     "optional_targets"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.text "optional_targets"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["key"], name: "index_subscriptions_on_key"
     t.index ["target_type", "target_id", "key"], name: "index_subscriptions_on_target_type_and_target_id_and_key", unique: true
     t.index ["target_type", "target_id"], name: "index_subscriptions_on_target_type_and_target_id"
   end
 
   create_table "users", force: :cascade do |t|
-    t.string   "email",                default: "", null: false
-    t.string   "encrypted_password",   default: "", null: false
-    t.string   "confirmation_token"
+    t.string "email", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "name"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.string "name"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
     t.index ["email"], name: "index_users_on_email"
   end
 

data/spec/roles/acts_as_notifiable_spec.rb

@@ -1,4 +1,5 @@
 describe ActivityNotification::ActsAsNotifiable do
+  include ActiveJob::TestHelper
   let(:dummy_model_class)      { Dummy::DummyBase }
   let(:dummy_notifiable_class) { Dummy::DummyNotifiable }
   let(:user_target)            { create(:confirmed_user) }
@@ -193,6 +194,50 @@ describe ActivityNotification::ActsAsNotifiable do
             end
           end
         end
+
+        context "with :notify_later option" do
+          before do
+            ActiveJob::Base.queue_adapter = :test
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { notify_later: true }
+            @created_notifiable = dummy_notifiable_class.create
+          end
+
+          context "creation" do
+            it "generates notifications later when notifiable is created" do
+              expect {
+                @created_notifiable = dummy_notifiable_class.create
+              }.to have_enqueued_job(ActivityNotification::NotifyJob)
+            end
+
+            it "creates notification records later when notifiable is created" do
+              perform_enqueued_jobs do
+                @created_notifiable = dummy_notifiable_class.create
+              end
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+          end
+
+          context "update" do
+            before do
+              user_target.notifications.delete_all
+              expect(user_target.notifications.count).to eq(0)
+              @notifiable.update(created_at: @notifiable.updated_at)
+            end
+
+            it "generates notifications later when notifiable is created" do
+              expect {
+                @notifiable.update(created_at: @notifiable.updated_at)
+              }.to have_enqueued_job(ActivityNotification::NotifyJob)
+            end
+
+            it "creates notification records later when notifiable is created" do
+              perform_enqueued_jobs do
+                @notifiable.update(created_at: @notifiable.updated_at)
+              end
+              expect(user_target.notifications.filtered_by_instance(@notifiable).count).to eq(1)
+            end
+          end
+        end
       end
 
       context "with :dependent_notifications option" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -258,6 +258,9 @@ files:
 - app/controllers/activity_notification/notifications_with_devise_controller.rb
 - app/controllers/activity_notification/subscriptions_controller.rb
 - app/controllers/activity_notification/subscriptions_with_devise_controller.rb
+- app/jobs/activity_notification/notify_all_job.rb
+- app/jobs/activity_notification/notify_job.rb
+- app/jobs/activity_notification/notify_to_job.rb
 - app/mailers/activity_notification/mailer.rb
 - app/views/activity_notification/mailer/default/batch_default.html.erb
 - app/views/activity_notification/mailer/default/batch_default.text.erb
@@ -383,6 +386,9 @@ files:
 - spec/generators/views_generator_spec.rb
 - spec/helpers/polymorphic_helpers_spec.rb
 - spec/helpers/view_helpers_spec.rb
+- spec/jobs/notify_all_job_spec.rb
+- spec/jobs/notify_job_spec.rb
+- spec/jobs/notify_to_job_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/dummy/dummy_group_spec.rb
 - spec/models/dummy/dummy_notifiable_spec.rb
@@ -463,8 +469,8 @@ files:
 - spec/rails_app/config/mongoid.yml
 - spec/rails_app/config/routes.rb
 - spec/rails_app/config/secrets.yml
-- spec/rails_app/db/migrate/20160715050420_create_activity_notification_tables.rb
-- spec/rails_app/db/migrate/20160715050433_create_test_tables.rb
+- spec/rails_app/db/migrate/20160716000000_create_test_tables.rb
+- spec/rails_app/db/migrate/20181209000000_create_activity_notification_tables.rb
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/lib/custom_optional_targets/console_output.rb
@@ -540,6 +546,9 @@ test_files:
 - spec/generators/views_generator_spec.rb
 - spec/helpers/polymorphic_helpers_spec.rb
 - spec/helpers/view_helpers_spec.rb
+- spec/jobs/notify_all_job_spec.rb
+- spec/jobs/notify_job_spec.rb
+- spec/jobs/notify_to_job_spec.rb
 - spec/mailers/mailer_spec.rb
 - spec/models/dummy/dummy_group_spec.rb
 - spec/models/dummy/dummy_notifiable_spec.rb
@@ -620,8 +629,8 @@ test_files:
 - spec/rails_app/config/mongoid.yml
 - spec/rails_app/config/routes.rb
 - spec/rails_app/config/secrets.yml
-- spec/rails_app/db/migrate/20160715050420_create_activity_notification_tables.rb
-- spec/rails_app/db/migrate/20160715050433_create_test_tables.rb
+- spec/rails_app/db/migrate/20160716000000_create_test_tables.rb
+- spec/rails_app/db/migrate/20181209000000_create_activity_notification_tables.rb
 - spec/rails_app/db/schema.rb
 - spec/rails_app/db/seeds.rb
 - spec/rails_app/lib/custom_optional_targets/console_output.rb