premailer 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd6a0eccd0fddd3ad53178ee0b715c3d1b770491
-  data.tar.gz: 5768d084e017e213f46ae790ecc6003f9eb82573
+  metadata.gz: 780d807660eab934f32306d9ca689dab41f37a09
+  data.tar.gz: a250c50348de81e092ca35ac0092d09c952e0606
 SHA512:
-  metadata.gz: bc9b3bb5aa1ca359b15a45aec3f51b7ae9375483353f76d6a2ace0463a7b5d857721f10b3149f08adbf586cb6f2007271900933afdaac6d95d5e2bc625cc2c5b
-  data.tar.gz: 2939cfd440e8f10c2bba6f685bc0f538930b0c97532ff2f1cc3ccbe96ba22c4137821c918a80690693bf5aa0c6afbe3353204cbb01afc30f099466b952e0c20d
+  metadata.gz: b00c9baf702aff645325d6b10a71c98def9de70752b11e15f79f0d4218ae73a307a6ff826571148bafb335f477a4b3e909b97ec05ff6d6aa06c15325dd39e19d
+  data.tar.gz: b7305f4db9b442bbd2944fe05fdfcb823b963888a1d75156465be8505d934c6f7748d4cd28976ee9829f3ed0493358d005d1080d4f41927f5a980f0be2dcc91c

data/.travis.yml

@@ -5,5 +5,19 @@ rvm:
   - 1.9.2
   - 1.9.3
   - 2.0.0
-  - jruby
-  - ree
+  - ree
+gemfile:
+  - Gemfile
+  - gemfiles/ruby187.gemfile
+matrix:
+  exclude:
+    - rvm: 1.8.7
+      gemfile: Gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/ruby187.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/ruby187.gemfile
+    - rvm: 2.0.0
+      gemfile: gemfiles/ruby187.gemfile
+    - rvm: ree
+      gemfile: Gemfile

data/README.md

@@ -1,4 +1,4 @@
-# Premailer README
+# Premailer README [![Build Status](https://travis-ci.org/premailer/premailer.png?branch=master)](https://travis-ci.org/premailer/premailer)
 
 ## What is this?
 
@@ -16,7 +16,7 @@ script is my solution.
 
 ## Premailer 2.0 is coming
 
-I'm looking for input on a version 2.0 update to Premailer.  PLease visit the [Premailer 2.0 Planning Page](https://github.com/alexdunae/premailer/wiki/Premailer-2.0-Planning) and give me your feedback.
+I'm looking for input on a version 2.0 update to Premailer. Please visit the [Premailer 2.0 Planning Page](https://github.com/premailer/premailer/wiki/New-Premailer-2.0-Planning) and give me your feedback.
 
 ## Installation
 
@@ -54,7 +54,7 @@ end
 
 ## Ruby Compatibility
 
-Premailer is tested on Ruby 1.8.7, Ruby 1.9.2 and Ruby 1.9.3 . It also works on REE. JRuby support is close; contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](http://travis-ci.org/#!/alexdunae/premailer).
+Premailer is tested on Ruby 1.8.7, Ruby 1.9.2, Ruby 1.9.3, and Ruby 2.0.0 . It also works on REE. JRuby support is close; contributors are welcome.  Checkout the latest build status on the [Travis CI dashboard](http://travis-ci.org/#!/premailer/premailer).
 
 ## Premailer-specific CSS
 

data/gemfiles/ruby187.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+gem 'css_parser',	:git => 'git://github.com/premailer/css_parser.git'
+gem 'webmock',		:group => [:development, :test]
+
+
+gemspec :name => 'ruby187'
+
+gem "ripper", :group => :development, :platforms => :mri_18
+
+gem "coveralls", :require => false, :platforms => [:mri_19, :mri_20], :group => :development

data/gemfiles/ruby187.gemspec

@@ -0,0 +1,31 @@
+GEM_ROOT = File.dirname(File.dirname(__FILE__)).freeze  unless defined?(GEM_ROOT)
+
+lib_path = File.expand_path('lib', GEM_ROOT)
+$LOAD_PATH.unshift(lib_path)  unless $LOAD_PATH.include? lib_path
+
+require 'premailer/version'
+
+Gem::Specification.new do |s|
+  s.name     = "premailer"
+  s.version  = Premailer::VERSION.dup
+  s.date = Time.now.strftime('%Y-%m-%d')
+  s.summary  = "Preflight for HTML e-mail."
+  s.email    = "code@dunae.ca"
+  s.homepage = "http://premailer.dialect.ca/"
+  s.description = "Improve the rendering of HTML emails by making CSS inline, converting links and warning about unsupported code."
+  s.has_rdoc = true
+  s.author  = "Alex Dunae"
+  s.files            = `git ls-files`.split("\n")
+  s.test_files       = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
+  s.add_dependency('css_parser', '>= 1.3.5')
+  s.add_dependency('htmlentities', '>= 4.0.0')
+  s.add_development_dependency "bundler", "~> 1.3"
+  s.add_development_dependency('rake', ['~> 0.8',  '!= 0.9.0'])
+  s.add_development_dependency('hpricot', '>= 0.8.3')
+  s.add_development_dependency('nokogiri', '~> 1.5.10')
+  s.add_development_dependency('yard', '~> 0.8.7')
+  s.add_development_dependency('redcarpet', '~> 2.3.0')
+  s.add_development_dependency "yard-redcarpet-ext", "~> 0.0.3"
+end
+

data/lib/premailer/adapter/nokogiri.rb

@@ -121,9 +121,9 @@ class Premailer
         @processed_doc = doc
         if is_xhtml?
           # we don't want to encode carriage returns
-          @processed_doc.to_xhtml(:encoding => nil).gsub(/&\#(xD|13);/i, "\r")
+          @processed_doc.to_xhtml(:encoding => @options[:output_encoding]).gsub(/&\#(xD|13);/i, "\r")
         else
-          @processed_doc.to_html
+          @processed_doc.to_html(:encoding => @options[:output_encoding])
         end
       end
 
@@ -186,10 +186,10 @@ class Premailer
         # TODO: duplicate options
         if @options[:with_html_string] or @options[:inline] or input.respond_to?(:read)
           thing = input
-				elsif @is_local_file
+        elsif @is_local_file
           @base_dir = File.dirname(input)
           thing = File.open(input, 'r')
-				else
+        else
           thing = open(input)
         end
 
@@ -202,15 +202,8 @@ class Premailer
 
         # Handle HTML entities
         if @options[:replace_html_entities] == true and thing.is_a?(String)
-          if RUBY_VERSION =~ /1.9/
-            html_entity_ruby_version = "1.9"
-          elsif RUBY_VERSION =~ /1.8/
-            html_entity_ruby_version = "1.8"
-          end
-          if html_entity_ruby_version
-            HTML_ENTITIES[html_entity_ruby_version].map do |entity, replacement|
-              thing.gsub! entity, replacement
-            end
+          HTML_ENTITIES.map do |entity, replacement|
+            thing.gsub! entity, replacement
           end
         end
         # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74

data/lib/premailer/executor.rb

@@ -52,6 +52,10 @@ opts = OptionParser.new do |opts|
     options[:line_length] = v
   end
 
+  opts.on("-e", "--entities", "Output HTML entities instead of UTF-8 when using Nokogiri") do |v|
+    options[:output_encoding] = "US-ASCII"
+  end
+
   opts.on("-d", "--io-exceptions", "Abort on I/O errors") do |v|
     options[:io_exceptions] = v
   end

data/lib/premailer/premailer.rb

@@ -45,38 +45,17 @@ class Premailer
   # list of HTMLEntities to fix
   # source: http://stackoverflow.com/questions/2812781/how-to-convert-webpage-apostrophe-8217-to-ascii-39-in-ruby-1-
   HTML_ENTITIES = {
-    "1.8" => {
-      "\342\200\231" => "'",
-      "\342\200\246" => "...",
-      "\342\200\176" => "'",
-      "\342\200\177" => "'",
-      "\342\200\230" => "'",
-      "\342\200\231" => "'",
-      "\342\200\232" => ',',
-      "\342\200\233" => "'",
-      "\342\200\234" => '"',
-      "\342\200\235" => '"',
-      "\342\200\041" => '-',
-      "\342\200\174" => '-',
-      "\342\200\220" => '-',
-      "\342\200\223" => '-',
-      "\342\200\224" => '--',
-      "\342\200\225" => '--',
-      "\342\200\042" => '--'
-    },
-    "1.9" => {
-      "’" => "'",
-      "…" => "...",
-      "‘" => "'",
-      "‚" => ',',
-      "‛" => "'",
-      "“" => '"',
-      "”" => '"',
-      "‐" => '-',
-      "–" => '-',
-      "—" => '--',
-      "―" => '--'
-    }
+    "’" => "'",
+    "…" => "...",
+    "‘" => "'",
+    "‚" => ',',
+    "‛" => "'",
+    "“" => '"',
+    "”" => '"',
+    "‐" => '-',
+    "–" => '-',
+    "—" => '--',
+    "―" => '--'
   }
 
   # list of CSS attributes that can be rendered as HTML attributes
@@ -185,7 +164,9 @@ class Premailer
   # @option options [Boolean] :include_style_tags Whether to include css from <tt>style</tt> tags.  Default is true.
   # @option options [String] :input_encoding Manually specify the source documents encoding. This is a good idea. Default is ASCII-8BIT.
   # @option options [Boolean] :replace_html_entities Convert HTML entities to actual characters. Default is false.
+  # @option options [Boolean] :escape_url_attributes URL Escapes href, src, and background attributes on elements. Default is true.
   # @option options [Symbol] :adapter Which HTML parser to use, either <tt>:nokogiri</tt> or <tt>:hpricot</tt>.  Default is <tt>:hpricot</tt>.
+  # @option options [String] :output_encoding Output encoding option for Nokogiri adapter. Should be set to "US-ASCII" to output HTML entities instead of Unicode characters.
   def initialize(html, options = {})
     @options = {:warn_level => Warnings::SAFE,
                 :line_length => 65,
@@ -207,7 +188,9 @@ class Premailer
                 :include_link_tags => true,
                 :include_style_tags => true,
                 :input_encoding => 'ASCII-8BIT',
+                :output_encoding => nil,
                 :replace_html_entities => false,
+                :escape_url_attributes => true,
                 :adapter => Adapter.use,
                 }.merge(options)
 
@@ -416,6 +399,7 @@ public
     base_uri = URI.parse(base_uri) unless base_uri.kind_of?(URI)
 
     append_qs = @options[:link_query_string] || ''
+    escape_attrs = @options[:escape_url_attributes]
 
     ['href', 'src', 'background'].each do |attribute|
       tags = doc.search("*[@#{attribute}]")
@@ -438,6 +422,7 @@ public
             merged = Premailer.resolve_link(tag.attributes[attribute].to_s, base_uri)
           rescue
             begin
+              next unless escape_attrs
               merged = Premailer.resolve_link(URI.escape(tag.attributes[attribute].to_s), base_uri)
             rescue; end
           end

data/lib/premailer/version.rb

@@ -1,4 +1,4 @@
 class Premailer
   # Premailer version.
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.1'.freeze
 end

data/test/files/base.html

@@ -17,9 +17,7 @@
 		@import "noimport.css" print;
 	</style>
 	<style type="text/css">
-	@media only screen and (max-device-width: 480px) {
-	  #iphone { display: block; }
-	}
+		#iphone { display: block; }
 	</style>
 </head>
 <body>

data/test/helper.rb

@@ -20,8 +20,7 @@ class Premailer::TestCase < Test::Unit::TestCase
       end
     end
 
-    stub_request(:get, /my\.example\.com\:8080\/*/)
-      .to_return(:status => 200, :body => "", :headers => {})
+    stub_request(:get, /my\.example\.com\:8080\/*/).to_return(:status => 200, :body => "", :headers => {})
   end
   
   def default_test; end

data/test/test_misc.rb

@@ -119,7 +119,7 @@ END_HTML
 
       # should be preserved as unmergeable
 
-  	  assert_match /red !important/i, premailer.processed_doc.at('body style').inner_html
+  	  assert_match /color: red/i, premailer.processed_doc.at('body style').inner_html
 
   	  assert_match /a:hover/i, premailer.processed_doc.at('style').inner_html
 
@@ -136,8 +136,9 @@ END_HTML
 		premailer = Premailer.new(html, :with_html_string => true, :verbose => true)
 		premailer.to_inline_css
 
-	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red[\s]*!important;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
-
+    # blue should be inlined
+	  assert_no_match /a\:hover[\s]*\{[\s]*color\:[\s]*blue[\s]*;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
+    # red should remain in <style> block
 	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
   end
 
@@ -171,9 +172,9 @@ END_HTML
 
       assert_equal "color: blue", premailer.processed_doc.at('a').attributes['style'].to_s,
                    "#{adapter}: Failed to inline the default style"
-      assert_match /@media \(min-width:500px\) {.*?a {.*?color: red;.*?}.*?}/m, style_tag_contents,
+      assert_match /@media \(min-width:500px\) \{.*?a {.*?color: red;.*?\}.*?\}/m, style_tag_contents,
                    "#{adapter}: Failed to add media query with no type to style"
-      assert_match /@media screen and \(orientation: portrait\) {.*?a {.*?color: green;.*?}.*?}/m, style_tag_contents,
+      assert_match /@media screen and \(orientation: portrait\) \{.*?a \{.*?color: green;.*?\}.*?\}/m, style_tag_contents,
                    "#{adapter}: Failed to add media query with type to style"
     end
 

data/test/test_premailer.rb

@@ -151,6 +151,23 @@ END_HTML
     end
   end
   
+  def test_initialize_no_escape_attributes_option
+    html = <<END_HTML
+    <html> <body>
+    <a id="google" href="http://google.com">Google</a>
+    <a id="noescape" href="{{link_url}}">Link</a>
+		</body> </html>
+END_HTML
+
+    [:nokogiri, :hpricot].each do |adapter|
+    	pm = Premailer.new(html, :with_html_string => true, :adapter => adapter, :escape_url_attributes => false)
+      pm.to_inline_css
+      doc = pm.processed_doc
+      assert_equal doc.at('#google')['href'], 'http://google.com'
+      assert_equal doc.at('#noescape')['href'], '{{link_url}}'
+    end
+  end
+  
   def test_remove_ids
     html = <<END_HTML
     <html> <head> <style type="text/css"> #remove { color:blue; } </style> </head>

metadata

@@ -1,145 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "!="
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-    - - "!="
+    - - '!='
       - !ruby/object:Gem::Version
         version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: hpricot
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard-redcarpet-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.0.3
 description: Improve the rendering of HTML emails by making CSS inline, converting
@@ -150,14 +150,16 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".jrubyrc"
-- ".travis.yml"
-- ".yardopts"
+- .gitignore
+- .jrubyrc
+- .travis.yml
+- .yardopts
 - Gemfile
 - LICENSE.md
 - README.md
 - bin/premailer
+- gemfiles/ruby187.gemfile
+- gemfiles/ruby187.gemspec
 - init.rb
 - lib/premailer.rb
 - lib/premailer/adapter.rb
@@ -204,17 +206,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Preflight for HTML e-mail.