email_spec 2.2.0 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6953e2bb1e960ed248a93cd7cbf47dbc0dedbfa3
-  data.tar.gz: 48595daa6d8a485acae168fd690261db13e39216
+SHA256:
+  metadata.gz: 67b5cef2ce1c7cb7d919d61567a3fcdedab6747bf016962ca03da9b1d2abf660
+  data.tar.gz: 3694cba82a8b25469d5c0a7e5ec9f7d688471d357926a46cb37e7290320222f8
 SHA512:
-  metadata.gz: edf125d376b91ba678cb815c18413618d8062bd89b39a039629ce304c1f5ec057cd07f9ad37e38f6ef4f2debbba226310075f0b72ff72e795d9e757dc5a052f8
-  data.tar.gz: 82794056b0200b35691a1e359a5c5b23c58abb09fa25c3798b1f3b18ee3145256115ffc615cedd5aedabedd66ab80bb81adbdf3c840901a92c4b0a2d8ad9ef81
+  metadata.gz: 780394b891b7fbcc9a75629fd20608e99730cca2a1ecf5882193d7e8f2fc59fd115c4360d517c1a0f94d7b6e8ca56c0bf01e00ae91f8f42f592d0d169fed09ae
+  data.tar.gz: 790bb0a29b5c44aacb5ddfb5c9d9f049cedea133df51a2ccf66c41f364b4610450ebb01ce4aa92a2f18ef815e4c48d402863fcb5a41530e7d819f3475242f01c

data/Changelog.md

@@ -1,3 +1,14 @@
+## 2.2.2 2023-06-26
+
+* [Defer accommodating different delivery methods to runtime](https://github.com/email-spec/email-spec/pull/224)
+
+## 2.2.1 2022-09-12
+
+* [Support to decode part in EmailSpec::MailExt#default_part_body](https://github.com/email-spec/email-spec/pull/211)
+* [Drop rubyforge_project from gemspec](https://github.com/email-spec/email-spec/pull/215)
+* [Avoid eagerly loading ActionMailer::Base](https://github.com/email-spec/email-spec/pull/219)
+* [README: use SVG badges](https://github.com/email-spec/email-spec/pull/217)
+
 ## 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

@@ -1,5 +1,5 @@
 module EmailSpec
-  module MailerDeliveries
+  module Deliveries
     def all_emails
       deliveries
     end
@@ -9,7 +9,9 @@ module EmailSpec
     end
 
     def reset_mailer
-      if defined?(ActionMailer) && ActionMailer::Base.delivery_method == :cache
+      if defined?(ActionMailer) && ActionMailer::Base.delivery_method == :activerecord
+        Email.delete_all
+      elsif defined?(ActionMailer) && ActionMailer::Base.delivery_method == :cache
         mailer.clear_cache
       else
         deliveries.clear
@@ -23,36 +25,22 @@ module EmailSpec
     protected
 
     def deliveries
-      if ActionMailer::Base.delivery_method == :cache
+      if defined?(Pony)
+        Pony.deliveries
+      elsif ActionMailer::Base.delivery_method == :activerecord
+        Email.all.map { |email| parse_ar_to_mail(email) }
+      elsif ActionMailer::Base.delivery_method == :cache
         mailer.cached_deliveries
       else
         mailer.deliveries
       end
     end
-  end
-
-  module ARMailerDeliveries
-    def all_emails
-      Email.all.map{ |email| parse_to_mail(email) }
-    end
 
-    def last_email_sent
-      if email = Email.last
-        parse_to_mail(email)
-      else
-        raise("No email has been sent!")
-      end
+    def mailer
+      ActionMailer::Base
     end
 
-    def reset_mailer
-      Email.delete_all
-    end
-
-    def mailbox_for(address)
-      Email.all.select { |email| email.destinations.include?(address) }.map{ |email| parse_to_mail(email) }
-    end
-
-    def parse_to_mail(email)
+    def parse_ar_to_mail(email)
       Mail.read(email.mail)
     end
   end
@@ -68,17 +56,4 @@ module EmailSpec
       end
     end
   end
-
-  module Deliveries
-    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
-    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,5 @@
+# frozen_string_literal: true
+
 module EmailSpec
-  VERSION = '2.2.0'
+  VERSION = "2.2.2"
 end

data/spec/email_spec/mail_ext_spec.rb

@@ -35,6 +35,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

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: email_spec
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.2
 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: 2023-06-27 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,7 +222,6 @@ 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
@@ -238,8 +236,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,7 +258,6 @@ 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
@@ -301,7 +296,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 +311,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.4.10
+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