email_spec 2.1.0 → 2.1.1

data/examples/sinatra_root/Gemfile.lock

@@ -1,78 +1,86 @@
 PATH
-  remote: ../../
+  remote: ../..
   specs:
-    email_spec (2.0.0)
+    email_spec (2.1.0)
       htmlentities (~> 4.3.3)
       launchy (~> 2.1)
-      mail (~> 2.6.3)
+      mail (~> 2.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.3.8)
-    builder (3.2.2)
-    capybara (2.4.4)
+    addressable (2.5.1)
+      public_suffix (~> 2.0, >= 2.0.2)
+    builder (3.2.3)
+    capybara (2.14.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    cucumber (2.0.0)
+    cucumber (2.4.0)
       builder (>= 2.1.2)
-      cucumber-core (~> 1.1.3)
+      cucumber-core (~> 1.5.0)
+      cucumber-wire (~> 0.0.1)
       diff-lcs (>= 1.1.3)
-      gherkin (~> 2.12)
+      gherkin (~> 4.0)
       multi_json (>= 1.7.5, < 2.0)
       multi_test (>= 0.1.2)
-    cucumber-core (1.1.3)
-      gherkin (~> 2.12.0)
+    cucumber-core (1.5.0)
+      gherkin (~> 4.0)
     cucumber-sinatra (0.5.0)
       templater (>= 1.0.0)
-    diff-lcs (1.2.5)
+    cucumber-wire (0.0.1)
+    diff-lcs (1.3)
     extlib (0.9.16)
-    gherkin (2.12.2)
-      multi_json (~> 1.3)
-    highline (1.7.2)
-    htmlentities (4.3.3)
+    gherkin (4.1.3)
+    highline (1.7.8)
+    htmlentities (4.3.4)
     launchy (2.4.3)
       addressable (~> 2.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    mini_portile (0.6.2)
-    multi_json (1.11.1)
+    mail (2.6.5)
+      mime-types (>= 1.16, < 4)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    mini_portile2 (2.1.0)
+    multi_json (1.12.1)
     multi_test (0.1.2)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
+    mustermann (1.0.0)
+    nokogiri (1.7.2)
+      mini_portile2 (~> 2.1.0)
     pony (1.11)
       mail (>= 2.0)
-    rack (1.6.4)
-    rack-protection (1.5.3)
+    public_suffix (2.0.5)
+    rack (2.0.3)
+    rack-protection (2.0.0)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
-    sinatra (1.4.6)
-      rack (~> 1.4)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     templater (1.0.0)
       diff-lcs (>= 1.1.2)
       extlib (>= 0.9.5)
       highline (>= 1.4.0)
-    tilt (2.0.1)
+    tilt (2.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -92,4 +100,4 @@ DEPENDENCIES
   xpath
 
 BUNDLED WITH
-   1.10.5
+   1.14.6

data/lib/email_spec/email_viewer.rb

@@ -17,7 +17,7 @@ module EmailSpec
 
     def self.save_and_open_all_html_emails
       all_emails.each_with_index do |m, index|
-        if m.multipart? && html_part = m.parts.detect{ |p| p.content_type.include?('text/html') }
+        if m.multipart? && m.parts.detect{ |p| p.content_type.include?('text/html') }
           filename = tmp_email_filename("-#{index}.html")
           File.open(filename, "w") do |f|
             f.write m.parts[1].body

data/lib/email_spec/helpers.rb

@@ -6,8 +6,8 @@ module EmailSpec
   module Helpers
     include Deliveries
 
-    A_TAG_BEGIN_REGEX = %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*>(?:(?!</a>).)*?}
-    A_TAG_END_REGEX = %r{(?:(?!</a>).)*?</a>}
+    A_TAG_BEGIN_REGEX = %r{<a[^>]*href=['"]?([^'"]*)['"]?[^>]*>\s*(?:(?!</a>).)*?\s*}
+    A_TAG_END_REGEX = %r{\s*(?:(?!</a>).)*?\s*</a>}
 
     def visit_in_email(link_text, address = '')
       if address.nil? || address.empty?
@@ -85,7 +85,7 @@ module EmailSpec
     end
 
     def links_in_email(email)
-      links = URI.extract(email.default_part_body.to_s, ['http', 'https'])
+      links = URI::Parser.new.extract(email.default_part_body.to_s, ['http', 'https'])
       links.map{|url| HTMLEntities.new.decode(url) }.uniq
     end
 
@@ -102,7 +102,7 @@ module EmailSpec
       elsif email.nil?
         error = "#{opts.keys.first.to_s.gsub("_", " ").downcase unless opts.empty?} #{('"' + opts.values.first.to_s + '"') unless opts.empty?}"
         raise EmailSpec::CouldNotFindEmailError, "Could not find email #{error} in the mailbox for #{current_email_address}. \n Found the following emails:\n\n #{all_emails.to_s}"
-       end
+      end
       email
     end
 

data/lib/email_spec/version.rb

@@ -1,3 +1,3 @@
 module EmailSpec
-  VERSION = '2.1.0'
+  VERSION = '2.1.1'.freeze
 end

data/spec/email_spec/helpers_spec.rb

@@ -37,6 +37,20 @@ describe EmailSpec::Helpers do
       expect(parse_email_for_link(email, "Click Here")).to eq("/path/to/page")
     end
 
+    it "properly finds links with tags and text in new lines" do
+      email = Mail.new(:body =>  <<-HTML
+        <a href="/path/to/app">Welcome</a>
+        <a href="/path/to/page">
+          <strong>
+            Click Here
+          </strong>
+        </a>
+        HTML
+      )
+
+      expect(parse_email_for_link(email, "Click Here")).to eq("/path/to/page")
+    end
+
     it "recognizes img alt properties as text" do
       email = Mail.new(:body => %(<a href="/path/to/page"><img src="http://host.com/images/image.gif" alt="an image" /></a>))
       expect(parse_email_for_link(email, "an image")).to eq("/path/to/page")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Ben Mabey
@@ -10,160 +10,160 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.3
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.3
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.17
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.17
 - !ruby/object:Gem::Dependency
   name: actionmailer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Easily test email in RSpec, Cucumber, and MiniTest
@@ -261,8 +261,6 @@ files:
 - examples/rails4_root/test/mailers/user_mailer_classic_test.rb
 - examples/rails4_root/test/mailers/user_mailer_spec_test.rb
 - examples/rails4_root/test/test_helper.rb
-- examples/rails4_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb
-- examples/rails4_root/vendor/plugins/email_spec/rails_generators/email_spec/templates/email_steps.rb
 - examples/sinatra_root/Gemfile
 - examples/sinatra_root/Gemfile.lock
 - examples/sinatra_root/config.ru
@@ -308,17 +306,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: email-spec
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Easily test email in RSpec, Cucumber or Minitest

data/examples/rails4_root/vendor/plugins/email_spec/rails_generators/email_spec/email_spec_generator.rb

@@ -1,17 +0,0 @@
-# This generator adds email steps to the step definitions directory 
-generator_base = defined?(Rails) ? Rails::Generator::Base : RubiGen::Base
-class EmailSpecGenerator < generator_base
-  def manifest
-    record do |m|
-      m.directory 'features/step_definitions'
-      m.file      'email_steps.rb', 'features/step_definitions/email_steps.rb'
-    end
-  end
-
-protected
-
-  def banner
-    "Usage: #{$0} email_spec"
-  end
-
-end

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

@@ -1,199 +0,0 @@
-# Commonly used email steps
-#
-# To add your own steps make a custom_email_steps.rb
-# The provided methods are:
-#
-# last_email_address
-# reset_mailer
-# open_last_email
-# visit_in_email
-# unread_emails_for
-# mailbox_for
-# current_email
-# open_email
-# read_emails_for
-# find_email
-#
-# General form for email scenarios are:
-#   - clear the email queue (done automatically by email_spec)
-#   - execute steps that sends an email
-#   - check the user received an/no/[0-9] emails
-#   - open the email
-#   - inspect the email contents
-#   - interact with the email (e.g. click links)
-#
-# The Cucumber steps below are setup in this order.
-
-module EmailHelpers
-  def current_email_address
-    # Replace with your way to find your current email (e.g @current_user.email).
-    # last_email_address will return the last email address used by email spec to find an email.
-    # Note that last_email_address will be reset after each Scenario.
-    last_email_address || "example@example.com"
-  end
-end
-
-World(EmailHelpers)
-
-#
-# Reset the e-mail queue within a scenario.
-# This is done automatically before each scenario.
-#
-
-Given /^(?:a clear email queue|no emails have been sent)$/ do
-  reset_mailer
-end
-
-#
-# Check how many emails have been sent/received
-#
-
-Then /^(?:I|they|he|she|"([^"]*?)") should receive (an|no|\d+) emails?$/ do |address, amount|
-  expect(unread_emails_for(address).size).to eql parse_email_count(amount)
-end
-
-Then /^(?:I|they|he|she|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amount|
-  expect(mailbox_for(address).size).to eql parse_email_count(amount)
-end
-
-Then /^(?:I|they|he|she|"([^"]*?)") should receive (an|no|\d+) emails? with subject "([^"]*?)"$/ do |address, amount, subject|
-  expect(unread_emails_for(address).select { |m| m.subject =~ Regexp.new(Regexp.escape(subject)) }.size).to eql parse_email_count(amount)
-end
-
-Then /^(?:I|they|he|she|"([^"]*?)") should receive an email with the following body:$/ do |address, expected_body|
-  open_email(address, :with_text => expected_body)
-end
-
-#
-# Accessing emails
-#
-
-# Opens the most recently received email
-When /^(?:I|they|he|she|"([^"]*?)") opens? the email$/ do |address|
-  open_email(address)
-end
-
-When /^(?:I|they|he|she|"([^"]*?)") opens? the email with subject "([^"]*?)"$/ do |address, subject|
-  open_email(address, :with_subject => subject)
-end
-
-When /^(?:I|they|he|she|"([^"]*?)") opens? the email with text "([^"]*?)"$/ do |address, text|
-  open_email(address, :with_text => text)
-end
-
-#
-# Inspect the Email Contents
-#
-
-Then /^(?:I|they|he|she) should see "([^"]*?)" in the email subject$/ do |text|
-  expect(current_email).to have_subject(text)
-end
-
-Then /^(?:I|they|he|she) should see "([^"]*?)" in the email body$/ do |text|
-  if current_email.multipart?
-    Then %(I should see "#{text}" in the html part of the email body)
-    Then %(I should see "#{text}" in the text part of the email body)
-  else
-    expect(current_email.body).to match Regexp.new(text)
-  end
-end
-
-Then /^(?:I|they|he|she) should see "([^"]*?)" in the html part of the email body$/ do |text|
-  expect(current_email.html_part.body).to match Regexp.new(text)
-end
-
-Then /^(?:I|they|he|she) should see "([^"]*?)" in the text part of the email body$/ do |text|
-  expect(current_email.text_part.body).to match Regexp.new(text)
-end
-
-Then /^(?:I|they|he|she) should see "([^"]*?)" in the email body$/ do |text|
-  expect(current_email.body).to include(text)
-end
-
-Then /^(?:I|they|he|she) should see \/([^"]*?)\/ in the email body$/ do |text|
-  expect(current_email.body).to match Regexp.new(text)
-end
-
-Then /^(?:I|they|he|she) should see the email delivered from "([^"]*?)"$/ do |text|
-  expect(current_email).to be_delivered_from(text)
-end
-
-Then /^(?:I|they) should see the email reply to "([^"]*?)"$/ do |text|
-  current_email.should have_reply_to(text)
-end
-
-Then /^(?:I|they|he|she) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
-  expect(current_email).to have_header(name, text)
-end
-
-Then /^(?:I|they|he|she) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
-  expect(current_email).to have_header(name, Regexp.new(text))
-end
-
-#
-# Inspect the Email Attachments
-#
-
-Then /^(?:I|they|he|she) should see (an|no|\d+) attachments? with the email$/ do |amount|
-  expect(current_email_attachments.size).to eql parse_email_count(amount)
-end
-
-Then /^there should be (an|no|\d+) attachments? named "([^"]*?)"$/ do |amount, filename|
-  expect(current_email_attachments.select { |a| a.original_filename == filename }.size).to eql parse_email_count(amount)
-end
-
-Then /^attachment (\d+) should be named "([^"]*?)"$/ do |index, filename|
-  expect(current_email_attachments[(index.to_i - 1)].original_filename).to eql filename
-end
-
-Then /^there should be (an|no|\d+) attachments? of type "([^"]*?)"$/ do |amount, content_type|
-  expect(current_email_attachments.select { |a| a.content_type == content_type }.size).to eql parse_email_count(amount)
-end
-
-Then /^attachment (\d+) should be of type "([^"]*?)"$/ do |index, content_type|
-  expect(current_email_attachments[(index.to_i - 1)].content_type).to eql content_type
-end
-
-Then /^all attachments should not be blank$/ do
-  current_email_attachments.each do |attachment|
-    expect(attachment.size).to_not eql 0
-  end
-end
-
-Then /^show me a list of email attachments$/ do
-  EmailSpec::EmailViewer::save_and_open_email_attachments_list(current_email)
-end
-
-#
-# Interact with Email Contents
-#
-
-When /^(?:I|they|he|she) follow "([^"]*?)" in the email$/ do |link|
-  visit_in_email(link)
-end
-
-When /^(?:I|they|he|she) click the first link in the email$/ do
-  click_first_link_in_email
-end
-
-#
-# Debugging
-# These only work with Rails and OSx ATM since EmailViewer uses RAILS_ROOT and OSx's 'open' command.
-# Patches accepted. ;)
-#
-
-Then /^save and open current email$/ do
-  EmailSpec::EmailViewer::save_and_open_email(current_email)
-end
-
-Then /^save and open all text emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_text_emails
-end
-
-Then /^save and open all html emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_html_emails
-end
-
-Then /^save and open all raw emails$/ do
-  EmailSpec::EmailViewer::save_and_open_all_raw_emails
-end