email_spec 0.6.3 → 0.6.4

data/History.txt

@@ -3,6 +3,11 @@ This is the Rails 2 compatible branch/gem.
 
 == 0.6.x (git)
 
+== 0.6.4
+
+ === Bugfixes
+  * Updates the matchers to use RSpec's new API instead of deprecated simple_matcher. (Aaron Gibralter)
+
 == 0.6.3
 
  === Bugfixes
@@ -33,7 +38,7 @@ This is the Rails 2 compatible branch/gem.
  === Changes
   * Deprecated steps were removed. (Kieran Pilkington)
 
- === Bufixes
+ === Bugfixes
 
 == 0.5.0 2010-02-22
 
@@ -46,10 +51,10 @@ This is the Rails 2 compatible branch/gem.
     * "save and open all html emails"
     * "save and open all raw emails"
 
- === Bufixes
+ === Bugfixes
   * Gracefully handle cases where emails do not have a 'to' value. (Kieran Pilkington)
 
- === Bufixes
+ === Bugfixes
 
 == 0.4.0 2010-01-07
 
@@ -57,12 +62,12 @@ This is the Rails 2 compatible branch/gem.
     * Added support for action_mailer_cache_delivery plugin. (Dan Dofter)
       You must use the fork at: http://github.com/liangzan/action_mailer_cache_delivery
 
- === Bufixes
+ === Bugfixes
     * be_delivered_from matcher now compares both sender name and email address. (Dan Dofter)
 
 == 0.3.8 2009-12-23
 
- === Bufixes
+ === Bugfixes
     * Guard against cc and bcc fields being nil for ActionMailer. (Piotr Sarnacki)
 
 == 0.3.7 2009-12-17
@@ -122,7 +127,7 @@ Big shoutout to Kieran Pilkington who did the majority of work for this release.
     * Then /^I should not receive any emails?$/
     * When %r{^"([^"]*?)" opens? the email$} do |address|
 
- === Bufixes
+ === Bugfixes
 
  == 0.2.1 2009-5-29
 
@@ -138,19 +143,19 @@ No changes. Bumping version for RubyForge release.
 
  == 0.1.4 2009-5-29
 
- === Bufixes
+ === Bugfixes
   * Require deliveries in the helpers so it doesn't blow up with RSpec. (Craig Webster)
 
  == 0.1.3 2009-4-15
 
- === Bufixes
+ === Bugfixes
   * Fixed regular expressions in genertaed steps. (Ben Mabey)
   * World semantics changed in cucumber (0.2.3.2), email_spec now uses the new API. (Hector Morales)
 
  == 0.1.2 2009-4-05
 
  === New features
- === Bufixes
+ === Bugfixes
   * Actually added the renamed generators to the gem so people could use it! D'oh! (Ben Mabey)
     * You can either use "./script generate email_spec" or "rubigen rails email_spec"
   * Removed Rake tasks from example application to prevent conflicts when used as a plugin. (Ben Mabey)
@@ -159,7 +164,7 @@ No changes. Bumping version for RubyForge release.
  === New features
   * Switched dir structure over to support rubigen. (Dr. Nic)
 
- === Bufixes
+ === Bugfixes
 
  == 0.1.0 2009-3-25
  === New features
@@ -181,7 +186,7 @@ No changes. Bumping version for RubyForge release.
        end
       end
 
-=== Bufixes
+=== Bugfixes
  * Revert parse_email_for_link helper method to allow for text links as well as explicit link finding. (Mischa Fierer)
  * Isolated variances between using email-spec with an ARMailer project. (Luke Melia)
 

data/lib/email_spec/matchers.rb

@@ -132,86 +132,89 @@ module EmailSpec
       BccTo.new(expected_email_addresses_or_objects_that_respond_to_email.flatten)
     end
 
-    def have_subject(expected)
-      simple_matcher do |given, matcher|
+    Spec::Matchers.define :have_subject do
+      match do |given|
         given_subject = given.subject
+        expected_subject = expected.first
 
-        if expected.is_a?(String)
-          matcher.description = "have subject of #{expected.inspect}"
-          matcher.failure_message = "expected the subject to be #{expected.inspect} but was #{given_subject.inspect}"
-          matcher.negative_failure_message = "expected the subject not to be #{expected.inspect} but was"
+        if expected_subject.is_a?(String)
+          description { "have subject of #{expected_subject.inspect}" }
+          failure_message_for_should { "expected the subject to be #{expected_subject.inspect} but was #{given_subject.inspect}" }
+          failure_message_for_should_not { "expected the subject not to be #{expected_subject.inspect} but was" }
 
-          given_subject == expected
+          given_subject == expected_subject
         else
-          matcher.description = "have subject matching #{expected.inspect}"
-          matcher.failure_message = "expected the subject to match #{expected.inspect}, but did not.  Actual subject was: #{given_subject.inspect}"
-          matcher.negative_failure_message = "expected the subject not to match #{expected.inspect} but #{given_subject.inspect} does match it."
+          description { "have subject matching #{expected_subject.inspect}" }
+          failure_message_for_should { "expected the subject to match #{expected_subject.inspect}, but did not.  Actual subject was: #{given_subject.inspect}" }
+          failure_message_for_should_not { "expected the subject not to match #{expected_subject.inspect} but #{given_subject.inspect} does match it." }
 
-          !!(given_subject =~ expected)
+          !!(given_subject =~ expected_subject)
         end
       end
     end
 
-    def include_email_with_subject(expected)
-      simple_matcher do |given_emails, matcher|
+    Spec::Matchers.define :include_email_with_subject do
+      match do |given_emails|
+        expected_subject = expected.first
 
-        if expected.is_a?(String)
-          matcher.description = "include email with subject of #{expected.inspect}"
-          matcher.failure_message = "expected at least one email to have the subject #{expected.inspect} but none did. Subjects were #{given_emails.map(&:subject).inspect}"
-          matcher.negative_failure_message = "expected no email with the subject #{expected.inspect} but found at least one. Subjects were #{given_emails.map(&:subject).inspect}"
+        if expected_subject.is_a?(String)
+          description { "include email with subject of #{expected_subject.inspect}" }
+          failure_message_for_should { "expected at least one email to have the subject #{expected_subject.inspect} but none did. Subjects were #{given_emails.map(&:subject).inspect}" }
+          failure_message_for_should_not { "expected no email with the subject #{expected_subject.inspect} but found at least one. Subjects were #{given_emails.map(&:subject).inspect}" }
 
-          given_emails.map(&:subject).include?(expected)
+          given_emails.map(&:subject).include?(expected_subject)
         else
-          matcher.description = "include email with subject matching #{expected.inspect}"
-          matcher.failure_message = "expected at least one email to have a subject matching #{expected.inspect}, but none did. Subjects were #{given_emails.map(&:subject).inspect}"
-          matcher.negative_failure_message = "expected no email to have a subject matching #{expected.inspect} but found at least one. Subjects were #{given_emails.map(&:subject).inspect}"
+          description { "include email with subject matching #{expected_subject.inspect}" }
+          failure_message_for_should { "expected at least one email to have a subject matching #{expected_subject.inspect}, but none did. Subjects were #{given_emails.map(&:subject).inspect}" }
+          failure_message_for_should_not { "expected no email to have a subject matching #{expected_subject.inspect} but found at least one. Subjects were #{given_emails.map(&:subject).inspect}" }
 
-          !!(given_emails.any?{ |mail| mail.subject =~ expected })
+          !!(given_emails.any?{ |mail| mail.subject =~ expected_subject })
         end
       end
     end
 
-    def have_body_text(expected)
-      simple_matcher do |given, matcher|
+    Spec::Matchers.define :have_body_text do
+      match do |given|
+        expected_text = expected.first
 
-        if expected.is_a?(String)
+        if expected_text.is_a?(String)
           normalized_body = given.body.gsub(/\s+/, " ")
-          normalized_expected = expected.gsub(/\s+/, " ")
-          matcher.description = "have body including #{normalized_expected.inspect}"
-          matcher.failure_message = "expected the body to contain #{normalized_expected.inspect} but was #{normalized_body.inspect}"
-          matcher.negative_failure_message = "expected the body not to contain #{normalized_expected.inspect} but was #{normalized_body.inspect}"
+          normalized_expected = expected_text.gsub(/\s+/, " ")
+          description { "have body including #{normalized_expected.inspect}" }
+          failure_message_for_should { "expected the body to contain #{normalized_expected.inspect} but was #{normalized_body.inspect}" }
+          failure_message_for_should_not { "expected the body not to contain #{normalized_expected.inspect} but was #{normalized_body.inspect}" }
 
           normalized_body.include?(normalized_expected)
         else
           given_body = given.body
-          matcher.description = "have body matching #{expected.inspect}"
-          matcher.failure_message = "expected the body to match #{expected.inspect}, but did not.  Actual body was: #{given_body.inspect}"
-          matcher.negative_failure_message = "expected the body not to match #{expected.inspect} but #{given_body.inspect} does match it."
+          description { "have body matching #{expected_text.inspect}" }
+          failure_message_for_should { "expected the body to match #{expected_text.inspect}, but did not.  Actual body was: #{given_body.inspect}" }
+          failure_message_for_should_not { "expected the body not to match #{expected_text.inspect} but #{given_body.inspect} does match it." }
 
-          !!(given_body =~ expected)
+          !!(given_body =~ expected_text)
         end
       end
     end
 
-    def have_header(expected_name, expected_value)
-      simple_matcher do |given, matcher|
+    Spec::Matchers.define :have_header do
+      match do |given|
         given_header = given.header
+        expected_name, expected_value = *expected
 
         if expected_value.is_a?(String)
-          matcher.description = "have header #{expected_name}: #{expected_value}"
-          matcher.failure_message = "expected the headers to include '#{expected_name}: #{expected_value}' but they were #{given_header.inspect}"
-          matcher.negative_failure_message = "expected the headers not to include '#{expected_name}: #{expected_value}' but they were #{given_header.inspect}"
+          description { "have header #{expected_name}: #{expected_value}" }
+          failure_message_for_should { "expected the headers to include '#{expected_name}: #{expected_value}' but they were #{given_header.inspect}" }
+          failure_message_for_should_not { "expected the headers not to include '#{expected_name}: #{expected_value}' but they were #{given_header.inspect}" }
 
           given_header[expected_name].to_s == expected_value
         else
-          matcher.description = "have header #{expected_name} with value matching #{expected_value.inspect}"
-          matcher.failure_message = "expected the headers to include '#{expected_name}' with a value matching #{expected_value.inspect} but they were #{given_header.inspect}"
-          matcher.negative_failure_message = "expected the headers not to include '#{expected_name}' with a value matching #{expected_value.inspect} but they were #{given_header.inspect}"
+          description { "have header #{expected_name} with value matching #{expected_value.inspect}" }
+          failure_message_for_should { "expected the headers to include '#{expected_name}' with a value matching #{expected_value.inspect} but they were #{given_header.inspect}" }
+          failure_message_for_should_not { "expected the headers not to include '#{expected_name}' with a value matching #{expected_value.inspect} but they were #{given_header.inspect}" }
 
           given_header[expected_name].to_s =~ expected_value
         end
       end
     end
-
   end
 end

data/spec/email_spec/helpers_spec.rb

@@ -16,7 +16,7 @@ describe EmailSpec::Helpers do
     end
 
     it "causes a spec to fail if the body doesn't contain the text specified to click" do
-      email = stub(:has_body_text? => false)
+      email = stub(:has_body_text? => false, :body => "hello")
       lambda { parse_email_for_link(email, "non-existent text") }.should raise_error(Spec::Expectations::ExpectationNotMetError)
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: email_spec
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Ben Mabey
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -06:00
+date: 2010-10-06 00:00:00 -06:00
 default_executable: 
 dependencies: []