activity_notification 2.0.0 → 2.1.0

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

@@ -1,21 +1,24 @@
-unless ENV['AN_TEST_DB'] == 'mongodb'
-  class Comment < ActiveRecord::Base
+module CommentModel
+  extend ActiveSupport::Concern
+
+  included do
     belongs_to :article
     belongs_to :user
     validates :article, presence: true
     validates :user, presence: true
 
     acts_as_notifiable :users,
-      targets: ->(comment, key) { ([comment.article.user] + comment.article.commented_users.to_a - [comment.user]).uniq },
+      targets: ->(comment, key) { ([comment.article.user] + comment.article.reload.commented_users.to_a - [comment.user]).uniq },
       group: :article, notifier: :user, email_allowed: true,
-      action_cable_allowed: true,
+      action_cable_allowed: true, action_cable_api_allowed: true,
       parameters: { 'test_default_param' => '1' },
       notifiable_path: :article_notifiable_path,
       printable_name: ->(comment) { "comment \"#{comment.body}\"" },
       dependent_notifications: :update_group_and_delete_all
 
     require 'custom_optional_targets/console_output'
-    # optional_targets = { CustomOptionalTarget::ConsoleOutput => {} }
+    optional_targets = {}
+    # optional_targets = optional_targets.merge(CustomOptionalTarget::ConsoleOutput => {})
     if ENV['OPTIONAL_TARGET_AMAZON_SNS']
       require 'activity_notification/optional_targets/amazon_sns'
       if ENV['OPTIONAL_TARGET_AMAZON_SNS_TOPIC_ARN']
@@ -39,24 +42,29 @@ unless ENV['AN_TEST_DB'] == 'mongodb'
       )
     end
     acts_as_notifiable :admins,
-      targets: Admin.all.to_a,
+      targets: ->(comment) { Admin.all.to_a },
       group: :article, notifier: :user, notifiable_path: :article_notifiable_path,
-      action_cable_allowed: true,
-      tracked: { only: [:create], action_cable_rendering: { fallback: :default } },
+      action_cable_allowed: true, action_cable_api_allowed: true,
+      tracked: Rails.env.test? ? {only: []} : { only: [:create], action_cable_rendering: { fallback: :default } },
       printable_name: ->(comment) { "comment \"#{comment.body}\"" },
       dependent_notifications: :delete_all,
       optional_targets: optional_targets
 
-    # For testing
     acts_as_group
+  end
 
-    def article_notifiable_path
-      article_path(article)
-    end
+  def article_notifiable_path
+    article_path(article)
+  end
 
-    def author?(user)
-      self.user == user
-    end
+  def author?(user)
+    self.user == user
+  end
+end
+
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Comment < ActiveRecord::Base
+    include CommentModel
   end
 else
   require 'mongoid'
@@ -65,64 +73,9 @@ else
     include Mongoid::Timestamps
     include GlobalID::Identification
 
-    belongs_to :article
-    belongs_to :user
-    validates :article, presence: true
-    validates :user, presence: true
     field :body,  type: String
 
     include ActivityNotification::Models
-    acts_as_notifiable :users,
-      targets: ->(comment, key) { ([comment.article.user] + comment.article.commented_users.to_a - [comment.user]).uniq },
-      group: :article, notifier: :user, email_allowed: true,
-      action_cable_allowed: true,
-      parameters: { 'test_default_param' => '1' },
-      notifiable_path: :article_notifiable_path,
-      printable_name: ->(comment) { "comment \"#{comment.body}\"" },
-      dependent_notifications: :update_group_and_delete_all
-
-    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.to_a,
-      group: :article, notifier: :user, notifiable_path: :article_notifiable_path,
-      action_cable_allowed: true,
-      tracked: { only: [:create], action_cable_rendering: { fallback: :default } },
-      printable_name: ->(comment) { "comment \"#{comment.body}\"" },
-      dependent_notifications: :delete_all,
-      optional_targets: optional_targets
-
-    # For testing
-    acts_as_group
-
-    def article_notifiable_path
-      article_path(article)
-    end
-
-    def author?(user)
-      self.user == user
-    end
+    include CommentModel
   end
 end

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

@@ -1,30 +1,47 @@
-unless ENV['AN_TEST_DB'] == 'mongodb'
-  class User < ActiveRecord::Base
-    devise :database_authenticatable, :registerable, :confirmable
+module UserModel
+  extend ActiveSupport::Concern
+
+  included do
+    devise :database_authenticatable, :confirmable
+    include DeviseTokenAuth::Concerns::User
     validates :email, presence: true
-    has_many :articles, dependent: :destroy
     has_one :admin, dependent: :destroy
+    has_many :articles, dependent: :destroy
+
+    acts_as_target email: :email,
+      email_allowed: :confirmed_at, batch_email_allowed: :confirmed_at,
+      subscription_allowed: true,
+      action_cable_allowed: true, action_cable_with_devise: true,
+      printable_name: :name
 
-    acts_as_target email: :email, email_allowed: :confirmed_at, batch_email_allowed: :confirmed_at,
-                   subscription_allowed: true, printable_name: :name,
-                   action_cable_allowed: true, action_cable_with_devise: true
     acts_as_notifier printable_name: :name
+  end
 
-    def admin?
-      admin.present?
-    end
+  def admin?
+    admin.present?
+  end
+
+  def as_json(options = {})
+    options[:include] = (options[:include] || {}).merge(admin: { methods: [:printable_target_name, :notification_action_cable_allowed?, :notification_action_cable_with_devise?] })
+    options[:methods] = (options[:methods] || []).push(:printable_target_name, :notification_action_cable_allowed?, :notification_action_cable_with_devise?)
+    super(options)
+  end
+end
+
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class User < ActiveRecord::Base
+    include UserModel
+    default_scope { order(:id) }
   end
 else
   require 'mongoid'
+  require 'mongoid-locker'
   class User
     include Mongoid::Document
     include Mongoid::Timestamps
+    include Mongoid::Locker
     include GlobalID::Identification
 
-    devise :database_authenticatable, :registerable, :confirmable
-    has_many :articles, dependent: :destroy
-    has_one :admin, dependent: :destroy
-    validates :email, presence: true
     # Devise
     ## Database authenticatable
     field :email,                type: String, default: ""
@@ -33,17 +50,23 @@ else
     field :confirmation_token,   type: String
     field :confirmed_at,         type: Time
     field :confirmation_sent_at, type: Time
+    ## Required
+    field :provider,             type: String, default: "email"
+    field :uid,                  type: String, default: ""
+    ## Tokens
+    field :tokens,               type: Hash,   default: {}
     # Apps
     field :name,                 type: String
 
     include ActivityNotification::Models
-    acts_as_target email: :email, email_allowed: :confirmed_at, batch_email_allowed: :confirmed_at,
-                   subscription_allowed: true, printable_name: :name,
-                   action_cable_allowed: true, action_cable_with_devise: true
-acts_as_notifier printable_name: :name
+    include UserModel
 
-    def admin?
-      admin.present?
+    # To avoid Devise Token Auth issue
+    # https://github.com/lynndylanhurley/devise_token_auth/issues/1335
+    if Rails::VERSION::MAJOR == 6
+      def saved_change_to_attribute?(attr_name, **options)
+        true
+      end
     end
   end
 end

data/spec/rails_app/app/views/activity_notification/notifications/default/article/_update.html.erb

@@ -0,0 +1,146 @@
+<% content_for :notification_content, flush: true do %>
+  <div class='notification_list <%= notification.opened? ? "opened" : "unopened" %>'>
+    <div class="notification_list_cover"></div>
+    <div class="list_image"></div>
+    <div class="list_text_wrapper">
+      <p class="list_text">
+        <strong><%= notification.notifier.name %></strong> updated his or her article "<%= notification.notifiable.title %>".
+        <br>
+        <span><%= notification.created_at.strftime("%b %d %H:%M") %></span>
+      </p>
+    </div>
+  </div>
+<% end %>
+
+<div class='<%= "notification_#{notification.id}" %>'>
+  <% if notification.unopened? %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(reload: false)), method: :put, remote: true, class: "unopened_wrapper" do %>
+      <div class="unopened_circle"></div>
+      <div class="unopened_description_wrapper">
+        <p class="unopened_description">Open</p>
+      </div>
+    <% end %>
+    <%= link_to open_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes).merge(move: true)), method: :put do %>
+      <%= yield :notification_content %>
+    <% end %>
+    <div class="unopened_wrapper"></div>
+  <% else %>
+    <%= link_to move_notification_path_for(notification, parameters.slice(:routing_scope, :devise_default_routes)) do %>
+      <%= yield :notification_content %>
+    <% end %>
+  <% end %>
+
+</div>
+
+<style>
+  /* unopened_circle */
+  .unopened_wrapper{
+    position: absolute;
+    margin-top: 20px;
+    margin-left: 56px;
+  }
+  .unopened_wrapper .unopened_circle {
+    display: block;
+    width: 10px;
+    height: 10px;
+    position: absolute;
+    border-radius: 50%;
+    background-color: #27a5eb;
+    z-index: 2;
+  }
+  .unopened_wrapper:hover > .unopened_description_wrapper{
+    display: block;
+  }
+  .unopened_wrapper .unopened_description_wrapper {
+    display: none;
+    position: absolute;
+    margin-top: 26px;
+    margin-left: -24px;
+  }
+  .unopened_wrapper .unopened_description_wrapper .unopened_description {
+    position: absolute;
+    color: #fff;
+    font-size: 12px;
+    text-align: center;
+
+    border-radius: 4px;
+    background: rgba(0, 0, 0, 0.8);
+    padding: 4px 12px;
+    z-index: 999;
+  }
+  .unopened_wrapper .unopened_description_wrapper .unopened_description:before {
+     border: solid transparent;
+     border-top-width: 0;
+     content: "";
+     display: block;
+     position: absolute;
+     width: 0;
+     left: 50%;
+     top: -5px;
+     margin-left: -5px;
+     height: 0;
+     border-width: 0 5px 5px 5px;
+     border-color: transparent transparent rgba(0, 0, 0, 0.8) transparent;
+     z-index: 0;
+  }
+
+  /* list */
+  .notification_list {
+    padding: 15px 10px;
+    position: relative;
+    border-bottom: 1px solid #e5e5e5;
+  }
+  .notification_list.unopened {
+    background-color: #eeeff4;
+  }
+  .notification_list:hover {
+    background-color: #f8f9fb;
+  }
+  .notification_list:last-child {
+    border-bottom: none;
+  }
+  .notification_list:after{
+    content: "";
+    clear: both;
+    display: block;
+  }
+  .notification_list .notification_list_cover{
+    position: absolute;
+    opacity: 0;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 1;
+
+  }
+  .notification_list .list_image {
+    float: left;
+    width: 40px;
+    height: 40px;
+    background-position: center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-color: #979797;
+  }
+  .notification_list .list_text_wrapper {
+    float: left;
+    width: calc(100% - 60px);
+    margin-left: 20px;
+  }
+  .notification_list .list_text_wrapper .list_text {
+    color: #4f4f4f;
+    font-size: 14px;
+    line-height: 1.4;
+    margin-top: 0;
+    height: auto;
+    font-weight: normal;
+  }
+  .notification_list .list_text_wrapper .list_text strong{
+    font-weight: bold;
+  }
+  .notification_list .list_text_wrapper .list_text span {
+    color: #979797;
+    font-size: 13px;
+  }
+</style>

data/spec/rails_app/app/views/articles/index.html.erb

@@ -1,4 +1,26 @@
-<% if @exists_user_notification_routes %>
+<% if @exists_notifications_routes %>
+  <section>
+    <h1>Authentecated User</h1>
+    <div class="list_wrapper">
+      <div class="list_image"></div>
+      <div class="list_description_wrapper">
+        <p class="list_description">
+          <% if user_signed_in? %>
+            <span><%= current_user.name %></span> · <%= current_user.email %> · <%= link_to 'Logout', destroy_user_session_path, method: :delete %><br>
+          <% else %>
+            <span>Not logged in</span> · <%= link_to 'Login', new_user_session_path %><br>
+          <% end %>
+          <%= link_to 'Notifications', notifications_path %> /
+          <% if User.subscription_enabled? %>
+            <%= link_to 'Subscriptions', subscriptions_path %>
+          <% end %>
+        </p>
+      </div>
+    </div>
+  </section>
+<% end %>
+
+<% if @exists_user_notifications_routes %>
   <section>
     <h1>Listing Users</h1>
     <% User.all.each do |user| %>
@@ -7,7 +29,7 @@
         <div class="list_description_wrapper">
           <p class="list_description">
             <span><%= user.name %></span> · <%= user.email %><br>
-            <%= link_to 'Notifications', user_notifications_path(user) %>
+            <%= link_to 'Notifications', user_notifications_path(user) %> /
             <% if User.subscription_enabled? %>
               <%= link_to 'Subscriptions', user_subscriptions_path(user) %>
             <% end %>
@@ -18,7 +40,29 @@
   </section>
 <% end %>
 
-<% if @exists_admin_notification_routes %>
+<% if @exists_admins_notifications_routes %>
+  <section>
+    <h1>Authentecated User as Admin</h1>
+    <div class="list_wrapper">
+      <div class="list_image"></div>
+      <div class="list_description_wrapper">
+        <p class="list_description">
+          <% if user_signed_in? %>
+            <span><%= current_user.name %></span> · <%= current_user.email %> <span><%= current_user.admin? ? "(admin)" : "(not admin)" %></span><br>
+          <% else %>
+            <span>Not logged in</span> · <%= link_to 'Login', new_user_session_path %><br>
+          <% end %>
+          <%= link_to 'Notifications', admins_notifications_path %> /
+          <% if User.subscription_enabled? %>
+            <%= link_to 'Subscriptions', admins_subscriptions_path %>
+          <% end %>
+        </p>
+      </div>
+    </div>
+  </section>
+<% end %>
+
+<% if @exists_admin_notifications_routes %>
   <section>
     <h1>Listing Admins</h1>
     <% Admin.all.each do |admin| %>
@@ -27,7 +71,7 @@
         <div class="list_description_wrapper">
           <p class="list_description">
             <span><%= admin.user.name %></span> · <%= admin.user.email %><br>
-            <%= link_to 'Notifications', admin_notifications_path(admin) %>
+            <%= link_to 'Notifications', admin_notifications_path(admin) %> /
             <% if Admin.subscription_enabled? %>
               <%= link_to 'Subscriptions', admin_subscriptions_path(admin) %>
             <% end %>
@@ -59,9 +103,9 @@
             <% if user_signed_in? and article.author?(current_user) %>
               <%= link_to 'Edit Article', edit_article_path(article), class: "gray_button" %>
             <% end %>
-            <% if user_signed_in? and (article.author?(current_user) or current_user.admin?) %>
-              <%= link_to 'Destroy Article', article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
-            <% end %>
+            <%# if user_signed_in? and (article.author?(current_user) or current_user.admin?) %>
+              <%#= link_to 'Destroy Article', article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
+            <%# end %>
           </div>
         </div>
       </div>