email_spec 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6953e2bb1e960ed248a93cd7cbf47dbc0dedbfa3
-  data.tar.gz: 48595daa6d8a485acae168fd690261db13e39216
+SHA256:
+  metadata.gz: 11bdd9e521aecbb968f672214cc109869f111f1ac981b793e1a3c41bcf4691ce
+  data.tar.gz: 7cd61105485eae764f8786ef4a3e2ccdbd9309f8d020f883177d8d62df7df184
 SHA512:
-  metadata.gz: edf125d376b91ba678cb815c18413618d8062bd89b39a039629ce304c1f5ec057cd07f9ad37e38f6ef4f2debbba226310075f0b72ff72e795d9e757dc5a052f8
-  data.tar.gz: 82794056b0200b35691a1e359a5c5b23c58abb09fa25c3798b1f3b18ee3145256115ffc615cedd5aedabedd66ab80bb81adbdf3c840901a92c4b0a2d8ad9ef81
+  metadata.gz: 540ed6ea489564623c0ab0c781c70842782b8485307cf70d7396fc0221896ac396cae83a58d72e64586bb879b58a68b3e93b61f24120586657fe9acaea9f9486
+  data.tar.gz: 57b37098385ff0d8f545e385195693ddf67c04d03d4c37a9219cf4677d36cc2a880e0dea6bca6eed595ac977eb9afd1841062d180e47410ce5ec6fe20c1820fd

data/Changelog.md

@@ -1,3 +1,7 @@
+## 2.2.1 2022-09-12
+
+* [Patch for eager loading](https://github.com/email-spec/email-spec/pull/219)
+
 ## 2.2.0 2018-04-03
 
 * Support for `spinach` (@pedantic-git)

data/README.md

@@ -1,5 +1,4 @@
-
-[![Build Status](https://secure.travis-ci.org/email-spec/email-spec.png)](http://travis-ci.org/email-spec/email-spec)
+[![Build Status](https://secure.travis-ci.org/email-spec/email-spec.svg)](http://travis-ci.org/email-spec/email-spec)
 
 ## Email Spec
 
@@ -339,6 +338,10 @@ email = UserMailer.create_signup "jojo@yahoo.com", "Jojo Binks"
 assert_must deliver_to("jojo@yahoo.com"), email
 ```
 
+## Issue triage [![Open Source Helpers](https://www.codetriage.com/email-spec/email-spec/badges/users.svg)](https://www.codetriage.com/email-spec/email-spec)
+
+You can contribute by triaging issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to email-spec on CodeTriage](https://www.codetriage.com/email-spec/email-spec).
+
 ## Original Authors
 
 Ben Mabey, Aaron Gibralter, Mischa Fierer

data/lib/email_spec/deliveries.rb

@@ -73,12 +73,19 @@ module EmailSpec
     if defined?(Pony)
       def deliveries; Pony::deliveries ; end
       include EmailSpec::MailerDeliveries
-    elsif ActionMailer::Base.delivery_method == :activerecord
-      include EmailSpec::ARMailerDeliveries
     else
-      def mailer; ActionMailer::Base; end
-      include EmailSpec::MailerDeliveries
+      ActiveSupport.on_load(:action_mailer) do
+        if delivery_method == :activerecord
+          ::EmailSpec::Helpers.include EmailSpec::ARMailerDeliveries
+        else
+          ::EmailSpec::Deliveries.module_eval do
+            def mailer
+              ActionMailer::Base
+            end
+          end
+          ::EmailSpec::Helpers.include ::EmailSpec::MailerDeliveries
+        end
+      end
     end
   end
 end
-

data/lib/email_spec/mail_ext.rb

@@ -5,11 +5,11 @@ module EmailSpec::MailExt
 
   def default_part_body
     # Calling to_str as we want the actual String object
-    HTMLEntities.new.decode(default_part.body.to_s.to_str)
+    HTMLEntities.new.decode(default_part.decoded.to_s.to_str)
   end
 
   def html
-    html_part ? html_part.body.raw_source : nil
+    html_part ? html_part.decoded : nil
   end
 end
 

data/lib/email_spec/version.rb

@@ -1,3 +1,3 @@
 module EmailSpec
-  VERSION = '2.2.0'
+  VERSION = '2.2.1'
 end

data/spec/email_spec/mail_ext_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'active_support'
 
 describe EmailSpec::MailExt do
   describe "#default_part" do
@@ -35,6 +36,13 @@ describe EmailSpec::MailExt do
       email = Mail.new(:body => ActiveSupport::SafeBuffer.new("bacon & pancake"))
       expect(email.default_part_body).to eq ("bacon & pancake")
     end
+
+    it "decodes parts before return" do
+      email = Mail.new(:body => "hello\r\nquoted-printable")
+      email.content_transfer_encoding = 'quoted-printable'
+      expect(email.encoded).to include("hello=0D\nquoted-printable")
+      expect(email.default_part_body).to eq("hello\r\nquoted-printable")
+    end
   end
 
   describe "#html" do

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@ require 'action_mailer'
 require 'mail'
 require File.expand_path(File.dirname(__FILE__) + '/../lib/email_spec.rb')
 
+# Trigger loading ActionMailer::Base
+ActionMailer::Base
+
 RSpec.configure do |config|
   config.include EmailSpec::Helpers
   config.include EmailSpec::Matchers

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Ben Mabey
 - Aaron Gibralter
 - Mischa Fierer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-04-03 00:00:00.000000000 Z
+date: 2022-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -179,7 +179,6 @@ files:
 - README.md
 - Rakefile
 - examples/rails4_root/Gemfile
-- examples/rails4_root/Gemfile.lock
 - examples/rails4_root/README
 - examples/rails4_root/Rakefile
 - examples/rails4_root/app/controllers/application_controller.rb
@@ -223,13 +222,11 @@ files:
 - examples/rails4_root/db/migrate/20141119224309_add_queue_to_delayed_jobs.rb
 - examples/rails4_root/db/schema.rb
 - examples/rails4_root/db/seeds.rb
-- examples/rails4_root/db/test.sqlite3
 - examples/rails4_root/doc/README_FOR_APP
 - examples/rails4_root/features/attachments.feature
 - examples/rails4_root/features/delayed_job.feature
 - examples/rails4_root/features/errors.feature
 - examples/rails4_root/features/example.feature
-- examples/rails4_root/features/step_definitions/email_steps.rb
 - examples/rails4_root/features/step_definitions/user_steps.rb
 - examples/rails4_root/features/step_definitions/web_steps.rb
 - examples/rails4_root/features/support/env.rb
@@ -238,8 +235,6 @@ files:
 - examples/rails4_root/lib/notifier_job.rb
 - examples/rails4_root/lib/tasks/cucumber.rake
 - examples/rails4_root/lib/tasks/rspec.rake
-- examples/rails4_root/log/development.log
-- examples/rails4_root/log/test.log
 - examples/rails4_root/public/404.html
 - examples/rails4_root/public/422.html
 - examples/rails4_root/public/500.html
@@ -262,11 +257,9 @@ files:
 - examples/rails4_root/test/mailers/user_mailer_spec_test.rb
 - examples/rails4_root/test/test_helper.rb
 - examples/sinatra_root/Gemfile
-- examples/sinatra_root/Gemfile.lock
 - examples/sinatra_root/config.ru
 - examples/sinatra_root/features/errors.feature
 - examples/sinatra_root/features/example.feature
-- examples/sinatra_root/features/step_definitions/email_steps.rb
 - examples/sinatra_root/features/step_definitions/user_steps.rb
 - examples/sinatra_root/features/step_definitions/web_steps.rb
 - examples/sinatra_root/features/support/env.rb
@@ -301,7 +294,7 @@ homepage: http://github.com/email-spec/email-spec/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -316,9 +309,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: email-spec
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.3.21
+signing_key:
 specification_version: 4
 summary: Easily test email in RSpec, Cucumber or Minitest
 test_files: []

data/examples/rails4_root/Gemfile.lock

@@ -1,199 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    email_spec (2.1.2)
-      htmlentities (~> 4.3.3)
-      launchy (~> 2.1)
-      mail (~> 2.7)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (6.0.4)
-    backports (3.11.1)
-    builder (3.2.3)
-    capybara (2.18.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (>= 2.0, < 4.0)
-    concurrent-ruby (1.0.5)
-    crass (1.0.3)
-    cucumber (3.1.0)
-      builder (>= 2.1.2)
-      cucumber-core (~> 3.1.0)
-      cucumber-expressions (~> 5.0.4)
-      cucumber-wire (~> 0.0.1)
-      diff-lcs (~> 1.3)
-      gherkin (~> 5.0)
-      multi_json (>= 1.7.5, < 2.0)
-      multi_test (>= 0.1.2)
-    cucumber-core (3.1.0)
-      backports (>= 3.8.0)
-      cucumber-tag_expressions (~> 1.1.0)
-      gherkin (>= 5.0.0)
-    cucumber-expressions (5.0.13)
-    cucumber-rails (1.5.0)
-      capybara (>= 1.1.2, < 3)
-      cucumber (>= 1.3.8, < 4)
-      mime-types (>= 1.17, < 4)
-      nokogiri (~> 1.5)
-      railties (>= 4, < 5.2)
-    cucumber-tag_expressions (1.1.1)
-    cucumber-wire (0.0.1)
-    database_cleaner (1.6.2)
-    delayed_job (4.0.6)
-      activesupport (>= 3.0, < 5.0)
-    delayed_job_active_record (4.1.2)
-      activerecord (>= 3.0, < 5.2)
-      delayed_job (>= 3.0, < 5)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    gherkin (5.0.0)
-    globalid (0.4.1)
-      activesupport (>= 4.2.0)
-    htmlentities (4.3.4)
-    i18n (0.9.5)
-      concurrent-ruby (~> 1.0)
-    launchy (2.4.3)
-      addressable (~> 2.3)
-    loofah (2.2.2)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    mail (2.7.0)
-      mini_mime (>= 0.1.1)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mimetype-fu (0.1.2)
-    mini_mime (1.0.0)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    minitest-matchers (1.4.1)
-      minitest (~> 5.0)
-    minitest-rails (2.2.1)
-      minitest (~> 5.7)
-      railties (~> 4.1)
-    multi_json (1.13.1)
-    multi_test (0.1.2)
-    nokogiri (1.8.2)
-      mini_portile2 (~> 2.3.0)
-    public_suffix (3.0.2)
-    rack (1.6.9)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.9)
-      activesupport (>= 4.2.0, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
-    thor (0.20.0)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    xpath (3.0.0)
-      nokogiri (~> 1.8)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara
-  cucumber-rails
-  database_cleaner
-  delayed_job (~> 4.0.6)
-  delayed_job_active_record
-  email_spec!
-  mimetype-fu
-  minitest-matchers
-  minitest-rails
-  rails (= 4.2.8)
-  rake (~> 10.3.2)
-  rspec-rails
-  sqlite3
-
-BUNDLED WITH
-   1.16.1

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

@@ -1,226 +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 a 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|"([^"]*?)") 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|"([^"]*?)") should have (an|no|\d+) emails?$/ do |address, amount|
-  expect(mailbox_for(address).size).to eql parse_email_count(amount)
-end
-
-Then /^(?:I|they|"([^"]*?)") 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|"([^"]*?)") should receive (an|no|\d+) emails? with subject \/([^"]*?)\/$/ do |address, amount, subject|
-  expect(unread_emails_for(address).select { |m| m.subject =~ Regexp.new(subject) }.size).to eql parse_email_count(amount)
-end
-
-Then /^(?:I|they|"([^"]*?)") 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|"([^"]*?)") opens? the email$/ do |address|
-  open_email(address)
-end
-
-When /^(?:I|they|"([^"]*?)") opens? the email with subject "([^"]*?)"$/ do |address, subject|
-  open_email(address, :with_subject => subject)
-end
-
-When /^(?:I|they|"([^"]*?)") opens? the email with subject \/([^"]*?)\/$/ do |address, subject|
-  open_email(address, :with_subject => Regexp.new(subject))
-end
-
-When /^(?:I|they|"([^"]*?)") opens? the email with text "([^"]*?)"$/ do |address, text|
-  open_email(address, :with_text => text)
-end
-
-When /^(?:I|they|"([^"]*?)") opens? the email with text \/([^"]*?)\/$/ do |address, text|
-  open_email(address, :with_text => Regexp.new(text))
-end
-
-#
-# Inspect the Email Contents
-#
-
-Then /^(?:I|they) should see "([^"]*?)" in the email subject$/ do |text|
-  expect(current_email).to have_subject(text)
-end
-
-Then /^(?:I|they) should see \/([^"]*?)\/ in the email subject$/ do |text|
-  expect(current_email).to have_subject(Regexp.new(text))
-end
-
-Then /^(?:I|they) should not see "([^"]*?)" in the email subject$/ do |text|
-  expect(current_email).not_to have_subject(text)
-end
-
-Then /^(?:I|they) should not see \/([^"]*?)\/ in the email subject$/ do |text|
-  expect(current_email).not_to have_subject(Regexp.new(text))
-end
-
-Then /^(?:I|they) should see "([^"]*?)" in the email body$/ do |text|
-  expect(current_email.default_part_body.to_s).to include(text)
-end
-
-Then /^(?:I|they) should not see "([^"]*?)" in the email body$/ do |text|
-  expect(current_email.default_part_body.to_s).not_to include(text)
-end
-
-Then /^(?:I|they) should see \/([^"]*?)\/ in the email body$/ do |text|
-  expect(current_email.default_part_body.to_s).to match Regexp.new(text)
-end
-
-Then /^(?:I|they) should not see \/([^"]*?)\/ in the email body$/ do |text|
-  expect(current_email.default_part_body.to_s).not_to match Regexp.new(text)
-end
-
-Then /^(?:I|they) 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|
-  expect(current_email).to have_reply_to(text)
-end
-
-Then /^(?:I|they) should see "([^\"]*)" in the email "([^"]*?)" header$/ do |text, name|
-  expect(current_email).to have_header(name, text)
-end
-
-Then /^(?:I|they) should see \/([^\"]*)\/ in the email "([^"]*?)" header$/ do |text, name|
-  expect(current_email).to have_header(name, Regexp.new(text))
-end
-
-Then /^I should see it is a multi\-part email$/ do
-    expect(current_email).to be_multipart
-end
-
-Then /^(?:I|they) should see "([^"]*?)" in the email html part body$/ do |text|
-    expect(current_email.html_part.body.to_s).to include(text)
-end
-
-Then /^(?:I|they) should see "([^"]*?)" in the email text part body$/ do |text|
-    expect(current_email.text_part.body.to_s).to include(text)
-end
-
-#
-# Inspect the Email Attachments
-#
-
-Then /^(?:I|they) 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.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)].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.include?(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 include(content_type)
-end
-
-Then /^all attachments should not be blank$/ do
-  current_email_attachments.each do |attachment|
-    expect(attachment.read.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|"([^"]*?)") follows? "([^"]*?)" in the email$/ do |address, link|
-  visit_in_email(link, address)
-end
-
-When /^(?:I|they) 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