maily_herald 0.8.0 → 0.9.1

data/spec/controllers/maily_herald/tokens_controller_spec.rb

@@ -16,16 +16,16 @@ describe MailyHerald::TokensController do
     describe "when regular subscription" do
       pending "should deactivate only one subscription" do
         get :get, token: @subscription.token, use_route: :maily_herald
-        response.should redirect_to("/")
+        expect(response).to redirect_to("/")
         @subscription.reload
 
-        @subscription.active?.should_not be_true
+        expect(@subscription.active?).not_to be_true
 
         @user.maily_herald_subscriptions.each do |s|
           next unless s.target.subscription_group == @subscription.target.subscription_group
           next if s == @subscription
 
-          s.active?.should be_true
+          expect(s.active?).to be_true
         end
       end
     end
@@ -43,17 +43,17 @@ describe MailyHerald::TokensController do
 
       pending "should deactivate subscription group" do
         get :get, token: @subscription.token, use_route: :maily_herald
-        response.should redirect_to("/")
+        expect(response).to redirect_to("/")
         @subscription.reload
 
-        @subscription.active?.should_not be_true
-        @subscription.aggregate.should_not be_nil
-        @subscription.aggregate.active?.should_not be_true
+        expect(@subscription.active?).not_to be_true
+        expect(@subscription.aggregate).not_to be_nil
+        expect(@subscription.aggregate.active?).not_to be_true
 
         @user.maily_herald_subscriptions.each do |s|
           next unless s.target.subscription_group == @subscription.target.subscription_group
 
-          s.active?.should be_false
+          expect(s.active?).to be_false
         end
       end
     end
@@ -62,20 +62,20 @@ describe MailyHerald::TokensController do
   pending "Custom action" do
     before(:each) do
       @mailing.token_action = :custom
-      @mailing.should be_valid
+      expect(@mailing).to be_valid
       @mailing.save
-      @mailing.token_custom_action.should_not be_nil
+      expect(@mailing.token_custom_action).not_to be_nil
     end
 
     pending "should perform custom action" do
       @subscription.reload
-      @subscription.target.token_action.should eq(:custom)
+      expect(@subscription.target.token_action).to eq(:custom)
       get :get, token: @subscription.token, use_route: :maily_herald
-      response.should redirect_to("/custom")
+      expect(response).to redirect_to("/custom")
       @subscription.reload
       @user.reload
 
-      @user.name.should eq("changed")
+      expect(@user.name).to eq("changed")
     end
   end
 end

data/spec/dummy/app/mailers/ad_hoc_mailer.rb

@@ -0,0 +1,11 @@
+class AdHocMailer < MailyHerald::Mailer
+  default from: "no-reply@mailyherald.org"
+
+  def ad_hoc_mail user
+    mail to: user.email, subject: "Test"
+  end
+
+  def missing_mailing_mail user
+    mail to: user.email, subject: "Test", from: "foo@bar.com"
+  end
+end

data/spec/dummy/app/mailers/custom_one_time_mailer.rb

@@ -0,0 +1,11 @@
+class CustomOneTimeMailer < MailyHerald::Mailer
+  default from: "no-reply@mailyherald.org"
+
+  def one_time_mail user
+    mail to: user.email, subject: "Test"
+  end
+
+  def mail_with_error user
+    raise "This error comes from CustomOneTimeMailer#mail_with_error"
+  end
+end

data/spec/dummy/config/application.rb

@@ -29,7 +29,7 @@ module Dummy
 
     # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+    config.time_zone = 'Europe/Warsaw'
 
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]

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

@@ -28,7 +28,7 @@ Dummy::Application.configure do
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
-  ActionMailer::Base.default :from => "no-reply@foo.com>"
+  ActionMailer::Base.default from: "no-reply@foo.com>"
 
   # Raise exception on mass assignment protection for Active Record models
   config.active_record.mass_assignment_sanitizer = :strict

data/spec/dummy/config/initializers/maily_herald.rb

@@ -18,86 +18,20 @@ MailyHerald.setup do |config|
     end
   end
 
-  config.list :generic_list do |list|
+  config.list :locked_list do |list|
     list.context_name = :all_users
   end
 
-  config.list :locked_list, locked: true do |list|
+  config.list :generic_list do |list|
     list.context_name = :all_users
   end
 
-  config.one_time_mailing :locked_mailing, locked: true do |mailing|
+  config.one_time_mailing :locked_mailing do |mailing|
     mailing.enable
     mailing.title = "Test mailing"
     mailing.subject = "Test mailing"
     mailing.list = :generic_list
-    mailing.template = "User name: {{user.name}}."
-  end
-
-  config.one_time_mailing :test_mailing do |mailing|
-    mailing.enable
-    mailing.title = "Test mailing"
-    mailing.subject = "Test mailing"
-    mailing.list = :generic_list
-    mailing.template = "User name: {{user.name}}."
-  end
-
-  config.one_time_mailing :sample_mail do |mailing|
-    mailing.enable
-    mailing.title = "Sample mailing"
-    mailing.list = :generic_list
-    mailing.mailer_name = "TestMailer"
-  end
-
-  config.sequence :newsletters do |seq|
-    seq.enable
-    seq.title = "Newsletters"
-    seq.list = :generic_list
-    seq.start_at = "user.created_at"
-    seq.mailing :initial_mail do |mailing|
-      mailing.title = "Test mailing #1"
-      mailing.subject = "Test mailing #1"
-      mailing.template = "User name: {{user.name}}."
-      mailing.absolute_delay = 1.hour
-      mailing.enable
-    end
-    seq.mailing :second_mail do |mailing|
-      mailing.title = "Test mailing #2"
-      mailing.subject = "Test mailing #2"
-      mailing.template = "User name: {{user.name}}."
-      mailing.absolute_delay = 3.hours
-      mailing.enable
-    end
-    seq.mailing :third_mail do |mailing|
-      mailing.title = "Test mailing #3"
-      mailing.subject = "Test mailing #3"
-      mailing.template = "User name: {{user.name}}."
-      mailing.absolute_delay = 6.hours
-      mailing.enable
-    end
-  end
-
-  config.periodical_mailing :weekly_summary do |mailing|
-    mailing.enable
-    mailing.title = "Weekly summary"
-    mailing.subject = "Weekly summary"
     mailing.start_at = "user.created_at"
-    mailing.list = :generic_list
-    mailing.title = "Test periodical mailing"
-    mailing.template = "User name: {{user.name}}."
-    mailing.period = 7.days
-    mailing.conditions = "user.weekly_notifications"
-  end
-
-  config.periodical_mailing :weekly_summary_sg do |mailing|
-    mailing.enable
-    mailing.title = "Weekly summary"
-    mailing.subject = "Weekly summary"
-    mailing.start_at = "user.created_at"
-    mailing.list = :generic_list
-    mailing.title = "Test periodical mailing"
     mailing.template = "User name: {{user.name}}."
-    mailing.period = 7.days
-    mailing.conditions = "user.weekly_notifications"
   end
 end

data/spec/dummy/config/maily_herald.yml

@@ -0,0 +1,3 @@
+---
+:verbose: true
+:logfile: "log/maily_herald.log"

data/spec/dummy/db/seeds.rb

@@ -0,0 +1,73 @@
+load "#{Rails.root}/config/initializers/maily_herald.rb" if MailyHerald.schema_loaded? && !MailyHerald::List.any?
+
+MailyHerald.one_time_mailing :test_mailing do |mailing|
+  mailing.enable
+  mailing.title = "Test mailing"
+  mailing.subject = "Test mailing"
+  mailing.list = :generic_list
+  mailing.start_at = "user.created_at"
+  mailing.template = "User name: {{user.name}}."
+end
+
+MailyHerald.one_time_mailing :one_time_mail do |mailing|
+  mailing.enable
+  mailing.title = "One time mailing"
+  mailing.list = :generic_list
+  mailing.mailer_name = "CustomOneTimeMailer"
+  mailing.start_at = "user.created_at"
+end
+
+MailyHerald.one_time_mailing :mail_with_error do |mailing|
+  mailing.enable
+  mailing.title = "Mail with error"
+  mailing.list = :generic_list
+  mailing.mailer_name = "CustomOneTimeMailer"
+  mailing.start_at = "user.created_at"
+end
+
+MailyHerald.ad_hoc_mailing :ad_hoc_mail do |mailing|
+  mailing.enable
+  mailing.title = "Ad hoc mailing"
+  mailing.list = :generic_list
+  mailing.mailer_name = "AdHocMailer"
+end
+
+MailyHerald.sequence :newsletters do |seq|
+  seq.enable
+  seq.title = "Newsletters"
+  seq.list = :generic_list
+  seq.start_at = "user.created_at"
+  seq.mailing :initial_mail do |mailing|
+    mailing.title = "Test mailing #1"
+    mailing.subject = "Test mailing #1"
+    mailing.template = "User name: {{user.name}}."
+    mailing.absolute_delay = 1.hour
+    mailing.enable
+  end
+  seq.mailing :second_mail do |mailing|
+    mailing.title = "Test mailing #2"
+    mailing.subject = "Test mailing #2"
+    mailing.template = "User name: {{user.name}}."
+    mailing.absolute_delay = 3.hours
+    mailing.enable
+  end
+  seq.mailing :third_mail do |mailing|
+    mailing.title = "Test mailing #3"
+    mailing.subject = "Test mailing #3"
+    mailing.template = "User name: {{user.name}}."
+    mailing.absolute_delay = 6.hours
+    mailing.enable
+  end
+end
+
+MailyHerald.periodical_mailing :weekly_summary do |mailing|
+  mailing.enable
+  mailing.title = "Weekly summary"
+  mailing.subject = "Weekly summary"
+  mailing.start_at = "user.created_at"
+  mailing.list = :generic_list
+  mailing.title = "Test periodical mailing"
+  mailing.template = "User name: {{user.name}}."
+  mailing.period = 7.days
+  mailing.conditions = "user.weekly_notifications == true"
+end

data/spec/lib/context_spec.rb

@@ -17,17 +17,17 @@ describe MailyHerald::Context do
       end
 
       it "should get valid context" do
-        @context.should be_a(MailyHerald::Context)
+        expect(@context).to be_kind_of(MailyHerald::Context)
       end
 
       it "should resolve attributes properly" do
-        @drop["user"].should be_a(MailyHerald::Context::Drop)
-        @drop["user"]["name"].should eq(@user.name)
-        @drop["user"]["properties"]["prop1"].should eq(@user.name[0])
+        expect(@drop["user"]).to be_kind_of(MailyHerald::Context::Drop)
+        expect(@drop["user"]["name"]).to eq(@user.name)
+        expect(@drop["user"]["properties"]["prop1"]).to eq(@user.name[0])
       end
 
       it "should resolve subscription attributes properly" do
-        @drop["subscription"].should be_a(MailyHerald::Subscription)
+        expect(@drop["subscription"]).to be_kind_of(MailyHerald::Subscription)
       end
     end
   end
@@ -35,7 +35,7 @@ describe MailyHerald::Context do
   it "should handle both destination procs and strings" do
     @user = FactoryGirl.create :user
     context = MailyHerald.context :all_users
-    context.destination_for(@user).should eq(@user.email)
-    context.destination_attribute.should be_nil
+    expect(context.destination_for(@user)).to eq(@user.email)
+    expect(context.destination_attribute).to be_nil
   end
 end

data/spec/lib/maily_herald_spec.rb

@@ -10,23 +10,22 @@ describe MailyHerald do
       MailyHerald.context(:all_users).model.name.should eq(User.name)
       User.included_modules.should include(MailyHerald::ModelExtensions)
 
-      @user.should respond_to(:maily_herald_subscriptions)
-
-      @user.maily_herald_subscriptions.length.should be_zero
+      expect(@user).to respond_to(:maily_herald_subscriptions)
+      expect(@user.maily_herald_subscriptions.length).to eq(0)
     end
 
     it "should create mailings from initializer" do
       mailing = MailyHerald.one_time_mailing(:test_mailing)
-      mailing.should be_a MailyHerald::Mailing
-      mailing.should_not be_a_new_record
+      expect(mailing).to be_kind_of(MailyHerald::Mailing)
+      expect(mailing).not_to be_a_new_record
     end
 
     it "should create sequences from initializer" do
       sequence = MailyHerald.sequence(:newsletters)
-      sequence.should be_a MailyHerald::Sequence
-      sequence.should_not be_a_new_record
+      expect(sequence).to be_kind_of(MailyHerald::Sequence)
+      expect(sequence).not_to be_a_new_record
 
-      sequence.mailings.length.should eq(3)
+      expect(sequence.mailings.length).to eq(3)
     end
   end
 end

data/spec/lib/utils_spec.rb

@@ -11,38 +11,78 @@ describe MailyHerald::Utils do
       @evaluator = MailyHerald::Utils::MarkupEvaluator.new(@list.context.drop_for(@user, @subscription))
     end
 
-    it "should validate syntax" do
-      @mailing.conditions = "foo bar"
-      expect {@evaluator.evaluate_conditions(@mailing.conditions)}.to raise_error(Liquid::Error)
-      expect {MailyHerald::Utils::MarkupEvaluator.test_conditions(@mailing.conditions)}.to raise_error(Liquid::Error)
-    end
+    describe "conditions" do
+      it "should validate syntax" do
+        expect(@mailing).to be_valid
+        @mailing.conditions = "foo bar"
+        #expect {@evaluator.evaluate_conditions(@mailing.conditions)}.to raise_error(Liquid::Error)
+        expect(MailyHerald::Utils::MarkupEvaluator.test_conditions(@mailing.conditions)).to be_falsy
+        expect(@mailing).not_to be_valid
+        expect(@mailing.errors).to include(:conditions)
+      end
 
-    pending "should validate numerical conditions" do
-      @mailing.conditions = "(2 * 3) - 1"
-      @evaluator.evaluate_conditions(@mailing.conditions).should be_falsy
-      expect {@mailing.test_conditions}.not_to raise_error(Liquid::Error)
+      it "should validate numerical conditions" do
+        @mailing.conditions = "2"
+        expect {@mailing.conditions_met?(@user)}.to raise_error
 
-      @mailing.conditions = "2 == 3"
-      @evaluator.evaluate_conditions(@mailing.conditions).should be_falsy
-      expect {@mailing.test_conditions}.not_to raise_error(Liquid::Error)
+        @mailing.conditions = "5 == 5"
+        @evaluator.evaluate_conditions(@mailing.conditions).should be_truthy
+        expect {@mailing.conditions_met?(@user)}.not_to raise_error
 
-      @mailing.conditions = "1 * 2 + 3"
-      @evaluator.evaluate_conditions(@mailing.conditions).should be_truthy
-      expect {@mailing.test_conditions}.not_to raise_error(Liquid::Error)
-    end
+        @mailing.conditions = "2 == 3"
+        @evaluator.evaluate_conditions(@mailing.conditions).should be_falsy
+        expect {@mailing.conditions_met?(@user)}.not_to raise_error
+      end
 
-    it "should provide model conditions syntax validation" do
-      @mailing.conditions = "foo bar"
-      @mailing.should_not be_valid
-    end
+      it "should evaluate more complex conditions" do
+        expect(@user.weekly_notifications).to be_truthy
+
+        @mailing.conditions = "user.weekly_notifications == true"
+        @evaluator.evaluate_conditions(@mailing.conditions).should be_truthy
+        expect {@mailing.conditions_met?(@user)}.not_to raise_error
+
+        @mailing.conditions = "user.weekly_notifications == false"
+        @evaluator.evaluate_conditions(@mailing.conditions).should be_falsy
+        expect {@mailing.conditions_met?(@user)}.not_to raise_error
+
+        @user.weekly_notifications = false
+        expect(@user.weekly_notifications).to be_falsy
 
-    it "should evaluate attributes" do
-      expect(@evaluator.evaluate_variable("user.created_at")).to eq(@user.created_at)
+        @mailing.conditions = "user.weekly_notifications == true"
+        @evaluator.evaluate_conditions(@mailing.conditions).should be_falsy
+        expect {@mailing.conditions_met?(@user)}.not_to raise_error
+      end
+
+      it "should provide model conditions syntax validation" do
+        @mailing.should be_valid
+        @mailing.conditions = "foo bar"
+        @mailing.should_not be_valid
+      end
     end
 
-    it "should evaluate attributes without subscription" do
-      @evaluator = MailyHerald::Utils::MarkupEvaluator.new(@list.context.drop_for(@user, nil))
-      expect(@evaluator.evaluate_variable("user.created_at")).to eq(@user.created_at)
+    describe "start at" do
+      it "should validate syntax" do
+        expect(@mailing).to be_valid
+        @mailing.start_at = "- foo bar | ddd"
+        expect(MailyHerald::Utils::MarkupEvaluator.test_start_at(@mailing.start_at)).to be_falsy
+        expect(@mailing).not_to be_valid
+        expect(@mailing.errors).to include(:start_at)
+      end
+
+      it "should evaluate attributes" do
+        expect(@evaluator.evaluate_start_at("user.created_at")).to eq(@user.created_at)
+      end
+
+      it "should evaluate attributes with filters" do
+        expect(@evaluator.evaluate_start_at("user.created_at | minus: 1, 'day'")).to eq(@user.created_at - 1.day)
+
+        expect(@evaluator.evaluate_start_at("user.created_at | plus: 2, 'minutes'")).to eq(@user.created_at + 2.minutes)
+      end
+
+      it "should evaluate attributes without subscription" do
+        @evaluator = MailyHerald::Utils::MarkupEvaluator.new(@list.context.drop_for(@user, nil))
+        expect(@evaluator.evaluate_start_at("user.created_at")).to eq(@user.created_at)
+      end
     end
   end
 end