premailer-rails 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a2073ed1c61cca54326ea63233c597afc05673a
-  data.tar.gz: 8a067a0516b3ff404ead0d70b147408a0ca88dea
+  metadata.gz: f2248a4e7484976c9aa3f9260873dc82927adb6d
+  data.tar.gz: 0a3eb925b80da4498279e90e452931f87ac048d1
 SHA512:
-  metadata.gz: 613d3feeeceb8be28f49e32c656b945d98ce23b6b22ef597e063a519a3e798e250e8ae80fe0a2bcd700acd6ee6b13efbdf92bf9813266c61aa0ef147d9fc4e45
-  data.tar.gz: 869483a1f22ae2e38587eb73f763fa11f430271c74a30f0ebdbb08164893113dd962027b43524abec789467481209e764d98cfb4798305b1c9662975a5ed8fa2
+  metadata.gz: 3dadbfdf3c5e22ee924824bfc8ac398957723207fd46e1f245c92da341830514ba64f6b0fe34d0cdf602329960f83f1eaa6134631d639589e714b3230665c19b
+  data.tar.gz: 9866e101c03db3be48bc0c840ec382875f7f7aee0042f9200712ac2eb28eb7665edde74d59df0c366dde132ef91bcbc108a2990ccaa6757c48f8474e6b2424d3

data/.travis.yml

@@ -6,7 +6,7 @@ rvm:
   - 1.9.3
   - ruby-head
   - jruby-19mode
-  - rbx-19mode
+  - rbx-2.1.1
 env:
   - "ACTION_MAILER_VERSION=3.1.0"
   - "ACTION_MAILER_VERSION=3.2.0"

data/Gemfile

@@ -1,4 +1,4 @@
-source "https://rubygems.org"
+source 'https://rubygems.org'
 
 gemspec
 
@@ -12,6 +12,7 @@ else
   gem 'actionmailer', "~> #{action_mailer_version}"
 end
 
-platforms :jruby do
-  gem "jruby-openssl"
+platforms :rbx do
+  gem 'rubysl'
+  gem 'racc'
 end

data/README.md

@@ -30,11 +30,44 @@ Rails. Although premailer-rails has certain Rails specific features, **it also
 works in the absence of Rails** making it compatible with other frameworks such
 as sinatra.
 
+## How It Works
+
 premailer-rails works with actionmailer by registering a delivery hook. This
 causes all emails that are delivered to be processed by premailer-rails. This
-means that, by simply including premailer-rails in your `Gemfile`, you'll get
+means that by simply including premailer-rails in your `Gemfile` you'll get
 styled emails without having to set anything up.
 
+Whenever premailer-rails processes an email, it collects the URLs of all linked
+stylesheets (`<link rel="stylesheet" href="css_url">`). Then, for each of these
+URLs, it tries to get the content through a couple of strategies. As long as
+a strategy does not return anything, the next one is used. The strategies and
+their order are as follows:
+
+1.  **Cache:** If there's a file in cache matching that URL, the cache content
+    is returned.  The cache right now is rather rudimentary. Whenever a CSS file
+    is retrieved, it is stored in memory such that subsequent requests to the
+    same file are faster. The caching is disabled inside Rails in the
+    development environment.
+
+2.  **File System:** If there's a file inside `public/` with the same path as in
+    the URL, it is read from disk. E.g. if the URL is
+    `http://cdn.example.com/assets/email.css` the contents of the file located
+    at `public/assets/email.css` gets returned if it exists.
+
+3.  **Asset Pipeline:** If Rails is available and the asset pipeline is enabled,
+    the file is retrieved through the asset pipeline. E.g. if the URL is
+    `http://cdn.example.com/assets/email-fingerprint123.css`, the file
+    `email.css` is requested from the asset pipeline. That is, the fingerprint
+    and the prefix (in this case `assets` is the prefix) are stripped before
+    requesting it from the asset pipeline.
+
+4.  **Network:** As a last resort, the URL is simply requested and the response
+    body is used. This is usefull when the assets are not bundled in the
+    application and only available on a CDN. On Heroku e.g. you can add assets
+    to your `.slugignore` causing your assets to not be available to the app
+    (and thus resulting in a smaller app) and deploy the assets to a CDN such
+    as S3/CloudFront.
+
 ## Installation
 
 Simply add the gem to your `Gemfile`:
@@ -99,6 +132,18 @@ class UserMailer < ActionMailer::Base
 end
 ```
 
+## Small Print
+
+### Author
+
+Philipe Fatio ([@fphilipe][fphilipe twitter])
+
+[![Support via Gittip][tip-image]][tip-link]
+
+### License
+
+premailer-rails is released under the MIT license. See the [license file].
+
 [build-image]: https://travis-ci.org/fphilipe/premailer-rails.png
 [build-link]:  https://travis-ci.org/fphilipe/premailer-rails
 [gem-image]:   https://badge.fury.io/rb/premailer-rails.png
@@ -111,6 +156,8 @@ end
 [cov-link]:    https://coveralls.io/r/fphilipe/premailer-rails
 [stats-image]: https://d2weczhvl823v0.cloudfront.net/fphilipe/premailer-rails/trend.png
 [stats-link]:  https://bitdeli.com/
+[tip-image]:   https://rawgithub.com/twolfson/gittip-badge/0.1.0/dist/gittip.png
+[tip-link]:    https://www.gittip.com/fphilipe/
 
 [premailer]:    https://github.com/premailer/premailer
 [actionmailer]: https://github.com/rails/rails/tree/master/actionmailer
@@ -118,3 +165,6 @@ end
 [hpricot]:      https://github.com/hpricot/hpricot
 
 [premailer documentation]: http://rubydoc.info/gems/premailer/1.7.3/Premailer:initialize
+
+[fphilipe twitter]: https://twitter.com/fphilipe
+[license file]:     LICENSE

data/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

data/lib/premailer/rails.rb

@@ -6,7 +6,6 @@ require 'premailer/rails/css_loaders'
 require 'premailer/rails/css_helper'
 require 'premailer/rails/customized_premailer'
 require 'premailer/rails/hook'
-require 'premailer/rails/nokogiri_fix'
 
 class Premailer
   module Rails

data/lib/premailer/rails/hook.rb

@@ -54,8 +54,8 @@ class Premailer
 
       def generate_alternative_part
         part = Mail::Part.new(content_type: 'multipart/alternative')
-        part.add_part(generate_html_part)
         part.add_part(generate_text_part)
+        part.add_part(generate_html_part)
 
         part
       end

data/premailer-rails.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec', '>= 3.0.0.beta1'
   s.add_development_dependency 'nokogiri'
   s.add_development_dependency 'hpricot' unless RUBY_PLATFORM == 'java'
-  s.add_development_dependency 'coveralls'
+  s.add_development_dependency 'coveralls' if RUBY_ENGINE == 'ruby'
 end

data/spec/spec_helper.rb

@@ -1,12 +1,14 @@
-if ENV['CI']
-  require 'coveralls'
-  Coveralls::Output.silent = true
-  Coveralls.wear! do
-    add_filter 'spec/'
+if RUBY_ENGINE == 'ruby'
+  if ENV['CI']
+    require 'coveralls'
+    Coveralls::Output.silent = true
+    Coveralls.wear! do
+      add_filter 'spec/'
+    end
+  else
+    require 'simplecov'
+    SimpleCov.start
   end
-else
-  require 'simplecov'
-  SimpleCov.start
 end
 
 require 'premailer/rails'

data/spec/support/fixtures/message.rb

@@ -1,3 +1,5 @@
+# coding: utf-8
+
 require 'mail'
 
 module Fixtures
@@ -19,6 +21,20 @@ module Fixtures
 </html>
     HTML
 
+    UNICODE_STRING = '٩(-̮̮̃-̃)۶ ٩(●̮̮̃•̃)۶ ٩(͡๏̯͡๏)۶ ٩(-̮̮̃•̃).'
+
+    HTML_PART_WITH_UNICODE = <<-HTML
+<html>
+  <head>
+  </head>
+  <body>
+    <p>
+      #{UNICODE_STRING}
+    </p>
+  </body>
+</html>
+    HTML
+
     HTML_PART_WITH_CSS = <<-HTML
 <html>
   <head>

data/spec/unit/customized_premailer_spec.rb

@@ -37,6 +37,15 @@ describe Premailer::Rails::CustomizedPremailer do
             expect(premailer.to_inline_css).to match(regex)
           end
         end
+
+        context 'when HTML contains unicode' do
+          it 'should not mess those up' do
+            html = Fixtures::Message::HTML_PART_WITH_UNICODE
+            premailer = Premailer::Rails::CustomizedPremailer.new(html)
+            expect(premailer.to_inline_css).to \
+              include(Fixtures::Message::UNICODE_STRING)
+          end
+        end
       end
     end
   end
@@ -48,13 +57,13 @@ describe Premailer::Rails::CustomizedPremailer do
     end
 
     it 'should pass on the configs' do
-      Premailer::Rails.config = { foo: :bar }
+      Premailer::Rails.config.merge!(foo: :bar)
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       expect(premailer.instance_variable_get(:'@options')[:foo]).to eq(:bar)
     end
 
     it 'should not allow to override with_html_string' do
-      Premailer::Rails.config = { with_html_string: false }
+      Premailer::Rails.config.merge!(with_html_string: false)
       premailer = Premailer::Rails::CustomizedPremailer.new('some html')
       options = premailer.instance_variable_get(:'@options')
       expect(options[:with_html_string]).to eq(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer-rails
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Philipe Fatio
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: premailer
@@ -136,7 +136,6 @@ files:
 - lib/premailer/rails/css_loaders/network_loader.rb
 - lib/premailer/rails/customized_premailer.rb
 - lib/premailer/rails/hook.rb
-- lib/premailer/rails/nokogiri_fix.rb
 - lib/premailer/rails/version.rb
 - premailer-rails.gemspec
 - spec/integration/css_helper_spec.rb
@@ -169,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Easily create styled HTML emails in Rails.

data/lib/premailer/rails/nokogiri_fix.rb

@@ -1,15 +0,0 @@
-require 'premailer/adapter/nokogiri'
-
-Premailer::Adapter::Nokogiri.module_eval do
-  # Patch load_html method to fix character encoding issues.
-  def load_html(html)
-    if RUBY_VERSION.to_f >= 1.9
-      html = html.force_encoding('UTF-8').encode!
-      ::Nokogiri::HTML(html) {|c| c.recover }
-    else
-      # :nocov:
-      ::Nokogiri::HTML(html, nil, 'UTF-8') {|c| c.recover }
-      # :nocov:
-    end
-  end
-end