activity_notification 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24f6a30a0e5feec1ffcb217bf78fa3283f4e369b
-  data.tar.gz: efc4c998546752ccc9bca15a2d6d35e93d9e13eb
+  metadata.gz: c4bddcd228924d6a594bb826a9e815a5bc31baed
+  data.tar.gz: 0d2e2517c32fab5cf3310d1f6261ee1a40323c52
 SHA512:
-  metadata.gz: c30d75ab0300d5895d341fe7ca2f89b039a0cc5db82c9708b335409557aa49da457e81a74a29ad4c01b0d28f93a4abf5d7652effbaad4e0e58a337187361d743
-  data.tar.gz: 81698f2ec06b1cc880555a1103e24348f00ab2209621e47c3b2336dc0fb747ee96f765decca07b5e6ac230455927616d393c748efa90f31f294fa3dc8d0f618a
+  metadata.gz: 3015810028cce0174fb091f46ded488310307e527b16b27f36bd72942112356373dbac8c9ed5e4ff2e2ebfb55fb4d33878003bf7f46165c2a0cfe0e822e355a2
+  data.tar.gz: 13bf2aa5ec658cbbc95236e3fd83a2c48ce513a12bc2daa07ee788757cdf5d6516d75fa7f7e5f2fd0a0b9c0dffdbaac02746cb214407a066496dfdd9079645b5

data/CHANGELOG.md

@@ -1,9 +1,21 @@
+## 1.6.1 / 2018-11-19
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.6.0...v1.6.1)
+
+Enhancements:
+
+* Update README.md to describe how to customize email subject - [#93](https://github.com/simukappu/activity_notification/issues/93)
+
+Bug Fixes:
+
+* Fix *notify_all* method to handle single notifiable target models - [#88](https://github.com/simukappu/activity_notification/issues/88)
+
 ## 1.6.0 / 2018-11-11
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.5.1...v1.6.0)
 
 Enhancements:
 
 * Add simple default routes with devise integration - [#64](https://github.com/simukappu/activity_notification/issues/64)
+* Add *:routing_scope* option to support routes with scope - [#56](https://github.com/simukappu/activity_notification/issues/56)
 
 Bug Fixes:
 

data/README.md

@@ -72,11 +72,13 @@
     - [Mailer setup](#mailer-setup)
     - [Sender configuration](#sender-configuration)
     - [Email templates](#email-templates)
+    - [Email subject](#email-subject)
     - [i18n for email](#i18n-for-email)
   - [Batch email notification](#batch-email-notification)
     - [Batch mailer setup](#batch-mailer-setup)
     - [Batch sender configuration](#batch-sender-configuration)
     - [Batch email templates](#batch-email-templates)
+    - [Batch email subject](#batch-email-subject)
     - [i18n for batch email](#i18n-for-batch-email)
   - [Grouping notifications](#grouping-notifications)
   - [Subscription management](#subscription-management)
@@ -673,6 +675,34 @@ config.mailer_sender = ->(key){ key == 'inquiry.post' ? 'support@example.com' :
 
 If this template is missing, the gem will look for a partial in *default* as the target type which means *activity_notification/mailer/default/_default.html.(|erb|haml|slim|something_else)*.
 
+#### Email subject
+
+*activity_notification* will use `"Notification of #{@notification.notifiable.printable_type.downcase}"` as default email subject. If it is defined, *activity_notification* will resolve email subject from *overriding_notification_email_subject* method in notifiable models. You can customize email subject like this:
+
+```
+class Comment < ActiveRecord::Base
+  belongs_to :article
+  belongs_to :user
+
+  acts_as_notifiable :users,
+    targets: ->(comment, key) {
+      ([comment.article.user] + comment.article.commented_users.to_a - [comment.user]).uniq
+    },
+    notifiable_path: :article_notifiable_path
+
+  def overriding_notification_email_subject(target, key)
+    if key == "comment.create"
+      "New comment to your article!"
+    else
+      "Notification for new comments!"
+    end
+  end
+end
+
+```
+
+If you use i18n for email, you can configure email subject in your locale files. See [i18n for email](#i18n-for-email).
+
 #### i18n for email
 
 The subject of notification email can be put in your locale *.yml* files as **mail_subject** field:
@@ -739,6 +769,12 @@ config.mailer_sender = ->(batch_key){ batch_key == 'batch.inquiry.post' ? 'suppo
 
 *activity_notification* will look for batch email template in the same way as email notification using *batch_key*.
 
+#### Batch email subject
+
+*activity_notification* will resolve batch email subject as the same way as [email subject](#email-subject) with *batch_key*.
+
+If you use i18n for batch email, you can configure batch email subject in your locale files. See [i18n for batch email](#i18n-for-batch-email).
+
 #### i18n for batch email
 
 The subject of batch notification email also can be put in your locale *.yml* files as **mail_subject** field for *batch_key*.

data/lib/activity_notification/apis/notification_api.rb

@@ -189,7 +189,7 @@ module ActivityNotification
       # @option options [Hash<String, Hash>]      :optional_targets         ({})                                  Options for optional targets, keys are optional target name (:amazon_sns or :slack etc) and values are options
       # @return [Array<Notificaion>] Array of generated notifications
       def notify_all(targets, notifiable, options = {})
-        targets.map { |target| target.notify_to(notifiable, options) }
+        targets.map { |target| notify_to(target, notifiable, options) }
       end
 
       # Generates notifications to one target.

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/rails_app/app/models/dummy/dummy_notifiable_target.rb

@@ -0,0 +1,18 @@
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyNotifiableTarget < ActiveRecord::Base
+    self.table_name = :users
+    acts_as_target
+    acts_as_notifiable :dummy_notifiable_targets, targets: -> (n, key) { Dummy::DummyNotifiableTarget.all }, tracked: true
+  end
+else
+  class Dummy::DummyNotifiableTarget
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    field :email, type: String, default: ""
+    field :name,  type: String
+
+    include ActivityNotification::Models
+    acts_as_target
+    acts_as_notifiable :dummy_notifiable_targets, targets: -> (n, key) { Dummy::DummyNotifiableTarget.all }, tracked: true
+  end
+end

data/spec/roles/acts_as_notifiable_spec.rb

@@ -83,6 +83,20 @@ describe ActivityNotification::ActsAsNotifiable do
                 .to eq(@notifiable.notification_key_for_tracked_update)
             end
           end
+
+          context "when the target is also configured as notifiable" do
+            before do
+              ActivityNotification::Notification.filtered_by_type("Dummy::DummyNotifiableTarget").delete_all
+              Dummy::DummyNotifiableTarget.delete_all
+              @created_target = Dummy::DummyNotifiableTarget.create
+              @created_notifiable = Dummy::DummyNotifiableTarget.create
+            end
+
+            it "generates notifications to specified targets" do
+              expect(@created_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+              expect(@created_notifiable.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+          end
         end
 
         context "with :only option (creation only)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2018-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -417,6 +417,7 @@ files:
 - spec/rails_app/app/models/dummy/dummy_base.rb
 - spec/rails_app/app/models/dummy/dummy_group.rb
 - spec/rails_app/app/models/dummy/dummy_notifiable.rb
+- spec/rails_app/app/models/dummy/dummy_notifiable_target.rb
 - spec/rails_app/app/models/dummy/dummy_notifier.rb
 - spec/rails_app/app/models/dummy/dummy_subscriber.rb
 - spec/rails_app/app/models/dummy/dummy_target.rb
@@ -573,6 +574,7 @@ test_files:
 - spec/rails_app/app/models/dummy/dummy_base.rb
 - spec/rails_app/app/models/dummy/dummy_group.rb
 - spec/rails_app/app/models/dummy/dummy_notifiable.rb
+- spec/rails_app/app/models/dummy/dummy_notifiable_target.rb
 - spec/rails_app/app/models/dummy/dummy_notifier.rb
 - spec/rails_app/app/models/dummy/dummy_subscriber.rb
 - spec/rails_app/app/models/dummy/dummy_target.rb