bmabey-email_spec 0.0.10 → 0.1.0

data/History.txt

@@ -1,6 +1,12 @@
 (In Git)
 
  === New features 
+ === Bufixes
+
+ == 0.1.0 2008-3-25
+ === New features 
+	* Change Rakefile to run all specs and features, as well as prepare the db (Mischa Fierer)
+  * Allow for array to be passed into deliver_to matcher. (Diego Carrion)
   * Added matcher for checking if a collection of emails includes an email with a particular subject (Luke Melia, Noah Davis)
   * Introduced hook to convert objects to email addresses (Luke Melia and Lee Bankewitz)
 
@@ -18,6 +24,7 @@
       end
 
 === Bufixes
+ * 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/Rakefile

@@ -33,9 +33,19 @@ task :generate do
   system "cd #{current_dir}/examples/rails_root && ./script/generate email_spec"
 end
 
-task :features => [:generate] do
-  system("cucumber examples/rails_root/features")
+task :migrate do
+	system("cd examples/rails_root/ && rake db:test:prepare")
 end
 
-task :default => :features
+task :features => :generate do
+  system("cucumber examples/rails_root/")
+  puts "4 steps should fail.\n\n"
+end
+
+task :specs do
+  system("spec examples/rails_root -c --format nested")
+  system("spec spec -c --format nested")
+end
+
+task :default => [:migrate, :features, :specs]
 

data/examples/rails_root/db/schema.rb

@@ -12,10 +12,8 @@
 ActiveRecord::Schema.define(:version => 20090125013728) do
 
   create_table "users", :force => true do |t|
-    t.string   "email"
-    t.string   "name"
-    t.string   "confirm_code"
-    t.datetime "confirmed_at"
+    t.string "email"
+    t.string "name"
   end
 
 end

data/examples/rails_root/features/example.feature

@@ -26,7 +26,7 @@ Scenario: A new person signs up imperatively
     And I should see "Quentin Jones" in the email
     And I should see "Account confirmation" in the subject
 
-    When I follow "confirm" in the email
+    When I follow "Click here to confirm your account!" in the email
     Then I should see "Confirm your new account"
 
 
@@ -43,7 +43,7 @@ Scenario: slightly more declarative, but still mostly imperative
     When I open the email
     Then I should see "Account confirmation" in the subject
 
-    When I follow "confirm" in the email
+    When I follow "http:///confirm" in the email
     Then I should see "Confirm your new account"
 
 
@@ -56,3 +56,4 @@ Scenario: slightly more declarative, but still mostly imperative
 
 
 
+

data/lib/email_spec/helpers.rb

@@ -95,27 +95,34 @@ module EmailSpec
       email_spec_hash[:current_email] = email
     end
         
-    def parse_email_for_link(email, link_text_or_regex)
-      email.should have_body_text(link_text_or_regex)
-      regex = link_text_or_regex
+    def parse_email_for_link(email, text_or_regex)
+      email.should have_body_text(text_or_regex)
+      
+      url = parse_email_for_explicit_link(email, text_or_regex) 
+      url ||= parse_email_for_anchor_text_link(email, text_or_regex)
+
+      raise "No link found matching #{text_or_regex.inspect} in #{email}" unless url
+      url
+    end
+    
+    # e.g. confirm in http://confirm
+    def parse_email_for_explicit_link(email, regex)
       regex = /#{Regexp.escape(regex)}/ unless regex.is_a?(Regexp)
       url = links_in_email(email).detect { |link| link =~ regex }
-      raise "No link found matching #{regex.inspect} in #{email}" unless url
-      URI::parse(url).request_uri
-      # 
-      # if link_text =~ %r{^/.*$}
-      #   # if it's an explicit link
-      #   link_text
-      # elsif email.body =~ %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?#{link_text}[^<]*?</a>}
-      #   # if it's an anchor tag
-      #   URI.split($~[1])[5..-1].compact!.join("?").gsub("&amp;", "&")
-      #   # sub correct ampersand after rails switches it (http://dev.rubyonrails.org/ticket/4002) 
-      #   # TODO: outsource this kind of parsing to webrat or someone else
-      # end
+      URI::parse(url).request_uri if url
     end
     
+    # e.g. Click here in  <a href="http://confirm">Click here</a>
+    def parse_email_for_anchor_text_link(email, link_text)
+      email.body =~ %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*?>[^<]*?#{link_text}[^<]*?</a>}
+      URI.split($~[1])[5..-1].compact!.join("?").gsub("&amp;", "&")
+      # sub correct ampersand after rails switches it (http://dev.rubyonrails.org/ticket/4002) 
+    end
+
+    
     def convert_address(address)
       AddressConverter.instance.convert(address)
     end
   end
 end
+

data/lib/email_spec/matchers.rb

@@ -32,7 +32,7 @@ module EmailSpec
     end
 
     def deliver_to(*expected_email_addresses_or_objects_that_respond_to_email)
-      DeliverTo.new(expected_email_addresses_or_objects_that_respond_to_email)
+      DeliverTo.new(expected_email_addresses_or_objects_that_respond_to_email.flatten)
     end
 
     alias :be_delivered_to :deliver_to

data/spec/email_spec/matchers_spec.rb

@@ -59,6 +59,12 @@ describe EmailSpec::Matchers do
       deliver_to("karen@yahoo.com").should_not match(email)
     end
 
+    it "should match when an array of emails is exact same as all of the email's recipients" do
+      addresses = ["james@yahoo.com", "karen@yahoo.com"]
+      email = mock_email(:to => addresses)
+      deliver_to(addresses).should match(email)
+    end
+
     it "should use the passed in objects :email method if not a string" do
       email = mock_email(:to => "jimmy_bean@yahoo.com")
       user = mock("user", :email => "jimmy_bean@yahoo.com")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bmabey-email_spec
 version: !ruby/object:Gem::Version 
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-21 00:00:00 -08:00
+date: 2009-03-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -79,7 +79,6 @@ files:
 - examples/rails_root/config/routes.rb
 - examples/rails_root/cucumber.yml
 - examples/rails_root/db
-- examples/rails_root/db/development.sqlite3
 - examples/rails_root/db/migrate
 - examples/rails_root/db/migrate/20090125013728_create_users.rb
 - examples/rails_root/db/schema.rb