activity_notification 2.1.2 → 2.2.2

data/spec/rails_app/app/javascript/components/DeviseTokenAuth.vue

@@ -19,7 +19,6 @@
 
 <script>
 import axios from 'axios'
-import authStore from "../store/auth"
 
 export default {
   name: 'DeviseTokenAuth',
@@ -53,7 +52,7 @@ export default {
               authHeaders[authHeader] = response.headers[authHeader];
               axios.defaults.headers.common[authHeader] = authHeaders[authHeader];
             }
-            authStore.commit('signIn', { user: response.data.data, authHeaders: authHeaders });
+            this.$store.commit('signIn', { user: response.data.data, authHeaders: authHeaders });
             if (this.$route.query.redirect) {
               this.$router.push(this.$route.query.redirect);
             } else {
@@ -69,10 +68,10 @@ export default {
         })
     },
     logout () {
-      for (var authHeader of Object.keys(authStore.getters.authHeaders)) {
+      for (var authHeader of Object.keys(this.$store.getters.authHeaders)) {
         delete axios.defaults.headers.common[authHeader];
       }
-      authStore.commit('signOut');
+      this.$store.commit('signOut');
       this.$router.push('/');
     }
   }

data/spec/rails_app/app/javascript/components/Top.vue

@@ -70,14 +70,13 @@
 
 <script>
 import axios from 'axios'
-import authStore from "../store/auth"
 
 export default {
   name: 'Top',
   data () {
     return {
-      userSignedIn: authStore.getters.userSignedIn,
-      currentUser: authStore.getters.currentUser,
+      userSignedIn: this.$store.getters.userSignedIn,
+      currentUser: this.$store.getters.currentUser,
       users: [],
       admins: []
     }

data/spec/rails_app/app/javascript/packs/spa.js

@@ -1,11 +1,14 @@
 import Vue from 'vue'
-import axios from 'axios'
 import App from '../App.vue'
+import router from '../router'
+import store from '../store'
 
-axios.defaults.baseURL = "/api/v2"
+Vue.config.productionTip = false
 
 document.addEventListener('DOMContentLoaded', () => {
-  const app = new Vue({
+  new Vue({
+    router,
+    store,
     render: h => h(App)
   }).$mount('#spa')
 })

data/spec/rails_app/app/javascript/router/index.js

@@ -0,0 +1,73 @@
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import store from '../store'
+import DeviseTokenAuth from '../components/DeviseTokenAuth.vue'
+import Top from '../components/Top.vue'
+import NotificationsIndex from '../components/notifications/Index.vue'
+import SubscriptionsIndex from '../components/subscriptions/Index.vue'
+
+Vue.use(VueRouter)
+
+const routes = [
+  // Routes for common components
+  { path: '/', component: Top },
+  { path: '/login', component: DeviseTokenAuth },
+  { path: '/logout', component: DeviseTokenAuth, props: { isLogout: true } },
+  // Routes for single page application working with activity_notification REST API backend for users
+  {
+    path: '/notifications',
+    name: 'AuthenticatedUserNotificationsIndex',
+    component: NotificationsIndex,
+    props: () => ({ target_type: 'users', target: store.getters.currentUser }),
+    meta: { requiresAuth: true }
+  },
+  {
+    path: '/subscriptions',
+    name: 'AuthenticatedUserSubscriptionsIndex',
+    component: SubscriptionsIndex,
+    props: () => ({ target_type: 'users', target: store.getters.currentUser }),
+    meta: { requiresAuth: true }
+  },
+  // Routes for single page application working with activity_notification REST API backend for admins
+  {
+    path: '/admins/notifications',
+    name: 'AuthenticatedAdminNotificationsIndex',
+    component: NotificationsIndex,
+    props: () => ({ target_type: 'admins', targetApiPath: 'admins', target: store.getters.currentUser.admin }),
+    meta: { requiresAuth: true }
+  },
+  {
+    path: '/admins/subscriptions',
+    name: 'AuthenticatedAdminSubscriptionsIndex',
+    component: SubscriptionsIndex,
+    props: () => ({ target_type: 'admins', targetApiPath: 'admins', target: store.getters.currentUser.admin }),
+    meta: { requiresAuth: true }
+  },
+  // Routes for single page application working with activity_notification REST API backend for unauthenticated targets
+  {
+    path: '/:target_type/:target_id/notifications',
+    name: 'UnauthenticatedTargetNotificationsIndex',
+    component: NotificationsIndex,
+    props : true
+  },
+  {
+    path: '/:target_type/:target_id/subscriptions',
+    name: 'UnauthenticatedTargetSubscriptionsIndex',
+    component: SubscriptionsIndex,
+    props : true
+  }
+]
+
+const router = new VueRouter({
+  routes
+})
+
+router.beforeEach((to, from, next) => {
+  if (to.matched.some(record => record.meta.requiresAuth) && !store.getters.userSignedIn) {
+      next({ path: '/login', query: { redirect: to.fullPath }});
+  } else {
+    next();
+  }
+})
+
+export default router

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

@@ -3,6 +3,14 @@ unless ENV['AN_TEST_DB'] == 'mongodb'
     self.table_name = :articles
     include ActivityNotification::Group
   end
+
+  def printable_target_name
+    "dummy"
+  end
+
+  def printable_group_name
+    "dummy"
+  end
 else
   class Dummy::DummyGroup
     include Mongoid::Document

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

@@ -3,6 +3,10 @@ unless ENV['AN_TEST_DB'] == 'mongodb'
     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
@@ -15,5 +19,9 @@ else
     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/user.rb

@@ -21,7 +21,8 @@ module UserModel
     admin.present?
   end
 
-  def as_json(options = {})
+  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)

data/spec/rails_app/config/application.rb

@@ -24,18 +24,14 @@ require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
 require "sprockets/railtie"
-require 'action_cable/engine' if Rails::VERSION::MAJOR >= 5
+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
-    end
-    if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 2 && ENV['AN_TEST_DB'] != 'mongodb'
+    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
 
@@ -44,7 +40,10 @@ module Dummy
       config.middleware.insert_before 0, Rack::Cors do
         allow do
           origins '*'
-          resource '*', :headers => :any, :methods => [:get, :post, :put, :delete]
+          resource '*',
+            headers: :any,
+            expose: ['access-token', 'client', 'uid'],
+            methods: [:get, :post, :put, :delete]
         end
       end
     end

data/spec/rails_app/config/dynamoid.rb

@@ -1,5 +1,13 @@
 Dynamoid.configure do |config|
-  config.namespace = "activity_notification_#{Rails.env}"
-  config.endpoint = 'http://localhost:8000'
-  # config.store_datetime_as_string = true
+  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

data/spec/rails_app/config/environments/production.rb

@@ -79,4 +79,7 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Allow Action Cable connection from any host
+  config.action_cable.disable_request_forgery_protection = true
 end

data/spec/rails_app/config/environments/test.rb

@@ -13,17 +13,8 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  if Rails::VERSION::MAJOR >= 5
-    config.public_file_server.enabled = true
-  else
-    config.serve_static_files = true
-  end
-
-  if Rails::VERSION::MAJOR >= 5
-    config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
-  else
-    config.static_cache_control = "public, max-age=3600"
-  end
+  config.public_file_server.enabled = true
+  config.public_file_server.headers = {'Cache-Control' => 'public, max-age=3600'}
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/rails_app/config/initializers/activity_notification.rb

@@ -10,10 +10,10 @@ ActivityNotification.configure do |config|
   config.orm = ENV['AN_ORM'].to_sym
 
   # Configure table name to store notification data.
-  config.notification_table_name = "notifications"
+  config.notification_table_name = ENV['AN_NOTIFICATION_TABLE_NAME'] || "notifications"
 
   # Configure table name to store subscription data.
-  config.subscription_table_name = "subscriptions"
+  config.subscription_table_name = ENV['AN_SUBSCRIPTION_TABLE_NAME'] || "subscriptions"
 
   # Configure if email notification is enabled as default.
   # Note that you can configure them for each model by acts_as roles.
@@ -31,6 +31,16 @@ ActivityNotification.configure do |config|
   # Set false when you want to unsubscribe to any notifications as default.
   config.subscribe_as_default = true
 
+  # Configure default email subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to email notifications as default.
+  # config.subscribe_to_email_as_default = true
+
+  # Configure default optional target subscription value to use when the subscription record does not configured.
+  # Note that you can configure them for each method calling as default argument.
+  # Set false when you want to unsubscribe to optinal target notifications as default.
+  # config.subscribe_to_optional_targets_as_default = true
+
   # Configure the e-mail address which will be shown in ActivityNotification::Mailer,
   # note that it will be overwritten if you use your own mailer class with default "from" parameter.
   config.mailer_sender = 'please-change-me-at-config-initializers-activity_notification@example.com'
@@ -64,7 +74,7 @@ ActivityNotification.configure do |config|
 
   # Configure if activity_notification stores notificaion records including associated records like target and notifiable..
   # This store_with_associated_records option can be set true only when you use mongoid or dynamoid ORM.
-  config.store_with_associated_records = false
+  config.store_with_associated_records = (config.orm != :active_record)
 
   # Configure if WebSocket subscription using ActionCable is enabled.
   # Note that you can configure them for each model by acts_as roles.

data/spec/rails_app/config/routes.rb

@@ -29,7 +29,11 @@ Rails.application.routes.draw do
       notify_to :users, api_mode: true, with_subscription: true
       notify_to :users, api_mode: true, with_devise: :users, devise_default_routes: true, with_subscription: true
       resources :apidocs, only: [:index], controller: 'activity_notification/apidocs'
-      resources :users, only: [:index, :show]
+      resources :users, only: [:index, :show] do
+        collection do
+          get :find
+        end
+      end
     end
   end
 

data/spec/rails_app/db/seeds.rb

@@ -2,8 +2,15 @@
 # This file is seed file for test data on development environment.
 
 def clean_database
-  [ActivityNotification::Notification, ActivityNotification::Subscription, Comment, Article, Admin, User].each do |model_class|
-    model_class.delete_all
+  models = [Comment, Article, Admin, User]
+  if ENV['AN_USE_EXISTING_DYNAMODB_TABLE']
+    ActivityNotification::Notification.where('id.not_null': true).delete_all
+    ActivityNotification::Subscription.where('id.not_null': true).delete_all
+  else
+    models.concat([ActivityNotification::Notification, ActivityNotification::Subscription])
+  end
+  models.each do |model|
+    model.delete_all
   end
 end
 

data/spec/rails_app/package.json

@@ -2,22 +2,22 @@
   "name": "activity_notification",
   "description": "Sample single page application for activity_notification using Vue.js",
   "dependencies": {
-    "@rails/webpacker": "^4.2.0",
-    "axios": "^0.19.0",
-    "vue": "^2.6.10",
-    "vuex": "^3.1.2",
-    "vuex-persistedstate": "^2.7.0",
-    "vue-loader": "^15.7.2",
-    "vue-router": "^3.1.3",
-    "vue-template-compiler": "^2.6.10",
-    "vue-moment": "^4.1.0",
-    "vue-moment-tz": "^2.1.1",
-    "vue-pluralize": "^0.0.2",
-    "actioncable-vue": "^1.5.1",
-    "push.js": "^1.0.12"
+    "@rails/webpacker": ">=4.3.0",
+    "axios": ">=0.21.1",
+    "vue": ">=2.6.10",
+    "vuex": ">=3.1.2",
+    "vuex-persistedstate": ">=2.7.0",
+    "vue-loader": ">=15.7.2",
+    "vue-router": ">=3.1.3",
+    "vue-template-compiler": ">=2.6.10",
+    "vue-moment": ">=4.1.0",
+    "vue-moment-tz": ">=2.1.1",
+    "vue-pluralize": ">=0.0.2",
+    "actioncable-vue": ">=1.5.1",
+    "push.js": ">=1.0.12"
   },
   "devDependencies": {
-    "webpack-dev-server": "^3.9.0"
+    "webpack-dev-server": ">=3.11.0"
   },
   "license": "MIT"
 }

data/spec/roles/acts_as_notifiable_spec.rb

@@ -54,7 +54,7 @@ describe ActivityNotification::ActsAsNotifiable do
 
         context "true as :tracked" do
           before do
-            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: true
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: true, notifiable_path: -> { "dummy_path" }
             @created_notifiable = dummy_notifiable_class.create
           end
 
@@ -103,7 +103,7 @@ describe ActivityNotification::ActsAsNotifiable do
 
         context "with :only option (creation only)" do
           before do
-            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { only: [:create] }
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { only: [:create] }, notifiable_path: -> { "dummy_path" }
             @created_notifiable = dummy_notifiable_class.create
           end
 
@@ -133,7 +133,7 @@ describe ActivityNotification::ActsAsNotifiable do
 
         context "with :except option (except update)" do
           before do
-            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { except: [:update] }
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { except: [:update] }, notifiable_path: -> { "dummy_path" }
             @created_notifiable = dummy_notifiable_class.create
           end
 
@@ -163,7 +163,7 @@ describe ActivityNotification::ActsAsNotifiable do
 
         context "with :key option" do
           before do
-            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { key: "test.key" }
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { key: "test.key" }, notifiable_path: -> { "dummy_path" }
             @created_notifiable = dummy_notifiable_class.create
           end
 
@@ -199,7 +199,7 @@ describe ActivityNotification::ActsAsNotifiable do
         context "with :notify_later option" do
           before do
             ActiveJob::Base.queue_adapter = :test
-            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { notify_later: true }
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { notify_later: true }, notifiable_path: -> { "dummy_path" }
             @created_notifiable = dummy_notifiable_class.create
           end
 

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 ENV["RAILS_ENV"] ||= "test"
+Warning[:deprecated] = true if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.2")
 
 require 'bundler/setup'
 Bundler.setup
@@ -25,11 +26,6 @@ SimpleCov.start('rails') do
     add_filter '/lib/activity_notification/orm/mongoid'
     add_filter '/lib/activity_notification/orm/dynamoid'
   end
-  if Rails::VERSION::MAJOR < 5
-    add_filter '/app/channels/'
-    add_filter '/lib/activity_notification/optional_targets/action_cable_channel'
-    add_filter '/lib/activity_notification/optional_targets/action_cable_api_channel'
-  end
 end
 
 # Dummy application