activity_notification 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a06d944af81db724d0db9cea31aecdddfb598a2
-  data.tar.gz: 7ec849e8c659d35be3af4319367db13cd9ca785d
+  metadata.gz: 6396ab94a172005c0bd940742471a388e746419e
+  data.tar.gz: 66f4b6b5162212ef397ed3fb26dfadbbe9709d97
 SHA512:
-  metadata.gz: 363b7c13bd8115db1394820d22a468076c5ab4cf93c398f5471a17505fdca52a0dcf0882a7e31d16e4bba1aa2b4b6ddfb64009453c1f7b4745f29fceeafb4ebf
-  data.tar.gz: 129aef5e6feb33fd2c22093f49f791418ec489093fd4d0012bca01019d3cb1a448578d54203f248b846591e1224b31582f4e6c8475c20eadeac4ad4d829ff2b3
+  metadata.gz: b3c26fad67e4e3647ac81f32e46181cfe1f420d8dd820b21f2f8f2a3039f87f200b5781a7eb203ec2a6f41d9d7a62c73aea249ee760a2de94341c987c3e16d92
+  data.tar.gz: f7d936e5c59608b736d068ee230c7919c6369ffd98c5c543343029e7fbfed58c611c2d17910ec74be2b398729a596217a02fda5c930a27b87843c1f55f81a892

data/.gitignore

@@ -2,6 +2,8 @@
 *.rbc
 /.config
 /coverage/
+/Gemfile.lock
+/gemfiles/Gemfile*.lock
 /InstalledFiles
 /pkg/
 /spec/reports/

data/.travis.yml

@@ -78,7 +78,6 @@ cache: bundler
 
 before_install:
   - gem install bundler --no-document
-  - rm ${BUNDLE_GEMFILE}.lock
 
 before_script:
   - bundle update

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.5.1 / 2018-08-26
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.5.0...v1.5.1)
+
+Enhancements:
+
+* Allow configuration of custom mailer templates directory - [#32](https://github.com/simukappu/activity_notification/pull/32)
+* Make Notifiable#notifiable_path to work when it is defined in a superclass - [#45](https://github.com/simukappu/activity_notification/pull/45)
+
+Bug Fixes:
+
+* Fix mongoid development dependency to work with bullet - [#72](https://github.com/simukappu/activity_notification/issues/72)
+* Remove duplicate scope of filtered_by_type since it is also defined in API - [#78](https://github.com/simukappu/activity_notification/pull/78)
+* Fix a bug in Subscriber concern about lack of arguments - [#80](https://github.com/simukappu/activity_notification/issues/80)
+
 ## 1.5.0 / 2018-05-05
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.4.4...v1.5.0)
 

data/README.md

@@ -2,10 +2,10 @@
 
 [![Build Status](https://travis-ci.org/simukappu/activity_notification.svg?branch=master)](https://travis-ci.org/simukappu/activity_notification)
 [![Coverage Status](https://coveralls.io/repos/github/simukappu/activity_notification/badge.svg?branch=master)](https://coveralls.io/github/simukappu/activity_notification?branch=master)
-[![Code Climate](https://codeclimate.com/github/simukappu/activity_notification/badges/gpa.svg)](https://codeclimate.com/github/simukappu/activity_notification)
-[![Dependency Status](https://gemnasium.com/badges/github.com/simukappu/activity_notification.svg)](https://gemnasium.com/github.com/simukappu/activity_notification)
+[![Dependency](https://img.shields.io/depfu/simukappu/activity_notification.svg)](https://depfu.com/repos/simukappu/activity_notification)
 [![Inline docs](http://inch-ci.org/github/simukappu/activity_notification.svg?branch=master)](http://inch-ci.org/github/simukappu/activity_notification)
-[![Gem Version](https://badge.fury.io/rb/activity_notification.svg)](https://badge.fury.io/rb/activity_notification)
+[![Gem Version](https://badge.fury.io/rb/activity_notification.svg)](https://rubygems.org/gems/activity_notification)
+[![Gem Downloads](https://img.shields.io/gem/dt/activity_notification.svg)](https://rubygems.org/gems/activity_notification)
 [![MIT License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](MIT-LICENSE)
 
 *activity_notification* provides integrated user activity notifications for Ruby on Rails. You can easily use it to configure multiple notification targets and make activity notifications with notifiable models, like adding comments, responding etc.
@@ -273,7 +273,7 @@ class Comment
 end
 ```
 
-###### Advanced notifiable path
+##### Advanced notifiable path
 
 Sometimes it might be necessary to provide extra information in the *notifiable_path*. In those cases, passing a lambda function to the *notifiable_path* will give you the notifiable object and the notifiable key to play around with:
 

data/activity_notification.gemspec

@@ -24,16 +24,16 @@ Gem::Specification.new do |s|
   s.add_dependency 'i18n', '>= 0.5.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
 
-  s.add_development_dependency 'sqlite3', '~> 1.3.13'
-  s.add_development_dependency 'mysql2', '~> 0.5.1'
-  s.add_development_dependency 'pg', '~> 1.0.0'
-  s.add_development_dependency 'mongoid', '>= 4.0.0'
-  s.add_development_dependency 'rspec-rails', '~> 3.7.2'
-  s.add_development_dependency 'factory_bot_rails', '~> 4.8.2'
+  s.add_development_dependency 'sqlite3', '>= 1.3.13'
+  s.add_development_dependency 'mysql2', '>= 0.5.2'
+  s.add_development_dependency 'pg', '>= 1.0.0'
+  s.add_development_dependency 'mongoid', '>= 4.0.0', '< 7.0.0'
+  s.add_development_dependency 'rspec-rails', '>= 3.8.0'
+  s.add_development_dependency 'factory_bot_rails', '>= 4.11.0'
   s.add_development_dependency 'simplecov', '~> 0'
-  s.add_development_dependency 'yard', '~> 0.9.12'
-  s.add_development_dependency 'yard-activesupport-concern', '~> 0.0.1'
-  s.add_development_dependency 'devise', '~> 4.4.3'
+  s.add_development_dependency 'yard', '>= 0.9.16'
+  s.add_development_dependency 'yard-activesupport-concern', '>= 0.0.1'
+  s.add_development_dependency 'devise', '>= 4.5.0'
   s.add_development_dependency 'aws-sdk-sns', '~> 1'
   s.add_development_dependency 'slack-notifier', '>= 1.5.1'
 end

data/lib/activity_notification/config.rb

@@ -101,6 +101,15 @@ module ActivityNotification
     #   @return [String] Base controller class for notifications_controller.
     attr_accessor :parent_controller
 
+    # @overload mailer_templates_dir
+    #   Returns custom mailer templates directory
+    #   @return [String] Custom mailer templates directory.
+    # @overload mailer_templates_dir=(value)
+    #   Sets custom mailer templates directory
+    #   @param [String] mailer_templates_dir The new custom mailer templates directory
+    #   @return [String] Custom mailer templates directory.
+    attr_accessor :mailer_templates_dir
+
     # @overload opened_index_limit
     #   Returns default limit to query for opened notifications
     #   @return [Integer] Default limit to query for opened notifications.
@@ -129,6 +138,7 @@ module ActivityNotification
       @mailer                  = 'ActivityNotification::Mailer'
       @parent_mailer           = 'ActionMailer::Base'
       @parent_controller       = 'ApplicationController'
+      @mailer_templates_dir    = 'activity_notification/mailer'
       @opened_index_limit      = 10
       @orm                     = :active_record
     end

data/lib/activity_notification/mailers/helpers.rb

@@ -120,8 +120,8 @@ module ActivityNotification
         #
         # @return [Array<String>] Template paths to find email view
         def template_paths
-          paths = ['activity_notification/mailer/default']
-          paths.unshift("activity_notification/mailer/#{@target.to_resources_name}") if @target.present?
+          paths = ["#{ActivityNotification.config.mailer_templates_dir}/default"]
+          paths.unshift("#{ActivityNotification.config.mailer_templates_dir}/#{@target.to_resources_name}") if @target.present?
           paths
         end
 

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

@@ -166,7 +166,7 @@ module ActivityNotification
         key)
       unless resolved_parameter
         begin
-          resolved_parameter = polymorphic_path(self)
+          resolved_parameter = defined?(super) ? super : polymorphic_path(self)
         rescue NoMethodError, ActionController::UrlGenerationError
           raise NotImplementedError, "You have to implement #{self.class}##{__method__}, "\
                                      "set :notifiable_path in acts_as_notifiable or "\

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

@@ -172,7 +172,7 @@ module ActivityNotification
       # @param [Array]   args    Arguments of evaluating subscription method
       # @return [Boolean] If the target subscribes
       def evaluate_subscription(record, field, default, *args)
-        default ? record.blank? || record.send(field, *args) : record.present? && record.send(field)
+        default ? record.blank? || record.send(field, *args) : record.present? && record.send(field, *args)
       end
 
   end

data/lib/activity_notification/orm/active_record/notification.rb

@@ -120,14 +120,6 @@ module ActivityNotification
         # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
         scope :filtered_by_instance,              ->(notifiable) { where(notifiable: notifiable) }
 
-        # Selects filtered notifications by notifiable_type.
-        # @example Get filtered unopened notificatons of the @user for Comment notifiable class
-        #   @notifications = @user.notifications.unopened_only.filtered_by_type('Comment')
-        # @scope class
-        # @param [String] notifiable_type Notifiable type for filter
-        # @return [ActiveRecord_AssociationRelation<Notificaion>] Database query of filtered notifications
-        scope :filtered_by_type,                  ->(notifiable_type) { where(notifiable_type: notifiable_type) }
-
         # Selects filtered notifications by group instance.
         # @example Get filtered unopened notificatons of the @user for @article as group
         #   @notifications = @user.notifications.unopened_only.filtered_by_group(@article)

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

data/lib/generators/templates/activity_notification.rb

@@ -44,6 +44,9 @@ ActivityNotification.configure do |config|
   # Configure the parent class for activity_notification controllers.
   # config.parent_controller = 'ApplicationController'
 
+  # Configure the custom mailer templates directory
+  # config.mailer_templates_dir = 'activity_notification/mailer'
+
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 

data/spec/concerns/apis/notification_api_spec.rb

@@ -51,8 +51,8 @@ shared_examples_for :notification_api do
             end
           }.to change { ActivityNotification::Mailer.deliveries.size }.by(2)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
   
         it "sends notification email with active job queue" do
@@ -66,8 +66,8 @@ shared_examples_for :notification_api do
         it "sends notification email now" do
           described_class.notify(:users, @comment_2, send_later: false)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
       end
 
@@ -125,8 +125,8 @@ shared_examples_for :notification_api do
             end
           }.to change { ActivityNotification::Mailer.deliveries.size }.by(2)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
 
         it "sends notification email with active job queue" do
@@ -140,8 +140,8 @@ shared_examples_for :notification_api do
         it "sends notification email now" do
           described_class.notify_all([@author_user, @user_1], @comment_2, send_later: false)
           expect(ActivityNotification::Mailer.deliveries.size).to eq(2)
-          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@user_1.email)
-          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.first.to[0]).to eq(@author_user.email)
+          expect(ActivityNotification::Mailer.deliveries.last.to[0]).to eq(@user_1.email)
         end
       end
     end

data/spec/factories/notifications.rb

@@ -2,6 +2,6 @@ FactoryBot.define do
   factory :notification, class: ActivityNotification::Notification do
     association :target, factory: :confirmed_user
     association :notifiable, factory: :article
-    key "default.default"
+    key { "default.default" }
   end
 end

data/spec/factories/subscriptions.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :subscription, class: ActivityNotification::Subscription do
     association :target, factory: :confirmed_user
-    key "default.default"
-    subscribed_at Time.current
-    subscribed_to_email_at Time.current
+    key { "default.default" }
+    subscribed_at { Time.current }
+    subscribed_to_email_at { Time.current }
   end
 end

data/spec/factories/users.rb

@@ -1,8 +1,8 @@
 FactoryBot.define do
   factory :user do
-    email Array.new(10){[*"A".."Z", *"0".."9"].sample}.join + '@example.com'
-    password "password"
-    password_confirmation "password"
+    email { Array.new(10){[*"A".."Z", *"0".."9"].sample}.join + '@example.com' }
+    password { "password" }
+    password_confirmation { "password" }
   end
 
   factory :confirmed_user, parent: :user do

data/spec/rails_app/config/initializers/activity_notification.rb

@@ -44,6 +44,9 @@ ActivityNotification.configure do |config|
   # Configure the parent class for activity_notification controllers.
   # config.parent_controller = 'ApplicationController'
 
+  # Configure the custom mailer templates directory
+  # config.mailer_templates_dir = 'activity_notification/mailer'
+
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 

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

@@ -6,12 +6,14 @@ class ActivityNotification::MailerPreview < ActionMailer::Preview
   end
 
   def send_notification_email_with_group
-    target_notification = ActivityNotification::Notification.where.not(group: nil).first
+    target_notification = ActivityNotification.config.orm == :active_record ?
+      ActivityNotification::Notification.where.not(group: nil).first :
+      ActivityNotification::Notification.where(:group_id.nin => ["", nil]).first
     ActivityNotification::Mailer.send_notification_email(target_notification)
   end
 
   def send_batch_notification_email
-    target = User.find_by_name('Ichiro')
+    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, 'batch.comment.default')
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-05 00:00:00.000000000 Z
+date: 2018-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -62,42 +62,42 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
@@ -107,6 +107,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,34 +117,37 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.7.2
+        version: 3.8.0
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: 4.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.8.2
+        version: 4.11.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -160,44 +166,44 @@ dependencies:
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.16
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.12
+        version: 0.9.16
 - !ruby/object:Gem::Dependency
   name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.4.3
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sns
   requirement: !ruby/object:Gem::Requirement
@@ -244,7 +250,6 @@ files:
 - ".yardopts"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -283,13 +288,9 @@ files:
 - app/views/activity_notification/subscriptions/default/unsubscribe_to_email.js.erb
 - app/views/activity_notification/subscriptions/default/unsubscribe_to_optional_target.js.erb
 - gemfiles/Gemfile.rails-4.2
-- gemfiles/Gemfile.rails-4.2.lock
 - gemfiles/Gemfile.rails-5.0
-- gemfiles/Gemfile.rails-5.0.lock
 - gemfiles/Gemfile.rails-5.1
-- gemfiles/Gemfile.rails-5.1.lock
 - gemfiles/Gemfile.rails-5.2
-- gemfiles/Gemfile.rails-5.2.lock
 - lib/activity_notification.rb
 - lib/activity_notification/apis/notification_api.rb
 - lib/activity_notification/apis/subscription_api.rb