activity_notification 1.4.4 → 2.2.4

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

@@ -0,0 +1,27 @@
+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
+
+    def notifiable_path(target_type, key = nil)
+      "dummy_path"
+    end
+  end
+else
+  class Dummy::DummyNotifiableTarget
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include GlobalID::Identification
+    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
+
+    def notifiable_path(target_type, key = nil)
+      "dummy_path"
+    end
+  end
+end

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

@@ -7,6 +7,7 @@ else
   class Dummy::DummyNotifier
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Notifier
     field :name,  type: String

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

@@ -7,6 +7,7 @@ else
   class Dummy::DummySubscriber
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     acts_as_target email: 'dummy@example.com', email_allowed: true, batch_email_allowed: true, subscription_allowed: true
   end

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

@@ -7,6 +7,7 @@ else
   class Dummy::DummyTarget
     include Mongoid::Document
     include Mongoid::Timestamps
+    include GlobalID::Identification
     include ActivityNotification::Models
     include ActivityNotification::Target
     field :email, type: String, default: ""

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

@@ -1,29 +1,48 @@
-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
     acts_as_notifier printable_name: :name
+  end
 
-    def admin?
-      admin.present?
-    end
+  def admin?
+    admin.present?
+  end
+
+  def as_json(_options = {})
+    options = _options.deep_dup
+    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: ""
@@ -32,16 +51,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
-    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/activity_notification/notifications/users/overridden/custom/_test.html.erb

@@ -0,0 +1 @@
+Overridden custom template root for user target: <%= notification.id %>

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

@@ -5,6 +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, parameters.slice(:routing_scope, :devise_default_routes).merge(open: true)) %>
 
 Thank you!

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

@@ -1,38 +1,86 @@
-<section>
-  <h1>Listing Users</h1>
-  <% User.all.each do |user| %>
+<% 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">
-          <span><%= user.name %></span> · <%= user.email %><br>
-          <%= link_to 'Notifications', user_notifications_path(user) %>
+          <% 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', user_subscriptions_path(user) %>
+            <%= link_to 'Subscriptions', subscriptions_path %>
           <% end %>
         </p>
       </div>
     </div>
-  <% end %>
-</section>
+  </section>
+<% end %>
 
-<section>
-  <h1>Listing Admins</h1>
-  <% Admin.all.each do |admin| %>
+<% if @exists_user_notifications_routes %>
+  <section>
+    <h1>Listing Users</h1>
+    <% User.all.each do |user| %>
+      <div class="list_wrapper">
+        <div class="list_image"></div>
+        <div class="list_description_wrapper">
+          <p class="list_description">
+            <span><%= user.name %></span> · <%= user.email %><br>
+            <%= link_to 'Notifications', user_notifications_path(user) %> /
+            <% if User.subscription_enabled? %>
+              <%= link_to 'Subscriptions', user_subscriptions_path(user) %>
+            <% end %>
+          </p>
+        </div>
+      </div>
+    <% end %>
+  </section>
+<% end %>
+
+<% 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">
-          <span><%= admin.user.name %></span> · <%= admin.user.email %><br>
-          <%= link_to 'Notifications', admin_notifications_path(admin) %>
-          <% if Admin.subscription_enabled? %>
-            <%= link_to 'Subscriptions', admin_subscriptions_path(admin) %>
+          <% 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>
-  <% end %>
-</section>
+  </section>
+<% end %>
+
+<% if @exists_admin_notifications_routes %>
+  <section>
+    <h1>Listing Admins</h1>
+    <% Admin.all.each do |admin| %>
+      <div class="list_wrapper">
+        <div class="list_image"></div>
+        <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) %> /
+            <% if Admin.subscription_enabled? %>
+              <%= link_to 'Subscriptions', admin_subscriptions_path(admin) %>
+            <% end %>
+          </p>
+        </div>
+      </div>
+    <% end %>
+  </section>
+<% end %>
 
 <section>
   <div class="create_button_wrapper">
@@ -55,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>

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

@@ -9,7 +9,7 @@
       </p>
       <div class="list_button_wrapper">
         <%= link_to 'Edit Article', edit_article_path(@article), class: "gray_button" %>
-        <%= link_to 'Destroy Article', @article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
+        <%#= link_to 'Destroy Article', @article, method: :delete, data: { confirm: 'Are you sure?' }, class: "gray_button" %>
       </div>
     </div>
   </div>

data/spec/rails_app/app/views/layouts/_header.html.erb

@@ -24,7 +24,7 @@
     </div>
     <div class="header_notification_wrapper">
       <% if user_signed_in? %>
-        <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
+        <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes, devise_default_routes: respond_to?('notifications_path') %>
         <%#= render_notifications_of current_user, fallback: :default, index_content: :unopened_with_attributes, reverse: true %>
         <%#= render_notifications_of current_user, fallback: :default, index_content: :with_attributes, as_latest_group_member: true %>
         <%#= render_notifications_of current_user, fallback: :default_without_grouping, index_content: :with_attributes, with_group_members: true %>
@@ -32,8 +32,14 @@
     </div>
     <div class="header_menu_wrapper">
       <p>
-        <%= link_to 'Preview email', "/rails/mailers" %>
-        <%= " · " unless user_signed_in? %>
+        <%= link_to 'Preview Email', "/rails/mailers" %>
+        <%= " · " if !user_signed_in? or (current_user.admin? and respond_to?('admins_notifications_path')) %>
+      </p>
+    </div>
+    <div class="header_menu_wrapper">
+      <p>
+        <%= link_to 'SPA', "/spa/" %>
+        <%= " · " %>
       </p>
     </div>
   </div>

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

@@ -0,0 +1,2 @@
+<div id='spa'/>
+<%= javascript_pack_tag 'spa' %>

data/spec/rails_app/babel.config.js

@@ -0,0 +1,72 @@
+module.exports = function(api) {
+  var validEnv = ['development', 'test', 'production']
+  var currentEnv = api.env()
+  var isDevelopmentEnv = api.env('development')
+  var isProductionEnv = api.env('production')
+  var isTestEnv = api.env('test')
+
+  if (!validEnv.includes(currentEnv)) {
+    throw new Error(
+      'Please specify a valid `NODE_ENV` or ' +
+        '`BABEL_ENV` environment variables. Valid values are "development", ' +
+        '"test", and "production". Instead, received: ' +
+        JSON.stringify(currentEnv) +
+        '.'
+    )
+  }
+
+  return {
+    presets: [
+      isTestEnv && [
+        '@babel/preset-env',
+        {
+          targets: {
+            node: 'current'
+          }
+        }
+      ],
+      (isProductionEnv || isDevelopmentEnv) && [
+        '@babel/preset-env',
+        {
+          forceAllTransforms: true,
+          useBuiltIns: 'entry',
+          corejs: 3,
+          modules: false,
+          exclude: ['transform-typeof-symbol']
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      'babel-plugin-macros',
+      '@babel/plugin-syntax-dynamic-import',
+      isTestEnv && 'babel-plugin-dynamic-import-node',
+      '@babel/plugin-transform-destructuring',
+      [
+        '@babel/plugin-proposal-class-properties',
+        {
+          loose: true
+        }
+      ],
+      [
+        '@babel/plugin-proposal-object-rest-spread',
+        {
+          useBuiltIns: true
+        }
+      ],
+      [
+        '@babel/plugin-transform-runtime',
+        {
+          helpers: false,
+          regenerator: true,
+          corejs: false
+        }
+      ],
+      [
+        '@babel/plugin-transform-regenerator',
+        {
+          async: false
+        }
+      ]
+    ].filter(Boolean)
+  }
+}

data/spec/rails_app/bin/webpack

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/webpack_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::WebpackRunner.run(ARGV)
+end

data/spec/rails_app/bin/webpack-dev-server

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+ENV["RAILS_ENV"] ||= ENV["RACK_ENV"] || "development"
+ENV["NODE_ENV"]  ||= "development"
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require "bundler/setup"
+
+require "webpacker"
+require "webpacker/dev_server_runner"
+
+APP_ROOT = File.expand_path("..", __dir__)
+Dir.chdir(APP_ROOT) do
+  Webpacker::DevServerRunner.run(ARGV)
+end

data/spec/rails_app/config/application.rb

@@ -4,30 +4,50 @@ require File.expand_path('../boot', __FILE__)
 if ENV['AN_ORM'] == 'mongoid'
   require 'mongoid'
   require 'rails'
-  if Rails.env != 'test'
+  unless Rails.env.test?
     Mongoid.load!(File.expand_path("config/mongoid.yml"), :development)
   end
+# Load dynamoid configuration if necessary:
+elsif ENV['AN_ORM'] == 'dynamoid'
+  require 'dynamoid'
+  require 'rails'
+  require File.expand_path('../dynamoid', __FILE__)
 end
 
 # Pick the frameworks you want:
-unless ENV['AN_ORM'] == 'mongoid' && ENV['AN_TEST_DB'] == 'mongodb'
+if ENV['AN_ORM'] == 'mongoid' && ENV['AN_TEST_DB'] == 'mongodb'
+  require "mongoid/railtie"
+else
   require "active_record/railtie"
 end
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
-# require "rails/test_unit/railtie"
+require 'action_cable/engine'
 
 Bundler.require(*Rails.groups)
 require "activity_notification"
 
 module Dummy
   class Application < Rails::Application
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2 && ENV['AN_TEST_DB'] != 'mongodb'
-      config.active_record.raise_in_transactional_callbacks = true
+    if Gem::Version.new("5.2.0") <= Rails.gem_version && Rails.gem_version < Gem::Version.new("6.0.0") && ENV['AN_TEST_DB'] != 'mongodb'
+      config.active_record.sqlite3.represent_boolean_as_integer = true
+    end
+
+    # Configure CORS for API mode
+    if defined?(Rack::Cors)
+      config.middleware.insert_before 0, Rack::Cors do
+        allow do
+          origins '*'
+          resource '*',
+            headers: :any,
+            expose: ['access-token', 'client', 'uid'],
+            methods: [:get, :post, :put, :delete]
+        end
+      end
     end
   end
 end
 
+puts "ActivityNotification test parameters: AN_ORM=#{ENV['AN_ORM'] || 'active_record(default)'} AN_TEST_DB=#{ENV['AN_TEST_DB'] || 'sqlite(default)'}"

data/spec/rails_app/config/cable.yml

@@ -0,0 +1,8 @@
+production:
+  adapter: async
+
+development:
+  adapter: async
+
+test:
+  adapter: test

data/spec/rails_app/config/database.yml

@@ -23,7 +23,7 @@ mongodb: &mongodb
 default: &default
   pool: 5
   timeout: 5000
-  host: localhost
+  host: 127.0.0.1
   <<: *<%= ENV['AN_TEST_DB'].blank? ? "sqlite" : ENV['AN_TEST_DB'] %>
 
 development:

data/spec/rails_app/config/dynamoid.rb

@@ -0,0 +1,13 @@
+Dynamoid.configure do |config|
+  config.namespace = ENV['AN_NO_DYNAMODB_NAMESPACE'] ? "" : "activity_notification_#{Rails.env}"
+  # TODO Update Dynamoid v3.4.0+
+  # config.capacity_mode = :on_demand
+  config.read_capacity = 5
+  config.write_capacity = 5
+  unless Rails.env.production?
+    config.endpoint = 'http://localhost:8000'
+  end
+  unless Rails.env.test?
+    config.store_datetime_as_string = true
+  end
+end