activity_notification 1.1.0 → 1.2.0

data/activity_notification.gemspec

@@ -31,5 +31,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'simplecov', '~> 0.12.0'
   s.add_development_dependency 'yard', '~> 0.9.5'
   s.add_development_dependency 'yard-activesupport-concern', '~> 0.0.1'
-  s.add_development_dependency "devise", '~> 4.2.0'
+  s.add_development_dependency 'devise', '~> 4.2.0'
+  s.add_development_dependency 'aws-sdk', '~> 2'
+  s.add_development_dependency 'slack-notifier', '~> 1.5.1'
 end

data/app/controllers/activity_notification/subscriptions_controller.rb

@@ -4,6 +4,7 @@ module ActivityNotification
     # Include CommonController to select target and define common methods
     include CommonController
     before_action :set_subscription, except: [:index, :create]
+    before_action :validate_optional_target_param, only: [:subscribe_to_optional_target, :unsubscribe_to_optional_target]
 
     # Shows subscription index of the target.
     #
@@ -75,13 +76,15 @@ module ActivityNotification
     # @overload open(params)
     #   @param [Hash] params Request parameters
     #   @option params [String] :with_email_subscription ('true')  If the subscriber also subscribes notification email
+    #   @option params [String] :with_optional_targets   ('true')  If the subscriber also subscribes optional targets
     #   @option params [String] :filter                  (nil)     Filter option to load subscription index (Nothing as all, 'configured' or 'unconfigured')
     #   @option params [String] :limit                   (nil)     Limit to query for subscriptions
     #   @option params [String] :reverse                 ('false') If subscription index and unconfigured notification keys will be ordered as earliest first
     #   @option params [String] :filtered_by_key         (nil)     Key of the subscription for filter
     #   @return [Responce] JavaScript view for ajax request or redirects to back as default
     def subscribe
-      @subscription.subscribe(with_email_subscription: params[:with_email_subscription].to_s.to_boolean(true))
+      @subscription.subscribe(with_email_subscription: params[:with_email_subscription].to_s.to_boolean(true),
+                              with_optional_targets:   params[:with_optional_targets].to_s.to_boolean(true))
       return_back_or_ajax
     end
 
@@ -130,6 +133,38 @@ module ActivityNotification
       return_back_or_ajax
     end
 
+    # Subscribes to the specified optional target.
+    #
+    # POST /:target_type/:target_id/subscriptions/:id/subscribe_to_optional_target
+    # @overload open(params)
+    #   @param [Hash] params Request parameters
+    #   @option params [required, String] :optional_target_name (nil)           Class name of the optional target implementation (e.g. 'amazon_sns', 'slack')
+    #   @option params [String]           :filter               (nil)           Filter option to load subscription index (Nothing as all, 'configured' or 'unconfigured')
+    #   @option params [String]           :limit                (nil)           Limit to query for subscriptions
+    #   @option params [String]           :reverse              ('false')       If subscription index and unconfigured notification keys will be ordered as earliest first
+    #   @option params [String]           :filtered_by_key      (nil)           Key of the subscription for filter
+    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    def subscribe_to_optional_target
+      @subscription.subscribe_to_optional_target(params[:optional_target_name])
+      return_back_or_ajax
+    end
+
+    # Unsubscribes to the specified optional target.
+    #
+    # POST /:target_type/:target_id/subscriptions/:id/unsubscribe_to_optional_target
+    # @overload open(params)
+    #   @param [Hash] params Request parameters
+    #   @option params [required, String] :optional_target_name (nil)           Class name of the optional target implementation (e.g. 'amazon_sns', 'slack')
+    #   @option params [String]           :filter               (nil)           Filter option to load subscription index (Nothing as all, 'configured' or 'unconfigured')
+    #   @option params [String]           :limit                (nil)           Limit to query for subscriptions
+    #   @option params [String]           :reverse              ('false')       If subscription index and unconfigured notification keys will be ordered as earliest first
+    #   @option params [String]           :filtered_by_key      (nil)           Key of the subscription for filter
+    #   @return [Responce] JavaScript view for ajax request or redirects to back as default
+    def unsubscribe_to_optional_target
+      @subscription.unsubscribe_to_optional_target(params[:optional_target_name])
+      return_back_or_ajax
+    end
+
     protected
 
       # Sets @subscription instance variable from request parameters.
@@ -141,7 +176,11 @@ module ActivityNotification
 
       # Only allow a trusted parameter "white list" through.
       def subscription_params
-        params.require(:subscription).permit(:key, :subscribing, :subscribing_to_email)
+        optional_targets = (params[:subscription][:optional_targets] || {}).keys.select { |key| key.to_s.start_with?("subscribing_to_") }
+        optional_targets.each do |optional_target_key|
+          params[:subscription][:optional_targets][optional_target_key] = params[:subscription][:optional_targets][optional_target_key].to_boolean
+        end
+        params.require(:subscription).permit(:key, :subscribing, :subscribing_to_email, optional_targets: optional_targets)
       end
 
       # Sets options to load subscription index from request parameters.
@@ -180,5 +219,12 @@ module ActivityNotification
         "activity_notification/subscriptions"
       end
 
+      # Validate optional_target_name param and return HTTP 400 unless it presents.
+      def validate_optional_target_param
+        if params[:optional_target_name].blank?
+          render plain: "400 Bad Request: Missing parameter", status: 400
+        end
+      end
+
   end
 end

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

@@ -0,0 +1,10 @@
+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) %>
+
+Thank you!
+
+<%= @notification.created_at.strftime("%b %d %H:%M") %>

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

@@ -0,0 +1,6 @@
+<%= @slack_name.present? ? "Hi <@#{@slack_name}>," : "<!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? %>.
+
+<%= "Move to notified #{@notification.notifiable.printable_type.downcase}:" %>
+  <%= move_notification_url_for(@notification, open: true) %>

data/app/views/activity_notification/subscriptions/default/_notification_keys.html.erb

@@ -45,6 +45,25 @@
             </div>
           </div>
 
+          <div class="field_wrapper subscribing_to_optional_targets <%= 'hidden' unless ActivityNotification.config.subscribe_as_default %>">
+            <% target.notifications.filtered_by_key(key).latest.optional_target_names.each do |optional_target_name| %>
+              <div class="field_label">
+                <label>
+                  Optional tagret (<%= optional_target_name %>)
+                </label>
+              </div>
+              <div class="field">
+                <div class="ui checkbox">
+                  <label>
+                    <%= hidden_field_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'false' %>
+                    <%= check_box_tag "subscription[optional_targets][#{ActivityNotification::Subscription.to_optional_target_key(optional_target_name)}]", 'true', ActivityNotification.config.subscribe_as_default %>
+                    <div class="slider"></div>
+                  </label>
+                </div>
+              </div>
+            <% end %>
+          </div>
+
           <div class="ui button">
             <button type="submit">Configure subscription</button>
           </div>

data/app/views/activity_notification/subscriptions/default/_subscription.html.erb

@@ -18,18 +18,18 @@
     <div class="field">
       <div class="ui checkbox">
         <% if subscription.subscribing? %>
-          <%= link_to unsubscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false);$(this).parent().parent().parent().next().slideUp();', method: :post, remote: true do %>
+          <%= link_to unsubscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", false);$(this).parent().parent().parent().next().slideUp();;$(this).parent().parent().parent().next().next().slideUp();', method: :post, remote: true do %>
             <%= check_box :subscribing, "", { checked: true }, 'true', 'false' %>
             <div class="slider"></div>
           <% end %>
         <% else %>
           <% if ActivityNotification.config.subscribe_as_default %>
-            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find("input").prop("checked", true);', method: :post, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().find("input").prop("checked", true);$(this).parent().parent().parent().next().next().slideDown();$(this).parent().parent().parent().next().next().find("input").prop("checked", true);', method: :post, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>
           <% else %>
-            <%= link_to subscribe_path_for(subscription, option_params.merge(with_email_subscription: false)), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();', method: :post, remote: true do %>
+            <%= link_to subscribe_path_for(subscription, option_params.merge(with_email_subscription: false)), onclick: '$(this).find("input").prop("checked", true);$(this).parent().parent().parent().next().slideDown();$(this).parent().parent().parent().next().next().slideDown();', method: :post, remote: true do %>
               <%= check_box :subscribing, "", { checked: false }, 'true', 'false' %>
               <div class="slider"></div>
             <% end %>
@@ -66,6 +66,35 @@
     </div>
   </div>
 
+  <div class="field_wrapper subscribing_to_optional_targets <%= 'hidden' unless subscription.subscribing? %>">
+    <% subscription.optional_target_names.each do |optional_target_name| %>
+      <div class="field_label">
+        <label>
+          Optional tagret (<%= optional_target_name %>)
+        </label>
+      </div>
+      <div class="field">
+        <div class="ui checkbox">
+          <% if subscription.subscribing_to_optional_target?(optional_target_name) %>
+            <%= link_to unsubscribe_to_optional_target_url_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", false)', method: :post, remote: true do %>
+              <label>
+                <%= check_box optional_target_name, "", { checked: true }, 'true', 'false' %>
+                <div class="slider"></div>
+              </label>
+            <% end %>
+          <% else %>
+            <%= link_to subscribe_to_optional_target_url_for(subscription, option_params.merge(optional_target_name: optional_target_name)), onclick: '$(this).find("input").prop("checked", true)', method: :post, remote: true do %>
+              <label>
+                <%= check_box optional_target_name, "", { checked: false }, 'true', 'false' %>
+                <div class="slider"></div>
+              </label>
+            <% end %>
+          <% end %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+
   <div class="ui button">
     <%#= link_to "Show", subscription_path_for(subscription, option_params), class: "button" %>
     <%= link_to "Destroy", subscription_path_for(subscription, option_params), method: :delete, remote: true, data: { confirm: 'Are you sure?' }, class: "button" %>

data/app/views/activity_notification/subscriptions/default/index.html.erb

@@ -186,10 +186,14 @@
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
         $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().slideDown();
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
+        $thisFieldWrapper.next().next().slideUp();
         setTimeout(function () {
           $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", false);
+          $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", false);
         }, 400);
       }
     })

data/app/views/activity_notification/subscriptions/default/show.html.erb

@@ -165,10 +165,15 @@
       $thisFieldWrapper = $(this).parent().parent().parent().parent();
       if ($(this).prop('checked')) {
         $thisFieldWrapper.next().slideDown();
+        $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
+        $thisFieldWrapper.next().next().slideDown();
+        $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", <%= ActivityNotification.config.subscribe_as_default %>);
       } else {
         $thisFieldWrapper.next().slideUp();
+        $thisFieldWrapper.next().next().slideUp();
         setTimeout(function () {
           $thisFieldWrapper.next().find("input[type='checkbox']").prop("checked", false);
+          $thisFieldWrapper.next().next().find("input[type='checkbox']").prop("checked", false);
         }, 400);
       }
     })

data/app/views/activity_notification/subscriptions/default/subscribe_to_optional_target.js.erb

@@ -0,0 +1,6 @@
+$("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
+$("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
+
+loadSubscription();

data/app/views/activity_notification/subscriptions/default/unsubscribe_to_optional_target.js.erb

@@ -0,0 +1,6 @@
+$("#subscriptions").html("<%= escape_javascript( render 'subscriptions', subscriptions: @subscriptions, option_params: @index_options ) %>");
+$("#subscription").html("<%= escape_javascript( render 'subscription', subscription: @subscription, option_params: {} ) %>");
+$("#notification_keys").html("<%= escape_javascript( render 'notification_keys', target: @target, notification_keys: @notification_keys, option_params: @index_options ) %>");
+$("#subscription_form").html("<%= escape_javascript( render 'form', target: @target, option_params: @index_options ) %>");
+
+loadSubscription();

data/gemfiles/Gemfile.rails-4.2.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activity_notification (1.1.0)
+    activity_notification (1.2.0)
       activerecord (>= 4.2.0)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
@@ -50,6 +50,14 @@ GEM
       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)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.6.43)
+      aws-sdk-core (= 2.6.43)
+    aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
     concurrent-ruby (1.0.3)
@@ -76,7 +84,8 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    jquery-rails (4.2.1)
+    jmespath (1.3.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -145,7 +154,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.7.0)
+    slack-notifier (1.5.1)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -173,12 +183,14 @@ PLATFORMS
 DEPENDENCIES
   activity_notification!
   ammeter
+  aws-sdk (~> 2)
   coveralls
   devise (~> 4.2.0)
   factory_girl_rails (~> 4.8.0)
   rails (~> 4.2.0)
   rspec-rails (~> 3.5.1)
   simplecov (~> 0.12.0)
+  slack-notifier (~> 1.5.1)
   sqlite3 (~> 1.3.12)
   timecop
   yard (~> 0.9.5)

data/gemfiles/Gemfile.rails-5.0.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    activity_notification (1.1.0)
+    activity_notification (1.2.0)
       activerecord (>= 4.2.0)
       i18n (>= 0.5.0)
       jquery-rails (>= 3.1.1)
@@ -10,39 +10,39 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.0.1)
-      actionpack (= 5.0.0.1)
+    actioncable (5.0.1)
+      actionpack (= 5.0.1)
       nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
+    actionmailer (5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.0.1)
-      actionview (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionpack (5.0.1)
+      actionview (= 5.0.1)
+      activesupport (= 5.0.1)
       rack (~> 2.0)
       rack-test (~> 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    actionview (5.0.1)
+      activesupport (= 5.0.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    activejob (5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activejob (5.0.1)
+      activesupport (= 5.0.1)
       globalid (>= 0.3.6)
-    activemodel (5.0.0.1)
-      activesupport (= 5.0.0.1)
-    activerecord (5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    activemodel (5.0.1)
+      activesupport (= 5.0.1)
+    activerecord (5.0.1)
+      activemodel (= 5.0.1)
+      activesupport (= 5.0.1)
       arel (~> 7.0)
-    activesupport (5.0.0.1)
+    activesupport (5.0.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
       minitest (~> 5.1)
@@ -52,6 +52,14 @@ 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-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.6.43)
+      aws-sdk-core (= 2.6.43)
+    aws-sigv4 (1.0.0)
     bcrypt (3.1.11)
     builder (3.2.2)
     concurrent-ruby (1.0.3)
@@ -78,7 +86,8 @@ GEM
     globalid (0.3.7)
       activesupport (>= 4.1.0)
     i18n (0.7.0)
-    jquery-rails (4.2.1)
+    jmespath (1.3.1)
+    jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -100,17 +109,17 @@ GEM
     rack (2.0.1)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (5.0.0.1)
-      actioncable (= 5.0.0.1)
-      actionmailer (= 5.0.0.1)
-      actionpack (= 5.0.0.1)
-      actionview (= 5.0.0.1)
-      activejob (= 5.0.0.1)
-      activemodel (= 5.0.0.1)
-      activerecord (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    rails (5.0.1)
+      actioncable (= 5.0.1)
+      actionmailer (= 5.0.1)
+      actionpack (= 5.0.1)
+      actionview (= 5.0.1)
+      activejob (= 5.0.1)
+      activemodel (= 5.0.1)
+      activerecord (= 5.0.1)
+      activesupport (= 5.0.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.0.1)
+      railties (= 5.0.1)
       sprockets-rails (>= 2.0.0)
     rails-controller-testing (1.0.1)
       actionpack (~> 5.x)
@@ -121,9 +130,9 @@ GEM
       nokogiri (~> 1.6.0)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
-    railties (5.0.0.1)
-      actionpack (= 5.0.0.1)
-      activesupport (= 5.0.0.1)
+    railties (5.0.1)
+      actionpack (= 5.0.1)
+      activesupport (= 5.0.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
@@ -152,7 +161,8 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sprockets (3.7.0)
+    slack-notifier (1.5.1)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.0)
@@ -183,6 +193,7 @@ PLATFORMS
 DEPENDENCIES
   activity_notification!
   ammeter
+  aws-sdk (~> 2)
   coveralls
   devise (~> 4.2.0)
   factory_girl_rails (~> 4.8.0)
@@ -190,6 +201,7 @@ DEPENDENCIES
   rails-controller-testing
   rspec-rails (~> 3.5.1)
   simplecov (~> 0.12.0)
+  slack-notifier (~> 1.5.1)
   sqlite3 (~> 1.3.12)
   timecop
   yard (~> 0.9.5)