activity_notification 0.0.9 → 0.0.10

data/spec/helpers/view_helpers_spec.rb

@@ -24,7 +24,7 @@ describe ActivityNotification::ViewHelpers, type: :helper do
     end
   end
 
-  describe '#render_notification' do
+  describe '.render_notification' do
     context "without fallback" do
       context "when the template is missing for the target type and key" do
         it "raises ActionView::MissingTemplate" do
@@ -98,14 +98,14 @@ describe ActivityNotification::ViewHelpers, type: :helper do
     end
   end
 
-  describe '#render_notifications' do
+  describe '.render_notifications' do
     it "is an alias of render_notification" do
       expect(notification).to receive(:render).with(self, { fallback: :default })
       render_notifications notification, fallback: :default
     end
   end
 
-  describe '#render_notification_of' do
+  describe '.render_notification_of' do
     context "without fallback" do
       context "when the template is missing for the target type and key" do
         it "raises ActionView::MissingTemplate" do

data/spec/mailers/mailer_spec.rb

@@ -7,7 +7,7 @@ describe ActivityNotification::Mailer do
     expect(ActivityNotification::Mailer.deliveries.size).to eq(0)
   end
 
-  describe "#send_notification_email" do
+  describe ".send_notification_email" do
     context "with deliver_now" do
       context "as default" do
         before do

data/spec/models/notification_spec.rb

@@ -169,7 +169,7 @@ describe ActivityNotification::Notification, type: :model do
     context "to filter by association" do
       before do
         ActivityNotification::Notification.delete_all
-        @target_1, @notifiable_1, @group_1, @key_1 = create(:confirmed_user), create(:article), nil, "key.1"
+        @target_1, @notifiable_1, @group_1, @key_1 = create(:confirmed_user), create(:article), nil,           "key.1"
         @target_2, @notifiable_2, @group_2, @key_2 = create(:confirmed_user), create(:comment), @notifiable_1, "key.2"
         @notification_1 = create(:notification, target: @target_1, notifiable: @notifiable_1, group: @group_1, key: @key_1)
         @notification_2 = create(:notification, target: @target_2, notifiable: @notifiable_2, group: @group_2, key: @key_2)
@@ -194,10 +194,10 @@ describe ActivityNotification::Notification, type: :model do
       end
 
       it "works with filtered_by_type scope" do
-        notifications = ActivityNotification::Notification.filtered_by_type(@notifiable_1.class)
+        notifications = ActivityNotification::Notification.filtered_by_type(@notifiable_1.to_class_name)
         expect(notifications.size).to eq(1)
         expect(notifications.first).to eq(@notification_1)
-        notifications = ActivityNotification::Notification.filtered_by_type(@notifiable_2.class)
+        notifications = ActivityNotification::Notification.filtered_by_type(@notifiable_2.to_class_name)
         expect(notifications.size).to eq(1)
         expect(notifications.first).to eq(@notification_2)
       end
@@ -219,6 +219,60 @@ describe ActivityNotification::Notification, type: :model do
         expect(notifications.size).to eq(1)
         expect(notifications.first).to eq(@notification_2)
       end
+
+      describe 'filtered_by_options scope' do
+        context 'with filtered_by_type options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_type: @notifiable_1.to_class_name })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_1)
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_type: @notifiable_2.to_class_name })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_2)
+          end
+        end
+  
+        context 'with filtered_by_group options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_group: @group_1 })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_1)
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_group: @group_2 })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_2)
+          end
+        end
+
+        context 'with filtered_by_group_type and :filtered_by_group_id options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_group_type: 'Article', filtered_by_group_id: @group_2.id.to_s })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_2)
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_group_type: 'Article' })
+            expect(notifications.size).to eq(2)
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_group_id: @group_2.id.to_s })
+            expect(notifications.size).to eq(2)
+          end
+        end
+
+        context 'with filtered_by_key options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_key: @key_1 })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_1)
+            notifications = ActivityNotification::Notification.filtered_by_options({ filtered_by_key: @key_2 })
+            expect(notifications.size).to eq(1)
+            expect(notifications.first).to eq(@notification_2)
+          end
+        end
+  
+        context 'with no options' do
+          it "works with filtered_by_options scope" do
+            notifications = ActivityNotification::Notification.filtered_by_options
+            expect(notifications.size).to eq(2)
+          end
+        end
+      end
     end
 
     context "to make order by created_at" do

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

@@ -7,6 +7,5 @@ class Article < ActiveRecord::Base
   acts_as_notifiable :users,
     targets: ->(article, key) { User.all.to_a - [article.user] },
     notifier: :user,
-    email_allowed: true#, 
-    #notifiable_path: ->(article) { concept_issue_path(issue.concept, issue) }
+    email_allowed: true
 end

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

@@ -5,14 +5,16 @@ class Comment < ActiveRecord::Base
   validates :user, presence: true
 
   acts_as_notifiable :users,
-    targets: ->(comment, key) { (comment.article.commented_users.to_a - [comment.user] + [comment.article.user]).uniq },
+    targets: ->(comment, key) {
+      (comment.article.commented_users.to_a - [comment.user] + [comment.article.user]).uniq
+    },
     group: :article,
     notifier: :user,
-    email_allowed: :custom_notification_email_to_users_allowed?,
-    parameters: {test_default_param: '1'}#,
-    #notifiable_path: :custom_notifiable_path
+    email_allowed: true,
+    parameters: { test_default_param: '1' },
+    notifiable_path: :article_notifiable_path
 
-  def custom_notification_email_to_users_allowed?(user, key)
-    true
+  def article_notifiable_path
+    article_path(article)
   end
 end

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

@@ -4,5 +4,5 @@ class User < ActiveRecord::Base
   has_many :articles, dependent: :delete_all
   has_many :comments, through: :articles, dependent: :delete_all
 
-  acts_as_notification_target email: :email, email_allowed: :confirmed_at
+  acts_as_target email: :email, email_allowed: :confirmed_at
 end

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

@@ -2,7 +2,9 @@
 <% if user_signed_in? %>
   <%= "Login as #{current_user.name}" %>
   <%= link_to 'Logout', destroy_user_session_path, method: :delete %>
+  <%#= render_notifications_of current_user, fallback: :default, index_content: :simple %>
   <%= render_notifications_of current_user, fallback: :default, index_content: :with_attributes %>
+  <%#= render_notifications_of current_user, fallback: :default, index_content: :none %>
 <% else %>
   <%= link_to 'Login', new_user_session_path %>
 <% end %>

data/spec/rails_app/config/application.rb

@@ -14,7 +14,9 @@ require "activity_notification"
 module Dummy
   class Application < Rails::Application
     # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
+    if Rails::VERSION::MAJOR == 4 && Rails::VERSION::MINOR >= 2
+      config.active_record.raise_in_transactional_callbacks = true
+    end
   end
 end
 

data/spec/rails_app/config/environment.rb

@@ -4,9 +4,19 @@ require File.expand_path('../application', __FILE__)
 # Initialize the Rails application.
 Rails.application.initialize!
 
+def silent_stdout(&block)
+  original_stdout = $stdout
+  $stdout = fake = StringIO.new
+  begin
+    yield
+  ensure
+    $stdout = original_stdout
+  end
+end
+
 # Load database schema
 if Rails.env.test?
-  silence_stream(STDOUT) do
+  silent_stdout do
     load "#{Rails.root}/db/schema.rb"
   end
-end
+end

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

@@ -13,8 +13,17 @@ Rails.application.configure do
   config.eager_load = false
 
   # Configure static file server for tests with Cache-Control for performance.
-  config.serve_static_files   = true
-  config.static_cache_control = 'public, max-age=3600'
+  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
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

data/spec/roles/acts_as_notifiable_spec.rb

@@ -2,7 +2,7 @@ describe ActivityNotification::ActsAsNotifiable do
   let(:dummy_model_class) { Dummy::DummyBase }
 
   describe "as public class methods" do
-    describe "acts_as_notifiable" do
+    describe ".acts_as_notifiable" do
       it "have not included Notifiable before calling" do
         expect(dummy_model_class.respond_to?(:available_as_notifiable?)).to be_falsey
       end
@@ -22,7 +22,7 @@ describe ActivityNotification::ActsAsNotifiable do
       #TODO test other options
     end
 
-    describe "available_notifiable_options" do
+    describe ".available_notifiable_options" do
       it "returns list of available options in acts_as_notifiable" do
         expect(dummy_model_class.available_notifiable_options)
           .to eq([:targets, :group, :notifier, :parameters, :email_allowed, :notifiable_path])

data/spec/roles/acts_as_notifier_spec.rb

@@ -2,7 +2,7 @@ describe ActivityNotification::ActsAsNotifier do
   let(:dummy_model_class) { Dummy::DummyBase }
 
   describe "as public class methods" do
-    describe "acts_as_notifier" do
+    describe ".acts_as_notifier" do
       it "have not included Notifier before calling" do
         expect(dummy_model_class.respond_to?(:available_as_notifier?)).to be_falsey
       end

data/spec/roles/acts_as_target_spec.rb

@@ -2,7 +2,7 @@ describe ActivityNotification::ActsAsTarget do
   let(:dummy_model_class) { Dummy::DummyBase }
 
   describe "as public class methods" do
-    describe "acts_as_target" do
+    describe ".acts_as_target" do
       it "have not included Target before calling" do
         expect(dummy_model_class.respond_to?(:available_as_target?)).to be_falsey
       end
@@ -22,7 +22,7 @@ describe ActivityNotification::ActsAsTarget do
       #TODO test other options
     end
 
-    describe "acts_as_notification_target" do
+    describe ".acts_as_notification_target" do
       it "is an alias of acts_as_target" do
         #TODO make better way to test alias
         #expect(dummy_model_class.acts_as_notification_target).to receive(:acts_as_target)
@@ -30,7 +30,7 @@ describe ActivityNotification::ActsAsTarget do
       end
     end
 
-    describe "available_target_options" do
+    describe ".available_target_options" do
       it "returns list of available options in acts_as_target" do
         expect(dummy_model_class.available_target_options)
           .to eq([:email, :email_allowed, :devise_resource])

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ Bundler.setup
 
 require 'simplecov'
 require 'coveralls'
+require 'rails'
 Coveralls.wear!
 SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new [
   SimpleCov::Formatter::HTMLFormatter,
@@ -14,6 +15,11 @@ SimpleCov.start('rails') do
   add_filter '/spec/'
   add_filter '/lib/generators/templates/'
   add_filter '/lib/activity_notification/version.rb'
+  if Rails::VERSION::MAJOR == 5
+    nocov_token 'skip-rails5'
+  elsif Rails::VERSION::MAJOR == 4
+    nocov_token 'skip-rails4'
+  end
 end
 
 # Testing with Devise

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: activity_notification
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Shota Yamazaki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -44,98 +50,84 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.11
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.11
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
-  name: jquery-rails
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 3.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.1
+        version: 3.5.1
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.7.0
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.7.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
-  name: ammeter
+  name: yard-activesupport-concern
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
@@ -163,6 +155,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- ".yardopts"
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -180,6 +173,10 @@ files:
 - app/views/activity_notification/notifications/default/open.js.erb
 - app/views/activity_notification/notifications/default/open_all.js.erb
 - app/views/activity_notification/notifications/default/show.html.erb
+- gemfiles/Gemfile.rails-4.2
+- gemfiles/Gemfile.rails-4.2.lock
+- gemfiles/Gemfile.rails-5.0
+- gemfiles/Gemfile.rails-5.0.lock
 - lib/activity_notification.rb
 - lib/activity_notification/apis/notification_api.rb
 - lib/activity_notification/common.rb
@@ -255,7 +252,6 @@ files:
 - spec/rails_app/app/models/admin.rb
 - spec/rails_app/app/models/article.rb
 - spec/rails_app/app/models/comment.rb
-- spec/rails_app/app/models/concerns/.keep
 - spec/rails_app/app/models/dummy/dummy_base.rb
 - spec/rails_app/app/models/dummy/dummy_notifiable.rb
 - spec/rails_app/app/models/dummy/dummy_notifier.rb
@@ -376,7 +372,6 @@ test_files:
 - spec/rails_app/app/models/admin.rb
 - spec/rails_app/app/models/article.rb
 - spec/rails_app/app/models/comment.rb
-- spec/rails_app/app/models/concerns/.keep
 - spec/rails_app/app/models/dummy/dummy_base.rb
 - spec/rails_app/app/models/dummy/dummy_notifiable.rb
 - spec/rails_app/app/models/dummy/dummy_notifier.rb