wupee 1.1.4 → 2.0.0.beta1

data/spec/models/concerns/receiver_spec.rb

@@ -7,31 +7,9 @@ shared_examples_for "Wupee::Receiver" do
     expect(model.new).to respond_to(:notifications)
   end
 
-  it "has many notification_type_configurations" do
-    expect(model.new).to respond_to(:notification_type_configurations)
-  end
-
   it "destroys notification on destroy" do
     receiver = create model.name.underscore
     create :notification, receiver: receiver
     expect { receiver.destroy }.to change { Wupee::Notification.count }.by(-1)
   end
-
-  it "destroys notification_type_configurations on destroy" do
-    receiver = create model.name.underscore
-    Wupee::NotificationTypeConfiguration.create(receiver: receiver, notification_type: Wupee::NotificationType.create(name: 'abc'))
-    expect { receiver.destroy }.to change { Wupee::NotificationTypeConfiguration.count }.by(-1)
-  end
-
-  context "there are already notification type created" do
-    it "has no notification_type_configurations associated to notification_type" do
-      expect(Wupee::NotificationTypeConfiguration.count).to eq 0
-    end
-
-    it "creates notification_type_configurations after model is created" do
-      create :notification_type
-      expect { create model.name.underscore }.to change { Wupee::NotificationTypeConfiguration.count }.by(1)
-      expect(Wupee::NotificationTypeConfiguration.last.receiver).to eq model.last
-    end
-  end
 end

data/spec/models/notification_spec.rb

@@ -36,19 +36,4 @@ RSpec.describe Wupee::Notification, type: :model do
     it { expect(create(:notification).is_read).to be false }
     it { expect(create(:notification).is_sent).to be false }
   end
-
-  # it '#deliver_now should send a mail' do
-  #   notification = Wupee::Notification.new.send_notification(type: notification_type_name, attached_object: message)
-  #                                  .to(receiver)
-  #   expect(notification.deliver_now).to be_a(Mail::Message)
-  # end
-  #
-  # it '#deliver_later should send later a mail' do
-  #   notification = Wupee::Notification.new.send_notification(type: notification_type_name, attached_object: message)
-  #                                  .to(receiver)
-  #   expect(notification.deliver_later).to be_a(ActionMailer::DeliveryJob)
-  # end
-  #
-
-
 end

data/spec/models/notification_type_spec.rb

@@ -21,28 +21,14 @@ RSpec.describe Wupee::NotificationType, type: :model do
   end
 
   context "methods" do
-    it "responds to notification_type_configurations" do
-      expect(notification_type).to respond_to(:notification_type_configurations)
-    end
-
     it "responds to notifications" do
       expect(notification_type).to respond_to(:notifications)
     end
   end
 
-  context "class methods" do
-    it "has a method create_configurations_for which creates NotificationTypeConfiguration objects" do
-      expect { create :notification_type, name: "random_notif_type_2" }.to change { Wupee::NotificationTypeConfiguration.count }.by(User.count)
-    end
-  end
-
   context "associations" do
-    it "destroys notification_type_configurations on destroy" do
-      expect { notification_type.destroy! }.to change { Wupee::Notification.count }.by(-1)
-    end
-
     it "destroys notifications on destroy" do
-      expect { notification_type.destroy! }.to change { Wupee::NotificationTypeConfiguration.count }.by(-1)
+      expect { notification_type.destroy! }.to change { Wupee::Notification.count }.by(-1)
     end
   end
 end

data/spec/models/notifier_spec.rb

@@ -23,22 +23,26 @@ RSpec.describe Wupee::Notifier, type: :model do
     expect(wupee_notifier.notification_type).to eq notif_type
   end
 
-  it "has a method execute to send notifications and mails depending on notification_type_configurations of the users" do
+  it "has a method execute to send notifications and mails" do
     user_1 = create :user
     user_2 = create :user
     user_3 = create :user
     user_4 = create :user
 
-    Wupee::NotificationTypeConfiguration.find_by(receiver: user_2, notification_type: notif_type).update(value: :nothing)
-    Wupee::NotificationTypeConfiguration.find_by(receiver: user_3, notification_type: notif_type).update(value: :email)
-    Wupee::NotificationTypeConfiguration.find_by(receiver: user_4, notification_type: notif_type).update(value: :notification)
-
     wupee_notifier = Wupee::Notifier.new(receivers: [user_1, user_2, user_3, user_4], notif_type: notif_type)
 
-    expect { wupee_notifier.execute }.to change { ActionMailer::Base.deliveries.size }.by(2)
-    expect { wupee_notifier.execute }.to change { Wupee::Notification.where(is_read: true).count }.by(2)
+    expect { wupee_notifier.execute }.to change { ActionMailer::Base.deliveries.size }.by(4)
+    expect { wupee_notifier.execute }.to change { Wupee::Notification.where(is_read: false).count }.by(4)
     expect { wupee_notifier.execute }.to change { Wupee::Notification.count }.by(4)
-  end
+
+    Wupee.email_sending_rule = false
+    expect { wupee_notifier.execute }.not_to change { ActionMailer::Base.deliveries.size }
+    expect { wupee_notifier.execute }.to change { Wupee::Notification.count }.by(4)
+    
+    Wupee.notification_sending_rule = false
+    expect { wupee_notifier.execute }.not_to change { Wupee::Notification.wanted.count }
+    expect { wupee_notifier.execute }.to change { Wupee::Notification.unwanted.count }.by(4)
+end
 
   it "raises ArgumentError if receiver or receivers is missing" do
     expect { Wupee::Notifier.new(notif_type: notif_type).execute }.to raise_error(ArgumentError)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wupee
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0.beta1
 platform: ruby
 authors:
 - Peng DU
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2017-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -98,13 +98,11 @@ files:
 - app/models/concerns/wupee/receiver.rb
 - app/models/wupee/notification.rb
 - app/models/wupee/notification_type.rb
-- app/models/wupee/notification_type_configuration.rb
 - app/views/wupee/api/notifications/_notification.json.jbuilder
 - app/views/wupee/api/notifications/index.json.jbuilder
 - app/views/wupee/api/notifications/show.json.jbuilder
 - config/routes.rb
 - db/migrate/20151029113100_create_wupee_notification_types.rb
-- db/migrate/20151029113101_create_wupee_notification_type_configurations.rb
 - db/migrate/20151029113107_create_wupee_notifications.rb
 - lib/generators/wupee/install/USAGE
 - lib/generators/wupee/install/install_generator.rb
@@ -175,14 +173,12 @@ files:
 - spec/factories/message.rb
 - spec/factories/notification.rb
 - spec/factories/notification_type.rb
-- spec/factories/notification_type_configuration.rb
 - spec/factories/user.rb
 - spec/mailers/notifications_mailer_spec.rb
 - spec/models/concerns/attached_object_spec.rb
 - spec/models/concerns/receiver_spec.rb
 - spec/models/message_spec.rb
 - spec/models/notification_spec.rb
-- spec/models/notification_type_configuration_spec.rb
 - spec/models/notification_type_spec.rb
 - spec/models/notifier_spec.rb
 - spec/models/user_spec.rb
@@ -205,9 +201,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8
@@ -273,14 +269,12 @@ test_files:
 - spec/factories/message.rb
 - spec/factories/notification.rb
 - spec/factories/notification_type.rb
-- spec/factories/notification_type_configuration.rb
 - spec/factories/user.rb
 - spec/mailers/notifications_mailer_spec.rb
 - spec/models/concerns/attached_object_spec.rb
 - spec/models/concerns/receiver_spec.rb
 - spec/models/message_spec.rb
 - spec/models/notification_spec.rb
-- spec/models/notification_type_configuration_spec.rb
 - spec/models/notification_type_spec.rb
 - spec/models/notifier_spec.rb
 - spec/models/user_spec.rb

data/app/models/wupee/notification_type_configuration.rb

@@ -1,17 +0,0 @@
-class Wupee::NotificationTypeConfiguration < ActiveRecord::Base
-  belongs_to :receiver, polymorphic: true
-  belongs_to :notification_type, class_name: "Wupee::NotificationType"
-
-  validates :notification_type, uniqueness: { scope: [:receiver] }
-  validates :receiver, :notification_type, presence: true
-
-  enum value: { both: 0, nothing: 1, email: 2, notification: 3 }
-
-  def wants_email?
-    ['both', 'email'].include?(value)
-  end
-
-  def wants_notification?
-    ['both', 'notification'].include?(value)
-  end
-end

data/db/migrate/20151029113101_create_wupee_notification_type_configurations.rb

@@ -1,14 +0,0 @@
-class CreateWupeeNotificationTypeConfigurations < ActiveRecord::Migration
-  def change
-    create_table :wupee_notification_type_configurations do |t|
-      t.belongs_to :notification_type
-      t.belongs_to :receiver, polymorphic: true
-      t.integer :value, default: 0
-      t.timestamps null: false
-    end
-
-    add_foreign_key :wupee_notification_type_configurations, :wupee_notification_types, column: :notification_type_id
-    add_index :wupee_notification_type_configurations, [:notification_type_id], name: "idx_wupee_notif_type_config_on_notification_type_id"
-    add_index :wupee_notification_type_configurations, [:receiver_type, :receiver_id], name: "idx_wupee_notif_typ_config_on_receiver_type_and_receiver_id"
-  end
-end

data/spec/factories/notification_type_configuration.rb

@@ -1,6 +0,0 @@
-FactoryGirl.define do
-  factory :notification_type_configuration, class: Wupee::NotificationTypeConfiguration do
-    association :receiver, factory: :user, strategy: :create
-    association :notification_type, factory: :notification_type, strategy: :create
-  end
-end

data/spec/models/notification_type_configuration_spec.rb

@@ -1,43 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe Wupee::NotificationTypeConfiguration, type: :model do
-  let!(:receiver) { create :user }
-  let!(:notification_type) { create :notification_type }
-
-  context "validations" do
-    it "validates presence of receiver" do
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new
-      notification_type_conf.valid?
-      expect(notification_type_conf.errors).to have_key :receiver
-    end
-
-    it "validates presence of notification_type" do
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new
-      notification_type_conf.valid?
-      expect(notification_type_conf.errors).to have_key :notification_type
-    end
-
-    it "validates uniqueness of [receiver, notification_type]" do
-      notification_type_conf_same = Wupee::NotificationTypeConfiguration.create(receiver: receiver, notification_type: notification_type)
-      expect(notification_type_conf_same).to be_invalid
-    end
-  end
-
-  context "methods" do
-    it "has method wants_email?" do
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new(value: :both)
-      expect(notification_type_conf.wants_email?).to eq true
-
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new(value: :email)
-      expect(notification_type_conf.wants_email?).to eq true
-    end
-
-    it "has method wants_notification?" do
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new(value: :both)
-      expect(notification_type_conf.wants_notification?).to eq true
-
-      notification_type_conf = Wupee::NotificationTypeConfiguration.new(value: :notification)
-      expect(notification_type_conf.wants_notification?).to eq true
-    end
-  end
-end