premailer 1.7.0 → 1.7.1

data/README.rdoc

@@ -48,12 +48,8 @@ Download the Premailer gem from RubyGems.
 Contributions are most welcome.  Premailer was rotting away in a private SVN repository for too long and could use some TLC.  Fork and patch to your heart's content.  Please don't increment the version numbers, though.
 
 A few areas that are particularly in need of love:
-* Testing suite
-  There were unit tests but they were so funky that it was better to just strip them out.
-* Create a binary file for easing command line use, allowing the output to be piped in *nix systems
-* Test with Rails
+* Improved test coverage
 * Move un-repeated background images defined in CSS to <tt><td background=""></tt> for Outlook
-* Correctly parse http://www.webstandards.org/files/acid2/test.html
 
 === Credits and code
 

data/lib/premailer.rb

@@ -4,8 +4,5 @@ require 'digest/md5'
 require 'cgi'
 require 'css_parser'
 require File.expand_path(File.dirname(__FILE__) + '/premailer/adapter')
-require File.expand_path(File.dirname(__FILE__) + '/premailer/adapter/hpricot')
-require File.expand_path(File.dirname(__FILE__) + '/premailer/adapter/nokogiri')
-
 require File.expand_path(File.dirname(__FILE__) + '/premailer/html_to_plain_text')
 require File.expand_path(File.dirname(__FILE__) + '/premailer/premailer')

data/lib/premailer/adapter.rb

@@ -4,46 +4,56 @@
 #
 # * nokogiri
 # * hpricot
-module Adapter
-    DEFAULT = :hpricot
+class Premailer
+  module Adapter
 
-    # Returns the adapter to use. Defaults to <tt>Adapter::</tt>.
+    autoload :Hpricot, 'premailer/adapter/hpricot'
+    autoload :Nokogiri, 'premailer/adapter/nokogiri'
+
+    REQUIREMENT_MAP = [
+      ["hpricot",  :hpricot],
+      ["nokogiri", :nokogiri],
+    ]
+
+    # Returns the adapter to use.
     def self.use
-      @use ||= DEFAULT
+      return @use if @use
+      self.use = self.default
+      @use
     end
 
-    # Sets the +adapter+ to use. Raises an +ArgumentError+ unless the +adapter+ exists.
-    def self.use=(adapter)
-      validate_adapter! adapter
-      @use = adapter
+    # The default adapter based on what you currently have loaded and
+    # installed. First checks to see if any adapters are already loaded,
+    # then ckecks to see which are installed if none are loaded.
+    def self.default
+      return :hpricot  if defined?(::Hpricot)
+      return :nokogiri if defined?(::Nokogiri)
+
+      REQUIREMENT_MAP.each do |(library, adapter)|
+        begin
+          require library
+          return adapter
+        rescue LoadError
+          next
+        end
+      end
+
+      raise "No suitable adapter for Premailer was found, please install hpricot or nokogiri"
     end
 
-    # Returns a memoized +Hash+ of adapters.
-    def self.adapters
-      @adapters ||= {
-        :nokogiri => { :class => Nokogiri, :require => "nokogiri" },
-        :hpricot  => { :class => Hpricot,  :require => "hpricot" },
-      }
+    # Sets the +adapter+ to use. Raises an +ArgumentError+ unless the +adapter+ exists.
+    def self.use=(new_adapter)
+      @use = find(new_adapter)
     end
 
     # Returns an +adapter+. Raises an +ArgumentError+ unless the +adapter+ exists.
     def self.find(adapter)
-      validate_adapter! adapter
-      load_adapter adapter
-    end
+      return adapter if adapter.is_a?(Module)
 
-  private
-
-    # Raises an +ArgumentError+ unless the +adapter+ exists.
-    def self.validate_adapter!(adapter)
-      raise ArgumentError, "Invalid adapter: #{adapter}" unless adapters[adapter]
+      Premailer::Adapter.const_get("#{adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+    rescue NameError
+      raise ArgumentError, "Invalid adapter: #{adapter}"
     end
 
-    # Tries to load and return the given +adapter+ name and class and falls back to the +FALLBACK+ adapter.
-    def self.load_adapter(adapter)
-      require adapters[adapter][:require]
-      [adapter, adapters[adapter][:class]]
-    rescue LoadError
-      puts "tried to use the #{adapter} adapter, but was unable to find the library in the LOAD_PATH."
-    end
+  end
 end

data/lib/premailer/adapter/hpricot.rb

@@ -1,180 +1,183 @@
+require 'hpricot'
+
+class Premailer
+  module Adapter
+    module Hpricot
+
+      # Merge CSS into the HTML document.
+      #
+      # Returns a string.
+      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
 
-module Adapter
-	module Hpricot
-	
-	  # Merge CSS into the HTML document.
-  #
-  # Returns a string.
-  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|
-      # 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]
-      else
-        begin
-          # 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]')
-
-          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
+        # Iterate through the rules and merge them into the HTML
+        @css_parser.each_selector(:all) do |selector, declaration, specificity|
+          # 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]
+          else
+            begin
+              # 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]')
+
+              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
-        rescue Hpricot::Error, RuntimeError, ArgumentError
-          $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
-          next
         end
-      end
-    end
 
-    # Read STYLE attributes and perform folding
-    doc.search("*[@style]").each do |el|
-      style = el.attributes['style'].to_s
-      
-      declarations = []
+        # Read STYLE attributes and perform folding
+        doc.search("*[@style]").each do |el|
+          style = el.attributes['style'].to_s
 
-      style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-        rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-        declarations << rs
-      end
+          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!
-           
-      # Duplicate CSS attributes as HTML attributes
-      if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)       
-        Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-          el[html_att] = merged[css_att].gsub(/;$/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+          # Perform style folding
+          merged = CssParser.merge(declarations)
+          merged.expand_shorthand!
+
+          # Duplicate CSS attributes as HTML attributes
+          if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)
+            Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
+              el[html_att] = merged[css_att].gsub(/;$/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+            end
+          end
+
+          merged.create_dimensions_shorthand!
+
+          # write the inline STYLE attribute
+          el['style'] = Premailer.escape_string(merged.declarations_to_s)
         end
-      end
-      
-      merged.create_dimensions_shorthand!
 
-      # write the inline STYLE attribute
-      el['style'] = Premailer.escape_string(merged.declarations_to_s)
-    end
+        doc = write_unmergable_css_rules(doc, @unmergable_rules)
 
-    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[: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]
+        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
-      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))
+        @processed_doc = doc
+
+        @processed_doc.to_original_html
       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))
+
+      # 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.
+      #
+      # Returns an Hpricot document.
+      def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
+        if head = doc.search('head')
+          styles = ''
+          unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
+            styles += "#{selector} { #{declarations} }\n"
+          end
+
+          unless styles.empty?
+            style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
+            head.html.empty? ? head.inner_html(style_tag) : head.append(style_tag)
+          end
         else
-          el.remove_attribute('id')
+          $stderr.puts "Unable to write unmergable CSS rules: no <head> was found" if @options[:verbose]
         end
+        doc
       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.
-  #
-  # Returns an Hpricot document.
-  def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
-    if head = doc.search('head')
-      styles = ''
-      unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
-        styles += "#{selector} { #{declarations} }\n"
-      end    
-
-      unless styles.empty?
-        style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
-        head.html.empty? ? head.inner_html(style_tag) : head.append(style_tag)
+      # 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.
+      #
+      # Returns a string.
+      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
-    else
-      $stderr.puts "Unable to write unmergable CSS rules: no <head> was found" if @options[:verbose]
-    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.
-		#
-		# Returns a string.
-		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	
-	
-	
-	  # Returns the original HTML as a string.
-		def to_s
-			@doc.to_original_html
-		end
-
-	  # Load the HTML file and convert it into an Hpricot document.
-		#
-		# Returns an Hpricot 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
+
+      # Returns the original HTML as a string.
+      def to_s
+        @doc.to_original_html
+      end
+
+      # Load the HTML file and convert it into an Hpricot document.
+      #
+      # Returns an Hpricot 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')
+          @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
+          thing = open(input)
+        end
+
+        # TODO: deal with Hpricot seg faults on empty input
+        thing ? Hpricot(thing) : nil
+      end
+
+    end
+  end
 end

data/lib/premailer/adapter/nokogiri.rb

@@ -1,199 +1,203 @@
-module Adapter
-	module Nokogiri
-	
-  	# Merge CSS into the HTML document.
-    #
-    # Returns a string.
-    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
+require 'nokogiri'
+
+class Premailer
+  module Adapter
+    module Nokogiri
+
+      # Merge CSS into the HTML document.
+      #
+      # Returns a string.
+      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|
-        # Save un-mergable rules separately
-        selector.gsub!(/:link([\s]*)+/i) {|m| $1 }
+        # Iterate through the rules and merge them into the HTML
+        @css_parser.each_selector(:all) do |selector, declaration, specificity|
+          # 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]
-        else
-          begin
-            # 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]')
-
-            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
+          # 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]
+          else
+            begin
+              # 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]')
+
+              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  ::Nokogiri::SyntaxError, RuntimeError, ArgumentError
+              $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
+              next
             end
-          rescue  ::Nokogiri::SyntaxError, RuntimeError, ArgumentError
-            $stderr.puts "CSS syntax error with selector: #{selector}" if @options[:verbose]
-            next
           end
         end
-      end
 
-      # Read STYLE attributes and perform folding
-      doc.search("*[@style]").each do |el|
-        style = el.attributes['style'].to_s
-      
-        declarations = []
+        # Read STYLE attributes and perform folding
+        doc.search("*[@style]").each do |el|
+          style = el.attributes['style'].to_s
 
-        style.scan(/\[SPEC\=([\d]+)\[(.[^\]\]]*)\]\]/).each do |declaration|
-          rs = CssParser::RuleSet.new(nil, declaration[1].to_s, declaration[0].to_i)
-          declarations << rs
-        end
+          declarations = []
 
-        # Perform style folding
-        merged = CssParser.merge(declarations)
-        merged.expand_shorthand!
-          
-        # Duplicate CSS attributes as HTML attributes
-        if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)       
-          Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
-            el[html_att] = merged[css_att].gsub(/;$/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+          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!
+
+          # Duplicate CSS attributes as HTML attributes
+          if Premailer::RELATED_ATTRIBUTES.has_key?(el.name)
+            Premailer::RELATED_ATTRIBUTES[el.name].each do |css_att, html_att|
+              el[html_att] = merged[css_att].gsub(/;$/, '').strip if el[html_att].nil? and not merged[css_att].empty?
+            end
+          end
+
+          merged.create_dimensions_shorthand!
+
+          # write the inline STYLE attribute
+          el['style'] = Premailer.escape_string(merged.declarations_to_s)
         end
-      
-        merged.create_dimensions_shorthand!
 
-        # write the inline STYLE attribute
-        el['style'] = Premailer.escape_string(merged.declarations_to_s)
-      end
+        doc = write_unmergable_css_rules(doc, @unmergable_rules)
 
-      doc = write_unmergable_css_rules(doc, @unmergable_rules)
+        if @options[:remove_classes] or @options[:remove_comments]
+          doc.traverse do |el|
+            if el.comment? and @options[:remove_comments]
+              el.remove
+            elsif el.element?
+              el.remove_attribute('class') if @options[:remove_classes]
+            end
+          end
+        end
 
-      if @options[:remove_classes] or @options[:remove_comments]
-        doc.traverse do |el|
-          if el.comment? and @options[:remove_comments]
-            el.remove
-          elsif el.element?
-            el.remove_attribute('class') if @options[:remove_classes]
+        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
-        end  
-      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
 
-      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))
+        @processed_doc = doc
+        if is_xhtml?
+          @processed_doc.to_xhtml
+        else
+          @processed_doc.to_html
         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
+
+      # 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 Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
+      #
+      # Returns an Nokogiri document.
+      def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
+        if head = doc.at('head')
+          styles = ''
+          unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
+            styles += "#{selector} { #{declarations} }\n"
           end
+
+          unless styles.empty?
+            style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
+
+            head.add_child(style_tag)
+          end
+        else
+          $stderr.puts "Unable to write unmergable CSS rules: no <head> was found" if @options[:verbose]
         end
+        doc
       end
 
-      @processed_doc = doc
-  		if is_xhtml?
-  			@processed_doc.to_xhtml
-  		else
-      	@processed_doc.to_html
-    	end
-    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 Nokogiri document and <tt>unmergable_css_rules</tt> is a Css::RuleSet.
-    #
-    # Returns an Nokogiri document.
-    def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
-      if head = doc.at('head')
-        styles = ''
-        unmergable_rules.each_selector(:all, :force_important => true) do |selector, declarations, specificity|
-          styles += "#{selector} { #{declarations} }\n"
-        end    
-
-        unless styles.empty?
-          style_tag = "\n<style type=\"text/css\">\n#{styles}</style>\n"
-
-          head.add_child(style_tag)
+
+      # 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.
+      #
+      # Returns a string.
+      def to_plain_text
+        html_src = ''
+        begin
+          html_src = @doc.at("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
+
+      # Returns the original HTML as a string.
+      def to_s
+        if is_xhtml?
+          @doc.to_xhtml
+        else
+          @doc.to_html
         end
-      else
-        $stderr.puts "Unable to write unmergable CSS rules: no <head> was found" if @options[:verbose]
       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.
-    #
-    # Returns a string.
-    def to_plain_text
-      html_src = ''
-      begin
-        html_src = @doc.at("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
-	
-		# Returns the original HTML as a string.
-		def to_s
-			if is_xhtml?
-				@doc.to_xhtml
-			else
-				@doc.to_html
-			end
-		end
-		
-	  # Load the HTML file and convert it into an Nokogiri document.
-		#
-		# Returns an Nokogiri 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
+      # Load the HTML file and convert it into an Nokogiri document.
+      #
+      # Returns an Nokogiri 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')
+          @base_dir = File.dirname(input)
+          thing = File.open(input, 'r')
 				else
-				thing = open(input)
-			end
-
-		  if thing.respond_to?(:read)
-		    thing = thing.read
-		  end
-			
-			return nil unless thing
-			
-			doc = nil
-
-      # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-      if thing.is_a?(String) and RUBY_VERSION =~ /1.9/ 
-	      thing = thing.force_encoding('ASCII-8BIT').encode!
-		    doc = ::Nokogiri::HTML(thing) {|c| c.noent.recover }	    
-		  else
-		    doc = ::Nokogiri::HTML(thing, nil, 'ASCII-8BIT') {|c| c.noent.recover }
-	    end
-			
-			return doc
-		end
-		
-	end
+          thing = open(input)
+        end
+
+        if thing.respond_to?(:read)
+          thing = thing.read
+        end
+
+        return nil unless thing
+
+        doc = nil
+
+        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
+        if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
+          thing = thing.force_encoding('ASCII-8BIT').encode!
+          doc = ::Nokogiri::HTML(thing) {|c| c.noent.recover }
+        else
+          doc = ::Nokogiri::HTML(thing, nil, 'ASCII-8BIT') {|c| c.noent.recover }
+        end
+
+        return doc
+      end
+
+    end
+  end
 end

data/lib/premailer/premailer.rb

@@ -33,7 +33,7 @@ class Premailer
   include HtmlToPlainText
   include CssParser
 
-  VERSION = '1.7.0'
+  VERSION = '1.7.1'
 
   CLIENT_SUPPORT_FILE = File.dirname(__FILE__) + '/../../misc/client_support.yaml'
 
@@ -151,8 +151,7 @@ class Premailer
       :io_exceptions => @options[:io_exceptions]
     })
 
-    @adapter_name = @options[:adapter]
-    @adapter_name, @adapter_class = Adapter.find @adapter_name
+    @adapter_class = Adapter.find @options[:adapter]
 
     self.class.send(:include, @adapter_class)
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 7
-  - 0
-  version: 1.7.0
+  - 1
+  version: 1.7.1
 platform: ruby
 authors: 
 - Alex Dunae
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-31 00:00:00 -08:00
+date: 2011-04-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: css_parser
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -26,14 +26,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        - 8
-        - 3
-        version: 0.8.3
+        - 1
+        - 1
+        - 9
+        version: 1.1.9
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: css_parser
+  name: htmlentities
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -41,14 +41,14 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 1
-        - 1
-        - 6
-        version: 1.1.6
+        - 4
+        - 0
+        - 0
+        version: 4.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: htmlentities
+  name: hpricot
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -56,12 +56,27 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 4
-        - 0
         - 0
-        version: 4.0.0
-  type: :runtime
+        - 8
+        - 3
+        version: 0.8.3
+  type: :development
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 4
+        version: 1.4.4
+  type: :development
+  version_requirements: *id004
 description: Improve the rendering of HTML emails by making CSS inline, converting links and warning about unsupported code.
 email: code@dunae.ca
 executables: