activity_notification 1.0.2 → 1.1.0

data/spec/mailers/mailer_spec.rb

@@ -3,6 +3,7 @@ describe ActivityNotification::Mailer do
   let(:notification) { create(:notification) }
   let(:test_target) { notification.target }
   let(:notifications) { [create(:notification, target: test_target), create(:notification, target: test_target)] }
+  let(:batch_key) { 'test_batch_key' }
 
   before do
     ActivityNotification::Mailer.deliveries.clear
@@ -117,7 +118,7 @@ describe ActivityNotification::Mailer do
     context "with deliver_now" do
       context "as default" do
         before do
-          ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_now
+          ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_now
         end
   
         it "sends batch notification email now" do
@@ -132,7 +133,7 @@ describe ActivityNotification::Mailer do
 
       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 }
+          expect { ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key, fallback: :none).deliver_now }
             .to raise_error(ActionView::MissingTemplate)
         end
       end
@@ -142,7 +143,7 @@ describe ActivityNotification::Mailer do
       it "sends notification email later" do
         expect {
           perform_enqueued_jobs do
-            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_later
+            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_later
           end
         }.to change { ActivityNotification::Mailer.deliveries.size }.by(1)
         expect(ActivityNotification::Mailer.deliveries.size).to eq(1)
@@ -150,7 +151,7 @@ describe ActivityNotification::Mailer do
 
       it "sends notification email with active job queue" do
         expect {
-            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications).deliver_later
+            ActivityNotification::Mailer.send_batch_notification_email(test_target, notifications, batch_key).deliver_later
         }.to change(ActiveJob::Base.queue_adapter.enqueued_jobs, :size).by(1)
       end
     end

data/spec/models/dummy/dummy_subscriber_spec.rb

@@ -0,0 +1,5 @@
+describe Dummy::DummySubscriber, type: :model do
+
+  it_behaves_like :subscriber
+
+end

data/spec/models/notification_spec.rb

@@ -55,19 +55,19 @@ describe ActivityNotification::Notification, type: :model do
     it "is valid with target, notifiable and key" do
       expect(@notification).to be_valid
     end
-  
+
     it "is invalid with blank target" do
       @notification.target = nil
       expect(@notification).to be_invalid
       expect(@notification.errors[:target].size).to eq(1)
     end
-  
+
     it "is invalid with blank notifiable" do
       @notification.notifiable = nil
       expect(@notification).to be_invalid
       expect(@notification.errors[:notifiable].size).to eq(1)
     end
-  
+
     it "is invalid with blank key" do
       @notification.key = nil
       expect(@notification).to be_invalid
@@ -81,8 +81,8 @@ describe ActivityNotification::Notification, type: :model do
         ActivityNotification::Notification.delete_all
         @unopened_group_owner  = create(:notification, group_owner: nil)
         @unopened_group_member = create(:notification, group_owner: @unopened_group_owner)
-        @opened_group_owner    = create(:notification, group_owner: nil, opened_at: DateTime.now)
-        @opened_group_member   = create(:notification, group_owner: @opened_group_owner, opened_at: DateTime.now)
+        @opened_group_owner    = create(:notification, group_owner: nil, opened_at: Time.current)
+        @opened_group_member   = create(:notification, group_owner: @opened_group_owner, opened_at: Time.current)
       end
 
       it "works with group_owners_only scope" do
@@ -291,8 +291,8 @@ describe ActivityNotification::Notification, type: :model do
         ActivityNotification::Notification.delete_all
         unopened_group_owner   = create(:notification, group_owner: nil)
         unopened_group_member  = create(:notification, group_owner: unopened_group_owner)
-        opened_group_owner     = create(:notification, group_owner: nil, opened_at: DateTime.now)
-        opened_group_member    = create(:notification, group_owner: opened_group_owner, opened_at: DateTime.now)
+        opened_group_owner     = create(:notification, group_owner: nil, opened_at: Time.current)
+        opened_group_member    = create(:notification, group_owner: opened_group_owner, opened_at: Time.current)
         @earliest_notification = unopened_group_owner
         @latest_notification   = opened_group_member
       end

data/spec/models/subscription_spec.rb

@@ -0,0 +1,158 @@
+describe ActivityNotification::Subscription, type: :model do
+
+  it_behaves_like :subscription_api
+
+  describe "with association" do
+    it "belongs to target" do
+      target = create(:confirmed_user)
+      subscription = create(:subscription, target: target)
+      expect(subscription.reload.target).to eq(target)
+    end
+  end
+
+  describe "with validation" do
+    before { @subscription = build(:subscription) }
+
+    it "is valid with target and key" do
+      expect(@subscription).to be_valid
+    end
+
+    it "is invalid with blank target" do
+      @subscription.target = nil
+      expect(@subscription).to be_invalid
+      expect(@subscription.errors[:target].size).to eq(1)
+    end
+
+    it "is invalid with blank key" do
+      @subscription.key = nil
+      expect(@subscription).to be_invalid
+      expect(@subscription.errors[:key].size).to eq(1)
+    end
+
+    #TODO
+    # it "is invalid with non boolean value of subscribing" do
+      # @subscription.subscribing = 'hoge'
+      # expect(@subscription).to be_invalid
+      # expect(@subscription.errors[:subscribing].size).to eq(1)
+    # end
+# 
+    # it "is invalid with non boolean value of subscribing_to_email" do
+      # @subscription.subscribing_to_email = 'hoge'
+      # expect(@subscription).to be_invalid
+      # expect(@subscription.errors[:subscribing_to_email].size).to eq(1)
+    # end
+
+    it "is invalid with true as subscribing_to_email and false as subscribing" do
+      @subscription.subscribing = false
+      @subscription.subscribing_to_email = true
+      expect(@subscription).to be_invalid
+      expect(@subscription.errors[:subscribing_to_email].size).to eq(1)
+    end
+  end
+
+  describe "with scope" do
+    context "to filter by association" do
+      before do
+        ActivityNotification::Subscription.delete_all
+        @target_1, @key_1 = create(:confirmed_user), "key.1"
+        @target_2, @key_2 = create(:confirmed_user), "key.2"
+        @subscription_1 = create(:subscription, target: @target_1, key: @key_1)
+        @subscription_2 = create(:subscription, target: @target_2, key: @key_2)
+      end
+
+      it "works with filtered_by_target scope" do
+        subscriptions = ActivityNotification::Subscription.filtered_by_target(@target_1)
+        expect(subscriptions.size).to eq(1)
+        expect(subscriptions.first).to eq(@subscription_1)
+        subscriptions = ActivityNotification::Subscription.filtered_by_target(@target_2)
+        expect(subscriptions.size).to eq(1)
+        expect(subscriptions.first).to eq(@subscription_2)
+      end
+
+      it "works with filtered_by_key scope" do
+        subscriptions = ActivityNotification::Subscription.filtered_by_key(@key_1)
+        expect(subscriptions.size).to eq(1)
+        expect(subscriptions.first).to eq(@subscription_1)
+        subscriptions = ActivityNotification::Subscription.filtered_by_key(@key_2)
+        expect(subscriptions.size).to eq(1)
+        expect(subscriptions.first).to eq(@subscription_2)
+      end
+
+      describe 'filtered_by_options scope' do
+        context 'with filtered_by_key options' do
+          it "works with filtered_by_options scope" do
+            subscriptions = ActivityNotification::Subscription.filtered_by_options({ filtered_by_key: @key_1 })
+            expect(subscriptions.size).to eq(1)
+            expect(subscriptions.first).to eq(@subscription_1)
+            subscriptions = ActivityNotification::Subscription.filtered_by_options({ filtered_by_key: @key_2 })
+            expect(subscriptions.size).to eq(1)
+            expect(subscriptions.first).to eq(@subscription_2)
+          end
+        end
+
+        context 'with custom_filter options' do
+          it "works with filtered_by_options scope" do
+            subscriptions = ActivityNotification::Subscription.filtered_by_options({ custom_filter: ["key = ?", @key_1] })
+            expect(subscriptions.size).to eq(1)
+            expect(subscriptions.first).to eq(@subscription_1)
+            subscriptions = ActivityNotification::Subscription.filtered_by_options({ custom_filter: { key: @key_2 } })
+            expect(subscriptions.size).to eq(1)
+            expect(subscriptions.first).to eq(@subscription_2)
+          end
+        end
+  
+        context 'with no options' do
+          it "works with filtered_by_options scope" do
+            subscriptions = ActivityNotification::Subscription.filtered_by_options
+            expect(subscriptions.size).to eq(2)
+          end
+        end
+      end
+    end
+
+    context "to make order by created_at" do
+      before do
+        ActivityNotification::Subscription.delete_all
+        @subscription_1 = create(:subscription, key: 'key.1')
+        @subscription_2 = create(:subscription, key: 'key.2')
+        @subscription_3 = create(:subscription, key: 'key.3')
+        @subscription_4 = create(:subscription, key: 'key.4')
+      end
+
+      it "works with latest_order scope" do
+        subscriptions = ActivityNotification::Subscription.latest_order
+        expect(subscriptions.size).to eq(4)
+        expect(subscriptions.first).to eq(@subscription_4)
+        expect(subscriptions.last).to eq(@subscription_1)
+      end
+
+      it "works with earliest_order scope" do
+        subscriptions = ActivityNotification::Subscription.earliest_order
+        expect(subscriptions.size).to eq(4)
+        expect(subscriptions.first).to eq(@subscription_1)
+        expect(subscriptions.last).to eq(@subscription_4)
+      end
+
+      it "works with latest_subscribed_order scope" do
+        @subscription_2.subscribe
+        subscriptions = ActivityNotification::Subscription.latest_subscribed_order
+        expect(subscriptions.size).to eq(4)
+        expect(subscriptions.first).to eq(@subscription_2)
+      end
+
+      it "works with earliest_subscribed_order scope" do
+        @subscription_3.subscribe
+        subscriptions = ActivityNotification::Subscription.earliest_subscribed_order
+        expect(subscriptions.size).to eq(4)
+        expect(subscriptions.last).to eq(@subscription_3)
+      end
+
+      it "works with key_order scope" do
+        subscriptions = ActivityNotification::Subscription.key_order
+        expect(subscriptions.size).to eq(4)
+        expect(subscriptions.first).to eq(@subscription_1)
+        expect(subscriptions.last).to eq(@subscription_4)
+      end
+    end
+  end
+end

data/spec/rails_app/app/controllers/users/notifications_controller.rb

@@ -0,0 +1,67 @@
+class Users::NotificationsController < ActivityNotification::NotificationsController
+  # GET /:target_type/:target_id/notifications
+  # def index
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/open_all
+  # def open_all
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/notifications/:id
+  # def destroy
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/:id/open
+  # def open
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id/move
+  # def move
+  #   super
+  # end
+
+  # No action routing
+  # This method needs to be public since it is called from view helper
+  # def target_view_path
+  #   super
+  # end
+
+  # protected
+
+  # def set_target
+  #   super
+  # end
+
+  # def set_notification
+  #   super
+  # end
+
+  # def set_index_options
+  #   super
+  # end
+
+  # def load_notification_index(options = {})
+  #   super(options)
+  # end
+
+  # def controller_path
+  #   super
+  # end
+
+  # def set_view_prefixes
+  #   super
+  # end
+
+  # def return_back_or_ajax
+  #   super
+  # end
+end

data/spec/rails_app/app/controllers/users/notifications_with_devise_controller.rb

@@ -0,0 +1,75 @@
+class Users::NotificationsWithDeviseController < ActivityNotification::NotificationsWithDeviseController
+  # GET /:target_type/:target_id/notifications
+  # def index
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/open_all
+  # def open_all
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/notifications/:id
+  # def destroy
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/notifications/:id/open
+  # def open
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/notifications/:id/move
+  # def move
+  #   super
+  # end
+
+  # No action routing
+  # This method needs to be public since it is called from view helper
+  # def target_view_path
+  #   super
+  # end
+
+  # protected
+
+  # def set_target
+  #   super
+  # end
+
+  # def set_notification
+  #   super
+  # end
+
+  # def set_index_options
+  #   super
+  # end
+
+  # def load_notification_index(options = {})
+  #   super(options)
+  # end
+
+  # def controller_path
+  #   super
+  # end
+
+  # def set_view_prefixes
+  #   super
+  # end
+
+  # def return_back_or_ajax
+  #   super
+  # end
+
+  # def authenticate_devise_resource!
+  #   super
+  # end
+
+  # def authenticate_target!
+  #   super
+  # end
+end

data/spec/rails_app/app/controllers/users/subscriptions_controller.rb

@@ -0,0 +1,79 @@
+class Users::SubscriptionsController < ActivityNotification::SubscriptionsController
+  # GET /:target_type/:target_id/subscriptions
+  # def index
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/subscriptions
+  # def create
+  #   super
+  # end
+
+  # GET /:target_type/:target_id/subscriptions/:id
+  # def show
+  #   super
+  # end
+
+  # DELETE /:target_type/:target_id/subscriptions/:id
+  # def destroy
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/subscriptions/:id/subscribe
+  # def subscribe
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/subscriptions/:id/unsubscribe
+  # def unsubscribe
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/subscriptions/:id/subscribe_to_email
+  # def subscribe_to_email
+  #   super
+  # end
+
+  # POST /:target_type/:target_id/subscriptions/:id/unsubscribe_to_email
+  # def unsubscribe_to_email
+  #   super
+  # end
+
+  # protected
+
+  # def set_target
+  #   super
+  # end
+
+  # def set_subscription
+  #   super
+  # end
+
+  # def subscription_params
+  #   super
+  # end
+
+  # def set_index_options
+  #   super
+  # end
+
+  # def load_subscription_index(options = {})
+  #   super(options)
+  # end
+
+  # def controller_path
+  #   super
+  # end
+
+  # def target_view_path
+  #   super
+  # end
+
+  # def set_view_prefixes
+  #   super
+  # end
+
+  # def return_back_or_ajax
+  #   super
+  # end
+end