activity_notification 2.1.1 → 2.2.1

data/gemfiles/Gemfile.rails-5.0

@@ -11,13 +11,15 @@ group :development do
 end
 
 group :test do
+  gem 'rspec-rails', '< 4.0.0'
   gem 'rails-controller-testing'
   gem 'action-cable-testing'
   gem 'ammeter'
   gem 'timecop'
   gem 'committee'
   gem 'committee-rails'
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
 gem 'dotenv-rails', groups: [:development, :test]

data/gemfiles/Gemfile.rails-5.1

@@ -10,13 +10,15 @@ group :development do
 end
 
 group :test do
+  gem 'rspec-rails', '< 4.0.0'
   gem 'rails-controller-testing'
   gem 'action-cable-testing'
   gem 'ammeter'
   gem 'timecop'
   gem 'committee'
   gem 'committee-rails'
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
 gem 'dotenv-rails', groups: [:development, :test]

data/gemfiles/Gemfile.rails-5.2

@@ -10,13 +10,15 @@ group :development do
 end
 
 group :test do
+  gem 'rspec-rails', '< 4.0.0'
   gem 'rails-controller-testing'
   gem 'action-cable-testing'
   gem 'ammeter'
   gem 'timecop'
   gem 'committee'
   gem 'committee-rails'
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
 gem 'dotenv-rails', groups: [:development, :test]

data/gemfiles/Gemfile.rails-6.0

@@ -10,14 +10,13 @@ group :development do
 end
 
 group :test do
-  #TODO https://github.com/rails/rails/issues/35417
-  gem 'rspec-rails', '4.0.0.beta4'
   gem 'rails-controller-testing'
   gem 'ammeter'
   gem 'timecop'
   gem 'committee'
   gem 'committee-rails'
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
 gem 'dotenv-rails', groups: [:development, :test]

data/gemfiles/Gemfile.rails-6.1

@@ -0,0 +1,24 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'rails', '~> 6.1.0'
+gem 'mongoid', git: 'https://github.com/mongodb/mongoid.git'
+gem 'devise_token_auth', git: 'https://github.com/lynndylanhurley/devise_token_auth'
+
+group :development do
+  gem 'bullet'
+  gem 'rack-cors'
+end
+
+group :test do
+  gem 'rails-controller-testing'
+  gem 'ammeter'
+  gem 'timecop'
+  gem 'committee'
+  gem 'committee-rails'
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
+end
+
+gem 'dotenv-rails', groups: [:development, :test]

data/lib/activity_notification/apis/notification_api.rb

@@ -495,16 +495,23 @@ module ActivityNotification
 
         notification = new({ target: target, notifiable: notifiable, key: key, group: group, parameters: parameters, notifier: notifier, group_owner: group_owner })
         notification.prepare_to_store.save
+        notification.after_store
         notification
       end
     end
 
+    # :nocov:
     # Returns prepared notification object to store
     # @return [Object] prepared notification object to store
     def prepare_to_store
       self
     end
 
+    # Call after store action with stored notification
+    def after_store
+    end
+    # :nocov:
+
     # Sends notification email to the target.
     #
     # @param [Hash] options Options for notification email

data/lib/activity_notification/common.rb

@@ -16,7 +16,11 @@ module ActivityNotification
     when Symbol
       symbol_method = context.method(thing)
       if symbol_method.arity > 1
-        symbol_method.call(ActivityNotification.get_controller, *args)
+        if args.last.kind_of?(Hash)
+          symbol_method.call(ActivityNotification.get_controller, *args[0...-1], **args[-1])
+        else
+          symbol_method.call(ActivityNotification.get_controller, *args)
+        end
       elsif symbol_method.arity > 0
         symbol_method.call(ActivityNotification.get_controller)
       else
@@ -74,7 +78,11 @@ module ActivityNotification
       when Symbol
         symbol_method = method(thing)
         if symbol_method.arity > 0
-          symbol_method.call(*args)
+          if args.last.kind_of?(Hash)
+            symbol_method.call(*args[0...-1], **args[-1])
+          else
+            symbol_method.call(*args)
+          end
         else
           symbol_method.call
         end
@@ -98,9 +106,12 @@ module ActivityNotification
     end
 
     # Convets to class name.
+    # This function returns base_class name for STI models if the class responds to base_class method.
+    # @see https://github.com/simukappu/activity_notification/issues/89
+    # @see https://github.com/simukappu/activity_notification/pull/139
     # @return [String] Class name
     def to_class_name
-      self.class.name
+      self.class.respond_to?(:base_class) ? self.class.base_class.name : self.class.name
     end
 
     # Convets to singularized model name (resource name).
@@ -128,4 +139,4 @@ module ActivityNotification
       "#{self.printable_type} (#{id})"
     end
   end
-end
+end

data/lib/activity_notification/controllers/common_controller.rb

@@ -26,7 +26,7 @@ module ActivityNotification
           target_class = target_type.to_model_class
           @target = params[:target_id].present? ?
             target_class.find_by!(id: params[:target_id]) :
-            target_class.find_by!(id: params["#{target_type.to_resource_name}_id"])
+            target_class.find_by!(id: params["#{target_type.to_resource_name[/([^\/]+)$/]}_id"])
         else
           render status: 400, json: error_response(code: 400, message: "Invalid parameter", type: "Parameter is missing or the value is empty: target_type")
         end
@@ -130,25 +130,9 @@ module ActivityNotification
             load_index if params[:reload].to_s.to_boolean(true)
             format.js
           else
-            compatibly_redirect_back(@index_options) and return
+            redirect_back(fallback_location: { action: :index }, **@index_options) and return
           end
         end
       end
-
-      # Redirect to back.
-      # @api protected
-      # @return [Boolean] True
-      def compatibly_redirect_back(request_params = {})
-        # :nocov:
-        if Rails::VERSION::MAJOR >= 5
-          redirect_back fallback_location: { action: :index }, **request_params
-        elsif request.referer
-          redirect_to :back, **request_params
-        else
-          redirect_to action: :index, **request_params
-        end
-        # :nocov:
-        true
-      end
   end
 end

data/lib/activity_notification/models/concerns/notifiable.rb

@@ -25,8 +25,8 @@ module ActivityNotification
                       :_notifier,
                       :_notification_parameters,
                       :_notification_email_allowed,
-                      :_notification_action_cable_allowed,
-                      :_notification_action_cable_api_allowed,
+                      :_notifiable_action_cable_allowed,
+                      :_notifiable_action_cable_api_allowed,
                       :_notifiable_path,
                       :_printable_notifiable_name,
                       :_optional_targets
@@ -55,8 +55,8 @@ module ActivityNotification
         self._notifier                              = {}
         self._notification_parameters               = {}
         self._notification_email_allowed            = {}
-        self._notification_action_cable_allowed     = {}
-        self._notification_action_cable_api_allowed = {}
+        self._notifiable_action_cable_allowed       = {}
+        self._notifiable_action_cable_api_allowed   = {}
         self._notifiable_path                       = {}
         self._printable_notifiable_name             = {}
         self._optional_targets                      = {}
@@ -162,10 +162,10 @@ module ActivityNotification
     # @param [Object] target Target instance to notify
     # @param [String] key Key of the notification
     # @return [Boolean] If publishing WebSocket using ActionCable is allowed for the notifiable
-    def notification_action_cable_allowed?(target, key = nil)
+    def notifiable_action_cable_allowed?(target, key = nil)
       resolve_parameter(
-        "notification_action_cable_allowed_for_#{cast_to_resources_name(target.class)}?",
-        _notification_action_cable_allowed[cast_to_resources_sym(target.class)],
+        "notifiable_action_cable_allowed_for_#{cast_to_resources_name(target.class)}?",
+        _notifiable_action_cable_allowed[cast_to_resources_sym(target.class)],
         ActivityNotification.config.action_cable_enabled,
         target, key)
     end
@@ -176,10 +176,10 @@ module ActivityNotification
     # @param [Object] target Target instance to notify
     # @param [String] key Key of the notification
     # @return [Boolean] If publishing WebSocket API using ActionCable is allowed for the notifiable
-    def notification_action_cable_api_allowed?(target, key = nil)
+    def notifiable_action_cable_api_allowed?(target, key = nil)
       resolve_parameter(
-        "notification_action_cable_api_allowed_for_#{cast_to_resources_name(target.class)}?",
-        _notification_action_cable_api_allowed[cast_to_resources_sym(target.class)],
+        "notifiable_action_cable_api_allowed_for_#{cast_to_resources_name(target.class)}?",
+        _notifiable_action_cable_api_allowed[cast_to_resources_sym(target.class)],
         ActivityNotification.config.action_cable_api_enabled,
         target, key)
     end
@@ -456,7 +456,7 @@ module ActivityNotification
           unless generated_notifications.to_a.empty?
             record = self.class.human_attribute_name("generated_notifications_as_notifiable_for_#{target_type.to_s.pluralize.underscore}").downcase
             self.errors.add(:base, :'restrict_dependent_destroy.has_many', record: record)
-            if Rails::VERSION::MAJOR >= 5 then throw(:abort) else false end
+            throw(:abort)
           end
         when :destroy
           generated_notifications.each { |n| n.destroy }
@@ -482,7 +482,7 @@ module ActivityNotification
       # Casts to symbol of resources name.
       # @api private
       def cast_to_resources_sym(target_type)
-        target_type.to_s.to_resources_name.to_sym
+        cast_to_resources_name(target_type).to_sym
       end
   end
 end

data/lib/activity_notification/models/concerns/swagger/notification_schema.rb

@@ -90,7 +90,7 @@ module ActivityNotification
               type: :string
             }
             key :example, {
-              "test_default_param": "1"
+              test_default_param: "1"
             }
           end
           property :opened_at do
@@ -139,28 +139,28 @@ module ActivityNotification
                 key :type, :object
                 key :description, "Associated target model in your application"
                 key :example, {
-                  "id": 1,
-                  "email": "ichiro@example.com",
-                  "name": "Ichiro",
-                  "created_at": Time.current,
-                  "updated_at": Time.current,
-                  "provider": "email",
-                  "uid": "",
-                  "printable_type": "User",
-                  "printable_target_name": "Ichiro"
+                  id: 1,
+                  email: "ichiro@example.com",
+                  name: "Ichiro",
+                  created_at: Time.current,
+                  updated_at: Time.current,
+                  provider: "email",
+                  uid: "",
+                  printable_type: "User",
+                  printable_target_name: "Ichiro"
                 }
               end
               property :notifiable do
                 key :type, :object
                 key :description, "Associated notifiable model in your application"
                 key :example, {
-                  "id": 22,
-                  "user_id": 2,
-                  "article_id": 11,
-                  "body": "This is the first Stephen's comment to Ichiro's article.",
-                  "created_at": Time.current,
-                  "updated_at": Time.current,
-                  "printable_type": "Comment"
+                  id: 22,
+                  user_id: 2,
+                  article_id: 11,
+                  body: "This is the first Stephen's comment to Ichiro's article.",
+                  created_at: Time.current,
+                  updated_at: Time.current,
+                  printable_type: "Comment"
               }
               end
               property :group do
@@ -168,14 +168,14 @@ module ActivityNotification
                 key :description, "Associated group model in your application"
                 key :nullable, true
                 key :example, {
-                  "id": 11,
-                  "user_id": 4,
-                  "title": "Ichiro's great article",
-                  "body": "This is Ichiro's great article. Please read it!",
-                  "created_at": Time.current,
-                  "updated_at": Time.current,
-                  "printable_type": "Article",
-                  "printable_group_name": "article \"Ichiro's great article\""
+                  id: 11,
+                  user_id: 4,
+                  title: "Ichiro's great article",
+                  body: "This is Ichiro's great article. Please read it!",
+                  created_at: Time.current,
+                  updated_at: Time.current,
+                  printable_type: "Article",
+                  printable_group_name: "article \"Ichiro's great article\""
                 }
               end
               property :notifier do
@@ -183,15 +183,15 @@ module ActivityNotification
                 key :description, "Associated notifier model in your application"
                 key :nullable, true
                 key :example, {
-                  "id": 2,
-                  "email": "stephen@example.com",
-                  "name": "Stephen",
-                  "created_at": Time.current,
-                  "updated_at": Time.current,
-                  "provider": "email",
-                  "uid": "",
-                  "printable_type": "User",
-                  "printable_notifier_name": "Stephen"
+                  id: 2,
+                  email: "stephen@example.com",
+                  name: "Stephen",
+                  created_at: Time.current,
+                  updated_at: Time.current,
+                  provider: "email",
+                  uid: "",
+                  printable_type: "User",
+                  printable_notifier_name: "Stephen"
                 }
               end
               property :group_members do

data/lib/activity_notification/models/concerns/swagger/subscription_schema.rb

@@ -90,15 +90,15 @@ module ActivityNotification
                   }
                 }
                 key :example, {
-                  "action_cable_channel": {
-                    "subscribing": true,
-                    "subscribed_at": Time.current,
-                    "unsubscribed_at": nil
+                  action_cable_channel:  {
+                    subscribing:  true,
+                    subscribed_at:  Time.current,
+                    unsubscribed_at:  nil
                   },
-                  "slack": {
-                    "subscribing": false,
-                    "subscribed_at": nil,
-                    "unsubscribed_at": Time.current
+                  slack:  {
+                    subscribing:  false,
+                    subscribed_at:  nil,
+                    unsubscribed_at:  Time.current
                   }
                 }
               end
@@ -114,11 +114,11 @@ module ActivityNotification
                 key :type, :object
                 key :description, "Associated target model in your application"
                 key :example, {
-                  "id": 1,
-                  "email": "ichiro@example.com",
-                  "name": "Ichiro",
-                  "created_at": Time.current,
-                  "updated_at": Time.current
+                  id:  1,
+                  email:  "ichiro@example.com",
+                  name:  "Ichiro",
+                  created_at:  Time.current,
+                  updated_at:  Time.current
                 }
               end
             end
@@ -145,11 +145,11 @@ module ActivityNotification
                   }
                 }
                 key :example, {
-                  "action_cable_channel": {
-                    "subscribing": true
+                  action_cable_channel:  {
+                    subscribing:  true
                   },
-                  "slack": {
-                    "subscribing": false
+                  slack:  {
+                    subscribing:  false
                   }
                 }
               end

data/lib/activity_notification/models/concerns/target.rb

@@ -213,16 +213,12 @@ module ActivityNotification
       resolve_value(_notification_action_cable_with_devise)
     end
 
-    # :nocov:
-    if Rails::VERSION::MAJOR >= 5
-      # Returns notification ActionCable channel class name from action_cable_with_devise? configuration.
-      #
-      # @return [String] Notification ActionCable channel class name from action_cable_with_devise? configuration
-      def notification_action_cable_channel_class_name
-        notification_action_cable_with_devise? ? "ActivityNotification::NotificationWithDeviseChannel" : "ActivityNotification::NotificationChannel"
-      end
+    # Returns notification ActionCable channel class name from action_cable_with_devise? configuration.
+    #
+    # @return [String] Notification ActionCable channel class name from action_cable_with_devise? configuration
+    def notification_action_cable_channel_class_name
+      notification_action_cable_with_devise? ? "ActivityNotification::NotificationWithDeviseChannel" : "ActivityNotification::NotificationChannel"
     end
-    # :nocov:
 
     # Returns Devise resource model associated with this target.
     #