activity_notification 2.0.0 → 2.1.0

data/lib/generators/templates/controllers/subscriptions_controller.rb

@@ -4,11 +4,16 @@ class <%= @target_prefix %>SubscriptionsController < ActivityNotification::Subsc
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions
+  # PUT /:target_type/:target_id/subscriptions
   # def create
   #   super
   # end
 
+  # GET /:target_type/:target_id/subscriptions/find
+  def find
+    super
+  end
+
   # GET /:target_type/:target_id/subscriptions/:id
   # def show
   #   super
@@ -19,61 +24,33 @@ class <%= @target_prefix %>SubscriptionsController < ActivityNotification::Subsc
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/subscribe
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe
   # def subscribe
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/unsubscribe
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe
   # def unsubscribe
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/subscribe_to_email
+  # PUT /: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
+  # PUT /: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_index
-  #   super
-  # end
-
-  # def controller_path
-  #   super
-  # end
-
-  # def target_view_path
-  #   super
-  # end
-
-  # def set_view_prefixes
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe_to_optional_target
+  # def subscribe_to_optional_target
   #   super
   # end
 
-  # def return_back_or_ajax
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe_to_optional_target
+  # def unsubscribe_to_optional_target
   #   super
   # end
 end

data/lib/generators/templates/controllers/subscriptions_with_devise_controller.rb

@@ -4,11 +4,16 @@ class <%= @target_prefix %>SubscriptionsWithDeviseController < ActivityNotificat
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions
+  # PUT /:target_type/:target_id/subscriptions
   # def create
   #   super
   # end
 
+  # GET /:target_type/:target_id/subscriptions/find
+  def find
+    super
+  end
+
   # GET /:target_type/:target_id/subscriptions/:id
   # def show
   #   super
@@ -19,69 +24,33 @@ class <%= @target_prefix %>SubscriptionsWithDeviseController < ActivityNotificat
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/subscribe
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe
   # def subscribe
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/unsubscribe
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe
   # def unsubscribe
   #   super
   # end
 
-  # POST /:target_type/:target_id/subscriptions/:id/subscribe_to_email
+  # PUT /: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
+  # PUT /: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_index
-  #   super
-  # 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
-
-  # def authenticate_devise_resource!
+  # PUT /:target_type/:target_id/subscriptions/:id/subscribe_to_optional_target
+  # def subscribe_to_optional_target
   #   super
   # end
 
-  # def authenticate_target!
+  # PUT /:target_type/:target_id/subscriptions/:id/unsubscribe_to_optional_target
+  # def unsubscribe_to_optional_target
   #   super
   # end
 end

data/lib/generators/templates/models/README

@@ -1,10 +1,14 @@
 ===============================================================================
 
-Some setup you must do manually if you haven't yet:
+activity_notification uses internal models for notifications and subscriptions
+  - ActivityNotification::Notification
+  - ActivityNotification::Subscription
 
-  Ensure you have configured model name in your initializer activity_notification.rb.
-  For example:
+  You can use your own models with same database table used by these internal models.
 
-    #TODO
+  Ensure you have configured table name in your initializer activity_notification.rb.
+  For example:
+    config.notification_table_name = "notifications"
+    config.subscription_table_name = "subscriptions"
 
 ===============================================================================

data/lib/generators/templates/models/notification.rb

@@ -1,4 +1,4 @@
-# Notification model for customisation & custom methods
+# Notification model for customization & custom methods
 class <%= @target_prefix %><%= @model_name %> < ActivityNotification::Notification
   # Write custom methods or override methods here
 end

data/lib/generators/templates/models/subscription.rb

@@ -1,4 +1,4 @@
-# Subscription model for customisation & custom methods
+# Subscription model for customization & custom methods
 class <%= @target_prefix %><%= @model_name %> < ActivityNotification::Subscription
   # Write custom methods or override methods here
 end

data/package.json

@@ -0,0 +1,8 @@
+{
+  "engines": {
+     "yarn": "1.x"
+  },
+  "scripts": {
+    "postinstall": "cd ./spec/rails_app && yarn && yarn install --check-files"
+  }
+}

data/spec/channels/notification_api_channel_shared_examples.rb

@@ -0,0 +1,59 @@
+# @See https://github.com/palkan/action-cable-testing
+shared_examples_for :notification_api_channel do
+  let(:target_params) { { target_type: target_type }.merge(extra_params || {}) }
+
+  before { stub_connection }
+
+  context "with target_type and target_id parameters" do
+    it "successfully subscribes" do
+      subscribe(target_params.merge({ target_id: test_target.id, typed_target_param => 'dummy' }).merge(@auth_headers))
+      expect(subscription).to be_confirmed
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+    end
+  end
+
+  context "with target_type and (typed_target)_id parameters" do
+    it "successfully subscribes" do
+      subscribe(target_params.merge({ typed_target_param => test_target.id }).merge(@auth_headers))
+      expect(subscription).to be_confirmed
+      expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+    end
+  end
+
+  context "without any parameters" do
+    it "rejects subscription" do
+      subscribe(@auth_headers)
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
+    end
+  end
+
+  context "without target_type parameter" do
+    it "rejects subscription" do
+      subscribe({ typed_target_param => test_target.id }.merge(@auth_headers))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
+    end
+  end
+
+  context "without target_id and (typed_target)_id parameters" do
+    it "rejects subscription" do
+      subscribe(target_params.merge(@auth_headers))
+      expect(subscription).to be_rejected
+    end
+  end
+
+  context "with not found (typed_target)_id parameter" do
+    it "rejects subscription" do
+      subscribe(target_params.merge({ typed_target_param => 0 }).merge(@auth_headers))
+      expect(subscription).to be_rejected
+      expect {
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+      }.to raise_error(/Must be subscribed!/)
+    end
+  end
+end

data/spec/channels/notification_api_channel_spec.rb

@@ -0,0 +1,51 @@
+if Rails::VERSION::MAJOR >= 5
+  require 'channels/notification_api_channel_shared_examples'
+
+  # @See https://github.com/palkan/action-cable-testing
+  describe ActivityNotification::NotificationApiChannel, type: :channel do
+    let(:test_target)        { create(:user) }
+    let(:target_type)        { "User" }
+    let(:typed_target_param) { "user_id" }
+    let(:extra_params)       { {} }
+
+    context "when target.notification_action_cable_with_devise? returns true" do
+      before do
+        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+        User._notification_action_cable_with_devise = true
+      end
+
+      after do
+        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+      end
+
+      it "rejects subscription even if target_type and target_id parameters are passed" do
+        subscribe({ target_type: target_type, target_id: test_target.id })
+        expect(subscription).to be_rejected
+        expect {
+          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+        }.to raise_error(/Must be subscribed!/)
+      end
+    end
+
+    context "when target.notification_action_cable_with_devise? returns false" do
+      before do
+        @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+        User._notification_action_cable_with_devise = false
+        @auth_headers = {}
+      end
+
+      after do
+        User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+      end
+
+      it "successfully subscribes with target_type and target_id parameters" do
+        subscribe({ target_type: target_type, target_id: test_target.id })
+        expect(subscription).to be_confirmed
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+        expect(subscription).to have_stream_from("activity_notification_api_channel_User##{test_target.id}")
+      end
+
+      it_behaves_like :notification_api_channel
+    end
+  end
+end

data/spec/channels/notification_api_with_devise_channel_spec.rb

@@ -0,0 +1,78 @@
+if Rails::VERSION::MAJOR >= 5
+  require 'channels/notification_api_channel_shared_examples'
+
+  # @See https://github.com/palkan/action-cable-testing
+  describe ActivityNotification::NotificationApiWithDeviseChannel, type: :channel do
+    let(:test_user)            { create(:confirmed_user) }
+    let(:unauthenticated_user) { create(:confirmed_user) }
+    let(:test_target)          { create(:admin, user: test_user) }
+    let(:target_type)          { "Admin" }
+    let(:typed_target_param)   { "admin_id" }
+    let(:extra_params)         { { devise_type: :users } }
+    let(:valid_session)        {}
+
+    # @See https://github.com/lynndylanhurley/devise_token_auth
+    def sign_in(current_target)
+      @auth_headers = current_target.create_new_auth_token
+    end
+
+    before do
+      @user_notification_action_cable_with_devise = User._notification_action_cable_with_devise
+      User._notification_action_cable_with_devise = true
+    end
+
+    after do
+      User._notification_action_cable_with_devise = @user_notification_action_cable_with_devise
+    end
+
+    context "signed in with devise as authenticated user" do
+      before do
+        sign_in test_user
+      end
+    
+      it_behaves_like :notification_api_channel
+    end
+
+    context "signed in with devise as unauthenticated user" do
+      let(:target_params) { { target_type: target_type, devise_type: :users } }
+
+      before do
+        sign_in unauthenticated_user
+      end
+
+      it "rejects subscription" do
+        subscribe(target_params.merge({ typed_target_param => test_target }).merge(@auth_headers))
+        expect(subscription).to be_rejected
+        expect {
+          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+        }.to raise_error(/Must be subscribed!/)
+      end
+    end
+
+    context "unsigned in with devise" do
+      let(:target_params) { { target_type: target_type, devise_type: :users } }
+
+      it "rejects subscription" do
+        subscribe(target_params.merge({ typed_target_param => test_target }))
+        expect(subscription).to be_rejected
+        expect {
+          expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+        }.to raise_error(/Must be subscribed!/)
+      end
+    end
+
+    context "without target_id and (typed_target)_id parameters for devise integrated channel with devise_type option" do
+      let(:target_params) { { target_type: target_type, devise_type: :users } }
+
+      before do
+        sign_in test_target.user
+      end
+
+      it "successfully subscribes" do
+        subscribe(target_params.merge(@auth_headers))
+        expect(subscription).to have_stream_from("#{ActivityNotification.config.notification_api_channel_prefix}_#{test_target.to_class_name}#{ActivityNotification.config.composite_key_delimiter}#{test_target.id}")
+        expect(subscription).to have_stream_from("activity_notification_api_channel_Admin##{test_target.id}")
+      end
+    end
+  end
+end

data/spec/concerns/apis/notification_api_spec.rb

@@ -123,6 +123,24 @@ shared_examples_for :notification_api do
           end
         end
       end
+
+      context "when some optional targets raise error" do
+        before do
+          require 'custom_optional_targets/raise_error'
+          @optional_target = CustomOptionalTarget::RaiseError.new
+          @current_optional_target = Comment._optional_targets[:users]
+          Comment.acts_as_notifiable :users, optional_targets: ->{ [@optional_target] }
+        end
+
+        after do
+          Comment._optional_targets[:users] = @current_optional_target
+        end
+
+        it "generates notifications even if some optional targets raise error" do
+          notifications = described_class.notify(:users, @comment_2)
+          expect(notifications.size).to eq(2)  
+        end
+      end
     end
 
     describe ".notify_later" do
@@ -465,13 +483,14 @@ shared_examples_for :notification_api do
     describe ".open_all_of" do
       before do
         described_class.notify_to(@user_1, @article, group: @article, key: 'key.1')
+        sleep(0.01)
         described_class.notify_to(@user_1, @comment_2, group: @comment_2, key: 'key.2')
         expect(@user_1.notifications.unopened_only.count).to eq(2)
         expect(@user_1.notifications.opened_only!.count).to eq(0)
       end
 
-      it "returns the number of opened notification records" do
-        expect(described_class.open_all_of(@user_1)).to eq(2)
+      it "returns array of opened notification records" do
+        expect(described_class.open_all_of(@user_1).size).to eq(2)
       end
 
       it "opens all notifications of the target" do
@@ -534,6 +553,22 @@ shared_examples_for :notification_api do
           expect(@user_1.notifications.opened_only!.count).to eq(1)
         end
       end
+
+      context 'with later_than options' do
+        it "opens filtered notifications only" do
+          described_class.open_all_of(@user_1, { later_than: (@user_1.notifications.earliest.created_at.in_time_zone + 0.001).iso8601(3) })
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+        end
+      end
+
+      context 'with earlier_than options' do
+        it "opens filtered notifications only" do
+          described_class.open_all_of(@user_1, { earlier_than: @user_1.notifications.latest.created_at.iso8601(3) })
+          expect(@user_1.notifications.unopened_only.count).to eq(1)
+          expect(@user_1.notifications.opened_only!.count).to eq(1)
+        end
+      end
     end
 
     describe ".group_member_exists?" do