activity_notification 1.4.1 → 1.4.2

data/gemfiles/Gemfile.rails-5.1.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activity_notification (1.4.1)
+    activity_notification (1.4.2)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
       railties (>= 4.2.0, < 5.2)
@@ -9,39 +9,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.1)
-      actionpack (= 5.1.1)
+    actioncable (5.1.2)
+      actionpack (= 5.1.2)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
+    actionmailer (5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.1)
-      actionview (= 5.1.1)
-      activesupport (= 5.1.1)
+    actionpack (5.1.2)
+      actionview (= 5.1.2)
+      activesupport (= 5.1.2)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.1)
-      activesupport (= 5.1.1)
+    actionview (5.1.2)
+      activesupport (= 5.1.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.1)
-      activesupport (= 5.1.1)
+    activejob (5.1.2)
+      activesupport (= 5.1.2)
       globalid (>= 0.3.6)
-    activemodel (5.1.1)
-      activesupport (= 5.1.1)
-    activerecord (5.1.1)
-      activemodel (= 5.1.1)
-      activesupport (= 5.1.1)
+    activemodel (5.1.2)
+      activesupport (= 5.1.2)
+    activerecord (5.1.2)
+      activemodel (= 5.1.2)
+      activesupport (= 5.1.2)
       arel (~> 8.0)
-    activesupport (5.1.1)
+    activesupport (5.1.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -51,18 +51,18 @@ GEM
       railties (>= 3.0)
       rspec-rails (>= 2.2)
     arel (8.0.0)
-    aws-sdk (2.9.19)
-      aws-sdk-resources (= 2.9.19)
-    aws-sdk-core (2.9.19)
+    aws-sdk (2.10.15)
+      aws-sdk-resources (= 2.10.15)
+    aws-sdk-core (2.10.15)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.9.19)
-      aws-sdk-core (= 2.9.19)
-    aws-sigv4 (1.0.0)
+    aws-sdk-resources (2.10.15)
+      aws-sdk-core (= 2.10.15)
+    aws-sigv4 (1.0.1)
     bcrypt (3.1.11)
-    bson (4.2.1)
+    bson (4.2.2)
     builder (3.2.3)
-    bullet (5.5.1)
+    bullet (5.6.0)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.10.0)
     concurrent-ruby (1.0.5)
@@ -84,7 +84,7 @@ GEM
     dotenv-rails (2.2.1)
       dotenv (= 2.2.1)
       railties (>= 3.2, < 5.2)
-    erubi (1.6.0)
+    erubi (1.6.1)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.8.0)
@@ -92,7 +92,7 @@ GEM
       railties (>= 3.0.0)
     globalid (0.4.0)
       activesupport (>= 4.2.0)
-    i18n (0.8.1)
+    i18n (0.8.6)
     jmespath (1.3.1)
     jquery-rails (4.3.1)
       rails-dom-testing (>= 1, < 3)
@@ -101,39 +101,39 @@ GEM
     json (2.1.0)
     loofah (2.0.3)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
+    mail (2.6.6)
       mime-types (>= 1.16, < 4)
     method_source (0.8.2)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
-    mongo (2.4.1)
+    mini_portile2 (2.2.0)
+    minitest (5.10.3)
+    mongo (2.4.2)
       bson (>= 4.2.1, < 5.0.0)
-    mongoid (6.1.0)
-      activemodel (~> 5.0)
+    mongoid (6.2.0)
+      activemodel (~> 5.1)
       mongo (>= 2.4.1, < 3.0.0)
-    mysql2 (0.4.6)
-    nio4r (2.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
+    mysql2 (0.4.8)
+    nio4r (2.1.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
     orm_adapter (0.5.0)
-    pg (0.20.0)
+    pg (0.21.0)
     rack (2.0.3)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.1.1)
-      actioncable (= 5.1.1)
-      actionmailer (= 5.1.1)
-      actionpack (= 5.1.1)
-      actionview (= 5.1.1)
-      activejob (= 5.1.1)
-      activemodel (= 5.1.1)
-      activerecord (= 5.1.1)
-      activesupport (= 5.1.1)
+    rails (5.1.2)
+      actioncable (= 5.1.2)
+      actionmailer (= 5.1.2)
+      actionpack (= 5.1.2)
+      actionview (= 5.1.2)
+      activejob (= 5.1.2)
+      activemodel (= 5.1.2)
+      activerecord (= 5.1.2)
+      activesupport (= 5.1.2)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.1.1)
+      railties (= 5.1.2)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.2)
       actionpack (~> 5.x, >= 5.0.1)
@@ -144,9 +144,9 @@ GEM
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.1.1)
-      actionpack (= 5.1.1)
-      activesupport (= 5.1.1)
+    railties (5.1.2)
+      actionpack (= 5.1.2)
+      activesupport (= 5.1.2)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -175,8 +175,8 @@ GEM
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
-    slack-notifier (2.1.0)
+    simplecov-html (0.10.1)
+    slack-notifier (2.2.2)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -189,8 +189,8 @@ GEM
       tins (~> 1.0)
     thor (0.19.4)
     thread_safe (0.3.6)
-    timecop (0.8.1)
-    tins (1.14.0)
+    timecop (0.9.1)
+    tins (1.15.0)
     tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uniform_notifier (1.10.0)
@@ -216,8 +216,8 @@ DEPENDENCIES
   dotenv-rails
   factory_girl_rails (~> 4.8.0)
   mongoid (>= 4.0.0)
-  mysql2 (~> 0.4.6)
-  pg (~> 0.20.0)
+  mysql2 (~> 0.4.8)
+  pg (~> 0.21.0)
   rails (~> 5.1.0)
   rails-controller-testing
   rspec-rails (~> 3.6.0)

data/lib/activity_notification/apis/notification_api.rb

@@ -7,6 +7,9 @@ module ActivityNotification
       # Defines store_notification as private clas method
       private_class_method :store_notification
 
+      # Defines mailer class to send notification
+      set_notification_mailer
+
       # Selects all notification index.
       #   ActivityNotification::Notification.all_index!
       # is defined same as
@@ -285,8 +288,8 @@ module ActivityNotification
            target.subscribes_to_notification_email?(batch_key)
           send_later = options.has_key?(:send_later) ? options[:send_later] : true
           send_later ?
-            Mailer.send_batch_notification_email(target, notifications, batch_key, options).deliver_later :
-            Mailer.send_batch_notification_email(target, notifications, batch_key, options).deliver_now
+            @@notification_mailer.send_batch_notification_email(target, notifications, batch_key, options).deliver_later :
+            @@notification_mailer.send_batch_notification_email(target, notifications, batch_key, options).deliver_now
         end
       end
 
@@ -297,6 +300,11 @@ module ActivityNotification
         [:key, :group, :parameters, :notifier, :send_email, :send_later].freeze
       end
 
+      # Defines mailer class to send notification
+      def set_notification_mailer
+        @@notification_mailer = ActivityNotification.config.mailer.constantize
+      end
+
       # Stores notifications to datastore
       # @api private
       def store_notification(target, notifiable, key, options = {})
@@ -321,7 +329,6 @@ module ActivityNotification
       end
     end
 
-
     # Sends notification email to the target.
     #
     # @param [Hash] options Options for notification email
@@ -334,8 +341,8 @@ module ActivityNotification
          email_subscribed?
         send_later = options.has_key?(:send_later) ? options[:send_later] : true
         send_later ?
-          Mailer.send_notification_email(self, options).deliver_later :
-          Mailer.send_notification_email(self, options).deliver_now
+          @@notification_mailer.send_notification_email(self, options).deliver_later :
+          @@notification_mailer.send_notification_email(self, options).deliver_now
       end
     end
 

data/lib/activity_notification/controllers/devise_authentication_controller.rb

@@ -1,6 +1,6 @@
 module ActivityNotification
   # Module included in controllers to authenticate with Devise module
-  module DeviceAuthenticationController
+  module DeviseAuthenticationController
     extend ActiveSupport::Concern
 
     included do

data/lib/activity_notification/mailers/helpers.rb

@@ -58,8 +58,14 @@ module ActivityNotification
              @notification.notifiable.overriding_notification_email_key(@target, key).present?
             key = @notification.notifiable.overriding_notification_email_key(@target, key)
           end
+          if @notification.notifiable.respond_to?(:overriding_notification_email_subject) &&
+              @notification.notifiable.overriding_notification_email_subject(@target, key).present?
+            subject = @notification.notifiable.overriding_notification_email_subject(@target, key)
+          else
+            subject = subject_for(key)
+          end
           headers = {
-            subject: subject_for(key),
+            subject: subject,
             to: mailer_to(@target),
             from: mailer_from(key),
             reply_to: mailer_reply_to(key),

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

@@ -220,6 +220,12 @@ module ActivityNotification
     #
     # overriding_notification_email_key(target, key)
 
+    # overriding_notification_email_subject is the method to override subject definition for Mailer
+    # When respond_to?(:overriding_notification_email_subject) returns true,
+    # Mailer uses overriding_notification_email_subject instead of configured notification subject in locale file.
+    #
+    # overriding_notification_email_subject(target, key)
+
 
     # Generates notifications to configured targets with notifiable model.
     # This method calls NotificationApi#notify internally with self notifiable instance.

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/lib/generators/templates/README

@@ -14,7 +14,6 @@ Some setup you must do manually if you haven't yet:
 
    - Add including statement and acts_as_target definition to your target model
 
-       include ActivityNotification::Target
        acts_as_target email: :email, email_allowed: :confirmed_at
 
    - Add notification routing to config/routes.rb
@@ -29,8 +28,7 @@ Some setup you must do manually if you haven't yet:
   3. Setup your notifiable model (e.g. app/models/comment.rb)
 
     - Add including statement and acts_as_notifiable definition to your notifiable model
-     
-       include ActivityNotification::Notifiable
+
        acts_as_notifiable :users,
          targets: :custom_notification_users,
          group: :article,

data/lib/generators/templates/activity_notification.rb

@@ -2,7 +2,7 @@ ActivityNotification.configure do |config|
 
   # Configure ORM name for ActivityNotification.
   # Set :active_record or :mongoid.
-  ENV['AN_ORM'] = 'active_record' if ENV['AN_ORM'] != 'mongoid'
+  ENV['AN_ORM'] = 'active_record' unless ENV['AN_ORM'] == 'mongoid'
   config.orm = ENV['AN_ORM']
 
   # Configure if all activity notifications are enabled.
@@ -41,6 +41,9 @@ ActivityNotification.configure do |config|
   # Configure the parent class responsible to send e-mails.
   # config.parent_mailer = 'ActionMailer::Base'
 
+  # Configure the parent class for activity_notification controllers.
+  # config.parent_controller = 'ApplicationController'
+
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 

data/spec/config_spec.rb

@@ -0,0 +1,34 @@
+describe ActivityNotification::Config do
+  describe "config.mailer" do
+    let(:notification) { create(:notification) }
+
+    context "as default" do
+      it "is configured with ActivityNotification::Mailer" do
+        expect(ActivityNotification::Mailer).to receive(:send_notification_email).and_call_original
+        notification.send_notification_email send_later: false
+      end
+  
+      it "is not configured with CustomNotificationMailer" do
+        expect(CustomNotificationMailer).not_to receive(:send_notification_email).and_call_original
+        notification.send_notification_email send_later: false
+      end
+    end
+
+    context "when it is configured with CustomNotificationMailer" do
+      before do
+        ActivityNotification.config.mailer = 'CustomNotificationMailer'
+        ActivityNotification::Notification.set_notification_mailer
+      end
+
+      after do
+        ActivityNotification.config.mailer = 'ActivityNotification::Mailer'
+        ActivityNotification::Notification.set_notification_mailer
+      end
+
+      it "is configured with CustomMailer" do
+        expect(CustomNotificationMailer).to receive(:send_notification_email).and_call_original
+        notification.send_notification_email send_later: false
+      end
+    end
+  end
+end

data/spec/mailers/mailer_spec.rb

@@ -88,6 +88,20 @@ describe ActivityNotification::Mailer do
         end
       end
 
+      context "with defined overriding_notification_email_subject in notifiable model" do
+        it "sends with updated subject" do
+          module AdditionalMethods
+            def overriding_notification_email_subject(target, key)
+              'Hi, You have got comment'
+            end
+          end
+          notification.notifiable.extend(AdditionalMethods)
+          ActivityNotification::Mailer.send_notification_email(notification).deliver_now
+          expect(ActivityNotification::Mailer.deliveries.last.subject)
+            .to eq("Hi, You have got comment")
+        end
+      end
+
       context "when fallback option is :none and the template is missing" do
         it "raise ActionView::MissingTemplate" do
           expect { ActivityNotification::Mailer.send_notification_email(notification, fallback: :none).deliver_now }

data/spec/rails_app/app/mailers/custom_notification_mailer.rb

@@ -0,0 +1,5 @@
+class CustomNotificationMailer < ActivityNotification::Mailer
+  def send_notification_email(notification, options = {})
+    'This is CustomNotificationMailer'
+  end
+end

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

@@ -41,6 +41,9 @@ ActivityNotification.configure do |config|
   # Configure the parent class responsible to send e-mails.
   # config.parent_mailer = 'ActionMailer::Base'
 
+  # Configure the parent class for activity_notification controllers.
+  # config.parent_controller = 'ApplicationController'
+
   # Configure default limit number of opened notifications you can get from opened* scope
   config.opened_index_limit = 10
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-17 00:00:00.000000000 Z
+date: 2017-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.8
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.21.0
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
@@ -352,6 +352,7 @@ files:
 - spec/concerns/models/subscriber_spec.rb
 - spec/concerns/models/target_spec.rb
 - spec/concerns/renderable_spec.rb
+- spec/config_spec.rb
 - spec/controllers/common_controller_spec.rb
 - spec/controllers/dummy_common_controller.rb
 - spec/controllers/notifications_controller_shared_examples.rb
@@ -404,6 +405,7 @@ files:
 - spec/rails_app/app/controllers/users/subscriptions_with_devise_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mailers/.keep
+- spec/rails_app/app/mailers/custom_notification_mailer.rb
 - spec/rails_app/app/models/.keep
 - spec/rails_app/app/models/admin.rb
 - spec/rails_app/app/models/article.rb
@@ -506,6 +508,7 @@ test_files:
 - spec/concerns/models/subscriber_spec.rb
 - spec/concerns/models/target_spec.rb
 - spec/concerns/renderable_spec.rb
+- spec/config_spec.rb
 - spec/controllers/common_controller_spec.rb
 - spec/controllers/dummy_common_controller.rb
 - spec/controllers/notifications_controller_shared_examples.rb
@@ -558,6 +561,7 @@ test_files:
 - spec/rails_app/app/controllers/users/subscriptions_with_devise_controller.rb
 - spec/rails_app/app/helpers/application_helper.rb
 - spec/rails_app/app/mailers/.keep
+- spec/rails_app/app/mailers/custom_notification_mailer.rb
 - spec/rails_app/app/models/.keep
 - spec/rails_app/app/models/admin.rb
 - spec/rails_app/app/models/article.rb