mailstro 0.0.7 → 0.0.8

data/Readme.md

@@ -45,7 +45,7 @@ Mailstro.deliver(
 Sending an email to a list of users, with subscription management.
 
 ```ruby
-Mailstro.subscribe('jack@mailstroapp.com', :build_watchers, project_id)
+Mailstro.subscribe('shanon@mailstroapp.com', :build_watchers, project_id)
 
 Mailstro.deliver(
   :to            => [:build_watchers, project_id]
@@ -55,10 +55,10 @@ Mailstro.deliver(
   }
 )
 
-Mailstro.unsubscribe('jack@mailstroapp.com', :build_watchers, project_id)
+Mailstro.unsubscribe('shanon@mailstroapp.com', :build_watchers, project_id)
 ```
 
-## RSpec Test Mode
+## RSpec
 
 Require the mailstro spec helper to automatically enable test mode.
 
@@ -75,11 +75,19 @@ Mailstro.deliver(
 )
 
 Mailstro.should have_delivered(:welcome)
+Mailstro.should have_delivered(
+  :to            => 'shanon@mailstroapp.com',
+  :template_name => :welcome
+)
 
 Mailstro.should have_subscribed('a@a.com', :watchers, 2)
 Mailstro.should have_unsubscribed('a@a.com', :watchers, 2)
-```
 
+Mailstro.should have_delivered(
+  :to            => [:build_watchers, project_name],
+  :template_name => :build_failed
+)
+```
 
 ## Contributing
 

data/lib/mailstro/rspec.rb

@@ -5,7 +5,7 @@ RSpec.configure do |config|
     Mailstro::TestStrategy.enable
   end
 
-  config.before(:each) do
+  config.after(:each) do
     Mailstro::TestStrategy.clear
   end
 end

data/lib/mailstro/test_strategy.rb

@@ -8,10 +8,6 @@ module Mailstro
     @@subscribes   = []
     @@unsubscribes = []
 
-    def self.deliveries
-      @@deliveries
-    end
-
     def self.clear
       @@deliveries   = []
       @@subscribes   = []
@@ -34,8 +30,27 @@ module Mailstro
       @@unsubscribes << ListUnsubscribe.new(contact_email, list_type, list_name)
     end
 
-    def self.has_delivered?(template_name)
-      @@deliveries.map(&:template_name).include?(template_name)
+    def self.has_delivered?(conditions)
+      @@deliveries.any? do |delivery|
+        result = true
+        if conditions.is_a?(Hash)
+          if conditions[:template_name]
+            result = result && delivery.template_name == conditions[:template_name]
+          end
+          if conditions[:to]
+            result = result && delivery.contact_email == conditions[:to]
+          end
+          if conditions[:to_list_type]
+            result = result && delivery.list_type     == conditions[:to_list_type]
+          end
+          if conditions[:to_list_name]
+            result = result && delivery.list_name     == conditions[:to_list_name]
+          end
+        else
+          result = delivery.template_name == conditions
+        end
+        result
+      end
     end
 
     def self.has_subscribed?(contact_email, list_type, list_name)

data/lib/mailstro/version.rb

@@ -1,3 +1,3 @@
 module Mailstro
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/spec/mailstro/configuration_spec.rb

@@ -14,4 +14,19 @@ describe Mailstro::Configuration do
       }.to raise_error(Mailstro::Error::ConfigurationError)
     end
   end
+
+  describe ".configure" do
+    after do
+      Mailstro.configuration = Mailstro::Configuration.new
+    end
+
+    it "allows you to pass a block to configure Mailstro" do
+      Mailstro.configure do |config|
+        config.api_key  = 'x'
+        config.api_endpoint = 'mailstro.dev'
+      end
+
+      Mailstro.configuration.api_endpoint.should == 'mailstro.dev'
+    end
+  end
 end

data/spec/mailstro/test_strategy_spec.rb

@@ -29,39 +29,77 @@ describe Mailstro::TestStrategy do
     end
   end
 
-  describe '.clear' do
-    before do
-      Mailstro.deliver(
-        :to            => 'a@a.com',
-        :template_name => :welcome
-      )
-    end
-
-    it 'empties out the .deliveries array' do
-      Mailstro::TestStrategy.deliveries.should_not be_empty
-      Mailstro::TestStrategy.clear
-
-      Mailstro::TestStrategy.deliveries.should be_empty
-    end
-  end
-
   describe '.has_delivered?' do
-    it 'keeps a record of deliveries' do
-      Mailstro.deliver(
-        :to            => 'a@a.com',
-        :template_name => :welcome
-      )
-
-      Mailstro.should have_delivered(:welcome)
+    context "with a delivery" do
+      before do
+        Mailstro.deliver(
+          :to            => 'a@a.com',
+          :template_name => :welcome
+        )
+      end
+
+      it 'matches template name' do
+        Mailstro.should have_delivered(:welcome)
+      end
+
+      it 'matches contact email and template name' do
+        Mailstro.should have_delivered(
+          :to            => 'a@a.com',
+          :template_name => :welcome,
+        )
+      end
+
+      it 'does not match an invalid template name' do
+        Mailstro.should_not have_delivered(:build_failed)
+      end
+
+      it 'does not match an invalid contact email' do
+        Mailstro.should_not have_delivered(
+          :to            => 'b@a.com',
+          :template_name => :welcome,
+        )
+      end
     end
 
-    it 'keeps a record of list deliveries' do
-      Mailstro.deliver(
-        :to            => [:list_type, 10],
-        :template_name => :welcome
-      )
-
-      Mailstro.should have_delivered(:welcome)
+    context "with a list delivery" do
+      before do
+        Mailstro.deliver(
+          :to            => [:build_watchers, 'mailstro/mailstro-ruby'],
+          :template_name => :build_failed
+        )
+      end
+
+      it "matches against list type, name and template name" do
+        Mailstro.should have_delivered(
+          :to_list_type  => :build_watchers,
+          :to_list_name  => 'mailstro/mailstro-ruby',
+          :template_name => :build_failed,
+        )
+      end
+
+      it "does not match an invalid list type" do
+        Mailstro.should_not have_delivered(
+          :to_list_type  => :customers,
+          :to_list_name  => 'mailstro/mailstro-ruby',
+          :template_name => :build_failed,
+        )
+      end
+
+      it "does not match an invalid list name" do
+        Mailstro.should_not have_delivered(
+          :to_list_type  => :build_watchers,
+          :to_list_name  => 'mailstro/mailstro',
+          :template_name => :build_failed,
+        )
+      end
+
+      it "does not match an invalid template name" do
+        Mailstro.should_not have_delivered(
+          :to_list_type  => :build_watchers,
+          :to_list_name  => 'mailstro/mailstro-ruby',
+          :template_name => :welcome,
+        )
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -7,6 +7,7 @@ Dir[SPEC_PATH.join("support/**/*.rb")].each { |f| require f }
 
 RSpec.configure do |config|
   config.after(:each) do
+    Mailstro::TestStrategy.clear
     Mailstro.strategy = Mailstro::RealStrategy
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mailstro
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -160,7 +160,6 @@ files:
 - spec/mailstro/configuration_spec.rb
 - spec/mailstro/test_strategy_spec.rb
 - spec/mailstro/version_spec.rb
-- spec/mailstro_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/webmock.rb
@@ -198,7 +197,6 @@ test_files:
 - spec/mailstro/configuration_spec.rb
 - spec/mailstro/test_strategy_spec.rb
 - spec/mailstro/version_spec.rb
-- spec/mailstro_spec.rb
 - spec/spec_helper.rb
 - spec/support/fixtures.rb
 - spec/support/webmock.rb

data/spec/mailstro_spec.rb

@@ -1,19 +0,0 @@
-require 'spec_helper'
-
-describe Mailstro do
-
-  after do
-    Mailstro.configuration = Mailstro::Configuration.new
-  end
-
-  describe ".configure" do
-    it "allows you to pass a block to configure Mailstro" do
-      Mailstro.configure do |config|
-        config.api_key  = 'x'
-        config.api_endpoint = 'mailstro.dev'
-      end
-
-      Mailstro.configuration.api_endpoint.should == 'mailstro.dev'
-    end
-  end
-end