premailer-rails 1.10.2 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 483c734faf06020e78195069fb6db136527c24b2d725320aec5aa66e608a013f
-  data.tar.gz: 6c34682ffa25c13678928467a465f1a9a1e367fd70e783067a2d3c3c3b6c81f2
+  metadata.gz: 13055f85c556422022c71564c81f5816ecffd482e4514c1481212fab2c942eb7
+  data.tar.gz: 8b9093f66f195ac826382329877be7c9b863650c5bcb0c057bae0cc073b8978d
 SHA512:
-  metadata.gz: f26c083fc1f290c83779645ba7347fb54b497aeff4e1d96055457ec9e399b36ae9035773dbe9ef38a9a2e60a7f684ac9ae682332f498215e4f863cdea48d82c4
-  data.tar.gz: d4c906d184d1e3e3c1925324193a2c535365e11345bb460a4094a423f26d2be66f0efe6b8182bdd73068902d9162cfa26c7de65e1fb6ae4d1e4a989960ecd00d
+  metadata.gz: a861465e80d026c7e221b09f0c395be4d4fb26fa3662a233de5ba8295c41f0861b79958f873830fa4bd6333bd21798298155f8cadf1cf7861f08f5348ee3f901
+  data.tar.gz: f4cd1b29b3b1a4ee43fe83971b35b6a43896298ab3c1fec8d4fc91e2fc0d1290b353bba0096e2ae45376e394f6ad00142cf3dda7447a72259c7639c01fbd4231

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.4.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,17 @@
 # Changelog
 
+## v1.11.1
+
+- Check if `Rails.application` is defined (@pabloh, #250)
+
+## v1.11.0
+
+- Remove `force_encoding!`
+
+## v1.10.3
+
+- Remove upper version constraint for actionmailer
+
 ## v1.10.2
 
 - Explicitly check for assets_manifest (@derekwheel, #214)

data/README.md

@@ -179,7 +179,7 @@ premailer-rails is released under the MIT license. See the [license file].
 [actionmailer]: https://github.com/rails/rails/tree/master/actionmailer
 [nokogiri]:     https://github.com/sparklemotion/nokogiri
 
-[premailer documentation]: http://rubydoc.info/gems/premailer/1.7.3/Premailer:initialize
+[premailer documentation]: https://www.rubydoc.info/gems/premailer/Premailer:initialize
 
 [fphilipe twitter]: https://twitter.com/fphilipe
 [license file]:     LICENSE

data/VERSION

@@ -1 +1 @@
-1.10.2
+1.11.1

data/lib/premailer/rails/css_helper.rb

@@ -39,13 +39,13 @@ class Premailer
       end
 
       def cache_enabled?
-        defined?(::Rails) && ::Rails.env.production?
+        defined?(::Rails.env) && ::Rails.env.production?
       end
 
       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/css_loaders/asset_pipeline_loader.rb

@@ -25,6 +25,7 @@ class Premailer
 
         def asset_pipeline_present?
           defined?(::Rails) &&
+            ::Rails.respond_to?(:application) &&
             ::Rails.application &&
             ::Rails.application.respond_to?(:assets_manifest) &&
             ::Rails.application.assets_manifest

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/premailer-rails.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'premailer', '~> 1.7', '>= 1.7.9'
-  s.add_dependency 'actionmailer', '>= 3', '< 6'
+  s.add_dependency 'actionmailer', '>= 3'
 
   s.add_development_dependency 'rspec', '~> 3.3'
   s.add_development_dependency 'nokogiri'

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.2
+  version: 1.11.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2020-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -37,9 +37,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -47,9 +44,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -158,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
@@ -185,8 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.
@@ -224,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