activity_notification 2.1.1 → 2.2.1

data/spec/concerns/models/target_spec.rb

@@ -490,20 +490,18 @@ shared_examples_for :target do
       end
     end
 
-    if Rails::VERSION::MAJOR >= 5
-      describe "#notification_action_cable_channel_class_name" do
-        context "when custom_notification_action_cable_with_devise? returns true" do
-          it "returns ActivityNotification::NotificationWithDeviseChannel" do
-            described_class._notification_action_cable_with_devise = true
-            expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationWithDeviseChannel.name)
-          end
+    describe "#notification_action_cable_channel_class_name" do
+      context "when custom_notification_action_cable_with_devise? returns true" do
+        it "returns ActivityNotification::NotificationWithDeviseChannel" do
+          described_class._notification_action_cable_with_devise = true
+          expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationWithDeviseChannel.name)
         end
+      end
 
-        context "when custom_notification_action_cable_with_devise? returns false" do
-          it "returns ActivityNotification::NotificationChannel" do
-            described_class._notification_action_cable_with_devise = false
-            expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationChannel.name)
-          end
+      context "when custom_notification_action_cable_with_devise? returns false" do
+        it "returns ActivityNotification::NotificationChannel" do
+          described_class._notification_action_cable_with_devise = false
+          expect(test_instance.notification_action_cable_channel_class_name).to eq(ActivityNotification::NotificationChannel.name)
         end
       end
     end

data/spec/concerns/renderable_spec.rb

@@ -32,7 +32,7 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text"))
         .to eq(params_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{params_text_key}.text",
-        {article_title: article_title}))
+        article_title: article_title))
         .to eq(params_text_embedded)
     end
 
@@ -40,7 +40,7 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text"))
         .to eq(group_text_original)
       expect(I18n.t("notification.#{target_type_key}.#{group_text_key}.text",
-        {notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count}))
+        **{ notifier_name: notifier_name, group_member_count: group_member_count, group_notification_count: group_notification_count }))
         .to eq(group_text_embedded)
     end
 
@@ -50,10 +50,10 @@ shared_examples_for :renderable do
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text")[:other])
         .to eq(plural_text_original_other)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: 1}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: 1 }))
         .to eq(plural_text_embedded_one)
       expect(I18n.t("notification.#{target_type_key}.#{plural_text_key}.text",
-        {article_title: article_title, notifier_name: notifier_name, count: group_notification_count}))
+        **{ article_title: article_title, notifier_name: notifier_name, count: group_notification_count }))
         .to eq(plural_text_embedded_other)
     end
   end
@@ -126,4 +126,4 @@ shared_examples_for :renderable do
     # #layout_path
 
   end
-end
+end

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/controllers/controller_spec_utility.rb

@@ -2,43 +2,23 @@ module ActivityNotification
   module ControllerSpec
     module RequestUtility
       def get_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          get action, params, session
-        else
-          get action, params: params, session: session
-        end
+        get action, params: params, session: session
       end
 
       def post_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          post action, params, session
-        else
-          post action, params: params, session: session
-        end
+        post action, params: params, session: session
       end
 
       def put_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          put action, params, session
-        else
-          put action, params: params, session: session
-        end
+        put action, params: params, session: session
       end
 
       def delete_with_compatibility action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          delete action, params, session
-        else
-          delete action, params: params, session: session
-        end
+        delete action, params: params, session: session
       end
 
       def xhr_with_compatibility method, action, params, session
-        if Rails::VERSION::MAJOR <= 4
-          xhr method, action, params, session
-        else
-          send method.to_s, action, xhr: true, params: params, session: session
-        end
+        send method.to_s, action, xhr: true, params: params, session: session
       end
     end
 
@@ -76,53 +56,37 @@ module ActivityNotification
         def api_path
           "/#{root_path}/#{target_type}/#{test_target.id}"
         end
-  
+
         def schema_path
-          Rails.root.join('..', 'openapi.json') 
+          Rails.root.join('..', 'openapi.json')
         end
-  
+
         def write_schema_file(schema_json)
           File.open(schema_path, "w") { |file| file.write(schema_json) }
         end
-  
+
         def read_schema_file
           JSON.parse(File.read(schema_path))
         end
 
         def committee_options
-          @committee_options ||= { schema: Committee::Drivers::load_from_file(schema_path), prefix: root_path, validate_success_only: true }
+          @committee_options ||= { schema: Committee::Drivers::load_from_file(schema_path), prefix: root_path, validate_success_only: true, parse_response_by_content_type: false }
         end
 
         def get_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            get path, options[:params], options[:headers]
-          else
-            get path, options
-          end
+          get path, **options
         end
 
         def post_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            post path, options[:params], options[:headers]
-          else
-            post path, options
-          end
+          post path, **options
         end
 
         def put_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            put path, options[:params], options[:headers]
-          else
-            put path, options
-          end
+          put path, **options
         end
 
         def delete_with_compatibility path, options = {}
-          if Rails::VERSION::MAJOR <= 4
-            delete path, options[:params], options[:headers]
-          else
-            delete path, options
-          end
+          delete path, **options
         end
 
         def assert_all_schema_confirm(response, status)
@@ -133,4 +97,4 @@ module ActivityNotification
       end
     end
   end
-end
+end

data/spec/generators/migration/migration_generator_spec.rb

@@ -31,11 +31,7 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_activity_notification_tables.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        if Rails::VERSION::MAJOR >= 5
-          it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration\[\d\.\d\]/) }
-        else
-          it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration/) }
-        end
+        it { is_expected.to contain(/class CreateActivityNotificationTables < ActiveRecord::Migration\[\d\.\d\]/) }
 
         if ActivityNotification.config.orm == :active_record
           it 'can be executed to migrate scheme' do
@@ -55,11 +51,7 @@ describe ActivityNotification::Generators::MigrationGenerator, type: :generator
       describe 'CreateCustomNotifications migration file' do
         subject { file(Dir["tmp/db/migrate/*_create_custom_notifications.rb"].first.gsub!('tmp/', '')) }
         it { is_expected.to exist }
-        if Rails::VERSION::MAJOR >= 5
-          it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration\[\d\.\d\]/) }
-        else
-          it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration/) }
-        end
+        it { is_expected.to contain(/class CreateCustomNotifications < ActiveRecord::Migration\[\d\.\d\]/) }
 
         if ActivityNotification.config.orm == :active_record
           it 'can be executed to migrate scheme' do

data/spec/helpers/view_helpers_spec.rb

@@ -1,5 +1,5 @@
 describe ActivityNotification::ViewHelpers, type: :helper do
-  let(:view_context)         { ActionView::Base.new }
+  let(:view_context)         { ActionView::Base.new(ActionView::LookupContext.new(ActionController::Base.view_paths), [], nil) }
   let(:notification)         {
     create(:notification, target: create(:confirmed_user))
   }

data/spec/models/subscription_spec.rb

@@ -11,6 +11,14 @@ describe ActivityNotification::Subscription, type: :model do
       subscription = create(:subscription, target: target)
       expect(subscription.reload.target).to eq(target)
     end
+
+    it "several targets can subscribe to the same key" do
+      target = create(:confirmed_user)
+      target2 = create(:confirmed_user)
+      subscription_1 = create(:subscription, target: target, key: 'key.1')
+      subscription_2 = create(:subscription, target: target2, key: 'key.1')
+      expect(subscription_2).to be_valid
+    end
   end
 
   describe "with validation" do

data/spec/optional_targets/action_cable_api_channel_spec.rb

@@ -1,37 +1,34 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'activity_notification/optional_targets/action_cable_api_channel'
-  describe ActivityNotification::OptionalTarget::ActionCableApiChannel do
-    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableApiChannel.new(skip_initializing_target: true) }
+require 'activity_notification/optional_targets/action_cable_api_channel'
+describe ActivityNotification::OptionalTarget::ActionCableApiChannel do
+  let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableApiChannel.new(skip_initializing_target: true) }
 
-    describe "as public instance methods" do
-      describe "#to_optional_target_name" do
-        it "is return demodulized symbol class name" do
-          expect(test_instance.to_optional_target_name).to eq(:action_cable_api_channel)
-        end
+  describe "as public instance methods" do
+    describe "#to_optional_target_name" do
+      it "is return demodulized symbol class name" do
+        expect(test_instance.to_optional_target_name).to eq(:action_cable_api_channel)
       end
+    end
 
-      describe "#initialize_target" do
-        it "does not raise NotImplementedError" do
-          test_instance.initialize_target
-        end
+    describe "#initialize_target" do
+      it "does not raise NotImplementedError" do
+        test_instance.initialize_target
       end
+    end
 
-      describe "#notify" do
-        it "does not raise NotImplementedError" do
-          test_instance.notify(create(:notification))
-        end
+    describe "#notify" do
+      it "does not raise NotImplementedError" do
+        test_instance.notify(create(:notification))
       end
     end
+  end
 
-    describe "as protected instance methods" do
-      describe "#render_notification_message" do
-        context "as default" do
-          it "renders notification message as formatted JSON" do
-            expect(test_instance.send(:render_notification_message, create(:notification)).with_indifferent_access[:notification].has_key?(:id)).to be_truthy
-          end
+  describe "as protected instance methods" do
+    describe "#render_notification_message" do
+      context "as default" do
+        it "renders notification message as formatted JSON" do
+          expect(test_instance.send(:render_notification_message, create(:notification)).with_indifferent_access[:notification].has_key?(:id)).to be_truthy
         end
       end
     end
-
   end
 end

data/spec/optional_targets/action_cable_channel_spec.rb

@@ -1,44 +1,41 @@
-if Rails::VERSION::MAJOR >= 5
-  require 'activity_notification/optional_targets/action_cable_channel'
-  describe ActivityNotification::OptionalTarget::ActionCableChannel do
-    let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableChannel.new(skip_initializing_target: true) }
+require 'activity_notification/optional_targets/action_cable_channel'
+describe ActivityNotification::OptionalTarget::ActionCableChannel do
+  let(:test_instance) { ActivityNotification::OptionalTarget::ActionCableChannel.new(skip_initializing_target: true) }
 
-    describe "as public instance methods" do
-      describe "#to_optional_target_name" do
-        it "is return demodulized symbol class name" do
-          expect(test_instance.to_optional_target_name).to eq(:action_cable_channel)
-        end
+  describe "as public instance methods" do
+    describe "#to_optional_target_name" do
+      it "is return demodulized symbol class name" do
+        expect(test_instance.to_optional_target_name).to eq(:action_cable_channel)
       end
+    end
 
-      describe "#initialize_target" do
-        it "does not raise NotImplementedError" do
-          test_instance.initialize_target
-        end
+    describe "#initialize_target" do
+      it "does not raise NotImplementedError" do
+        test_instance.initialize_target
       end
+    end
 
-      describe "#notify" do
-        it "does not raise NotImplementedError" do
-          test_instance.notify(create(:notification))
-        end
+    describe "#notify" do
+      it "does not raise NotImplementedError" do
+        test_instance.notify(create(:notification))
       end
     end
+  end
 
-    describe "as protected instance methods" do
-      describe "#render_notification_message" do
-        context "as default" do
-          it "renders notification message with default template" do
-            expect(test_instance.send(:render_notification_message, create(:notification))).to be_include("<div class='notification_list") 
-          end
+  describe "as protected instance methods" do
+    describe "#render_notification_message" do
+      context "as default" do
+        it "renders notification message with default template" do
+          expect(test_instance.send(:render_notification_message, create(:notification))).to be_include("<div class='notification_list") 
         end
+      end
 
-        context "with unexisting template as fallback option" do
-          it "raise ActionView::MissingTemplate" do
-            expect { expect(test_instance.send(:render_notification_message, create(:notification), fallback: :hoge)) }
-              .to raise_error(ActionView::MissingTemplate)
-          end
+      context "with unexisting template as fallback option" do
+        it "raise ActionView::MissingTemplate" do
+          expect { expect(test_instance.send(:render_notification_message, create(:notification), fallback: :hoge)) }
+            .to raise_error(ActionView::MissingTemplate)
         end
       end
     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>