premailer 1.7.9 → 1.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bd6a0eccd0fddd3ad53178ee0b715c3d1b770491
+  data.tar.gz: 5768d084e017e213f46ae790ecc6003f9eb82573
+SHA512:
+  metadata.gz: bc9b3bb5aa1ca359b15a45aec3f51b7ae9375483353f76d6a2ace0463a7b5d857721f10b3149f08adbf586cb6f2007271900933afdaac6d95d5e2bc625cc2c5b
+  data.tar.gz: 2939cfd440e8f10c2bba6f685bc0f538930b0c97532ff2f1cc3ccbe96ba22c4137821c918a80690693bf5aa0c6afbe3353204cbb01afc30f099466b952e0c20d

data/.gitignore

@@ -8,4 +8,5 @@ doc/
 .yardoc/
 *.sw?
 pkg/
+.bundle/
 *.sublime-*

data/Gemfile

@@ -1,6 +1,6 @@
 source "https://rubygems.org"
 
-gem 'css_parser', :git => 'git://github.com/alexdunae/css_parser.git'
+gem 'css_parser', :git => 'git://github.com/premailer/css_parser.git'
 gem 'webmock', :group => [:development, :test]
 
 platforms :jruby do

data/lib/premailer.rb

@@ -7,4 +7,3 @@ require 'css_parser'
 require 'premailer/adapter'
 require 'premailer/html_to_plain_text'
 require 'premailer/premailer'
-

data/lib/premailer/adapter/hpricot.rb

@@ -18,15 +18,15 @@ class Premailer
         end
 
         # Iterate through the rules and merge them into the HTML
-        @css_parser.each_selector(:all) do |selector, declaration, specificity|
+        @css_parser.each_selector(:all) do |selector, declaration, specificity, media_types|
           # Save un-mergable rules separately
           selector.gsub!(/:link([\s]*)+/i) {|m| $1 }
 
           # Convert element names to lower case
           selector.gsub!(/([\s]|^)([\w]+)/) {|m| $1.to_s + $2.to_s.downcase }
 
-          if selector =~ Premailer::RE_UNMERGABLE_SELECTORS
-            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration)) unless @options[:preserve_styles]
+          if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
           else
             begin
               if selector =~ Premailer::RE_RESET_SELECTORS
@@ -75,6 +75,7 @@ class Premailer
           # Perform style folding
           merged = CssParser.merge(declarations)
           merged.expand_shorthand!
+          merged.create_shorthand!
 
           # Duplicate CSS attributes as HTML attributes
           if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)
@@ -132,10 +133,7 @@ class Premailer
       #
       # @return [::Hpricot] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
-        styles = ''
-        unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
-          styles += "#{selector} { #{declarations} }\n"
-        end
+        styles = unmergable_rules.to_s
 
         unless styles.empty?
           style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"

data/lib/premailer/adapter/nokogiri.rb

@@ -19,15 +19,15 @@ class Premailer
         end
 
         # Iterate through the rules and merge them into the HTML
-        @css_parser.each_selector(:all) do |selector, declaration, specificity|
+        @css_parser.each_selector(:all) do |selector, declaration, specificity, media_types|
           # Save un-mergable rules separately
           selector.gsub!(/:link([\s]*)+/i) {|m| $1 }
 
           # Convert element names to lower case
           selector.gsub!(/([\s]|^)([\w]+)/) {|m| $1.to_s + $2.to_s.downcase }
 
-          if selector =~ Premailer::RE_UNMERGABLE_SELECTORS
-            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration)) unless @options[:preserve_styles]
+          if Premailer.is_media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration), media_types) unless @options[:preserve_styles]
           else
             begin
               if selector =~ Premailer::RE_RESET_SELECTORS
@@ -80,6 +80,9 @@ class Premailer
             end
           end
 
+          # Collapse multiple rules into one as much as possible.
+          merged.create_shorthand!
+
           # write the inline STYLE attribute
           el['style'] = Premailer.escape_string(merged.declarations_to_s).split(';').map(&:strip).sort.join('; ')
         end
@@ -131,16 +134,11 @@ class Premailer
       #
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
-        styles = ''
-        unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
-          styles += "#{selector} { #{declarations} }\n"
-        end
+        styles = unmergable_rules.to_s
 
         unless styles.empty?
           style_tag = "<style type=\"text/css\">\n#{styles}</style>"
-          if head = doc.search('head')
-            doc.at_css('head').add_child(::Nokogiri::XML.fragment(style_tag))
-          elsif body = doc.search('body')
+          if body = doc.search('body')
             if doc.at_css('body').children && !doc.at_css('body').children.empty?
               doc.at_css('body').children.before(::Nokogiri::XML.fragment(style_tag))
             else
@@ -230,7 +228,7 @@ class Premailer
           child.swap(child.text()) if child.cdata?
         end
 
-        return doc
+        doc
       end
 
     end

data/lib/premailer/executor.rb

@@ -77,9 +77,11 @@ $stderr.puts "Processing in #{mode} mode with options #{options.inspect}" if opt
 premailer = nil
 input = nil
 
-if $stdin.tty?
+if ARGV.size > 0
+  # Executed via command line or shell script
   input = ARGV.shift
 else
+  # Called in piped command
   input = $stdin.read
   options[:with_html_string] = true
 end

data/lib/premailer/premailer.rb

@@ -178,12 +178,12 @@ class Premailer
   # @option options [Boolean] :remove_comments Remove html comments. Default is false.
   # @option options [Boolean] :remove_scripts Remove <tt>script</tt> elements. Default is true.
   # @option options [Boolean] :preserve_styles Whether to preserve any <tt>link rel=stylesheet</tt> and <tt>style</tt> elements.  Default is false.
-  # @option options [Boolean] :preserve_reset Whether to preserve styles associated with the MailChimp reset code.
-  # @option options [Boolean] :with_html_string Whether the html param should be treated as a raw string.
+  # @option options [Boolean] :preserve_reset Whether to preserve styles associated with the MailChimp reset code. Default is true.
+  # @option options [Boolean] :with_html_string Whether the html param should be treated as a raw string. Default is false.
   # @option options [Boolean] :verbose Whether to print errors and warnings to <tt>$stderr</tt>.  Default is false.
   # @option options [Boolean] :include_link_tags Whether to include css from <tt>link rel=stylesheet</tt> tags.  Default is true.
   # @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.
+  # @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 [Symbol] :adapter Which HTML parser to use, either <tt>:nokogiri</tt> or <tt>:hpricot</tt>.  Default is <tt>:hpricot</tt>.
   def initialize(html, options = {})
@@ -455,6 +455,10 @@ public
     doc
   end
 
+  # @private
+  def self.is_media_query?(media_types)
+    media_types && media_types.any?{|mt| mt.to_s.count('()') >= 2 }
+  end
 
   # @private
   def self.escape_string(str) # :nodoc:
@@ -548,7 +552,7 @@ public
       end
     end
 
-    return warnings
+    warnings
   end
 end
 

data/lib/premailer/version.rb

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

data/premailer.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   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.1.9')
+  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'])

data/test/helper.rb

@@ -19,6 +19,9 @@ class Premailer::TestCase < Test::Unit::TestCase
         { :status => 404, :body => "#{file_path} not found" }
       end
     end
+
+    stub_request(:get, /my\.example\.com\:8080\/*/)
+      .to_return(:status => 200, :body => "", :headers => {})
   end
   
   def default_test; end

data/test/test_misc.rb

@@ -20,10 +20,10 @@ class TestMisc < Premailer::TestCase
 
   def test_styles_in_the_body
     html = <<END_HTML
-    <html> 
-    <body> 
+    <html>
+    <body>
     <style type="text/css"> p { color: red; } </style>
-		<p>Test</p> 
+		<p>Test</p>
 		</body>
 		</html>
 END_HTML
@@ -33,13 +33,13 @@ END_HTML
 
 	  assert_match /color\: red/i,  premailer.processed_doc.at('p')['style']
   end
-  
+
   def test_commented_out_styles_in_the_body
     html = <<END_HTML
-    <html> 
-    <body> 
+    <html>
+    <body>
     <style type="text/css"> <!-- p { color: red; } --> </style>
-		<p>Test</p> 
+		<p>Test</p>
 		</body>
 		</html>
 END_HTML
@@ -52,13 +52,13 @@ END_HTML
 
   def test_not_applying_styles_to_the_head
     html = <<END_HTML
-    <html> 
+    <html>
     <head>
     <title>Title</title>
     <style type="text/css"> * { color: red; } </style>
     </head>
-    <body> 
-		<p><a>Test</a></p> 
+    <body>
+		<p><a>Test</a></p>
 		</body>
 		</html>
 END_HTML
@@ -77,13 +77,13 @@ END_HTML
 
   def test_multiple_identical_ids
     html = <<-END_HTML
-    <html> 
+    <html>
     <head>
     <style type="text/css"> #the_id { color: red; } </style>
     </head>
-    <body> 
-		<p id="the_id">Test</p> 
-		<p id="the_id">Test</p> 
+    <body>
+		<p id="the_id">Test</p>
+		<p id="the_id">Test</p>
 		</body>
 		</html>
     END_HTML
@@ -97,13 +97,13 @@ END_HTML
 
   def test_preserving_styles
     html = <<END_HTML
-    <html> 
+    <html>
     <head>
     <link rel="stylesheet" href="#"/>
     <style type="text/css"> a:hover { color: red; } </style>
     </head>
-    <body> 
-		<p><a>Test</a></p> 
+    <body>
+		<p><a>Test</a></p>
 		</body>
 		</html>
 END_HTML
@@ -118,27 +118,72 @@ END_HTML
   	  assert_nil premailer.processed_doc.at('body link')
 
       # should be preserved as unmergeable
-  	  assert_match /red !important/i, premailer.processed_doc.at('head style').inner_html
+
+  	  assert_match /red !important/i, premailer.processed_doc.at('body style').inner_html
+
+  	  assert_match /a:hover/i, premailer.processed_doc.at('style').inner_html
+
   	end
   end
 
   def test_unmergable_rules
     html = <<END_HTML
     <html> <head> <style type="text/css"> a { color:blue; } a:hover { color: red; } </style> </head>
-		<p><a>Test</a></p> 
+		<p><a>Test</a></p>
 		</body> </html>
 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('head style').inner_html
+
+	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red[\s]*!important;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
+
+	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('body style').inner_html
+  end
+
+  def test_unmergable_media_queries
+    html = <<END_HTML
+    <html> <head>
+    <style type="text/css">
+    a { color: blue; }
+    @media (min-width:500px) {
+      a { color: red; }
+    }
+    @media screen and (orientation: portrait) {
+      a { color: green; }
+    }
+    </style>
+    </head>
+    <body>
+    <p><a>Test</a></p>
+    </body> </html>
+END_HTML
+
+    [:nokogiri, :hpricot].each do |adapter|
+      puts "------- Testing adapter #{adapter}"
+      premailer = Premailer.new(html, :with_html_string => true, :adapter => adapter)
+      puts premailer.to_inline_css
+
+      style_tag = premailer.processed_doc.at('body style')
+      assert style_tag, "#{adapter} failed to add a body style tag"
+
+      style_tag_contents = style_tag.inner_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,
+                   "#{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,
+                   "#{adapter}: Failed to add media query with type to style"
+    end
+
   end
 
   def test_unmergable_rules_with_no_body
     html = <<END_HTML
-    <html> 
+    <html>
     <style type="text/css"> a:hover { color: red; } </style>
-		<p><a>Test</a></p> 
+		<p><a>Test</a></p>
 		</html>
 END_HTML
 
@@ -146,7 +191,7 @@ END_HTML
     assert_nothing_raised do
 		  premailer.to_inline_css
 	  end
-	  assert_match /red !important/i, premailer.processed_doc.at('style').inner_html
+	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red;[\s]*\}/i, premailer.processed_doc.at('style').inner_html
   end
 
   # in response to https://github.com/alexdunae/premailer/issues#issue/7
@@ -173,9 +218,9 @@ END_HTML
   def test_parsing_bad_markup_around_tables
     html = <<END_HTML
     <html>
-    <style type="text/css"> 
+    <style type="text/css">
       .style3 { font-size: xx-large; }
-      .style5 { background-color: #000080; } 
+      .style5 { background-color: #000080; }
     </style>
 		<tr>
 						<td valign="top" class="style3">
@@ -191,14 +236,14 @@ END_HTML
 		premailer = Premailer.new(html, :with_html_string => true)
 		premailer.to_inline_css
 	  assert_match /font-size: xx-large/, premailer.processed_doc.search('.style3').first.attributes['style'].to_s
-	  assert_match /background-color: #000080/, premailer.processed_doc.search('.style5').first.attributes['style'].to_s		
+	  assert_match /background: #000080/, premailer.processed_doc.search('.style5').first.attributes['style'].to_s
   end
 
   # in response to https://github.com/alexdunae/premailer/issues/56
   def test_inline_important
     html = <<END_HTML
     <html>
-    <style type="text/css"> 
+    <style type="text/css">
       p { color: red !important; }
     </style>
     <body>
@@ -216,10 +261,10 @@ END_HTML
   def test_handling_shorthand_auto_properties
     html = <<END_HTML
     <html>
-    <style type="text/css"> 
+    <style type="text/css">
       #page { margin: 0; margin-left: auto; margin-right: auto; }
       p { border: 1px solid black; border-right: none; }
-      
+
     </style>
     <body>
       <div id='page'><p>test</p></div>
@@ -229,7 +274,8 @@ END_HTML
 
     premailer = Premailer.new(html, :with_html_string => true)
   	premailer.to_inline_css
-    assert_match /margin: 0 auto;/, premailer.processed_doc.search('#page').first.attributes['style'].to_s
+
+    assert_match /margin: 0 auto/, premailer.processed_doc.search('#page').first.attributes['style'].to_s
     assert_match /border-style: solid none solid solid;/, premailer.processed_doc.search('p').first.attributes['style'].to_s
   end
 

metadata

@@ -1,164 +1,145 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.7.9
-  prerelease: 
+  version: 1.8.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-25 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.9
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     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
-    none: false
     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
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.3
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard-redcarpet-ext
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.3
 description: Improve the rendering of HTML emails by making CSS inline, converting
@@ -169,10 +150,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .jrubyrc
-- .travis.yml
-- .yardopts
+- ".gitignore"
+- ".jrubyrc"
+- ".travis.yml"
+- ".yardopts"
 - Gemfile
 - LICENSE.md
 - README.md
@@ -216,27 +197,26 @@ files:
 - test/test_warnings.rb
 homepage: http://premailer.dialect.ca/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Preflight for HTML e-mail.
 test_files:
 - test/files/base.html