activity_notification 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f21c6ee444304e1291b2f032fe3d8bc485741a89c73123b781ba6f69a883c3d9
-  data.tar.gz: 6b80e107e1c256c8fa4acdbe08ba7b62d96b9b6d61f0f912186aac73db720535
+  metadata.gz: 9a517c56b317fe1705d3666039793aee93ed55c77c2493b70018eb1da4268f97
+  data.tar.gz: ba26afa004950dc8ec175abb6f36a948014f3ff7be81b8d185665f25f22137fe
 SHA512:
-  metadata.gz: 1d4a6f4da5491d589d7f0b4433323f270465e35edd758122b5e58fcd30a30e9cada9cc7a5b129246ba114b755940dea5e6550d7e5b7d00ff23d8673bbceafbcf
-  data.tar.gz: f240f26d35c835babf447d4b22d2b7acdb1853970a2b50967e9fc3131ec52f73a6dfad86875dc191d69c4993bdca41133dc0005ffcc7f1e6ca8c995ab003d912
+  metadata.gz: 88b587552a4c2e1bfeda92759b44f7611309409b3bfb11c7a777739a30e3af4f28f96d532b39c42edfed0b07de274239014d6d117590f51dc1ac09fc8898e8de
+  data.tar.gz: c9e40bf9e14e6c5c0f4898161748e2ab07e9b1e95c8fbb2daaf151a5d94bab9727280f840216c7375819aac2f6564659d9fa9b05ce8a320dd2e3c7b42269acb3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 2.1.3 / 2020-08-1
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.2...v2.1.3)
+
+Enhancements:
+
+* Enable to use namespaced model - [#132](https://github.com/simukappu/activity_notification/pull/132)
+
+Bug Fixes:
+
+* Fix mongoid any_of selector error in filtered_by_group scope - [MONGOID-4887](https://jira.mongodb.org/browse/MONGOID-4887)
+
 ## 2.1.2 / 2020-02-24
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v2.1.1...v2.1.2)
 

data/Gemfile

@@ -23,7 +23,8 @@ group :test do
   gem 'timecop'
   gem 'committee'
   gem 'committee-rails'
-  gem 'coveralls', require: false
+  # gem 'coveralls', require: false
+  gem 'coveralls_reborn', require: false
 end
 
 gem 'webpacker', groups: [:production, :development]

data/activity_notification.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pg', '>= 1.0.0'
   s.add_development_dependency 'mongoid', '>= 4.0.0'
   s.add_development_dependency 'dynamoid', '3.1.0'
-  s.add_development_dependency 'rspec-rails', '>= 3.8.0'
+  s.add_development_dependency 'rspec-rails', '>= 3.8.0', '< 4.0.0'
   s.add_development_dependency 'factory_bot_rails', '>= 4.11.0', '< 5.0.0'
   s.add_development_dependency 'simplecov', '~> 0'
   s.add_development_dependency 'yard', '>= 0.9.16'

data/app/channels/activity_notification/notification_api_with_devise_channel.rb

@@ -24,7 +24,7 @@ if defined?(ActionCable)
       # @return [Object] Target instance (Reject subscription when request parameters are not enough)
       def set_target
         reject and return if (target_type = params[:target_type]).blank?
-        if params[:target_id].blank? && params["#{target_type.to_s.to_resource_name}_id"].blank?
+        if params[:target_id].blank? && params["#{target_type.to_s.to_resource_name[/([^\/]+)$/]}_id"].blank?
           reject and return if params[:devise_type].blank?
           current_target = find_current_target(params[:devise_type])
           params[:target_id] = target_type.to_model_class.resolve_current_devise_target(current_target)

data/app/channels/activity_notification/notification_channel.rb

@@ -22,7 +22,7 @@ if defined?(ActionCable)
         target_class = target_type.to_s.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_s.to_resource_name}_id"])
+          target_class.find_by!(id: params["#{target_type.to_s.to_resource_name[/([^\/]+)$/]}_id"])
         rescue
         reject
       end

data/app/channels/activity_notification/notification_with_devise_channel.rb

@@ -29,7 +29,7 @@ if defined?(ActionCable)
       # @return [Object] Target instance (Reject subscription when request parameters are not enough)
       def set_target
         reject and return if (target_type = params[:target_type]).blank?
-        if params[:target_id].blank? && params["#{target_type.to_s.to_resource_name}_id"].blank?
+        if params[:target_id].blank? && params["#{target_type.to_s.to_resource_name[/([^\/]+)$/]}_id"].blank?
           reject and return if params[:devise_type].blank?
           current_target = find_current_target(params[:devise_type])
           params[:target_id] = target_type.to_model_class.resolve_current_devise_target(current_target)

data/app/controllers/activity_notification/subscriptions_api_controller.rb

@@ -44,7 +44,7 @@ module ActivityNotification
         params[:subscription][:optional_targets]["subscribing_to_#{optional_target_name}"] = subscribing_param unless subscribing_param.nil?
       end
       super
-      render status: 201, location: { action: :show, id: @subscription }, json: subscription_json
+      render status: 201, json: subscription_json if @subscription
     end
 
     # Finds and shows a subscription from specified key.

data/docs/Setup.md

@@ -343,6 +343,20 @@ end
 Then, you can access several pages like */users/1/notifications* and manage open/unopen of notifications using *[ActivityNotification::NotificationsController](/app/controllers/activity_notification/notifications_controller.rb)*.
 If you use Devise integration and you want to configure simple default routes for authenticated users, see [Configuring simple default routes](#configuring-simple-default-routes).
 
+#### Routes with namespaced model
+
+It is possible to configure a target model as a submodule, e.g. if your target is `Entity::User`,
+however by default the **ActivityNotification** controllers will be placed under the same namespace,
+so it is mandatory to explicitly call the controllers this way
+
+```ruby
+Rails.application.routes.draw do
+  notify_to :users, controller: '/activity_notification/notifications', target_type: 'entity/users'
+end
+```
+
+This will generate the necessary routes for the `Entity::User` target with parameters `:user_id`
+
 #### Routes with scope
 
 You can also configure *activity_notification* routes with scope like this:

data/gemfiles/Gemfile.rails-4.2

@@ -17,7 +17,8 @@ group :test do
   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.0

@@ -17,7 +17,8 @@ group :test do
   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

@@ -16,7 +16,8 @@ group :test do
   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

@@ -16,7 +16,8 @@ group :test do
   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

@@ -17,7 +17,8 @@ group :test do
   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/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

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

@@ -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/orm/mongoid/notification.rb

@@ -140,7 +140,9 @@ module ActivityNotification
         scope :filtered_by_group,                 ->(group) {
           group.present? ?
             where(group_id: group.id, group_type: group.class.name) :
-            any_of({ :group_id.exists => false, :group_type.exists => false }, { group_id: nil, group_type: nil })
+            Gem::Version.new(::Mongoid::VERSION) >= Gem::Version.new('7.1.0') ?
+              where(:group_id.exists => false, :group_type.exists => false).or(group_id: nil, group_type: nil) :
+              any_of({ :group_id.exists => false, :group_type.exists => false }, { group_id: nil, group_type: nil })
         }
 
         # Selects filtered notifications later than specified time.

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -163,6 +163,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,6 +173,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.8.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement