premailer-rails 1.10.3 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36e83f5f50cf99a5c7c520cc40f135b08e1957f23bd471ab3dfd987549fcca25
-  data.tar.gz: 002da6d81c92ab09bf2af64c6dd7a87c6a0babf6fd70bc2b59361730499bf3e5
+  metadata.gz: 6190c1ff4075799a5bb8860f3f1052ea5312aada5a99aa5a8acad78eee3be40f
+  data.tar.gz: d45d0c59d8849cb5b76f265e8a281b632698bef153a8a266a55b3064a7e0dbbe
 SHA512:
-  metadata.gz: 2a44732ed01c2cb9ae7662e8dedaffd3d1989d32f627d7182683c6a6878c12e563cbe370008a4770f3e0643715c458ea981a5dd1a303387f4ddec825da7e80ad
-  data.tar.gz: 23e017fb41932ee883165623cc0afe3f74d9c49a27c5070bd879dfbf174faca160cc76bc3fae350f083be4b89380760016a3c5de8fcfcb1887e4033a855035e3
+  metadata.gz: e17ac0c63b5a86baf6316a8e3f595147e5989880e349b904a3f70bce50e6818da0a94f571dd1dba5828ae5692ff1070fedc35bdbda8f88a8440eff72962eabe3
+  data.tar.gz: 9f0ac9954868ff7ec22e7d44e3226257f00188bd58ab3ae91b6619e9a6f43bf1f28c9f3f1c40e0602b73b3fd1146c09b27826318326eda853557a15d0d2439bb

data/.gitignore

@@ -2,7 +2,7 @@
 doc/
 Gemfile.lock
 coverage/
-spec/rails_app/tmp/
-spec/rails_app/log/
+spec/rails_app/log/*
+spec/rails_app/tmp/*
 .ruby-version
 /.bundle

data/.travis.yml

@@ -3,11 +3,12 @@ language: ruby
 cache: bundler
 script: bundle exec rspec
 rvm:
-  - 2.6.1
+  - 2.6.5
+  - 2.7.0
 env:
   matrix:
-    - ACTION_MAILER_VERSION=4
     - ACTION_MAILER_VERSION=5
+    - ACTION_MAILER_VERSION=6
     - ACTION_MAILER_VERSION=master
 matrix:
   fast_finish: true

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.11.0
+
+- Remove `force_encoding!`
+
 ## v1.10.3
 
 - Remove upper version constraint for actionmailer

data/VERSION

@@ -1 +1 @@
-1.10.3
+1.11.0

data/lib/premailer/rails/css_helper.rb

@@ -45,7 +45,7 @@ class Premailer
       def load_css(url)
         Premailer::Rails.config.fetch(:strategies).each do |strategy|
           css = find_strategy(strategy).load(url)
-          return css.force_encoding('UTF-8') if css
+          return css if css
         end
 
         raise FileNotFound, %{File with URL "#{url}" could not be loaded by any strategy.}

data/lib/premailer/rails/hook.rb

@@ -73,10 +73,8 @@ class Premailer
         part = html_part
         html = premailer.to_inline_css
         Mail::Part.new do
-          content_transfer_encoding part.content_transfer_encoding
-          content_type "text/html; charset=#{part.charset}"
+          content_type "text/html; charset=#{html.encoding}"
           body html
-          body_encoding part.body.encoding
         end
       end
 
@@ -85,10 +83,8 @@ class Premailer
           part = html_part
           text = premailer.to_plain_text
           Mail::Part.new do
-            content_transfer_encoding part.content_transfer_encoding
-            content_type "text/plain; charset=#{part.charset}"
+            content_type "text/plain; charset=#{text.encoding}"
             body text
-            body_encoding part.body.encoding
           end
         end
       end

data/spec/integration/hook_spec.rb

@@ -6,7 +6,7 @@ describe Premailer::Rails::Hook do
   end
 
   def body_content(message)
-    Nokogiri::HTML(message.html_string).at('body').content
+    Nokogiri::HTML(message.html_string).at('body').content.gsub("\r\n", "\n")
   end
 
   class Mail::Message
@@ -47,18 +47,31 @@ describe Premailer::Rails::Hook do
     expect(processed_message.parts).to match_array(expected_parts)
   end
 
-  describe 'when the content-transfer-encoding is set' do
-    before { message.content_transfer_encoding = 'quoted-printable' }
+  it 'does not screw up the text by maintaining the original body encoding' do
+    raw_msg = Fixtures::Message.latin_message
+    processed_msg = Fixtures::Message.latin_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
 
-    it 'should maintain the value' do
-      expect(processed_message.parts.first.content_transfer_encoding).to \
-        eq 'quoted-printable'
-      expect(processed_message.parts.last.content_transfer_encoding).to \
-        eq 'quoted-printable'
-    end
+    raw_msg = Fixtures::Message.non_latin_message
+    processed_msg = Fixtures::Message.non_latin_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+
+    raw_msg = Fixtures::Message.greek_message
+    processed_msg = Fixtures::Message.greek_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+
+    raw_msg = Fixtures::Message.dash_message
+    processed_msg = Fixtures::Message.dash_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
   end
 
-  it 'does not screw up the text by maintaining the original body encoding' do
+  it 'supports US-ASCII output' do
+    Premailer::Rails.config.merge!(output_encoding: 'US-ASCII')
+
     raw_msg = Fixtures::Message.latin_message
     processed_msg = Fixtures::Message.latin_message
     run_hook(processed_msg)
@@ -68,6 +81,18 @@ describe Premailer::Rails::Hook do
     processed_msg = Fixtures::Message.non_latin_message
     run_hook(processed_msg)
     expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+
+    raw_msg = Fixtures::Message.greek_message
+    processed_msg = Fixtures::Message.greek_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+
+    raw_msg = Fixtures::Message.dash_message
+    processed_msg = Fixtures::Message.dash_message
+    run_hook(processed_msg)
+    expect(body_content(processed_msg)).to eq(body_content(raw_msg))
+  ensure
+    Premailer::Rails.config.delete(:output_encoding)
   end
 
   it 'generates a text part from the html' do

data/spec/support/fixtures/message.rb

@@ -35,6 +35,30 @@ module Fixtures
 </html>
     HTML
 
+    HTML_PART_IN_GREEK = <<-HTML.encode(Encoding::ISO_8859_7)
+<html>
+  <head>
+  </head>
+  <body>
+    <p>
+      Αα Ββ Γγ Δδ Εε Ζζ Ηη Θθ Ιι Κκ Λλ Μμ Νν Ξξ Οο Ππ Ρρ Σσ Ττ Υυ Φφ Χχ Ψψ Ωω
+    </p>
+  </body>
+</html>
+    HTML
+
+    HTML_PART_WITH_DASHES = <<-HTML
+<html>
+  <head>
+  </head>
+  <body>
+    <p>
+      Hello there—yes you! What's up with – pardon the interrupion – dashes? I can also do &ndash; and &mdash;.
+    </p>
+  </body>
+</html>
+    HTML
+
     HTML_PART_WITH_CSS = <<-HTML
 <html>
   <head>
@@ -130,6 +154,22 @@ nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
       end
     end
 
+    def greek_message
+      base_message.tap do |message|
+        message.body = HTML_PART_IN_GREEK
+        message.content_type 'text/html; charset=ISO-8859-7'
+        message.ready_to_send!
+      end
+    end
+
+    def dash_message
+      base_message.tap do |message|
+        message.body = HTML_PART_WITH_DASHES
+        message.content_type 'text/html; charset=UTF-8'
+        message.ready_to_send!
+      end
+    end
+
     private
 
     def base_message

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.11.0
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-17 00:00:00.000000000 Z
+date: 2020-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -152,6 +152,8 @@ files:
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/initializers/assets.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/log/.keep
+- spec/rails_app/tmp/.keep
 - spec/spec_helper.rb
 - spec/support/fixtures/html.rb
 - spec/support/fixtures/message.rb
@@ -179,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
@@ -217,6 +219,8 @@ test_files:
 - spec/rails_app/config/environments/test.rb
 - spec/rails_app/config/initializers/assets.rb
 - spec/rails_app/config/routes.rb
+- spec/rails_app/log/.keep
+- spec/rails_app/tmp/.keep
 - spec/spec_helper.rb
 - spec/support/fixtures/html.rb
 - spec/support/fixtures/message.rb