email_spec 1.5.0 → 1.6.0

data/History.txt

@@ -1,4 +1,11 @@
-== 1.5.0 2012-07-22
+== 1.6.0 2014-05-27
+
+  * New RSpec matcher API support (Morton Jonuschat)
+  * Turnip Doc updates (Joshua Muheim)
+  * Use Mail#destination for picking recipients (Lukasz Strzalkowski)
+  * Emails deliver to nobody when perform_deliveries is set to false (Sean Griffin)
+
+== 1.5.0 2013-07-22
 
   * Upgraded use of Capybara to avoid deprecation warnings.
   * Upgraded use of RSpec to deal with new expect API (Thomas Drake-Brockman)

data/README.md

@@ -131,6 +131,10 @@ describe SignupMailer do
 end
 ```
 
+### Turnip
+
+If you're using [Turnip](https://github.com/jnicklas/turnip), you might be interested in this [conversion of the Cucumber steps into Turnip steps](https://github.com/jmuheim/transition/blob/master/spec/support/steps/email_steps.rb).
+
 ## Usage
 
 ### Cucumber
@@ -329,7 +333,7 @@ And of course you can use the matcher as an assertion:
 
 ```ruby
 email = UserMailer.create_signup "jojo@yahoo.com", "Jojo Binks"
-assert_must_deliver_to "jojo@yahoo.com", email
+assert_must deliver_to("jojo@yahoo.com"), email
 ```
 
 

data/lib/email_spec/deliveries.rb

@@ -17,10 +17,7 @@ module EmailSpec
     end
 
     def mailbox_for(address)
-      deliveries.select { |email|
-        (email.to && email.to.include?(address)) ||
-        (email.bcc && email.bcc.include?(address)) ||
-        (email.cc && email.cc.include?(address)) }
+      deliveries.select { |email| email.destinations.include?(address) }
     end
 
     protected
@@ -41,7 +38,7 @@ module EmailSpec
 
     def last_email_sent
       if email = Email.last
-        Mail.read(email.mail)
+        parse_to_mail(email)
       else
         raise("No email has been sent!")
       end
@@ -52,10 +49,7 @@ module EmailSpec
     end
 
     def mailbox_for(address)
-      Email.all.select { |email|
-        (email.to && email.to.include?(address)) ||
-        (email.bcc && email.bcc.include?(address)) ||
-        (email.cc && email.cc.include?(address)) }.map{ |email| parse_to_mail(email) }
+      Email.all.select { |email| email.destinations.include?(address) }.map{ |email| parse_to_mail(email) }
     end
 
     def parse_to_mail(email)

data/lib/email_spec/helpers.rb

@@ -1,4 +1,4 @@
-  require 'uri'
+require 'uri'
 require 'email_spec/deliveries'
 
 module EmailSpec
@@ -180,4 +180,3 @@ module EmailSpec
 
   end
 end
-

data/lib/email_spec/matchers.rb

@@ -1,5 +1,15 @@
 module EmailSpec
   module Matchers
+    class EmailMatcher
+      def address_array
+        if @email.perform_deliveries
+          Array(yield)
+        else
+          []
+        end
+      end
+    end
+
     class ReplyTo
       def initialize(email)
         @expected_reply_to = Mail::ReplyToField.new(email).addrs.first
@@ -20,9 +30,10 @@ module EmailSpec
         "expected #{@email.inspect} to reply to #{@expected_reply_to.address.inspect}, but it replied to #{@actual_reply_to.inspect}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected #{@email.inspect} not to deliver to #{@expected_reply_to.address.inspect}, but it did"
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def reply_to(email)
@@ -31,7 +42,7 @@ module EmailSpec
 
     alias :have_reply_to :reply_to
 
-    class DeliverTo
+    class DeliverTo < EmailMatcher
       def initialize(expected_email_addresses_or_objects_that_respond_to_email)
         emails = expected_email_addresses_or_objects_that_respond_to_email.map do |email_or_object|
           email_or_object.kind_of?(String) ? email_or_object : email_or_object.email
@@ -46,7 +57,7 @@ module EmailSpec
 
       def matches?(email)
         @email = email
-        @actual_recipients = (email.header[:to].addrs || []).map(&:to_s).sort
+        @actual_recipients = address_array{ email.header[:to].addrs }.map(&:to_s).sort
         @actual_recipients == @expected_recipients
       end
 
@@ -54,9 +65,10 @@ module EmailSpec
         "expected #{@email.inspect} to deliver to #{@expected_recipients.inspect}, but it delivered to #{@actual_recipients.inspect}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected #{@email.inspect} not to deliver to #{@expected_recipients.inspect}, but it did"
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def deliver_to(*expected_email_addresses_or_objects_that_respond_to_email)
@@ -65,7 +77,7 @@ module EmailSpec
 
     alias :be_delivered_to :deliver_to
 
-    class DeliverFrom
+    class DeliverFrom < EmailMatcher
 
       def initialize(email)
         @expected_sender = Mail::FromField.new(email).addrs.first
@@ -77,7 +89,7 @@ module EmailSpec
 
       def matches?(email)
         @email = email
-        @actual_sender = (email.header[:from].addrs || []).first
+        @actual_sender = address_array{ email.header[:from].addrs }.first
 
         !@actual_sender.nil? &&
           @actual_sender.to_s == @expected_sender.to_s
@@ -87,9 +99,10 @@ module EmailSpec
         %(expected #{@email.inspect} to deliver from "#{@expected_sender.to_s}", but it delivered from "#{@actual_sender.to_s}")
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         %(expected #{@email.inspect} not to deliver from "#{@expected_sender.to_s}", but it did)
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def deliver_from(email)
@@ -98,7 +111,7 @@ module EmailSpec
 
     alias :be_delivered_from :deliver_from
 
-    class BccTo
+    class BccTo < EmailMatcher
 
       def initialize(expected_email_addresses_or_objects_that_respond_to_email)
         emails = expected_email_addresses_or_objects_that_respond_to_email.map do |email_or_object|
@@ -114,7 +127,7 @@ module EmailSpec
 
       def matches?(email)
         @email = email
-        @actual_recipients = (Array(email.bcc) || []).sort
+        @actual_recipients = address_array{ email.bcc }.sort
         @actual_recipients == @expected_email_addresses
       end
 
@@ -122,16 +135,17 @@ module EmailSpec
         "expected #{@email.inspect} to bcc to #{@expected_email_addresses.inspect}, but it was bcc'd to #{@actual_recipients.inspect}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected #{@email.inspect} not to bcc to #{@expected_email_addresses.inspect}, but it did"
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def bcc_to(*expected_email_addresses_or_objects_that_respond_to_email)
       BccTo.new(expected_email_addresses_or_objects_that_respond_to_email.flatten)
     end
 
-    class CcTo
+    class CcTo < EmailMatcher
 
       def initialize(expected_email_addresses_or_objects_that_respond_to_email)
         emails = expected_email_addresses_or_objects_that_respond_to_email.map do |email_or_object|
@@ -147,7 +161,7 @@ module EmailSpec
 
       def matches?(email)
         @email = email
-        @actual_recipients = (Array(email.cc) || []).sort
+        @actual_recipients = address_array { email.cc }.sort
         @actual_recipients == @expected_email_addresses
       end
 
@@ -155,9 +169,10 @@ module EmailSpec
         "expected #{@email.inspect} to cc to #{@expected_email_addresses.inspect}, but it was cc'd to #{@actual_recipients.inspect}"
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         "expected #{@email.inspect} not to cc to #{@expected_email_addresses.inspect}, but it did"
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def cc_to(*expected_email_addresses_or_objects_that_respond_to_email)
@@ -195,13 +210,14 @@ module EmailSpec
         end
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         if @expected_subject.is_a?(String)
           "expected the subject not to be #{@expected_subject.inspect} but was"
         else
           "expected the subject not to match #{@expected_subject.inspect} but #{@given_subject.inspect} does match it."
         end
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def have_subject(subject)
@@ -239,13 +255,14 @@ module EmailSpec
         end
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         if @expected_subject.is_a?(String)
           "expected no email with the subject #{@expected_subject.inspect} but found at least one. Subjects were #{@given_emails.map(&:subject).inspect}"
         else
           "expected no email to have a subject matching #{@expected_subject.inspect} but found at least one. Subjects were #{@given_emails.map(&:subject).inspect}"
         end
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def include_email_with_subject(*emails)
@@ -285,13 +302,14 @@ module EmailSpec
         end
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         if @expected_text.is_a?(String)
           "expected the body not to contain #{@expected_text.inspect} but was #{@given_text.inspect}"
         else
           "expected the body not to match #{@expected_text.inspect} but #{@given_text.inspect} does match it."
         end
       end
+      alias negative_failure_message failure_message_when_negated
     end
 
     def have_body_text(text)
@@ -329,13 +347,14 @@ module EmailSpec
         end
       end
 
-      def negative_failure_message
+      def failure_message_when_negated
         if @expected_value.is_a?(String)
           "expected the headers not to include '#{@expected_name}: #{@expected_value}' but they were #{mail_headers_hash(@given_header).inspect}"
         else
           "expected the headers not to include '#{@expected_name}' with a value matching #{@expected_value.inspect} but they were #{mail_headers_hash(@given_header).inspect}"
         end
       end
+      alias negative_failure_message failure_message_when_negated
 
       def mail_headers_hash(email_headers)
         email_headers.fields.inject({}) { |hash, field| hash[field.field.class::FIELD_NAME] = field.to_s; hash }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-22 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: launchy
@@ -189,22 +189,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -315,7 +299,8 @@ files:
 - rails_generators/email_spec/email_spec_generator.rb
 - rails_generators/email_spec/templates/email_steps.rb
 homepage: http://github.com/bmabey/email-spec/
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths: