activity_notification 1.0.0 → 1.0.1

data/spec/controllers/notifications_controller_shared_examples.rb

@@ -149,6 +149,83 @@ shared_examples_for :notification_controller do
         end
       end
     end
+
+    context "with reverse parameter" do
+      before do
+        @notifiable    = create(:article)
+        @group         = create(:article)
+        @key           = 'test.key.1'
+        create(:notification, target: test_target, notifiable: @notifiable)
+        create(:notification, target: test_target, notifiable: create(:comment), group: @group)
+        create(:notification, target: test_target, notifiable: create(:article), key: @key).open!
+        @notification1 = test_target.notification_index[0]
+        @notification2 = test_target.notification_index[1]
+        @notification3 = test_target.notification_index[2]
+      end
+
+      context "as default" do
+        before do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target }), valid_session
+        end
+
+        it "returns the latest order" do
+          expect(assigns(:notifications)[0]).to eq(@notification1)
+          expect(assigns(:notifications)[1]).to eq(@notification2)
+          expect(assigns(:notifications)[2]).to eq(@notification3)
+          expect(assigns(:notifications).size).to eq(3)
+        end
+      end
+
+      context "with true as reverse" do
+        before do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, reverse: true }), valid_session
+        end
+
+        it "returns the earliest order" do
+          expect(assigns(:notifications)[0]).to eq(@notification2)
+          expect(assigns(:notifications)[1]).to eq(@notification1)
+          expect(assigns(:notifications)[2]).to eq(@notification3)
+          expect(assigns(:notifications).size).to eq(3)
+        end
+      end
+    end
+
+    context "with options filter parameters" do
+      before do
+        @notifiable    = create(:article)
+        @group         = create(:article)
+        @key           = 'test.key.1'
+        @notification2 = create(:notification, target: test_target, notifiable: @notifiable)
+        @notification1 = create(:notification, target: test_target, notifiable: create(:comment), group: @group)
+        @notification3 = create(:notification, target: test_target, notifiable: create(:article), key: @key)
+        @notification3.open!
+      end
+
+      context 'with filtered_by_type parameter' do
+        it "returns filtered notifications only" do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filtered_by_type: 'Article' }), valid_session
+          expect(assigns(:notifications)[0]).to eq(@notification2)
+          expect(assigns(:notifications)[1]).to eq(@notification3)
+          expect(assigns(:notifications).size).to eq(2)
+        end
+      end
+
+      context 'with filtered_by_group_type and :filtered_by_group_id parameters' do
+        it "returns filtered notifications only" do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filtered_by_group_type: 'Article', filtered_by_group_id: @group.id.to_s }), valid_session
+          expect(assigns(:notifications)[0]).to eq(@notification1)
+          expect(assigns(:notifications).size).to eq(1)
+        end
+      end
+
+      context 'with filtered_by_key parameter' do
+        it "returns filtered notifications only" do
+          get_with_compatibility :index, target_params.merge({ typed_target_param => test_target, filtered_by_key: @key }), valid_session
+          expect(assigns(:notifications)[0]).to eq(@notification3)
+          expect(assigns(:notifications).size).to eq(1)
+        end
+      end
+    end
   end
 
   describe "POST #open_all" do

data/spec/helpers/view_helpers_spec.rb

@@ -122,7 +122,7 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         expect(render_notification_of target_user, fallback: :default)
           .to eq(
             render partial: 'activity_notification/notifications/default/index',
-                   locals: { target: target_user }
+                   locals: { target: target_user, parameters: { fallback: :default } }
           )
       end
     end
@@ -149,7 +149,7 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         expect(self).to receive(:render).with({
           partial: 'activity_notification/notifications/users/index',
           layout:  'layouts/test',
-          locals:  { target: target_user }
+          locals:  { target: target_user, parameters: {} }
         })
         render_notification_of target_user, layout: 'test'
       end
@@ -174,13 +174,41 @@ describe ActivityNotification::ViewHelpers, type: :helper do
         end
       end
 
-      context "with :with_attributes or any other key" do
+      context "with :unopened_simple" do
+        it "uses target.unopened_notification_index" do
+          expect(target_user).to receive(:unopened_notification_index).at_least(:once)
+          render_notification_of target_user, index_content: :unopened_simple
+        end
+      end
+
+      context "with :opened_simple" do
+        it "uses target.opened_notification_index" do
+          expect(target_user).to receive(:opened_notification_index).at_least(:once)
+          render_notification_of target_user, index_content: :opened_simple
+        end
+      end
+
+      context "with :with_attributes" do
         it "uses target.notification_index_with_attributes" do
           expect(target_user).to receive(:notification_index_with_attributes)
           render_notification_of target_user, index_content: :with_attributes
         end
       end
 
+      context "with :unopened_with_attributes" do
+        it "uses target.unopened_notification_index_with_attributes" do
+          expect(target_user).to receive(:unopened_notification_index_with_attributes).at_least(:once)
+          render_notification_of target_user, index_content: :unopened_with_attributes
+        end
+      end
+
+      context "with :opened_with_attributes" do
+        it "uses target.opened_notification_index_with_attributes" do
+          expect(target_user).to receive(:opened_notification_index_with_attributes).at_least(:once)
+          render_notification_of target_user, index_content: :opened_with_attributes
+        end
+      end
+
       context "with :none" do
         it "uses neither target.notification_index nor notification_index_with_attributes" do
           expect(target_user).not_to receive(:notification_index)
@@ -188,6 +216,14 @@ describe ActivityNotification::ViewHelpers, type: :helper do
           render_notification_of target_user, index_content: :none
         end
       end
+
+      context "with any other key" do
+        it "uses target.notification_index_with_attributes" do
+          expect(target_user).to receive(:notification_index_with_attributes)
+          render_notification_of target_user, index_content: :hoge
+        end
+      end
+
     end
   end
 

data/spec/mailers/mailer_spec.rb

@@ -1,6 +1,8 @@
 describe ActivityNotification::Mailer do
   include ActiveJob::TestHelper
   let(:notification) { create(:notification) }
+  let(:test_target) { notification.target }
+  let(:notifications) { [create(:notification, target: test_target), create(:notification, target: test_target)] }
 
   before do
     ActivityNotification::Mailer.deliveries.clear
@@ -56,11 +58,19 @@ describe ActivityNotification::Mailer do
       context "with email proc as ActivityNotification.config.mailer_sender" do
         it "sends from configured email as ActivityNotification.config.mailer_sender" do
           ActivityNotification.config.mailer_sender =
-            ->(notification){ notification.target_type == 'User' ? "test03@example.com" : "test04@example.com" }
+            ->(key){ key == notification.key ? "test03@example.com" : "test04@example.com" }
           ActivityNotification::Mailer.send_notification_email(notification).deliver_now
           expect(ActivityNotification::Mailer.deliveries.last.from[0])
             .to eq("test03@example.com")
         end
+
+        it "sends from configured email as ActivityNotification.config.mailer_sender" do
+          ActivityNotification.config.mailer_sender =
+            ->(key){ key == 'hogehoge' ? "test03@example.com" : "test04@example.com" }
+          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
+          expect(ActivityNotification::Mailer.deliveries.last.from[0])
+            .to eq("test04@example.com")
+        end
       end
 
       context "with defined overriding_notification_email_key in notifiable model" do
@@ -102,4 +112,47 @@ describe ActivityNotification::Mailer do
       end
     end
   end
+
+  describe ".send_batch_notification_email" do
+    context "with deliver_now" do
+      context "as default" do
+        before do
+          ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_now
+        end
+  
+        it "sends batch notification email now" do
+          expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
+        end
+  
+        it "sends to target email" do
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(test_target.email)
+        end
+  
+      end
+
+      context "when fallback option is :none and the template is missing" do
+        it "raise ActionView::MissingTemplate" do
+          expect { ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, fallback: :none).deliver_now }
+            .to raise_error(ActionView::MissingTemplate)
+        end
+      end
+    end
+
+    context "with deliver_later" do
+      it "sends notification email later" do
+        expect {
+          perform_enqueued_jobs do
+            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_later
+          end
+        }.to change { ActivityNotification::Mailer.deliveries.size }.by(1)
+        expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
+      end
+
+      it "sends notification email with active job queue" do
+        expect {
+            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_later
+        }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(1)
+      end
+    end
+  end
 end

data/spec/models/notification_spec.rb

@@ -265,6 +265,17 @@ describe ActivityNotification::Notification, type: :model do
             expect(notifications.first).to eq(@notification_2)
           end
         end
+
+        context 'with custom_filter options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options({ custom_filter: ["key = ?", @key_1] })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_1)
+            notifications = ActivityNotification::Notification.filtered_by_options({ custom_filter: { key: @key_2 } })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_2)
+          end
+        end
   
         context 'with no options' do
           it "works with filtered_by_options scope" do

data/spec/rails_app/app/models/user.rb

@@ -4,7 +4,7 @@ class User < ActiveRecord::Base
   has_many :articles, dependent: :destroy
   has_one :admin, dependent: :destroy
 
-  acts_as_target email: :email, email_allowed: :confirmed_at, printable_name: :name
+  acts_as_target email: :email, email_allowed: :confirmed_at, batch_email_allowed: :confirmed_at, printable_name: :name
   acts_as_notifier printable_name: :name
 
   def admin?

data/spec/rails_app/app/views/layouts/_header.html.erb

@@ -25,6 +25,8 @@
     <div class="header_notification_wrapper">
       <% if user_signed_in? %>
         <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
+        <%#= render_notifications_of current_user, fallback: :default, index_content: :unopened_with_attributes, reverse: true %>
+        <%#= render_notifications_of current_user, fallback: :default_without_grouping, index_content: :with_attributes, with_group_members: true %>
       <% end %>
     </div>
     <div class="header_menu_wrapper">

data/spec/rails_app/lib/mailer_previews/mailer_preview.rb

@@ -10,4 +10,10 @@ class ActivityNotification::MailerPreview < ActionMailer::Preview
     ActivityNotification::Mailer.send_notification_email(target_notification)
   end
 
+  def send_batch_notification_email
+    target = User.find_by_name('Ichiro')
+    target_notifications = target.notification_index_with_attributes(filtered_by_key: 'comment.default')
+    ActivityNotification::Mailer.send_batch_notification_email(target, target_notifications)
+  end
+
 end

data/spec/roles/acts_as_target_spec.rb

@@ -33,7 +33,7 @@ describe ActivityNotification::ActsAsTarget do
     describe ".available_target_options" do
       it "returns list of available options in acts_as_target" do
         expect(dummy_model_class.available_target_options)
-          .to eq([:email, :email_allowed, :devise_resource, :printable_notification_target_name, :printable_name])
+          .to eq([:email, :email_allowed, :batch_email_allowed, :devise_resource, :printable_notification_target_name, :printable_name])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 1.3.12
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -193,9 +193,12 @@ files:
 - app/controllers/activity_notification/notifications_controller.rb
 - app/controllers/activity_notification/notifications_with_devise_controller.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
 - app/views/activity_notification/mailer/default/default.html.erb
 - app/views/activity_notification/mailer/default/default.text.erb
 - app/views/activity_notification/notifications/default/_default.html.erb
+- app/views/activity_notification/notifications/default/_default_without_grouping.html.erb
 - app/views/activity_notification/notifications/default/_index.html.erb
 - app/views/activity_notification/notifications/default/destroy.js.erb
 - app/views/activity_notification/notifications/default/index.html.erb