premailer 1.9.2 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4df1d858e475536189c6e91cb30d72194cf8d88b
-  data.tar.gz: 39daad276db1125fc182e4da80ce8635debe9959
+  metadata.gz: 3b62798f9ef3929357e4fe01538d05615f37b9b3
+  data.tar.gz: f0224b7a6a42b88ebea688cf9d55fe30504f9751
 SHA512:
-  metadata.gz: 335cb3dc57599aba6fe75eba289a250abed56b9180ffc11feb129a0b90f49d9845f92d475329dfc2ba9ec9623e69f295bc844af35a66ca790914988e0f733620
-  data.tar.gz: d7401533fdfda12a308377cf6719e38461aafdf4c7f9b3c0eedef3998e8ef27c2126671e077d20e70aea82bb1dec3ee492b4b60545b5590e921bfb4a85628407
+  metadata.gz: 96bfa7a6374f3cd91f6004a8a988d46e789bd2cce29e12f595fee64c0e86244236e77766b1380a347329dbd71866f487ca23f9aedab0d600b2cf1a54a1c3253f
+  data.tar.gz: 09148edbb09bee950ad6e5c7c97709587b862136a38b5f484ab8e5f039f92f137ce7b948303796480004b31018e0f4ebe488d68c4ae1767f0f61d141d11f8db7

data/README.md

@@ -1,4 +1,4 @@
-# Premailer README [![Build Status](https://travis-ci.org/premailer/premailer.png?branch=master)](https://travis-ci.org/premailer/premailer)
+# Premailer README [![Build Status](https://travis-ci.org/premailer/premailer.png?branch=master)](https://travis-ci.org/premailer/premailer) [![Gem Version](https://badge.fury.io/rb/premailer.svg)](https://badge.fury.io/rb/premailer)
 
 ## What is this?
 
@@ -50,14 +50,13 @@ end
 
 ## Adapters
 
-Premailer's default adapter is nokogiri if both nokogiri and hpricot are included in the Gemfile list. However, if you want to use a different adapter, you can choose to.
+Premailer's default adapter is nokogiri if both nokogiri and nokogumbo are included in the Gemfile list. However, if you want to use a different adapter, you can choose to.
 
-There are four adapters in total (as of premailer 1.9.1)
+There are three adapters in total (as of premailer 1.9.1)
 
 1. nokogiri (default)
 2. nokogiri_fast
 3. nokogumbo
-4. hpricot (deprecated and will be removed in future premailer releases)
 
 `NokogiriFast` adapter improves the Algorithmic complexity of the running time by 20x with a slight compensation on memory. To switch to any of these adapters, add the following line. For example, if you want to include the `NokogiriFast` adapter,
 
@@ -113,5 +112,5 @@ and to [Campaign Monitor](https://www.campaignmonitor.com/) for supporting the w
 
 The source code can be found on [GitHub](https://github.com/premailer/premailer).
 
-Copyright by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-2017.  See [LICENSE.md](https://github.com/alexdunae/premailer/blob/master/LICENSE.md) for license details.
+Copyright by Alex Dunae (dunae.ca, e-mail 'code' at the same domain), 2007-2017.  See [LICENSE.md](https://github.com/premailer/premailer/blob/master/LICENSE.md) for license details.
 

data/lib/premailer/adapter.rb

@@ -4,10 +4,8 @@ class Premailer
   # * nokogiri
   # * nokogiri_fast
   # * nokogumbo
-  # * hpricot
   module Adapter
 
-    autoload :Hpricot, 'premailer/adapter/hpricot'
     autoload :Nokogiri, 'premailer/adapter/nokogiri'
     autoload :NokogiriFast, 'premailer/adapter/nokogiri_fast'
     autoload :Nokogumbo, 'premailer/adapter/nokogumbo'
@@ -17,7 +15,6 @@ class Premailer
       ["nokogiri", :nokogiri],
       ["nokogiri", :nokogiri_fast],
       ["nokogumbo", :nokogumbo],
-      ["hpricot",  :hpricot],
     ]
 
     # Returns the adapter to use.
@@ -35,7 +32,6 @@ class Premailer
       return :nokogiri if defined?(::Nokogiri)
       return :nokogiri_fast if defined?(::NokogiriFast)
       return :nokogumbo if defined?(::Nokogumbo)
-      return :hpricot  if defined?(::Hpricot)
 
       REQUIREMENT_MAP.each do |(library, adapter)|
         begin
@@ -46,7 +42,7 @@ class Premailer
         end
       end
 
-      raise RuntimeError.new("No suitable adapter for Premailer was found, please install hpricot or nokogiri")
+      raise RuntimeError.new("No suitable adapter for Premailer was found, please install nokogiri or nokogumbo")
     end
 
     # Sets the adapter to use.

data/lib/premailer/adapter/nokogiri.rb

@@ -144,25 +144,19 @@ class Premailer
       end
 
       # Create a <tt>style</tt> element with un-mergable rules (e.g. <tt>:hover</tt>)
-      # and write it into the <tt>body</tt>.
+      # and write it into the <tt>head</tt>.
       #
       # <tt>doc</tt> is an Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
       #
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
-
         unless styles.empty?
-          style_tag = "<style type=\"text/css\">\n#{styles}</style>"
-          unless (body = doc.search('body')).empty?
-            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
+          style_tag = doc.create_element "style", "#{styles}"
+          head = doc.at_css('head')
+          head ||=  doc.root.first_element_child.add_previous_sibling(doc.create_element "head")  if doc.root && doc.root.first_element_child
+          head ||=  doc.add_child(doc.create_element "head")
+          head << style_tag
         end
         doc
       end

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -146,26 +146,19 @@ class Premailer
       end
 
       # Create a <tt>style</tt> element with un-mergable rules (e.g. <tt>:hover</tt>)
-      # and write it into the <tt>body</tt>.
+      # and write it into the <tt>head</tt>.
       #
       # <tt>doc</tt> is an Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
       #
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
-
-        unless styles.empty?
-          style_tag = "<style type=\"text/css\">\n#{styles}</style>"
-          unless (body = doc.search('body')).empty?
-            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
-        end
+        return doc  if styles.empty?
+        style_tag = doc.create_element "style", styles
+        head = doc.at_css('head')
+        head ||=  doc.root.first_element_child.add_previous_sibling(doc.create_element "head")  if doc.root && doc.root.first_element_child
+        head ||=  doc.add_child(doc.create_element "head")
+        head << style_tag
         doc
       end
 

data/lib/premailer/adapter/nokogumbo.rb

@@ -143,26 +143,19 @@ class Premailer
       end
 
       # Create a <tt>style</tt> element with un-mergable rules (e.g. <tt>:hover</tt>)
-      # and write it into the <tt>body</tt>.
+      # and write it into the <tt>head</tt>.
       #
       # <tt>doc</tt> is an Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
       #
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
-
-        unless styles.empty?
-          style_tag = "<style type=\"text/css\">\n#{styles}</style>"
-          unless (body = doc.search('body')).empty?
-            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
-        end
+        return doc  if styles.empty?
+        style_tag = doc.create_element "style", styles
+        head = doc.at_css('head')
+        head ||=  doc.root.first_element_child.add_previous_sibling(doc.create_element "head")  if doc.root && doc.root.first_element_child
+        head ||=  doc.add_child(doc.create_element "head")
+        head << style_tag
         doc
       end
 

data/lib/premailer/executor.rb

@@ -3,11 +3,12 @@ require 'premailer'
 
 # defaults
 options = {
-  :base_url => nil,
+  :base_url          => nil,
   :link_query_string => nil,
-  :remove_classes => false,
-  :verbose => false,
-  :line_length => 65
+  :remove_classes    => false,
+  :verbose           => false,
+  :line_length       => 65,
+  :adapter           => :nokogiri,
 }
 
 mode = :html
@@ -28,6 +29,10 @@ opts = OptionParser.new do |opts|
     mode = v
   end
 
+  opts.on("--adapter ADAPTER", [:nokogiri, :nokogiri_fast, :nokogumbo], "Adapter: nokogiri, nokogiri_fast or nokogumbo (default: #{options[:adapter]}") do |v|
+    options[:adapter] = v
+  end
+
   opts.on("-b", "--base-url STRING", String, "Base URL, useful for local files") do |v|
     options[:base_url] = v
   end
@@ -40,12 +45,12 @@ opts = OptionParser.new do |opts|
     options[:css] = v
   end
 
-  opts.on("-r", "--remove-classes", "Remove HTML classes") do |v|
-    options[:remove_classes] = v
+  opts.on("-r", "--remove-classes", "Remove HTML classes") do
+    options[:remove_classes] = true
   end
 
-  opts.on("-j", "--remove-scripts", "Remove <script> elements") do |v|
-    options[:remove_scripts] = v
+  opts.on("-j", "--remove-scripts", "Remove <script> elements") do
+    options[:remove_scripts] = true
   end
 
   opts.on("-l", "--line-length N", Integer, "Line length for plaintext (default: #{options[:line_length].to_s})") do |v|
@@ -56,12 +61,12 @@ opts = OptionParser.new do |opts|
     options[:output_encoding] = "US-ASCII"
   end
 
-  opts.on("-d", "--io-exceptions", "Abort on I/O errors") do |v|
-    options[:io_exceptions] = v
+  opts.on("-d", "--io-exceptions", "Abort on I/O errors") do
+    options[:io_exceptions] = true
   end
 
-  opts.on("-v", "--verbose", "Print additional information at runtime") do |v|
-    options[:verbose] = v
+  opts.on("-v", "--verbose", "Print additional information at runtime") do
+    options[:verbose] = true
   end
 
   opts.on_tail("-?", "--help", "Show this message") do

data/lib/premailer/premailer.rb

@@ -121,10 +121,10 @@ class Premailer
   # unmergeable CSS rules to be preserved in the head (CssParser)
   attr_reader   :unmergable_rules
 
-  # processed HTML document (Hpricot/Nokogiri)
+  # processed HTML document (Nokogiri/Nokogumbo)
   attr_reader   :processed_doc
 
-  # source HTML document (Hpricot/Nokogiri)
+  # source HTML document (Nokogiri/Nokogumbo)
   attr_reader   :doc
 
   # Warning levels
@@ -174,7 +174,7 @@ class Premailer
   # @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 [Symbol] :adapter Which HTML parser to use, <tt>:nokogiri</tt>, <tt>:nokogiri_fast</tt> or <tt>:nokogumbo</tt>.  Default is <tt>:nokogiri</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.
   # @option options [Boolean] :create_shorthands Combine several properties into a shorthand one, e.g. font: style weight size. Default is true.
   def initialize(html, options = {})
@@ -411,9 +411,9 @@ public
   # Processes <tt>href</tt> <tt>src</tt> and <tt>background</tt> attributes
   # as well as CSS <tt>url()</tt> declarations found in inline <tt>style</tt> attributes.
   #
-  # <tt>doc</tt> is an Hpricot document and <tt>base_uri</tt> is either a string or a URI.
+  # <tt>doc</tt> is a document and <tt>base_uri</tt> is either a string or a URI.
   #
-  # Returns an Hpricot document.
+  # Returns a document.
   def convert_inline_links(doc, base_uri) # :nodoc:
     base_uri = URI.parse(base_uri) unless base_uri.kind_of?(URI)
 

data/lib/premailer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.9.2
+  version: 1.10.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: css_parser
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 1.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.8
+        version: 1.4.9
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -42,14 +42,14 @@ dependencies:
   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
@@ -72,40 +72,20 @@ dependencies:
     - - "!="
       - !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
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.4.4
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.8
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -192,7 +172,7 @@ dependencies:
         version: '0'
 description: Improve the rendering of HTML emails by making CSS inline, converting
   links and warning about unsupported code.
-email: code@dunae.ca
+email: akzhan.abdulin@gmail.com
 executables:
 - premailer
 extensions: []
@@ -203,7 +183,6 @@ files:
 - bin/premailer
 - lib/premailer.rb
 - lib/premailer/adapter.rb
-- lib/premailer/adapter/hpricot.rb
 - lib/premailer/adapter/nokogiri.rb
 - lib/premailer/adapter/nokogiri_fast.rb
 - lib/premailer/adapter/nokogumbo.rb
@@ -213,7 +192,7 @@ files:
 - lib/premailer/premailer.rb
 - lib/premailer/version.rb
 - misc/client_support.yaml
-homepage: http://premailer.dialect.ca/
+homepage: https://github.com/premailer/premailer
 licenses: []
 metadata:
   yard.run: yri
@@ -225,7 +204,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -233,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Preflight for HTML e-mail.

data/lib/premailer/adapter/hpricot.rb

@@ -1,220 +0,0 @@
-require 'hpricot'
-
-class Premailer
-  module Adapter
-    # Hpricot adapter
-    module Hpricot
-      include AdapterHelper::RgbToHex
-
-      def self.included(base)
-        warn <<eos
-[DEPRECATED] Premailer's Hpricot adapter will be removed with the next major \
-release. Change your :adapter option to :nokogiri or remove the `hpricot` gem \
-from your application to silence this warning. (Called from #{caller[2]})
-eos
-      end
-
-      # Merge CSS into the HTML document.
-      # @return [String] HTML.
-      def to_inline_css
-        doc = @processed_doc
-        @unmergable_rules = CssParser::Parser.new
-
-        # Give all styles already in style attributes a specificity of 1000
-        # per http://www.w3.org/TR/CSS21/cascade.html#specificity
-        doc.search("*[@style]").each do |el|
-          el['style'] = '[SPEC=1000[' + el.attributes['style'] + ']]'
-        end
-
-        # Iterate through the rules and merge them into the HTML
-        @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 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
-                # this is in place to preserve the MailChimp CSS reset: http://github.com/mailchimp/Email-Blueprints/
-                # however, this doesn't mean for testing pur
-                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selector, declaration))  unless !@options[:preserve_reset]
-              end
-
-              # Change single ID CSS selectors into xpath so that we can match more
-              # than one element.  Added to work around dodgy generated code.
-              selector.gsub!(/\A\#([\w_\-]+)\Z/, '*[@id=\1]')
-
-              # convert attribute selectors to hpricot's format
-              selector.gsub!(/\[([\w]+)\]/, '[@\1]')
-              selector.gsub!(/\[([\w]+)([\=\~\^\$\*]+)([\w\s]+)\]/, '[@\1\2\'\3\']')
-
-              doc.search(selector).each do |el|
-                if el.elem? and (el.name != 'head' and el.parent.name != 'head')
-                  # Add a style attribute or append to the existing one
-                  block = "[SPEC=#{specificity}[#{declaration}]]"
-                  el['style'] = (el.attributes['style'].to_s ||= '') + ' ' + block
-                end
-              end
-            rescue ::Hpricot::Error, RuntimeError, ArgumentError
-              $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
-              next
-            end
-          end
-        end
-
-        # Remove script tags
-        if @options[:remove_scripts]
-          doc.search("script").remove
-        end
-
-        # Read STYLE attributes and perform folding
-        doc.search("*[@style]").each do |el|
-          style = el.attributes['style'].to_s
-
-          declarations = []
-
-          style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-            rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-            declarations << rs
-          end
-          # Perform style folding
-          merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
-          merged.create_shorthand! if @options[:create_shorthands]
-
-          # Duplicate CSS attributes as HTML attributes
-          if Premailer::RELATED_ATTRIBUTES.has_key?(el.name) && @options[:css_to_attributes]
-            Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-              if el[html_att].nil? and not merged[css_att].empty?
-                new_html_att = merged[css_att].gsub(/url\(['|"](.*)['|"]\)/, '\1').gsub(/;$|\s*!important/, '').strip
-                el[html_att] = css_att.end_with?('color') && @options[:rgb_to_hex_attributes] ? ensure_hex(new_html_att) : new_html_att
-              end
-              merged.instance_variable_get("@declarations").tap do |declarations|
-                unless @options[:preserve_style_attribute]
-                  declarations.delete(css_att)
-                end
-              end
-            end
-          end
-
-          # write the inline STYLE attribute
-          el['style'] = Premailer.escape_string(merged.declarations_to_s)
-        end
-
-        doc = write_unmergable_css_rules(doc, @unmergable_rules)
-
-        if @options[:remove_classes] or @options[:remove_comments]
-          doc.search('*').each do |el|
-            if el.comment? and @options[:remove_comments]
-              lst = el.parent.children
-              el.parent = nil
-              lst.delete(el)
-            elsif el.elem?
-              el.remove_attribute('class') if @options[:remove_classes]
-            end
-          end
-        end
-
-        if @options[:reset_contenteditable]
-          doc.search('*[@contenteditable]').each do |el|
-            el.remove_attribute('contenteditable')
-          end
-        end
-
-        if @options[:remove_ids]
-          # find all anchor's targets and hash them
-          targets = []
-          doc.search("a[@href^='#']").each do |el|
-            target = el.get_attribute('href')[1..-1]
-            targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
-          end
-          # hash ids that are links target, delete others
-          doc.search("*[@id]").each do |el|
-            id = el.get_attribute('id')
-            if targets.include?(id)
-              el.set_attribute('id', Digest::MD5.hexdigest(id))
-            else
-              el.remove_attribute('id')
-            end
-          end
-        end
-
-        @processed_doc = doc
-
-        @processed_doc.to_original_html
-      end
-
-      # Create a <tt>style</tt> element with un-mergable rules (e.g. <tt>:hover</tt>)
-      # and write it into the <tt>body</tt>.
-      #
-      # <tt>doc</tt> is an Hpricot document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
-      #
-      # @return [::Hpricot] a document.
-      def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
-        styles = unmergable_rules.to_s
-
-        unless styles.empty?
-          style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
-          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
-          end
-        end
-        doc
-      end
-
-
-      # Converts the HTML document to a format suitable for plain-text e-mail.
-      #
-      # If present, uses the <body> element as its base; otherwise uses the whole document.
-      #
-      # @return [String] Plain text.
-      def to_plain_text
-        html_src = ''
-        begin
-          html_src = @doc.search("body").inner_html
-        rescue; end
-
-        html_src = @doc.to_html unless html_src and not html_src.empty?
-        convert_to_text(html_src, @options[:line_length], @html_encoding)
-      end
-
-
-      # Gets the original HTML as a string.
-      # @return [String] HTML.
-      def to_s
-        @doc.to_original_html
-      end
-
-      # Load the HTML file and convert it into an Hpricot document.
-      #
-      # @return [::Hpricot] a document.
-      def load_html(input) # :nodoc:
-        thing = nil
-
-        # TODO: duplicate options
-        if @options[:with_html_string] or @options[:inline] or input.respond_to?(:read)
-          thing = input
-        elsif @is_local_file
-          @base_dir = File.dirname(input)
-          thing = File.open(input, 'r')
-        else
-          thing = open(input)
-        end
-
-        # TODO: deal with Hpricot seg faults on empty input
-        thing ? Hpricot(thing) : nil
-      end
-
-    end
-  end
-end
-