activity_notification 1.3.0 → 1.4.0

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

@@ -1,14 +1,47 @@
-class User < ActiveRecord::Base
-  devise :database_authenticatable, :registerable, :confirmable
-  validates :email, presence: true
-  has_many :articles, dependent: :destroy
-  has_one :admin, dependent: :destroy
-
-  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
-
-  def admin?
-    admin.present?
+if ENV['AN_TEST_DB'] != 'mongodb'
+  class User < ActiveRecord::Base
+    devise :database_authenticatable, :registerable, :confirmable
+    validates :email, presence: true
+    has_many :articles, dependent: :destroy
+    has_one :admin, dependent: :destroy
+
+    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
+
+    def admin?
+      admin.present?
+    end
+  end
+else
+  require 'mongoid'
+  class User
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    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: ""
+    field :encrypted_password,   type: String, default: ""
+    ## Confirmable
+    field :confirmation_token,   type: String
+    field :confirmed_at,         type: Time
+    field :confirmation_sent_at, type: Time
+    # 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
+
+    def admin?
+      admin.present?
+    end
   end
 end

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

@@ -26,6 +26,7 @@
       <% if user_signed_in? %>
         <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
         <%#= 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 %>
       <% end %>
     </div>

data/spec/rails_app/config/database.yml

@@ -1,25 +1,36 @@
-# SQLite version 3.x
-#   gem install sqlite3
-#
-#   Ensure the SQLite 3 gem is defined in your Gemfile
-#   gem 'sqlite3'
-#
-default: &default
+sqlite: &sqlite
+  adapter: sqlite3
+  database: <%= Rails.env.test? ? '":memory:"' : "db/#{Rails.env}.sqlite3" %>
+
+mysql: &mysql
+  adapter: mysql2
+  database: activity_notification_<%= Rails.env %>
+  username: root
+  password:
+  encoding: utf8
+
+postgresql: &postgresql
+  adapter: postgresql
+  database: activity_notification_<%= Rails.env %>
+  username: postgres
+  password:
+  min_messages: ERROR
+
+mongodb: &mongodb
   adapter: sqlite3
+  database: <%= Rails.env.test? ? '":memory:"' : "db/#{Rails.env}.sqlite3" %>
+
+default: &default
   pool: 5
   timeout: 5000
+  host: localhost
+  <<: *<%= ENV['AN_TEST_DB'].blank? ? "sqlite" : ENV['AN_TEST_DB'] %>
 
 development:
   <<: *default
-  database: db/development.sqlite3
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
-  adapter: sqlite3
-  database: ":memory:"
+  <<: *default
 
 production:
-  adapter: sqlite3
-  database: ":memory:"
+  <<: *default

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

@@ -24,7 +24,11 @@ Devise.setup do |config|
   # Load and configure the ORM. Supports :active_record (default) and
   # :mongoid (bson_ext recommended) by default. Other ORMs may be
   # available as additional gems.
-  require 'devise/orm/active_record'
+  if ENV['AN_TEST_DB'] == 'mongodb'
+    require 'devise/orm/mongoid'
+  else
+    require 'devise/orm/active_record'
+  end
 
   # ==> Configuration for any authentication mechanism
   # Configure which keys are used when authenticating a user. The default is

data/spec/rails_app/db/migrate/20160715050420_create_activity_notification_tables.rb

@@ -1,5 +1,5 @@
 # Migration responsible for creating a table with notifications
-class CreateActivityNotificationTables < ActiveRecord::Migration
+class CreateActivityNotificationTables < ActiveRecord::Migration[5.1]
   # Create tables
   def change
     create_table :notifications do |t|

data/spec/rails_app/db/migrate/20160715050433_create_test_tables.rb

@@ -1,4 +1,4 @@
-class CreateTestTables < ActiveRecord::Migration
+class CreateTestTables < ActiveRecord::Migration[5.1]
   def change
     create_table :users do |t|
       # Devise

data/spec/rails_app/db/seeds.rb

@@ -1,13 +1,36 @@
 # coding: utf-8
 # This file is seed file for test data on development environment.
 
-ActivityNotification::Notification.delete_all
-ActivityNotification::Subscription.delete_all
-Comment.delete_all
-Article.delete_all
-Admin.delete_all
-User.delete_all
-User.connection.execute("UPDATE sqlite_sequence SET seq = 0;")
+def clear_database
+  [ActivityNotification::Notification, ActivityNotification::Subscription, Comment, Article, Admin, User].each do |model|
+    model.delete_all
+  end
+end
+
+def reset_pk_sequence
+  models = [Comment, Article, Admin, User]
+  if ActivityNotification.config.orm == :active_record
+    models.concat([ActivityNotification::Notification, ActivityNotification::Subscription])
+  end
+  case ENV['AN_TEST_DB']
+  when nil, '', 'sqlite'
+    ActiveRecord::Base.connection.execute("UPDATE sqlite_sequence SET seq = 0")
+  when 'mysql'
+    models.each do |model|
+      ActiveRecord::Base.connection.execute("ALTER TABLE #{model.table_name} AUTO_INCREMENT = 1")
+    end
+  when 'postgresql'
+    models.each do |model|
+      ActiveRecord::Base.connection.reset_pk_sequence!(model.table_name)
+    end
+  when 'mongodb'
+  else
+    raise "#{ENV['AN_TEST_DB']} as AN_TEST_DB environment variable is not supported"
+  end
+end
+
+clear_database
+reset_pk_sequence
 
 ['Ichiro', 'Stephen', 'Klay', 'Kevin'].each do |name|
   user = User.new(
@@ -21,7 +44,7 @@ User.connection.execute("UPDATE sqlite_sequence SET seq = 0;")
 end
 
 ['Ichiro'].each do |name|
-  user = User.find_by_name(name)
+  user = User.find_by(name: name)
   Admin.create(
     user: user,
     phone_number: ENV['OPTIONAL_TARGET_AMAZON_SNS_PHONE_NUMBER'],

data/spec/roles/acts_as_notifiable_spec.rb

@@ -8,6 +8,9 @@ describe ActivityNotification::ActsAsNotifiable do
     describe ".acts_as_notifiable" do
       before do
         dummy_notifiable_class.set_notifiable_class_defaults
+        dummy_notifiable_class.reset_callbacks :create
+        dummy_notifiable_class.reset_callbacks :update
+        dummy_notifiable_class.reset_callbacks :destroy
         @notifiable = dummy_notifiable_class.create
       end
 
@@ -27,9 +30,159 @@ describe ActivityNotification::ActsAsNotifiable do
         end
       end
 
+      context "with :tracked option" do
+        before do
+          user_target.notifications.delete_all
+          expect(user_target.notifications.count).to eq(0)
+        end
+
+        it "returns hash of :tracked option" do
+          expect(dummy_notifiable_class.acts_as_notifiable :users, tracked: true)
+            .to eq({ tracked: [:create, :update] })
+        end
+
+        context "without option" do
+          it "does not generate notifications when notifiable is created and updated" do
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target]
+            notifiable = dummy_notifiable_class.create
+            notifiable.update(created_at: notifiable.created_at + 10.second)
+            expect(user_target.notifications.filtered_by_instance(notifiable).count).to eq(0)
+          end
+        end
+
+        context "true as :tracked" do
+          before do
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: true
+            @created_notifiable = dummy_notifiable_class.create
+          end
+
+          context "creation" do
+            it "generates notifications when notifiable is created" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+
+            it "generated notification has notification_key_for_tracked_creation as key" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).latest.key)
+                .to eq(@created_notifiable.notification_key_for_tracked_creation)
+            end
+          end
+
+          context "update" do
+            before do
+              user_target.notifications.delete_all
+              expect(user_target.notifications.count).to eq(0)
+              @notifiable.update(created_at: @notifiable.created_at + 10.second)
+            end
+
+            it "generates notifications when notifiable is updated" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).count).to eq(1)
+            end
+
+            it "generated notification has notification_key_for_tracked_update as key" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).first.key)
+                .to eq(@notifiable.notification_key_for_tracked_update)
+            end
+          end
+        end
+
+        context "with :only option (creation only)" do
+          before do
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { only: [:create] }
+            @created_notifiable = dummy_notifiable_class.create
+          end
+
+          context "creation" do
+            it "generates notifications when notifiable is created" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+
+            it "generated notification has notification_key_for_tracked_creation as key" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).latest.key)
+                .to eq(@created_notifiable.notification_key_for_tracked_creation)
+            end
+          end
+
+          context "update" do
+            before do
+              user_target.notifications.delete_all
+              expect(user_target.notifications.count).to eq(0)
+              @notifiable.update(created_at: @notifiable.created_at + 10.second)
+            end
+
+            it "does not generate notifications when notifiable is updated" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).count).to eq(0)
+            end
+          end
+        end
+
+        context "with :except option (except update)" do
+          before do
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { except: [:update] }
+            @created_notifiable = dummy_notifiable_class.create
+          end
+
+          context "creation" do
+            it "generates notifications when notifiable is created" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+
+            it "generated notification has notification_key_for_tracked_creation as key" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).latest.key)
+                .to eq(@created_notifiable.notification_key_for_tracked_creation)
+            end
+          end
+
+          context "update" do
+            before do
+              user_target.notifications.delete_all
+              expect(user_target.notifications.count).to eq(0)
+              @notifiable.update(created_at: @notifiable.created_at + 10.second)
+            end
+
+            it "does not generate notifications when notifiable is updated" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).count).to eq(0)
+            end
+          end
+        end
+
+        context "with :key option" do
+          before do
+            dummy_notifiable_class.acts_as_notifiable :users, targets: [user_target], tracked: { key: "test.key" }
+            @created_notifiable = dummy_notifiable_class.create
+          end
+
+          context "creation" do
+            it "generates notifications when notifiable is created" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).count).to eq(1)
+            end
+
+            it "generated notification has specified key" do
+              expect(user_target.notifications.filtered_by_instance(@created_notifiable).latest.key)
+                .to eq("test.key")
+            end
+          end
+
+          context "update" do
+            before do
+              user_target.notifications.delete_all
+              expect(user_target.notifications.count).to eq(0)
+              @notifiable.update(created_at: @notifiable.created_at + 10.second)
+            end
+
+            it "generates notifications when notifiable is updated" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).count).to eq(1)
+            end
+
+            it "generated notification has notification_key_for_tracked_update as key" do
+              expect(user_target.notifications.filtered_by_instance(@notifiable).first.key)
+                .to eq("test.key")
+            end
+          end
+        end
+      end
+
       context "with :dependent_notifications option" do
         before do
-          dummy_notifiable_class.reset_callbacks :destroy
           @notifiable_1, @notifiable_2, @notifiable_3 = dummy_notifiable_class.create, dummy_notifiable_class.create, dummy_notifiable_class.create
           @group_owner  = create(:notification, target: user_target, notifiable: @notifiable_1, group: @notifiable_1)
           @group_member = create(:notification, target: user_target, notifiable: @notifiable_2, group: @notifiable_1, group_owner: @group_owner)

data/spec/spec_helper.rb

@@ -40,12 +40,17 @@ require 'activity_notification'
 # For active record ORM
 require 'active_record'
 
+def clear_database
+  [ActivityNotification::Notification, ActivityNotification::Subscription, Comment, Article, Admin, User].each do |model_class|
+    model_class.delete_all
+  end
+end
+
 RSpec.configure do |config|
   config.include FactoryGirl::Syntax::Methods
   config.before(:all) do
     FactoryGirl.reload
-    ActivityNotification::Notification.delete_all
-    ActivityNotification::Subscription.delete_all
+    clear_database
   end
   config.include Devise::Test::ControllerHelpers, type: :controller
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -19,7 +19,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -73,47 +73,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.1.1
 - !ruby/object:Gem::Dependency
-  name: mongoid
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 1.3.13
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 1.3.13
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 0.4.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.13
+        version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.20.0
+- !ruby/object:Gem::Dependency
+  name: mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.5.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 3.5.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -148,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
@@ -272,6 +300,8 @@ files:
 - gemfiles/Gemfile.rails-4.2.lock
 - gemfiles/Gemfile.rails-5.0
 - gemfiles/Gemfile.rails-5.0.lock
+- gemfiles/Gemfile.rails-5.1
+- gemfiles/Gemfile.rails-5.1.lock
 - lib/activity_notification.rb
 - lib/activity_notification/apis/notification_api.rb
 - lib/activity_notification/apis/subscription_api.rb
@@ -476,7 +506,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Integrated user activity notifications for Ruby on Rails