email_spec 0.3.7 → 0.3.8

data/History.txt

@@ -4,6 +4,10 @@
 
  === Bufixes
 
+== 0.3.8 2009-12-23
+
+ === Bufixes
+    * Guard against cc and bcc fields being nil for ActionMailer. (Piotr Sarnacki)
 
 == 0.3.7 2009-12-17
 

data/examples/rails_root/features/step_definitions/email_steps.rb

@@ -87,13 +87,34 @@ end
 #
 
 Then /^(?:I|they) should see "([^"]*?)" in the email subject$/ do |text|
+  current_email.should have_subject(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
   current_email.should have_subject(Regexp.new(text))
 end
 
 Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
+  current_email.body.should include(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
   current_email.body.should =~ Regexp.new(text)
 end
 
+Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
+  current_email.should be_delivered_from(text)
+end
+
+Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, text)
+end
+
+Then /^(?:I|they) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, Regexp.new(text))
+end
+
+
 # DEPRECATED
 # The following methods are left in for backwards compatibility and
 # should be removed by version 0.4.0.

data/examples/rails_root/log/test.log

@@ -340,3 +340,331 @@ Processing WelcomeController#signup (for 0.0.0.0 at 2009-12-16 23:20:18) [POST]
   Parameters: {"Name"=>"Jimmy Bean", "Email"=>"email@example.com"}
 Rendering welcome/signup
 Completed in 3ms (View: 0, DB: 0) | 200 OK [http://test.host/welcome/signup?Email=email%40example.com&Name=Jimmy+Bean]
+  SQL (0.7ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to CreateUsers (20090125013728)
+Migrating to CreateDelayedJobs (20090908054656)
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   PRAGMA index_list("delayed_jobs")
+  SQL (0.1ms)   PRAGMA index_list("users")
+REQUESTING PAGE: GET http://www.example.com/newsletter?Email=example%40example.com&Name=Joe+Someone with {} and HTTP headers {}
+
+
+Processing WelcomeController#newsletter (for 127.0.0.1 at 2009-12-23 18:33:56) [GET]
+  Parameters: {"Name"=>"Joe Someone", "Email"=>"example@example.com"}
+  Delayed::Job Create (0.4ms)   INSERT INTO "delayed_jobs" ("locked_by", "updated_at", "handler", "priority", "run_at", "locked_at", "last_error", "attempts", "failed_at", "created_at") VALUES(NULL, '2009-12-24 01:33:56', '--- !ruby/struct:Delayed::PerformableMethod 
+object: CLASS:UserMailer
+method: :deliver_newsletter
+args: 
+- example@example.com
+- Joe Someone
+', 0, '2009-12-24 01:33:56', NULL, NULL, 0, NULL, '2009-12-24 01:33:56')
+Rendering welcome/newsletter
+Completed in 281ms (View: 3, DB: 20) | 200 OK [http://www.example.com/newsletter?Email=example%40example.com&Name=Joe+Someone]
+* [JOB] acquiring lock on UserMailer.deliver_newsletter
+  Delayed::Job Update (0.1ms)   UPDATE "delayed_jobs" SET locked_at = '2009-12-24 01:33:56', locked_by = 'host:Benz pid:5059' WHERE (id = 1 and (locked_at is null or locked_at < '2009-12-23 21:33:56') and (run_at <= '2009-12-24 01:33:56')) 
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:56 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Newsletter sent
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello Joe Someone!
+
+This week.....
+.....
+.....
+
+Regards
+Rails Example App
+  Delayed::Job Destroy (0.1ms)   DELETE FROM "delayed_jobs" WHERE "id" = 1
+* [JOB] UserMailer.deliver_newsletter completed after 0.0048
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:56) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 2, DB: 2) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:56) [POST]
+  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:56 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello !
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 5ms (View: 1, DB: 1) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:56) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 2, DB: 103) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:56) [POST]
+  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:56 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello !
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 5ms (View: 0, DB: 2) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 1, DB: 318) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello !
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 5ms (View: 1, DB: 1) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 2, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello !
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 4ms (View: 0, DB: 1) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 2, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello !
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 4ms (View: 1, DB: 1) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 1, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello Joe Someone!
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 4ms (View: 0, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
+
+
+Processing WelcomeController#confirm (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/confirm
+Completed in 2ms (View: 1, DB: 2) | 200 OK [http://www.example.com/confirm]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 1, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello Joe Someone!
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 4ms (View: 1, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
+
+
+Processing WelcomeController#confirm (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/confirm
+Completed in 1ms (View: 0, DB: 2) | 200 OK [http://www.example.com/confirm]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 1, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello Joe Someone!
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 4ms (View: 0, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
+
+
+Processing WelcomeController#confirm (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/confirm
+Completed in 1ms (View: 0, DB: 1) | 200 OK [http://www.example.com/confirm]
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+
+
+Processing WelcomeController#index (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/index
+Completed in 2ms (View: 1, DB: 1) | 200 OK [http://www.example.com/]
+REQUESTING PAGE: POST /welcome/signup with {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+
+
+Processing WelcomeController#signup (for 127.0.0.1 at 2009-12-23 18:33:57) [POST]
+  Parameters: {"Name"=>"Joe Someone", "commit"=>"Sign up", "Email"=>"example@example.com"}
+Sent mail to example@example.com
+
+Date: Wed, 23 Dec 2009 18:33:57 -0700
+From: admin@example.com
+To: example@example.com
+Subject: Account confirmation
+Mime-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+
+Hello Joe Someone!
+
+<a href="http://example.com/confirm">Click here to confirm your account!</a>
+Rendering welcome/signup
+Completed in 6ms (View: 0, DB: 0) | 200 OK [http://www.example.com/welcome/signup]
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/welcome/signup"}
+
+
+Processing WelcomeController#confirm (for 127.0.0.1 at 2009-12-23 18:33:57) [GET]
+Rendering welcome/confirm
+Completed in 1ms (View: 0, DB: 1) | 200 OK [http://www.example.com/confirm]
+  SQL (0.6ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+Migrating to CreateUsers (20090125013728)
+Migrating to CreateDelayedJobs (20090908054656)
+  SQL (0.2ms)   select sqlite_version(*)
+  SQL (0.3ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.2ms)   SELECT version FROM schema_migrations
+  SQL (0.2ms)    SELECT name
+ FROM sqlite_master
+ WHERE type = 'table' AND NOT name = 'sqlite_sequence'
+
+  SQL (0.1ms)   PRAGMA index_list("delayed_jobs")
+  SQL (0.1ms)   PRAGMA index_list("users")
+
+
+Processing WelcomeController#signup (for 0.0.0.0 at 2009-12-23 18:34:08) [POST]
+  Parameters: {"Name"=>"Jimmy Bean", "Email"=>"email@example.com"}
+Rendering welcome/signup
+Completed in 2ms (View: 0, DB: 0) | 200 OK [http://test.host/welcome/signup?Email=email%40example.com&Name=Jimmy+Bean]

data/examples/rails_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb

@@ -87,13 +87,34 @@ end
 #
 
 Then /^(?:I|they) should see "([^"]*?)" in the email subject$/ do |text|
+  current_email.should have_subject(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
   current_email.should have_subject(Regexp.new(text))
 end
 
 Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
+  current_email.body.should include(text)
+end
+
+Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
   current_email.body.should =~ Regexp.new(text)
 end
 
+Then /^(?:I|they) should see the email delivered from "([^"]*?)"$/ do |text|
+  current_email.should be_delivered_from(text)
+end
+
+Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, text)
+end
+
+Then /^(?:I|they) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
+  current_email.should have_header(name, Regexp.new(text))
+end
+
+
 # DEPRECATED
 # The following methods are left in for backwards compatibility and
 # should be removed by version 0.4.0.

data/examples/sinatra/webrat.log

@@ -21,3 +21,25 @@ REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup
 REQUESTING PAGE: GET / with {} and HTTP headers {}
 REQUESTING PAGE: POST /signup with {"user[name]"=>"Joe Someone", "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
 REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>nil, "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>nil, "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>nil, "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>nil, "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>nil, "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>"Joe Someone", "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>"Joe Someone", "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>"Joe Someone", "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup"}
+REQUESTING PAGE: GET / with {} and HTTP headers {}
+REQUESTING PAGE: POST /signup with {"user[name]"=>"Joe Someone", "user[email]"=>"example@example.com"} and HTTP headers {"HTTP_REFERER"=>"/"}
+REQUESTING PAGE: GET /confirm with {} and HTTP headers {"HTTP_REFERER"=>"/signup"}

data/lib/email_spec/deliveries.rb

@@ -35,7 +35,10 @@ module EmailSpec
     end
 
     def mailbox_for(address)
-      Email.all.select { |email| email.to.include?(address) || email.bcc.include?(address) || email.cc.include?(address) }.map{ |email| parse_to_tmail(email) }
+      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_tmail(email) }
     end
 
     def parse_to_tmail(email)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors: 
 - Ben Mabey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 -07:00
+date: 2009-12-23 00:00:00 -07:00
 default_executable: 
 dependencies: []