regru-premailer 1.7.7 → 1.7.8

data/.gitignore

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

data/.jrubyrc

@@ -0,0 +1 @@
+cext.enabled=true

data/.travis.yml

@@ -4,5 +4,6 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - jruby
   - ree

data/Gemfile

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

data/lib/premailer/adapter/hpricot.rb

@@ -139,7 +139,9 @@ class Premailer
 
         unless styles.empty?
           style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
-          if body = doc.search('body')
+          if head = doc.search('head')
+            head.append(style_tag)
+          elsif body = doc.search('body')
             body.append(style_tag)
           else
             doc.inner_html= doc.inner_html << style_tag

data/lib/premailer/adapter/nokogiri.rb

@@ -112,7 +112,7 @@ class Premailer
         @processed_doc = doc
         if is_xhtml?
           # we don't want to encode carriage returns
-          @processed_doc.to_xhtml(:encoding => nil).gsub(/&\#xD;/i, "\r")
+          @processed_doc.to_xhtml(:encoding => nil).gsub(/&\#(xD|13);/i, "\r")
         else
           @processed_doc.to_html
         end
@@ -129,11 +129,17 @@ class Premailer
         unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
           styles += "#{selector} { #{declarations} }\n"
         end
-        
+
         unless styles.empty?
           style_tag = "<style type=\"text/css\">\n#{styles}></style>"
-          if body = doc.search('body')
-            doc.at_css('body').children.before(::Nokogiri::XML.fragment(style_tag))            
+          if head = doc.search('head')
+            doc.at_css('head').add_child(::Nokogiri::XML.fragment(style_tag))
+          elsif 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
+              doc.at_css('body').add_child(::Nokogiri::XML.fragment(style_tag))
+            end
           else
             doc.inner_html = style_tag += doc.inner_html
           end
@@ -191,7 +197,7 @@ class Premailer
         doc = nil
 
         # Handle HTML entities
-        if @options[:replace_html_entities] == true and thing.is_a?(String) 
+        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/
@@ -213,6 +219,11 @@ class Premailer
           doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding] || default_encoding) {|c| c.recover }
         end
 
+        # Fix for removing any CDATA tags inserted per https://github.com/sparklemotion/nokogiri/issues/311
+        doc.search("style").children.each do |child|
+          child.swap(child.text()) if child.cdata?
+        end
+
         return doc
       end
 

data/lib/premailer/html_to_plain_text.rb

@@ -14,20 +14,36 @@ module HtmlToPlainText
     he = HTMLEntities.new
     txt = he.decode(txt)
 
-    # replace image by their alt attribute
-    txt.gsub!(/<img.+?alt=\"([^\"]*)\"[^>]*\/>/i, '\1')
-
-    # replace image by their alt attribute
-    txt.gsub!(/<img.+?alt=\"([^\"]*)\"[^>]*\/>/i, '\1')
-    txt.gsub!(/<img.+?alt='([^\']*)\'[^>]*\/>/i, '\1')
+    # replace images with their alt attributes
+    # for img tags with "" for attribute quotes
+    # with or without closing tag
+    # eg. the following formats:
+    # <img alt="" />
+    # <img alt="">
+    txt.gsub!(/<img.+?alt=\"([^\"]*)\"[^>]*\>/i, '\1')
+
+    # for img tags with '' for attribute quotes
+    # with or without closing tag
+    # eg. the following formats:
+    # <img alt='' />
+    # <img alt=''>
+    txt.gsub!(/<img.+?alt=\'([^\']*)\'[^>]*\>/i, '\1')
 
     # links
-    txt.gsub!(/<a.+?href=\"(mailto:)?([^\"]*)\"[^>]*>((.|\s)+?)<\/a>/i) do |s|
-      $3.strip + ' ( ' + $2.strip + ' )'
+    txt.gsub!(/<a.+?href=\"(mailto:)?([^\"]*)\"[^>]*>((.|\s)*?)<\/a>/i) do |s|
+      if $3.empty?
+        ''
+      else
+        $3.strip + ' ( ' + $2.strip + ' )'
+      end
     end
 
-    txt.gsub!(/<a.+?href='(mailto:)?([^\']*)\'[^>]*>((.|\s)+?)<\/a>/i) do |s|
-      $3.strip + ' ( ' + $2.strip + ' )'
+    txt.gsub!(/<a.+?href='(mailto:)?([^\']*)\'[^>]*>((.|\s)*?)<\/a>/i) do |s|
+      if $3.empty?
+        ''
+      else
+        $3.strip + ' ( ' + $2.strip + ' )'
+      end
     end
 
 

data/lib/premailer/premailer.rb

@@ -291,21 +291,26 @@ protected
 
     # Load CSS included in <tt>style</tt> and <tt>link</tt> tags from an HTML document.
   def load_css_from_html! # :nodoc:
-    if tags = @doc.search("link[@rel='stylesheet'], style")
+    if (@options[:adapter] == :nokogiri)
+      tags = @doc.search("link[@rel='stylesheet']", "//style[not(contains(@data-premailer,'ignore'))]")
+    else
+      tags = @doc.search("link[@rel='stylesheet'], style:not([@data-premailer='ignore'])")
+    end
+    if tags
       tags.each do |tag|
         if tag.to_s.strip =~ /^\<link/i && tag.attributes['href'] && media_type_ok?(tag.attributes['media']) && @options[:include_link_tags]
           # A user might want to <link /> to a local css file that is also mirrored on the site
           # but the local one is different (e.g. newer) than the live file, premailer will now choose the local file
-          
+
           if tag.attributes['href'].to_s.include? @base_url.to_s and @html_file.kind_of?(String)
             link_uri = File.join(File.dirname(@html_file), tag.attributes['href'].to_s.sub!(@base_url.to_s, ''))
           end
-          
+
           # if the file does not exist locally, try to grab the remote reference
           if link_uri.nil? or not File.exists?(link_uri)
             link_uri = Premailer.resolve_link(tag.attributes['href'].to_s, @html_file)
           end
-          
+
           if Premailer.local_data?(link_uri)
             $stderr.puts "Loading css from local file: " + link_uri if @options[:verbose]
             load_css_from_local_file!(link_uri)
@@ -337,10 +342,9 @@ public
 
   # @private
   def media_type_ok?(media_types)
+    media_types = media_types.to_s
     return true if media_types.nil? or media_types.empty?
     media_types.split(/[\s]+|,/).any? { |media_type| media_type.strip =~ /screen|handheld|all/i }
-  rescue
-    true
   end
 
   def append_query_string(doc, qs)
@@ -360,7 +364,7 @@ public
     doc.search('a').each do|el|
       href = el.attributes['href'].to_s.strip
       next if href.nil? or href.empty?
-      
+
       next if href[0,1] =~ /[\#\{\[\<\%]/ # don't bother with anchors or special-looking links
 
       begin

data/lib/premailer/version.rb

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

data/premailer.gemspec

@@ -1,4 +1,7 @@
-$LOAD_PATH.unshift(File.expand_path('./lib', File.dirname(__FILE__)))
+GEM_ROOT = 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'
 
@@ -17,9 +20,10 @@ Gem::Specification.new do |s|
   s.executables      = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.add_dependency('css_parser', '>= 1.1.9')
   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.4.4')
-  s.add_development_dependency('rake', ['~> 0.8',  '!= 0.9.0'])
   s.add_development_dependency('yard', '~> 0.7.3')
   s.add_development_dependency('redcarpet', '~> 1.17.2')
 end

data/rakefile.rb

@@ -2,25 +2,23 @@ $:.unshift File.expand_path('../lib', __FILE__)
 
 require 'rake'
 require 'rake/testtask'
-require 'rubygems/package_task'
-require 'fileutils'
-require 'premailer'
+require 'rake'
+require "bundler/gem_tasks"
+require 'yard'
 
-def gemspec
- @gemspec ||= begin
-   file = File.expand_path('../premailer.gemspec', __FILE__)
-   eval(File.read(file), binding, file)
- end
-end
+GEM_ROOT = File.dirname(__FILE__).freeze  unless defined?(GEM_ROOT)
 
-Gem::PackageTask.new(gemspec) do |pkg|
-  pkg.need_tar = true
-end
+lib_path = File.expand_path('lib', GEM_ROOT)
+$LOAD_PATH.unshift(lib_path)  unless $LOAD_PATH.include? lib_path
+
+require 'premailer/version'
 
 task :default => [:test]
 
 desc 'Parse a URL and write out the output.'
 task :inline do
+  require 'premailer'
+
   url = ENV['url']
   output = ENV['output']
   
@@ -30,15 +28,17 @@ task :inline do
   end
 
   premailer = Premailer.new(url, :warn_level => Premailer::Warnings::SAFE, :verbose => true, :adapter => :nokogiri)
-  fout = File.open(output, "w")
-  fout.puts premailer.to_inline_css
-  fout.close
+  File.open(output, "w") do |fout|
+    fout.puts premailer.to_inline_css
+  end
 
   puts "Succesfully parsed '#{url}' into '#{output}'"
   puts premailer.warnings.length.to_s + ' CSS warnings were found'
 end
 
 task :text do
+  require 'premailer'
+
   url = ENV['url']
   output = ENV['output']
   
@@ -48,9 +48,9 @@ task :text do
   end
 
   premailer = Premailer.new(url, :warn_level => Premailer::Warnings::SAFE)
-  fout = File.open(output, "w")
-  fout.puts premailer.to_plain_text
-  fout.close
+  File.open(output, "w") do |fout|
+    fout.puts premailer.to_plain_text
+  end
   
   puts "Succesfully parsed '#{url}' into '#{output}'"
 end
@@ -60,12 +60,6 @@ Rake::TestTask.new do |t|
   t.verbose = false
 end
 
-
-begin
-  require 'yard'
-
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  $stderr.puts "Please install YARD with: gem install yard"
+YARD::Rake::YardocTask.new do |yard|
+  yard.options << "--title='premailer #{Premailer::VERSION}'"
 end
-

data/test/test_html_to_plain_text.rb

@@ -102,6 +102,20 @@ END_HTML
     assert lens.max <= 20
   end
 
+  def test_img_alt_tags
+    # ensure html imag tags that aren't self-closed are parsed, 
+    # along with accepting both '' and "" as attribute quotes
+
+    # <img alt="" />
+    assert_plaintext 'Example ( http://example.com/ )', '<a href="http://example.com/"><img src="http://example.ru/hello.jpg" alt="Example"/></a>'
+    # <img alt="">
+    assert_plaintext 'Example ( http://example.com/ )', '<a href="http://example.com/"><img src="http://example.ru/hello.jpg" alt="Example"></a>'
+    # <img alt='' />
+    assert_plaintext 'Example ( http://example.com/ )', "<a href='http://example.com/'><img src='http://example.ru/hello.jpg' alt='Example'/></a>"
+    # <img alt=''>
+    assert_plaintext 'Example ( http://example.com/ )', "<a href='http://example.com/'><img src='http://example.ru/hello.jpg' alt='Example'></a>"
+  end
+
   def test_links
     # basic
     assert_plaintext 'Link ( http://example.com/ )', '<a href="http://example.com/">Link</a>'
@@ -134,6 +148,9 @@ END_HTML
     
     # unsubscribe
     assert_plaintext 'Link ( [[!unsubscribe]] )', '<a href="[[!unsubscribe]]">Link</a>'
+
+    # empty link gets dropped, and shouldn't run forever
+    assert_plaintext(("This is some more text\n\n" * 14 + "This is some more text"), "<a href=\"test\"></a>#{"\n<p>This is some more text</p>" * 15}")
   end
   
   # see https://github.com/alexdunae/premailer/issues/72

data/test/test_misc.rb

@@ -115,10 +115,10 @@ END_HTML
 
   		premailer = Premailer.new(html, :with_html_string => true, :preserve_styles => false, :adapter => adapter)
   		premailer.to_inline_css
-  	  assert_nil premailer.processed_doc.at('head link')
+  	  assert_nil premailer.processed_doc.at('body link')
 
       # should be preserved as unmergeable
-  	  assert_match /red !important/i, premailer.processed_doc.at('body style').inner_html
+  	  assert_match /red !important/i, premailer.processed_doc.at('head style').inner_html
   	end
   end
 
@@ -131,7 +131,7 @@ 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
+	  assert_match /a\:hover[\s]*\{[\s]*color\:[\s]*red[\s]*!important;[\s]*\}/i, premailer.processed_doc.at('head style').inner_html
   end
 
   def test_unmergable_rules_with_no_body

data/test/test_premailer.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+# -*- encoding: UTF-8 -*-
+
 require File.expand_path(File.dirname(__FILE__)) + '/helper'
 
 class TestPremailer < Premailer::TestCase
@@ -234,7 +235,7 @@ END_HTML
   end
 
   def test_input_encoding
-    html_special_characters = "Ää, Öö, Üü".encode("UTF-8")
+    html_special_characters = "Ää, Öö, Üü"
     expected_html = "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/REC-html40/loose.dtd\">\n<html><body><p>" + html_special_characters + "</p></body></html>\n"
     pm = Premailer.new(html_special_characters, :with_html_string => true, :adapter => :nokogiri, :input_encoding => "UTF-8")
     assert_equal expected_html, pm.to_inline_css
@@ -242,14 +243,14 @@ END_HTML
 
   def test_meta_encoding_downcase
     meta_encoding = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'
-    expected_html = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
+    expected_html = Regexp.new(Regexp.escape('<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'), Regexp::IGNORECASE)
     pm = Premailer.new(meta_encoding, :with_html_string => true, :adapter => :nokogiri, :input_encoding => "utf-8")
     assert_match expected_html, pm.to_inline_css
   end
 
   def test_meta_encoding_upcase
     meta_encoding = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">'
-    expected_html = '<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'
+    expected_html = Regexp.new(Regexp.escape('<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">'), Regexp::IGNORECASE)
     pm = Premailer.new(meta_encoding, :with_html_string => true, :adapter => :nokogiri, :input_encoding => "UTF-8")
     assert_match expected_html, pm.to_inline_css
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: regru-premailer
 version: !ruby/object:Gem::Version
-  version: 1.7.7
+  version: 1.7.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -44,29 +44,51 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  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: 1.4.4
+        version: 0.8.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,29 +96,23 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 0.8.3
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ! '!='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.4.4
   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
+        version: 1.4.4
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -138,6 +154,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .jrubyrc
 - .travis.yml
 - .yardopts
 - Gemfile
@@ -193,12 +210,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4588317262745199697
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4588317262745199697
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -230,3 +253,4 @@ test_files:
 - test/test_misc.rb
 - test/test_premailer.rb
 - test/test_warnings.rb
+has_rdoc: true