activity_notification 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a65b89d38b765fb3308dddba4204f205bfb67c2
-  data.tar.gz: b44aeebf83a7718a987e97b3bb62bf3011cd7b39
+  metadata.gz: 10573a031431162243ea0c47762d6a23f2a1c5fc
+  data.tar.gz: 9d79ff21207045e1f8adb3c6154749b25f4cfbfc
 SHA512:
-  metadata.gz: af081cfffaf148d44c78e0fb3fddebfe213cebb970f585ac207c59fa62c96a2b5bd80b1dd720c7da148aa9e75a36556d6bb97ff4291a83bff4fd6905b96648ce
-  data.tar.gz: 815e00820bdf7d1f5f0486c00ee0e2d7eacd73b51d90b1f3ee1d6809cf875c1af3b24e9a44191c4e64f20cab04d1c179ff3814717a54b338e84c5af5dca0b27f
+  metadata.gz: 099d83aa693ea68f03ea346bc8d58f9ad03f812dd28b78ddd11e4ca31c18424949a3e1abe36ef5da77b1d8c39097211b5ca58dd852855bff831809801c179af7
+  data.tar.gz: c388ceeae7685591b3e8585efcf6ec597e5a7a343b48f42b4ad1d9bf960c3a31a17397e7071b9b95855df42cb653ee174642313edcff914a28444d22a3dfdc18

data/.gitignore

@@ -18,6 +18,7 @@
 
 # Used by dotenv library to load environment variables.
 # .env
+/spec/rails_app/.env
 
 ## Specific to RubyMotion:
 .dat*

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 1.2.1 / 2017-01-06
+[Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.2.0...v1.2.1)
+
+Enhancements:
+* Support default Slack optional target with slack-notifier 2.0.0
+
+Breaking Changes:
+
+* Rename :slack_name initializing parameter and template parameter of default Slack optional target to :target_username
+
 ## 1.2.0 / 2017-01-06
 [Full Changelog](http://github.com/simukappu/activity_notification/compare/v1.1.0...v1.2.0)
 

data/Gemfile

@@ -14,3 +14,5 @@ group :test do
   gem 'timecop'
   gem 'coveralls', require: false
 end
+
+gem 'dotenv-rails', groups: [:development, :test]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activity_notification (1.2.0)
+    activity_notification (1.2.1)
       activerecord (>= 4.2.0)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
@@ -52,13 +52,13 @@ GEM
       railties (>= 3.0)
       rspec-rails (>= 2.2)
     arel (7.1.4)
-    aws-sdk (2.6.43)
-      aws-sdk-resources (= 2.6.43)
-    aws-sdk-core (2.6.43)
+    aws-sdk (2.6.44)
+      aws-sdk-resources (= 2.6.44)
+    aws-sdk-core (2.6.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.43)
-      aws-sdk-core (= 2.6.43)
+    aws-sdk-resources (2.6.44)
+      aws-sdk-core (= 2.6.44)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
@@ -80,6 +80,10 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
+    dotenv (2.1.1)
+    dotenv-rails (2.1.1)
+      dotenv (= 2.1.1)
+      railties (>= 4.0, < 5.1)
     erubis (2.7.0)
     factory_girl (4.8.0)
       activesupport (>= 3.0.0)
@@ -106,7 +110,7 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     nio4r (1.2.1)
-    nokogiri (1.7.0)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     orm_adapter (0.5.0)
     rack (2.0.1)
@@ -164,7 +168,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slack-notifier (1.5.1)
+    slack-notifier (2.0.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -172,7 +176,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.4)
@@ -201,13 +205,14 @@ DEPENDENCIES
   bullet
   coveralls
   devise (~> 4.2.0)
+  dotenv-rails
   factory_girl_rails (~> 4.8.0)
   rails (~> 5.0.0)
   rails-controller-testing
   rspec-rails (~> 3.5.1)
   simplecov (~> 0.12.0)
-  slack-notifier (~> 1.5.1)
-  sqlite3 (~> 1.3.12)
+  slack-notifier (>= 1.5.1)
+  sqlite3 (~> 1.3.13)
   timecop
   yard (~> 0.9.5)
   yard-activesupport-concern (~> 0.0.1)

data/README.md

@@ -35,7 +35,7 @@
 <kbd>![subscription-management-image](https://raw.githubusercontent.com/simukappu/activity_notification/images/activity_notification_subscription_management_with_optional_targets.png)</kbd>
 
 ### Amazon SNS as optional notification target
-<kbd>![optional-target-amazon-sns-email-image](https://raw.githubusercontent.com/simukappu/activity_notification/images/activity_notification_optional_target_amazon_sns_email.png)</kbd>
+<kbd>![optional-target-amazon-sns-email-image](https://raw.githubusercontent.com/simukappu/activity_notification/images/activity_notification_optional_target_amazon_sns.png)</kbd>
 
 ### Slack as optional notification target
 <kbd>![optional-target-slack-image](https://raw.githubusercontent.com/simukappu/activity_notification/images/activity_notification_optional_target_slack.png)</kbd>
@@ -61,22 +61,22 @@
     4. [i18n for notifications](#i18n-for-notifications)
 3. [Functions](#functions)
   1. [Email notification](#email-notification)
-    1. [Setup mailer](#setup-mailer)
+    1. [Mailer setup](#mailer-setup)
     2. [Email templates](#email-templates)
     3. [i18n for email](#i18n-for-email)
   2. [Batch email notification](#batch-email-notification)
-    1. [Setup batch mailer](#setup-batch-mailer)
+    1. [Batch mailer setup](#batch-mailer-setup)
     2. [Batch email templates](#batch-email-templates)
     3. [i18n for batch email](#i18n-for-batch-email)
   3. [Grouping notifications](#grouping-notifications)
   4. [Subscription management](#subscription-management)
-    1. [Setup subscriptions](#setup-subscriptions)
-    2. [Manage subscriptions](#manage-subscriptions)
-    3. [Customize Subscriptions](#customize-subscriptions)
+    1. [Configuring subscriptions](#configuring-subscriptions)
+    2. [Managing subscriptions](#managing-subscriptions)
+    3. [Customizing subscriptions](#customizing-subscriptions)
   5. [Integration with Devise](#integration-with-devise)
   6. [Optional notification targets](#optional-notification-targets)
-    1. [Setup optional targets](#setup-optional-targets)
-    2. [Customizing message format](#Customizing-message-format)
+    1. [Configuring optional targets](#configuring-optional-targets)
+    2. [Customizing message format](#customizing-message-format)
     3. [Amazon SNS as optional target](#amazon-sns-as-optional-target)
     4. [Slack as optional target](#slack-as-optional-target)
     5. [Developing custom optional targets](#developing-custom-optional-targets)
@@ -414,7 +414,7 @@ This structure is valid for notifications with keys `"notification.comment.reply
 
 `activity_notification` provides email notification to the notification targets.
 
-#### Setup mailer
+#### Mailer setup
 
 Set up SMTP server configuration for `ActionMailer`. Then, you need to set up the default URL options for the `activity_notification` mailer in each environment. Here is a possible configuration for `config/environments/development.rb`:
 
@@ -481,7 +481,7 @@ notification:
 
 `activity_notification` provides batch email notification to the notification targets. You can send notification email daily, hourly or weekly and so on with a scheduler like `whenever`.
 
-#### Setup batch mailer
+#### Batch mailer setup
 
 Set up SMTP server configuration for `ActionMailer` and the default URL options for the `activity_notification` mailer in each environment.
 
@@ -591,7 +591,7 @@ Then, you will see `Kevin and 7 other users posted 10 comments to your article"`
 
 `activity_notification` provides the function for subscription management of notifications and notification email.
 
-#### Setup subscriptions
+#### Configuring subscriptions
 
 Subscription management is disabled as default. You can configure to enable subscription management in initializer `activity_notification.rb`.
 
@@ -617,7 +617,7 @@ $ bin/rake db:migrate
 ```
 
 
-#### Manage subscriptions
+#### Managing subscriptions
 
 Subscriptions are managed by `Subscription` model record which belongs to target and key of the notification.
 `Subscription#subscribing` manages subscription of notifications.
@@ -662,7 +662,7 @@ user.find_or_create_subscription('comment.reply').unsubscribe
 user.find_or_create_subscription('comment.reply').unsubscribe_to_email
 ```
 
-#### Customize subscriptions
+#### Customizing subscriptions
 
 `activity_notification` provides basic controllers and views to manage the subscriptions.
 
@@ -752,7 +752,7 @@ In this example `activity_notification` will confirm the `user` who `admin` belo
 
 `activity_notification` supports configurable optional notification targets like Amazon SNS, Slack, SMS and so on.
 
-#### Setup optional targets
+#### Configuring optional targets
 
 `activity_notification` provides default optional target implementation for Amazon SNS and Slack.
 You can develop any optional target classes which extends `ActivityNotification::OptionalTarget::Base`, and configure them to notifiable model by `acts_as_notifiable` like this.
@@ -835,7 +835,7 @@ First, add `slack-notifier` gem to your Gemfile and create Incoming WebHooks in
 gem 'slack-notifier'
 ```
 
-Then, write `require 'activity_notification/optional_targets/slack'` statement in your notifiable model and set `ActivityNotification::OptionalTarget::Slack` to `acts_as_notifiable` with `:webhook_url` and `:slack_name` initializing parameters. `:webhook_url` is created WebHook URL and required, `:slack_name` is target's slack user name as String value, symbol method name or lambda function and is optional.
+Then, write `require 'activity_notification/optional_targets/slack'` statement in your notifiable model and set `ActivityNotification::OptionalTarget::Slack` to `acts_as_notifiable` with `:webhook_url` and `:target_username` initializing parameters. `:webhook_url` is created WebHook URL and required, `:target_username` is target's slack user name as String value, symbol method name or lambda function and is optional.
 Any other options for `Slack::Notifier.new` are available as initializing parameters. See [Github slack-notifier](https://github.com/stevenosloan/slack-notifier) and [API Reference of Class: Slack::Notifier](http://www.rubydoc.info/gems/slack-notifier/1.5.1/Slack/Notifier) for more details.
 
 ```ruby
@@ -845,7 +845,7 @@ class Comment < ActiveRecord::Base
     optional_targets: {
       ActivityNotification::OptionalTarget::Slack  => {
         webhook_url: 'https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX',
-        slack_name: :slack_name, channel: 'activity_notification', username: 'ActivityNotification', icon_emoji: ":ghost:"
+        target_username: :slack_username, channel: 'activity_notification', username: 'ActivityNotification', icon_emoji: ":ghost:"
       }
     }
 end

data/activity_notification.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'activerecord', '>= 4.2.0'
   s.add_dependency 'jquery-rails', '>= 3.1.1'
 
-  s.add_development_dependency 'sqlite3', '~> 1.3.12'
+  s.add_development_dependency 'sqlite3', '~> 1.3.13'
   s.add_development_dependency 'rspec-rails', '~> 3.5.1'
   s.add_development_dependency 'factory_girl_rails', '~> 4.8.0'
   s.add_development_dependency 'simplecov', '~> 0.12.0'
@@ -33,5 +33,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'yard-activesupport-concern', '~> 0.0.1'
   s.add_development_dependency 'devise', '~> 4.2.0'
   s.add_development_dependency 'aws-sdk', '~> 2'
-  s.add_development_dependency 'slack-notifier', '~> 1.5.1'
+  s.add_development_dependency 'slack-notifier', '>= 1.5.1'
 end

data/app/views/activity_notification/optional_targets/default/slack/_default.text.erb

@@ -1,4 +1,4 @@
-<%= @slack_name.present? ? "Hi <@#{@slack_name}>," : "<!channel>,"  %>
+<%= @target_username.present? ? "Hi <@#{@target_username}>," : "<!channel>,"  %>
 
 <%= @notification.notifier.present? ? @notification.notifier.printable_notifier_name : 'Someone' %> notified you of <%= @notification.notifiable.printable_notifiable_name(@notification.target) %><%= " in #{@notification.group.printable_group_name}" if @notification.group.present? %>.
 

data/gemfiles/Gemfile.rails-4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activity_notification (1.2.0)
+    activity_notification (1.2.1)
       activerecord (>= 4.2.0)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
@@ -49,18 +49,18 @@ GEM
       activesupport (>= 3.0)
       railties (>= 3.0)
       rspec-rails (>= 2.2)
-    arel (6.0.3)
-    aws-sdk (2.6.43)
-      aws-sdk-resources (= 2.6.43)
-    aws-sdk-core (2.6.43)
+    arel (6.0.4)
+    aws-sdk (2.6.44)
+      aws-sdk-resources (= 2.6.44)
+    aws-sdk-core (2.6.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.43)
-      aws-sdk-core (= 2.6.43)
+    aws-sdk-resources (2.6.44)
+      aws-sdk-core (= 2.6.44)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
-    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.4)
     coveralls (0.8.17)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -99,7 +99,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
     minitest (5.10.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     orm_adapter (0.5.0)
     rack (1.6.5)
@@ -118,9 +118,9 @@ GEM
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.7)
+    rails-dom-testing (1.0.8)
       activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
@@ -154,7 +154,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slack-notifier (1.5.1)
+    slack-notifier (2.0.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -162,7 +162,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.4)
@@ -190,8 +190,8 @@ DEPENDENCIES
   rails (~> 4.2.0)
   rspec-rails (~> 3.5.1)
   simplecov (~> 0.12.0)
-  slack-notifier (~> 1.5.1)
-  sqlite3 (~> 1.3.12)
+  slack-notifier (>= 1.5.1)
+  sqlite3 (~> 1.3.13)
   timecop
   yard (~> 0.9.5)
   yard-activesupport-concern (~> 0.0.1)

data/gemfiles/Gemfile.rails-5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activity_notification (1.2.0)
+    activity_notification (1.2.1)
       activerecord (>= 4.2.0)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
@@ -52,17 +52,17 @@ GEM
       railties (>= 3.0)
       rspec-rails (>= 2.2)
     arel (7.1.4)
-    aws-sdk (2.6.43)
-      aws-sdk-resources (= 2.6.43)
-    aws-sdk-core (2.6.43)
+    aws-sdk (2.6.44)
+      aws-sdk-resources (= 2.6.44)
+    aws-sdk-core (2.6.44)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.43)
-      aws-sdk-core (= 2.6.43)
+    aws-sdk-resources (2.6.44)
+      aws-sdk-core (= 2.6.44)
     aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
-    concurrent-ruby (1.0.3)
+    concurrent-ruby (1.0.4)
     coveralls (0.8.17)
       json (>= 1.8, < 3)
       simplecov (~> 0.12.0)
@@ -103,7 +103,7 @@ GEM
     mini_portile2 (2.1.0)
     minitest (5.10.1)
     nio4r (1.2.1)
-    nokogiri (1.6.8.1)
+    nokogiri (1.7.0.1)
       mini_portile2 (~> 2.1.0)
     orm_adapter (0.5.0)
     rack (2.0.1)
@@ -125,9 +125,9 @@ GEM
       actionpack (~> 5.x)
       actionview (~> 5.x)
       activesupport (~> 5.x)
-    rails-dom-testing (2.0.1)
+    rails-dom-testing (2.0.2)
       activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6.0)
+      nokogiri (~> 1.6)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
     railties (5.0.1)
@@ -161,7 +161,7 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    slack-notifier (1.5.1)
+    slack-notifier (2.0.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -169,7 +169,7 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.3.13)
     term-ansicolor (1.4.0)
       tins (~> 1.0)
     thor (0.19.4)
@@ -201,8 +201,8 @@ DEPENDENCIES
   rails-controller-testing
   rspec-rails (~> 3.5.1)
   simplecov (~> 0.12.0)
-  slack-notifier (~> 1.5.1)
-  sqlite3 (~> 1.3.12)
+  slack-notifier (>= 1.5.1)
+  sqlite3 (~> 1.3.13)
   timecop
   yard (~> 0.9.5)
   yard-activesupport-concern (~> 0.0.1)

data/lib/activity_notification/optional_targets/slack.rb

@@ -6,27 +6,27 @@ module ActivityNotification
 
       # Initialize method to prepare Slack::Notifier
       # @param [Hash] options Options for initializing
-      # @option options [String, Proc, Symbol] :slack_name   (nil) Target user name of Slack, it resolved by target instance like email_allowed?
-      # @option options [required, String]     :webhook_url  (nil) Webhook URL of Slack Incoming WebHooks integration
-      # @option options [Hash]                 others              Other options to be set Slack::Notifier.new, like :channel, :username, :icon_emoji etc
+      # @option options [String, Proc, Symbol] :target_username (nil) Target user name of Slack, it resolved by target instance like email_allowed?
+      # @option options [required, String]     :webhook_url     (nil) Webhook URL of Slack Incoming WebHooks integration
+      # @option options [Hash]                 others                 Other options to be set Slack::Notifier.new, like :channel, :username, :icon_emoji etc
       def initialize_target(options = {})
-        @slack_name = options.delete(:slack_name)
+        @target_username = options.delete(:target_username)
         @notifier = ::Slack::Notifier.new(options.delete(:webhook_url), options)
       end
 
       # Publishes notification message to Slack
       # @param [Notification] notification Notification instance
       # @param [Hash] options Options for publishing
-      # @option options [String, Proc, Symbol] :slack_name   (nil)                     Target user name of Slack, it resolved by target instance like email_allowed?
-      # @option options [String]               :partial_root ("activity_notification/optional_targets/#{target}/#{optional_target_name}", "activity_notification/optional_targets/#{target}/base", "activity_notification/optional_targets/default/#{optional_target_name}", "activity_notification/optional_targets/default/base") Partial template name
-      # @option options [String]               :partial      (self.key.tr('.', '/'))   Root path of partial template
-      # @option options [String]               :layout       (nil)                     Layout template name
-      # @option options [String]               :layout_root  ('layouts')               Root path of layout template
-      # @option options [String, Symbol]       :fallback     (:default)                Fallback template to use when MissingTemplate is raised. Set :text to use i18n text as fallback.
-      # @option options [Hash]                 others                                  Parameters to be set as locals
+      # @option options [String, Proc, Symbol] :target_username (nil)                     Target user name of Slack, it resolved by target instance like email_allowed?
+      # @option options [String]               :partial_root    ("activity_notification/optional_targets/#{target}/#{optional_target_name}", "activity_notification/optional_targets/#{target}/base", "activity_notification/optional_targets/default/#{optional_target_name}", "activity_notification/optional_targets/default/base") Partial template name
+      # @option options [String]               :partial         (self.key.tr('.', '/'))   Root path of partial template
+      # @option options [String]               :layout          (nil)                     Layout template name
+      # @option options [String]               :layout_root     ('layouts')               Root path of layout template
+      # @option options [String, Symbol]       :fallback        (:default)                Fallback template to use when MissingTemplate is raised. Set :text to use i18n text as fallback.
+      # @option options [Hash]                 others                                     Parameters to be set as locals
       def notify(notification, options = {})
-        slack_name = notification.target.resolve_value(options.delete(:slack_name) || @slack_name)
-        @notifier.ping(render_notification_message(notification, options.merge(assignment: { slack_name: slack_name })))
+        target_username = notification.target.resolve_value(options.delete(:target_username) || @target_username)
+        @notifier.ping(render_notification_message(notification, options.merge(assignment: { target_username: target_username })))
       end
     end
   end

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/rails_app/app/models/comment.rb

@@ -12,21 +12,34 @@ class Comment < ActiveRecord::Base
     printable_name: ->(comment) { "comment \"#{comment.body}\"" },
     dependent_notifications: :update_group_and_delete_all
 
-  # require 'activity_notification/optional_targets/amazon_sns'
-  # require 'activity_notification/optional_targets/slack'
   require 'custom_optional_targets/console_output'
+  optional_targets = { CustomOptionalTarget::ConsoleOutput => {} }
+  if ENV['OPTIONAL_TARGET_AMAZON_SNS']
+    require 'activity_notification/optional_targets/amazon_sns'
+    if ENV['OPTIONAL_TARGET_AMAZON_SNS_TOPIC_ARN']
+      optional_targets = optional_targets.merge(
+        ActivityNotification::OptionalTarget::AmazonSNS => { topic_arn: ENV['OPTIONAL_TARGET_AMAZON_SNS_TOPIC_ARN'] }
+      )
+    elsif ENV['OPTIONAL_TARGET_AMAZON_SNS_PHONE_NUMBER']
+      optional_targets = optional_targets.merge(
+        ActivityNotification::OptionalTarget::AmazonSNS => { phone_number: :phone_number }
+      )
+    end
+  end
+  if ENV['OPTIONAL_TARGET_SLACK']
+    require 'activity_notification/optional_targets/slack'
+    optional_targets = optional_targets.merge(
+      ActivityNotification::OptionalTarget::Slack  => {
+        webhook_url: ENV['OPTIONAL_TARGET_SLACK_WEBHOOK_URL'], target_username: :slack_username,
+        channel:  ENV['OPTIONAL_TARGET_SLACK_CHANNEL']  || 'activity_notification',
+        username: 'ActivityNotification', icon_emoji: ":ghost:"
+      }
+    )
+  end
   acts_as_notifiable :admins, targets: Admin.all,
     group: :article, notifier: :user, notifiable_path: :article_notifiable_path,
     printable_name: ->(comment) { "comment \"#{comment.body}\"" }, dependent_notifications: :delete_all,
-    optional_targets: {
-      # ActivityNotification::OptionalTarget::AmazonSNS => { topic_arn: 'arn:aws:sns:XXXXX:XXXXXXXXXXXX:XXXXX' },
-      # # ActivityNotification::OptionalTarget::AmazonSNS => { phone_number: :phone_number },
-      # ActivityNotification::OptionalTarget::Slack  => {
-        # webhook_url: 'https://hooks.slack.com/services/XXXXXXXXX/XXXXXXXXX/XXXXXXXXXXXXXXXXXXXXXXXX',
-        # slack_name: :slack_name, channel: 'activity_notification', username: 'ActivityNotification', icon_emoji: ":ghost:"
-      # },
-      CustomOptionalTarget::ConsoleOutput => {}
-    }
+    optional_targets: optional_targets
 
   def article_notifiable_path
     article_path(article)

data/spec/rails_app/app/views/activity_notification/optional_targets/admins/amazon_sns/comment/_default.text.erb

@@ -5,4 +5,6 @@ Dear <%= @target.printable_target_name %>
 <%= @notification.notifier.present? ? @notification.notifier.printable_notifier_name : 'Someone' %> notified you of <%= @notification.notifiable.printable_notifiable_name(@notification.target) %><%= " in #{@notification.group.printable_group_name}" if @notification.group.present? %>.
 
 <%= "Move to notified #{@notification.notifiable.printable_type.downcase}:" %>
-  <%= move_notification_url_for(@notification, open: true) %>
+  <%= move_notification_url_for(@notification, open: true) %>
+
+Thank you!

data/spec/rails_app/db/migrate/20160715050433_create_test_tables.rb

@@ -18,7 +18,7 @@ class CreateTestTables < ActiveRecord::Migration
     create_table :admins do |t|
       t.references :user, index: true
       t.string     :phone_number
-      t.string     :slack_name
+      t.string     :slack_username
 
       t.timestamps
     end

data/spec/rails_app/db/schema.rb

@@ -15,7 +15,7 @@ ActiveRecord::Schema.define(version: 20160715050433) do
   create_table "admins", force: :cascade do |t|
     t.integer  "user_id"
     t.string   "phone_number"
-    t.string   "slack_name"
+    t.string   "slack_username"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.index ["user_id"], name: "index_admins_on_user_id"

data/spec/rails_app/db/seeds.rb

@@ -2,6 +2,7 @@
 # This file is seed file for test data on development environment.
 
 ActivityNotification::Notification.delete_all
+ActivityNotification::Subscription.delete_all
 Comment.delete_all
 Article.delete_all
 Admin.delete_all
@@ -21,7 +22,11 @@ end
 
 ['Ichiro'].each do |name|
   user = User.find_by_name(name)
-  Admin.create(user: user, slack_name: name.downcase)
+  Admin.create(
+    user: user,
+    phone_number: ENV['OPTIONAL_TARGET_AMAZON_SNS_PHONE_NUMBER'],
+    slack_username: ENV['OPTIONAL_TARGET_SLACK_USERNAME']
+  )
 end
 
 User.all.each do |user|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Shota Yamazaki
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.12
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.12
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
@@ -188,14 +188,14 @@ dependencies:
   name: slack-notifier
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.1
 description: Integrated user activity notifications for Ruby on Rails. Provides functions