activity_notification 1.2.1 → 1.3.0

data/spec/rails_app/app/views/activity_notification/notifications/users/overriden/custom/_test.html.erb

@@ -0,0 +1 @@
+Overriden custom template root for user target: <%= notification.id %>

data/spec/rails_app/config/application.rb

@@ -1,6 +1,13 @@
 require File.expand_path('../boot', __FILE__)
 
 # Pick the frameworks you want:
+if ENV['AN_ORM'] == 'mongoid'
+  require 'mongoid'
+  require 'rails'
+  if Rails.env != 'test'
+    Mongoid.load!(File.expand_path("config/mongoid.yml"), :development)
+  end
+end
 require "active_record/railtie"
 require "action_controller/railtie"
 require "action_mailer/railtie"

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

@@ -1,5 +1,10 @@
 ActivityNotification.configure do |config|
 
+  # Configure ORM name for ActivityNotification.
+  # Set :active_record or :mongoid.
+  ENV['AN_ORM'] = 'active_record' unless ENV['AN_ORM'] == 'mongoid'
+  config.orm = ENV['AN_ORM']
+
   # Configure if all activity notifications are enabled
   # Set false when you want to turn off activity notifications
   config.enabled = true

data/spec/rails_app/config/mongoid.yml

@@ -0,0 +1,13 @@
+development:
+  clients:
+    default:
+      database: activity_notification_development
+      hosts:
+        - localhost:27017
+
+test:
+  clients:
+    default:
+      database: activity_notification_test
+      hosts:
+        - localhost:27017

data/spec/rails_app/db/seeds.rb

@@ -7,7 +7,7 @@ Comment.delete_all
 Article.delete_all
 Admin.delete_all
 User.delete_all
-ActivityNotification::Notification.connection.execute("UPDATE sqlite_sequence SET seq = 0;")
+User.connection.execute("UPDATE sqlite_sequence SET seq = 0;")
 
 ['Ichiro', 'Stephen', 'Klay', 'Kevin'].each do |name|
   user = User.new(

data/spec/rails_app/lib/custom_optional_targets/console_output.rb

@@ -1,13 +1,16 @@
 module CustomOptionalTarget
-  # Optional target implementation for mobile push notification or SMS using AWS SNS.
+  # Optional target implementation to output console.
   class ConsoleOutput < ActivityNotification::OptionalTarget::Base
     def initialize_target(options = {})
+      @console_out = options[:console_out] == false ? false : true
     end
 
     def notify(notification, options = {})
-      puts "----- Optional targets: #{self.class.name} -----"
-      puts render_notification_message(notification, options)
-      puts "-----------------------------------------------------------------"
+      if @console_out
+        puts "----- Optional targets: #{self.class.name} -----"
+        puts render_notification_message(notification, options)
+        puts "-----------------------------------------------------------------"
+      end
     end
   end
 end

data/spec/rails_app/lib/custom_optional_targets/wrong_target.rb

@@ -1,6 +1,9 @@
 module CustomOptionalTarget
   # Wrong optional target implementation for tests.
   class WrongTarget
+    def initialize(options = {})
+    end
+
     def initialize_target(options = {})
     end
 

data/spec/roles/acts_as_notifiable_spec.rb

@@ -1,6 +1,7 @@
 describe ActivityNotification::ActsAsNotifiable do
   let(:dummy_model_class)      { Dummy::DummyBase }
   let(:dummy_notifiable_class) { Dummy::DummyNotifiable }
+  let(:user_target)            { create(:confirmed_user) }
   let(:dummy_target)           { create(:dummy_target) }
 
   describe "as public class methods" do
@@ -30,10 +31,16 @@ describe ActivityNotification::ActsAsNotifiable do
         before do
           dummy_notifiable_class.reset_callbacks :destroy
           @notifiable_1, @notifiable_2, @notifiable_3 = dummy_notifiable_class.create, dummy_notifiable_class.create, dummy_notifiable_class.create
-          @group_owner  = create(:notification, target: dummy_target, notifiable: @notifiable_1, group: @notifiable_1)
-          @group_member = create(:notification, target: dummy_target, notifiable: @notifiable_2, group: @notifiable_1, group_owner: @group_owner)
-                          create(:notification, target: dummy_target, notifiable: @notifiable_3, group: @notifiable_1, group_owner: @group_owner)
+          @group_owner  = create(:notification, target: user_target, notifiable: @notifiable_1, group: @notifiable_1)
+          @group_member = create(:notification, target: user_target, notifiable: @notifiable_2, group: @notifiable_1, group_owner: @group_owner)
+                          create(:notification, target: user_target, notifiable: @notifiable_3, group: @notifiable_1, group_owner: @group_owner)
+          @other_target_group_owner  = create(:notification, target: dummy_target, notifiable: @notifiable_1, group: @notifiable_1)
+          @other_target_group_member = create(:notification, target: dummy_target, notifiable: @notifiable_2, group: @notifiable_1, group_owner: @other_target_group_owner)
+                                       create(:notification, target: dummy_target, notifiable: @notifiable_3, group: @notifiable_1, group_owner: @other_target_group_owner)
           expect(@group_owner.group_member_count).to eq(2)
+          expect(@other_target_group_owner.group_member_count).to eq(2)
+          expect(user_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
+          expect(dummy_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
         end
 
         it "returns hash of :dependent_notifications option" do
@@ -44,57 +51,107 @@ describe ActivityNotification::ActsAsNotifiable do
         context "without option" do
           it "does not deletes any notifications when notifiable is deleted" do
             dummy_notifiable_class.acts_as_notifiable :users
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
             expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
           end
         end
 
         context ":delete_all" do
           it "deletes all notifications when notifiable is deleted" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :delete_all
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
             expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
-            expect(dummy_target.notifications.reload.size).to eq(2)
+            expect(user_target.notifications.reload.size).to eq(2)
             expect(@group_member.reload.group_owner?).to be_falsey
           end
+
+          it "does not delete notifications of other targets when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :delete_all
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(0)
+            expect(dummy_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
+          end
         end
 
         context ":destroy" do
           it "destroies all notifications when notifiable is deleted" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :destroy
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
             expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
-            expect(dummy_target.notifications.reload.size).to eq(2)
+            expect(user_target.notifications.reload.size).to eq(2)
             expect(@group_member.reload.group_owner?).to be_falsey
           end
+
+          it "does not destroy notifications of other targets when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :destroy
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(0)
+            expect(dummy_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
+          end
         end
 
         context ":restrict_with_exception" do
           it "can not be deleted when it has generated notifications" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :restrict_with_exception
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
             expect { @notifiable_1.destroy }.to raise_error(ActiveRecord::DeleteRestrictionError)
           end
         end
 
+        context ":restrict_with_error" do
+          it "can not be deleted when it has generated notifications" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :restrict_with_error
+            expect(user_target.notifications.reload.size).to eq(3)
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(0)
+          end
+        end
+
         context ":update_group_and_delete_all" do
           it "deletes all notifications and update notification group when notifiable is deleted" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_delete_all
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.reload.size).to eq(2)
+            expect(@group_member.reload.group_owner?).to be_truthy
+          end
+
+          it "does not delete notifications of other targets when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_delete_all
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(0)
+            expect(dummy_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
+          end
+
+          it "does not update notification group when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_delete_all
             expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
-            expect(dummy_target.notifications.reload.size).to eq(2)
             expect(@group_member.reload.group_owner?).to be_truthy
+            expect(@other_target_group_member.reload.group_owner?).to be_falsey
           end
         end
 
         context ":update_group_and_destroy" do
           it "destroies all notifications and update notification group when notifiable is deleted" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_destroy
-            expect(dummy_target.notifications.reload.size).to eq(3)
+            expect(user_target.notifications.reload.size).to eq(3)
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.reload.size).to eq(2)
+            expect(@group_member.reload.group_owner?).to be_truthy
+          end
+
+          it "does not destroy notifications of other targets when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_destroy
+            expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
+            expect(user_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(0)
+            expect(dummy_target.notifications.filtered_by_instance(@notifiable_1).count).to eq(1)
+          end
+
+          it "does not update notification group when notifiable is deleted" do
+            dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :update_group_and_destroy
             expect { @notifiable_1.destroy }.to change(dummy_notifiable_class, :count).by(-1)
-            expect(dummy_target.notifications.reload.size).to eq(2)
             expect(@group_member.reload.group_owner?).to be_truthy
+            expect(@other_target_group_member.reload.group_owner?).to be_falsey
           end
         end
       end
@@ -134,9 +191,13 @@ describe ActivityNotification::ActsAsNotifiable do
 
         context "with lambda function configuration" do
           it "configure optional_targets and notifiable#optional_targets returns optional_target array" do
-            dummy_notifiable_class.acts_as_notifiable :users, optional_targets: ->(notifiable, key){ key == 'dummy_key' ? [ActivityNotification::OptionalTarget::Base.new] : [] }
+            module AdditionalMethods
+              require 'custom_optional_targets/console_output'
+            end
+            dummy_notifiable_class.extend(AdditionalMethods)
+            dummy_notifiable_class.acts_as_notifiable :users, optional_targets: ->(notifiable, key){ key == 'dummy_key' ? [CustomOptionalTarget::ConsoleOutput.new] : [] }
             expect(@notifiable.optional_targets(:users)).to eq([])
-            expect(@notifiable.optional_targets(:users, 'dummy_key').first).to be_a(ActivityNotification::OptionalTarget::Base)
+            expect(@notifiable.optional_targets(:users, 'dummy_key').first).to be_a(CustomOptionalTarget::ConsoleOutput)
           end
         end
       end

data/spec/spec_helper.rb

@@ -20,6 +20,11 @@ SimpleCov.start('rails') do
   elsif Rails::VERSION::MAJOR == 4
     nocov_token 'skip-rails4'
   end
+  if ENV['AN_ORM'] == 'mongoid'
+    add_filter '/lib/activity_notification/orm/active_record'
+  else
+    add_filter '/lib/activity_notification/orm/mongoid'
+  end
 end
 
 # Testing with Devise
@@ -39,6 +44,8 @@ RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.before(:all) do
     FactoryGirl.reload
+    ActivityNotification::Notification.delete_all
+    ActivityNotification::Subscription.delete_all
   end
   config.include Devise::Test::ControllerHelpers, type: :controller
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -31,33 +31,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: i18n
+  name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: activerecord
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.1
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -120,28 +134,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.14.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.8
 - !ruby/object:Gem::Dependency
   name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
@@ -162,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -280,6 +294,12 @@ files:
 - lib/activity_notification/optional_targets/amazon_sns.rb
 - lib/activity_notification/optional_targets/base.rb
 - lib/activity_notification/optional_targets/slack.rb
+- lib/activity_notification/orm/active_record.rb
+- lib/activity_notification/orm/active_record/notification.rb
+- lib/activity_notification/orm/active_record/subscription.rb
+- lib/activity_notification/orm/mongoid.rb
+- lib/activity_notification/orm/mongoid/notification.rb
+- lib/activity_notification/orm/mongoid/subscription.rb
 - lib/activity_notification/rails.rb
 - lib/activity_notification/rails/routes.rb
 - lib/activity_notification/renderable.rb
@@ -384,6 +404,7 @@ files:
 - spec/rails_app/app/views/activity_notification/notifications/default/custom/_test.html.erb
 - spec/rails_app/app/views/activity_notification/notifications/users/_custom_index.html.erb
 - spec/rails_app/app/views/activity_notification/notifications/users/custom/_test.html.erb
+- spec/rails_app/app/views/activity_notification/notifications/users/overriden/custom/_test.html.erb
 - spec/rails_app/app/views/activity_notification/optional_targets/admins/amazon_sns/comment/_default.text.erb
 - spec/rails_app/app/views/articles/_form.html.erb
 - spec/rails_app/app/views/articles/edit.html.erb
@@ -416,6 +437,7 @@ files:
 - spec/rails_app/config/initializers/wrap_parameters.rb
 - spec/rails_app/config/locales/activity_notification.en.yml
 - spec/rails_app/config/locales/devise.en.yml
+- 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
@@ -536,6 +558,7 @@ test_files:
 - spec/rails_app/app/views/activity_notification/notifications/default/custom/_test.html.erb
 - spec/rails_app/app/views/activity_notification/notifications/users/_custom_index.html.erb
 - spec/rails_app/app/views/activity_notification/notifications/users/custom/_test.html.erb
+- spec/rails_app/app/views/activity_notification/notifications/users/overriden/custom/_test.html.erb
 - spec/rails_app/app/views/activity_notification/optional_targets/admins/amazon_sns/comment/_default.text.erb
 - spec/rails_app/app/views/articles/_form.html.erb
 - spec/rails_app/app/views/articles/edit.html.erb
@@ -568,6 +591,7 @@ test_files:
 - spec/rails_app/config/initializers/wrap_parameters.rb
 - spec/rails_app/config/locales/activity_notification.en.yml
 - spec/rails_app/config/locales/devise.en.yml
+- 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