activity_notification 1.4.0 → 1.4.1

data/lib/activity_notification/version.rb

@@ -1,3 +1,3 @@
 module ActivityNotification
-  VERSION = "1.4.0"
+  VERSION = "1.4.1"
 end

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

@@ -1,4 +1,4 @@
-if ENV['AN_TEST_DB'] != 'mongodb'
+unless ENV['AN_TEST_DB'] == 'mongodb'
   class Admin < ActiveRecord::Base
     belongs_to :user
     validates :user, presence: true

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

@@ -1,4 +1,4 @@
-if ENV['AN_TEST_DB'] != 'mongodb'
+unless ENV['AN_TEST_DB'] == 'mongodb'
   class Article < ActiveRecord::Base
     belongs_to :user
     has_many :comments, dependent: :destroy

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

@@ -1,4 +1,4 @@
-if ENV['AN_TEST_DB'] != 'mongodb'
+unless ENV['AN_TEST_DB'] == 'mongodb'
   class Comment < ActiveRecord::Base
     belongs_to :article
     belongs_to :user

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

@@ -1,2 +1,10 @@
-class Dummy::DummyBase < ActiveRecord::Base
-end
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyBase < ActiveRecord::Base
+  end
+else
+  class Dummy::DummyBase
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+  end
+end

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

@@ -1,4 +1,14 @@
-class Dummy::DummyGroup < ActiveRecord::Base
-  self.table_name = :articles
-  include ActivityNotification::Group
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyGroup < ActiveRecord::Base
+    self.table_name = :articles
+    include ActivityNotification::Group
+  end
+else
+  class Dummy::DummyGroup
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+    include ActivityNotification::Group
+    field :title, type: String
+  end
 end

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

@@ -1,4 +1,14 @@
-class Dummy::DummyNotifiable < ActiveRecord::Base
-  self.table_name = :articles
-  include ActivityNotification::Notifiable
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyNotifiable < ActiveRecord::Base
+    self.table_name = :articles
+    include ActivityNotification::Notifiable
+  end
+else
+  class Dummy::DummyNotifiable
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+    include ActivityNotification::Notifiable
+    field :title, type: String
+  end
 end

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

@@ -1,4 +1,14 @@
-class Dummy::DummyNotifier < ActiveRecord::Base
-  self.table_name = :users
-  include ActivityNotification::Notifier
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyNotifier < ActiveRecord::Base
+    self.table_name = :users
+    include ActivityNotification::Notifier
+  end
+else
+  class Dummy::DummyNotifier
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+    include ActivityNotification::Notifier
+    field :name,  type: String
+  end
 end

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

@@ -1,4 +1,13 @@
-class Dummy::DummySubscriber < ActiveRecord::Base
-  self.table_name = :users
-  acts_as_target email: 'dummy@example.com', email_allowed: true, batch_email_allowed: true, subscription_allowed: true
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummySubscriber < ActiveRecord::Base
+    self.table_name = :users
+    acts_as_target email: 'dummy@example.com', email_allowed: true, batch_email_allowed: true, subscription_allowed: true
+  end
+else
+  class Dummy::DummySubscriber
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+    acts_as_target email: 'dummy@example.com', email_allowed: true, batch_email_allowed: true, subscription_allowed: true
+  end
 end

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

@@ -1,4 +1,15 @@
-class Dummy::DummyTarget < ActiveRecord::Base
-  self.table_name = :users
-  include ActivityNotification::Target
+unless ENV['AN_TEST_DB'] == 'mongodb'
+  class Dummy::DummyTarget < ActiveRecord::Base
+    self.table_name = :users
+    include ActivityNotification::Target
+  end
+else
+  class Dummy::DummyTarget
+    include Mongoid::Document
+    include Mongoid::Timestamps
+    include ActivityNotification::Models
+    include ActivityNotification::Target
+    field :email, type: String, default: ""
+    field :name,  type: String
+  end
 end

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

@@ -1,4 +1,4 @@
-if ENV['AN_TEST_DB'] != 'mongodb'
+unless ENV['AN_TEST_DB'] == 'mongodb'
   class User < ActiveRecord::Base
     devise :database_authenticatable, :registerable, :confirmable
     validates :email, presence: true

data/spec/rails_app/config/application.rb

@@ -1,6 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-# Pick the frameworks you want:
+# Load mongoid configuration if necessary:
 if ENV['AN_ORM'] == 'mongoid'
   require 'mongoid'
   require 'rails'
@@ -8,7 +8,11 @@ if ENV['AN_ORM'] == 'mongoid'
     Mongoid.load!(File.expand_path("config/mongoid.yml"), :development)
   end
 end
-require "active_record/railtie"
+
+# Pick the frameworks you want:
+unless ENV['AN_ORM'] == 'mongoid' && ENV['AN_TEST_DB'] == 'mongodb'
+  require "active_record/railtie"
+end
 require "action_controller/railtie"
 require "action_mailer/railtie"
 require "action_view/railtie"
@@ -21,7 +25,7 @@ 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
+    if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2 && ENV['AN_TEST_DB'] != 'mongodb'
       config.active_record.raise_in_transactional_callbacks = true
     end
   end

data/spec/rails_app/config/environment.rb

@@ -15,7 +15,7 @@ def silent_stdout(&block)
 end
 
 # Load database schema
-if Rails.env.test?
+if Rails.env.test? && ENV['AN_TEST_DB'] != 'mongodb'
   silent_stdout do
     load "#{Rails.root}/db/schema.rb"
   end

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

@@ -20,7 +20,9 @@ Rails.application.configure do
   config.active_support.deprecation = :log
 
   # Raise an error on page load if there are pending migrations.
-  config.active_record.migration_error = :page_load
+  unless ENV['AN_ORM'] == 'mongoid' && ENV['AN_TEST_DB'] == 'mongodb'
+    config.active_record.migration_error = :page_load
+  end
 
   # Debug mode disables concatenation and preprocessing of assets.
   # This option may cause significant delays in view rendering with a large

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

@@ -49,6 +49,9 @@ Rails.application.configure do
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 
-  # For devise and notification email
+  # Use :test Active Job adapter for RSpec.
+  config.active_job.queue_adapter = :test
+
+  # Set default_url_options for devise and notification email.
   config.action_mailer.default_url_options = { host: 'localhost', port: 3000 }
 end

data/spec/roles/acts_as_notifiable_spec.rb

@@ -45,7 +45,7 @@ describe ActivityNotification::ActsAsNotifiable 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)
+            notifiable.update(created_at: notifiable.updated_at)
             expect(user_target.notifications.filtered_by_instance(notifiable).count).to eq(0)
           end
         end
@@ -71,7 +71,7 @@ describe ActivityNotification::ActsAsNotifiable 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)
+              @notifiable.update(created_at: @notifiable.updated_at)
             end
 
             it "generates notifications when notifiable is updated" do
@@ -106,7 +106,7 @@ describe ActivityNotification::ActsAsNotifiable 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)
+              @notifiable.update(created_at: @notifiable.updated_at)
             end
 
             it "does not generate notifications when notifiable is updated" do
@@ -136,7 +136,7 @@ describe ActivityNotification::ActsAsNotifiable 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)
+              @notifiable.update(created_at: @notifiable.updated_at)
             end
 
             it "does not generate notifications when notifiable is updated" do
@@ -166,7 +166,7 @@ describe ActivityNotification::ActsAsNotifiable 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)
+              @notifiable.update(created_at: @notifiable.updated_at)
             end
 
             it "generates notifications when notifiable is updated" do
@@ -248,7 +248,11 @@ describe ActivityNotification::ActsAsNotifiable do
           it "can not be deleted when it has generated notifications" do
             dummy_notifiable_class.acts_as_notifiable :users, dependent_notifications: :restrict_with_exception
             expect(user_target.notifications.reload.size).to eq(3)
-            expect { @notifiable_1.destroy }.to raise_error(ActiveRecord::DeleteRestrictionError)
+            if ActivityNotification.config.orm == :active_record
+              expect { @notifiable_1.destroy }.to raise_error(ActiveRecord::DeleteRestrictionError)
+            else
+              expect { @notifiable_1.destroy }.to raise_error(RuntimeError)
+            end
           end
         end
 

data/spec/spec_helper.rb

@@ -37,9 +37,6 @@ require 'ammeter/init'
 require 'factory_girl_rails'
 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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -30,20 +30,6 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +120,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.2
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
@@ -204,14 +190,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.3.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement