activity_notification 2.1.3 → 2.1.4

data/spec/config_spec.rb

@@ -35,38 +35,49 @@ describe ActivityNotification::Config do
   describe "config.store_with_associated_records" do
     let(:target) { create(:confirmed_user) }
 
-    context "false as default" do
-      before do
-        @notification = create(:notification, target: target)
-      end
-
-      it "stores notification without associated records" do
-        expect(@notification.target).to eq(target)
-        expect { @notification.target_record }.to raise_error(NoMethodError)
-      end
-    end
-
     context "when it is configured as true" do
       if ActivityNotification.config.orm == :active_record
         it "raises ActivityNotification::ConfigError when you use active_record ORM" do
           expect { ActivityNotification.config.store_with_associated_records = true }.to raise_error(ActivityNotification::ConfigError)
         end
-
       else
         before do
+          @original = ActivityNotification.config.store_with_associated_records
           ActivityNotification.config.store_with_associated_records = true
           load Rails.root.join("../../lib/activity_notification/orm/#{ActivityNotification.config.orm}/notification.rb").to_s
           @notification = create(:notification, target: target)
         end
 
         after do
-          ActivityNotification.config.store_with_associated_records = false
+          ActivityNotification.config.store_with_associated_records = @original
           load Rails.root.join("../../lib/activity_notification/orm/#{ActivityNotification.config.orm}/notification.rb").to_s
         end
 
-        it "stores notification without associated records" do
+        it "stores notification with associated records" do
           expect(@notification.target).to eq(target)
-          expect(@notification.target_record).to eq(target.to_json)
+          expect(@notification.stored_target["id"].to_s).to eq(target.id.to_s)
+        end
+      end
+    end
+
+    context "when it is configured as false" do
+      before do
+        @original = ActivityNotification.config.store_with_associated_records
+        ActivityNotification.config.store_with_associated_records = false
+        load Rails.root.join("../../lib/activity_notification/orm/#{ActivityNotification.config.orm}/notification.rb").to_s
+        @notification = create(:notification, target: target)
+      end
+
+      after do
+        ActivityNotification.config.store_with_associated_records = @original
+        load Rails.root.join("../../lib/activity_notification/orm/#{ActivityNotification.config.orm}/notification.rb").to_s
+      end
+
+      it "does not store notification with associated records" do
+        expect(@notification.target).to eq(target)
+        begin
+          expect(@notification.stored_target).to be_nil
+        rescue NoMethodError
         end
       end
     end

data/spec/rails_app/app/controllers/users_controller.rb

@@ -13,6 +13,11 @@ class UsersController < ApplicationController
     render json: @user
   end
 
+  # GET /users/find
+  def find
+    render json: User.find_by_email!(params[:email])
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_user

data/spec/rails_app/app/javascript/App.vue

@@ -6,85 +6,15 @@
 
 <script>
 import Vue from 'vue'
-import VueRouter from 'vue-router'
 import VueMoment from 'vue-moment'
 import moment from 'moment-timezone'
 import VuePluralize from 'vue-pluralize'
 import ActionCableVue from 'actioncable-vue'
 import axios from 'axios'
 import env from './config/environment'
-import authStore from "./store/auth"
-import Top from './components/Top.vue'
-import DeviseTokenAuth from './components/DeviseTokenAuth.vue'
-import NotificationsIndex from './components/notifications/Index.vue'
-import SubscriptionsIndex from './components/subscriptions/Index.vue'
 
-const router = new VueRouter({
-  routes: [
-    { 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: authStore.getters.currentUser }),
-      meta: { requiresAuth: true }
-    },
-    {
-      path: '/subscriptions',
-      name: 'AuthenticatedUserSubscriptionsIndex',
-      component: SubscriptionsIndex,
-      props: () => ({ target_type: 'users', target: authStore.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: authStore.getters.currentUser.admin }),
-      meta: { requiresAuth: true }
-    },
-    {
-      path: '/admins/subscriptions',
-      name: 'AuthenticatedAdminSubscriptionsIndex',
-      component: SubscriptionsIndex,
-      props: () => ({ target_type: 'admins', targetApiPath: 'admins', target: authStore.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
-    }
-  ]
-})
-
-router.beforeEach((to, from, next) => {
-  if (to.matched.some(record => record.meta.requiresAuth) && !authStore.getters.userSignedIn) {
-      next({ path: '/login', query: { redirect: to.fullPath }});
-  } else {
-    next();
-  }
-})
+axios.defaults.baseURL = "/api/v2"
 
-if (authStore.getters.userSignedIn) {
-  for (var authHeader of Object.keys(authStore.getters.authHeaders)) {
-    axios.defaults.headers.common[authHeader] = authStore.getters.authHeaders[authHeader];
-  }
-}
-
-Vue.use(VueRouter)
 Vue.use(VueMoment, { moment })
 Vue.use(VuePluralize)
 Vue.use(ActionCableVue, {
@@ -96,7 +26,13 @@ Vue.use(ActionCableVue, {
 
 export default {
   name: 'App',
-  router
+  mounted () {
+    if (this.$store.getters.userSignedIn) {
+      for (var authHeader of Object.keys(this.$store.getters.authHeaders)) {
+        axios.defaults.headers.common[authHeader] = this.$store.getters.authHeaders[authHeader];
+      }
+    }
+  }
 }
 </script>
 

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

@@ -44,7 +44,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/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.
@@ -64,7 +64,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