premailer 1.12.0 → 1.29.0

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
 require 'nokogiri'
 
 class Premailer
   module Adapter
     # NokogiriFast adapter
     module NokogiriFast
+      WIDTH_AND_HEIGHT = ['width', 'height'].freeze
 
       include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
@@ -25,34 +27,33 @@ class Premailer
 
         # 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 }
+          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 }
+          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]
+          if Premailer.media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if selector =~ Premailer::RE_RESET_SELECTORS
+              if Premailer::RE_RESET_SELECTORS.match?(selector) && !!@options[:preserve_reset]
                 # 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]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration))
               end
 
               # Try the new index based technique. If not supported, fall back to the old brute force one.
               nodes = match_selector(index, all_nodes, descendants, selector) || doc.search(selector)
               nodes.each do |el|
-                if el.elem? and (el.name != 'head' and el.parent.name != 'head')
+                if el.elem? && ((el.name != 'head') && (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]
+              warn "CSS syntax error with selector: #{selector}" if @options[:verbose]
               next
             end
           end
@@ -66,29 +67,50 @@ class Premailer
           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)
+          style.scan(/\[SPEC=([\d]+)\[(.[^\]]*)\]\]/m).each do |declaration|
+            rs = CssParser::RuleSet.new(block: declaration[1].to_s, specificity: declaration[0].to_i)
             declarations << rs
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
           end
 
           # Perform style folding
           merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
+          begin
+            merged.expand_shorthand!
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
+          end
 
           # 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
+          if Premailer::RELATED_ATTRIBUTES.key?(el.name) && @options[:css_to_attributes]
+            Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
+              if el[html_attr].nil? && !merged[css_attr].empty?
+                new_val = merged[css_attr].dup
+
+                # Remove url() function wrapper
+                new_val.gsub!(/url\((['"])(.*?)\1\)/, '\2')
+
+                # Remove !important, trailing semi-colon, and leading/trailing whitespace
+                new_val.gsub!(/;$|\s*!important/, '').strip!
+
+                # For width and height tags, remove px units
+                new_val.gsub!(/(\d+)px/, '\1') if WIDTH_AND_HEIGHT.include?(html_attr)
+
+                # For color-related tags, convert RGB to hex if specified by options
+                new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
+
+                el[html_attr] = new_val
               end
+
               unless @options[:preserve_style_attribute]
-                merged.instance_variable_get("@declarations").tap do |declarations|
-                    declarations.delete(css_att)
+                merged.instance_variable_get(:@declarations).tap do |declarations|
+                  declarations.delete(css_attr)
                 end
               end
             end
           end
+
           # Collapse multiple rules into one as much as possible.
           merged.create_shorthand! if @options[:create_shorthands]
 
@@ -98,9 +120,9 @@ class Premailer
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules) unless @options[:drop_unmergeable_css_rules]
 
-        if @options[:remove_classes] or @options[:remove_comments]
+        if @options[:remove_classes] || @options[:remove_comments]
           doc.traverse do |el|
-            if el.comment? and @options[:remove_comments]
+            if el.comment? && @options[:remove_comments]
               el.remove
             elsif el.element?
               el.remove_attribute('class') if @options[:remove_classes]
@@ -112,15 +134,15 @@ class Premailer
           # find all anchor's targets and hash them
           targets = []
           doc.search("a[@href^='#']").each do |el|
-            target = el.get_attribute('href')[1..-1]
+            target = el.get_attribute('href')[1..]
             targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
+            el.set_attribute('href', "#" + Digest::SHA256.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))
+              el.set_attribute('id', Digest::SHA256.hexdigest(id))
             else
               el.remove_attribute('id')
             end
@@ -134,7 +156,7 @@ class Premailer
         end
 
         @processed_doc = doc
-        if is_xhtml?
+        if xhtml?
           # we don't want to encode carriage returns
           @processed_doc.to_xhtml(:encoding => @options[:output_encoding]).gsub(/&\#(xD|13);/i, "\r")
         else
@@ -158,15 +180,14 @@ class Premailer
           else
             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 ||= doc.root.first_element_child.add_previous_sibling(doc.create_element("head")) if doc.root&.first_element_child
+            head ||= doc.add_child(doc.create_element("head"))
             head << 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.
@@ -176,17 +197,17 @@ class Premailer
         html_src = ''
         begin
           html_src = @doc.at("body").inner_html
-        rescue;
+        rescue StandardError
         end
 
-        html_src = @doc.to_html unless html_src and not html_src.empty?
+        html_src = @doc.to_html unless html_src && !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
-        if is_xhtml?
+        if xhtml?
           @doc.to_xhtml(:encoding => nil)
         else
           @doc.to_html(:encoding => nil)
@@ -200,13 +221,13 @@ class Premailer
         thing = nil
 
         # TODO: duplicate options
-        if @options[:with_html_string] or @options[:inline] or input.respond_to?(:read)
+        if @options[:with_html_string] || @options[:inline] || input.respond_to?(:read)
           thing = input
         elsif @is_local_file
           @base_dir = File.dirname(input)
           thing = File.open(input, 'r')
         else
-          thing = open(input)
+          thing = URI.parse(input).open
         end
 
         if thing.respond_to?(:read)
@@ -217,31 +238,24 @@ class Premailer
         doc = nil
 
         # Handle HTML entities
-        if @options[:replace_html_entities] == true and thing.is_a?(String)
+        if (@options[:replace_html_entities] == true) && thing.is_a?(String)
           HTML_ENTITIES.map do |entity, replacement|
             thing.gsub! entity, replacement
           end
         end
-        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-        # However, we really don't want to hardcode this. ASCII-8BIT should be the default, but not the only option.
-        encoding = if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
-          thing = thing.force_encoding(@options[:input_encoding]).encode!
-          @options[:input_encoding]
-        else
-          @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
-        end
+        encoding = @options[:input_encoding] || (RUBY_PLATFORM == 'java' ? nil : 'BINARY')
         doc = if @options[:html_fragment]
           ::Nokogiri::HTML.fragment(thing, encoding)
         else
-          ::Nokogiri::HTML(thing, nil, encoding) { |c| c.recover }
+          ::Nokogiri::HTML(thing, nil, encoding, &:recover)
         end
 
         # Fix for removing any CDATA tags from both style and script tags inserted per
         # https://github.com/sparklemotion/nokogiri/issues/311 and
         # https://github.com/premailer/premailer/issues/199
-        %w(style script).each do |tag|
+        ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
-            child.swap(child.text()) if child.cdata?
+            child.swap(child.text) if child.cdata?
           end
         end
 
@@ -265,7 +279,7 @@ class Premailer
         page.traverse do |node|
           all_nodes.push(node)
 
-          if node != page then
+          if node != page
             index_ancestry(page, node, node.parent, descendants)
           end
 
@@ -276,7 +290,7 @@ class Premailer
           # Index the node by all class attributes it possesses.
           # Classes are modestly selective. Usually more than tag names
           # but less selective than ids.
-          if node.has_attribute?("class") then
+          if node.has_attribute?("class")
             node.get_attribute("class").split(/\s+/).each do |c|
               c = '.' + c
               index[c] = (index[c] || Set.new).add(node)
@@ -285,7 +299,7 @@ class Premailer
 
           # Index the node by its "id" attribute if it has one.
           # This is usually the most selective of the three.
-          if node.has_attribute?("id") then
+          if node.has_attribute?("id")
             id = '#' + node.get_attribute("id")
             index[id] = (index[id] || Set.new).add(node)
           end
@@ -298,7 +312,7 @@ class Premailer
         index.default = Set.new
         descendants.default = Set.new
 
-        return index, Set.new(all_nodes), descendants
+        [index, Set.new(all_nodes), descendants]
       end
 
       # @param doc The top level document
@@ -307,9 +321,9 @@ class Premailer
       # @param descendants The running hash map of node -> set of nodes that maps descendants of a node.
       # @return The descendants argument after updating it.
       def index_ancestry(doc, elem, parent, descendants)
-        if parent then
+        if parent
           descendants[parent] = (descendants[parent] || Set.new).add(elem)
-          if doc != parent then
+          if doc != parent
             index_ancestry(doc, elem, parent.parent, descendants)
           end
         end
@@ -338,14 +352,14 @@ class Premailer
       # It will return nil when such a selector is passed, so you can take
       # action on the falsity of the return value.
       def match_selector(index, all_nodes, descendants, selector)
-        if /[^-a-zA-Z0-9_\s.#]/.match(selector) then
+        if /[^-a-zA-Z0-9_\s.#]/.match?(selector)
           return nil
         end
 
         take_children = false
         selector.split(/\s+/).reduce(all_nodes) do |base, spec|
           desc = base
-          if take_children then
+          if take_children
             desc = Set.new
             base.each do |n|
               desc.merge(descendants[n])

data/lib/premailer/adapter/nokogumbo.rb

@@ -1,9 +1,9 @@
-require 'nokogumbo'
-
+# frozen_string_literal: true
 class Premailer
   module Adapter
     # Nokogiri adapter
     module Nokogumbo
+      WIDTH_AND_HEIGHT = ['width', 'height'].freeze
 
       include AdapterHelper::RgbToHex
       # Merge CSS into the HTML document.
@@ -21,19 +21,19 @@ class Premailer
         # 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 }
+          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 }
+          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]
+          if Premailer.media_query?(media_types) || selector =~ Premailer::RE_UNMERGABLE_SELECTORS
+            @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration), media_types) unless @options[:preserve_styles]
           else
             begin
-              if selector =~ Premailer::RE_RESET_SELECTORS
+              if Premailer::RE_RESET_SELECTORS.match?(selector) && !!@options[:preserve_reset]
                 # 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]
+                @unmergable_rules.add_rule_set!(CssParser::RuleSet.new(selectors: selector, block: declaration))
               end
 
               # Change single ID CSS selectors into xpath so that we can match more
@@ -41,52 +41,71 @@ class Premailer
               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')
+                if el.elem? && ((el.name != 'head') && (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]
+              warn "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
+        doc.search("script").remove if @options[:remove_scripts]
 
         # 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)
+          style.scan(/\[SPEC=([\d]+)\[(.[^\]]*)\]\]/m).each do |declaration|
+            rs = CssParser::RuleSet.new(block: declaration[1].to_s, specificity: declaration[0].to_i)
             declarations << rs
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
           end
 
           # Perform style folding
           merged = CssParser.merge(declarations)
-          merged.expand_shorthand!
+          begin
+            merged.expand_shorthand!
+          rescue ArgumentError => e
+            raise e if @options[:rule_set_exceptions]
+          end
 
           # 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
+          if Premailer::RELATED_ATTRIBUTES.key?(el.name) && @options[:css_to_attributes]
+            Premailer::RELATED_ATTRIBUTES[el.name].each do |css_attr, html_attr|
+              if el[html_attr].nil? && !merged[css_attr].empty?
+                new_val = merged[css_attr].dup
+
+                # Remove url() function wrapper
+                new_val.gsub!(/url\((['"])(.*?)\1\)/, '\2')
+
+                # Remove !important, trailing semi-colon, and leading/trailing whitespace
+                new_val.gsub!(/;$|\s*!important/, '').strip!
+
+                # For width and height tags, remove px units
+                new_val.gsub!(/(\d+)px/, '\1') if WIDTH_AND_HEIGHT.include?(html_attr)
+
+                # For color-related tags, convert RGB to hex if specified by options
+                new_val = ensure_hex(new_val) if css_attr.end_with?('color') && @options[:rgb_to_hex_attributes]
+
+                el[html_attr] = new_val
               end
+
               unless @options[:preserve_style_attribute]
-                merged.instance_variable_get("@declarations").tap do |declarations|
-                    declarations.delete(css_att)
+                merged.instance_variable_get(:@declarations).tap do |declarations|
+                  declarations.delete(css_attr)
                 end
               end
             end
           end
+
           # Collapse multiple rules into one as much as possible.
           merged.create_shorthand! if @options[:create_shorthands]
 
@@ -96,9 +115,9 @@ class Premailer
 
         doc = write_unmergable_css_rules(doc, @unmergable_rules) unless @options[:drop_unmergeable_css_rules]
 
-        if @options[:remove_classes] or @options[:remove_comments]
+        if @options[:remove_classes] || @options[:remove_comments]
           doc.traverse do |el|
-            if el.comment? and @options[:remove_comments]
+            if el.comment? && @options[:remove_comments]
               el.remove
             elsif el.element?
               el.remove_attribute('class') if @options[:remove_classes]
@@ -110,15 +129,15 @@ class Premailer
           # find all anchor's targets and hash them
           targets = []
           doc.search("a[@href^='#']").each do |el|
-            target = el.get_attribute('href')[1..-1]
+            target = el.get_attribute('href')[1..]
             targets << target
-            el.set_attribute('href', "#" + Digest::MD5.hexdigest(target))
+            el.set_attribute('href', "#" + Digest::SHA256.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))
+              el.set_attribute('id', Digest::SHA256.hexdigest(id))
             else
               el.remove_attribute('id')
             end
@@ -132,7 +151,7 @@ class Premailer
         end
 
         @processed_doc = doc
-        if is_xhtml?
+        if xhtml?
           # we don't want to encode carriage returns
           @processed_doc.to_xhtml(:encoding => @options[:output_encoding]).gsub(/&\#(xD|13);/i, "\r")
         else
@@ -156,15 +175,14 @@ class Premailer
           else
             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 ||= doc.root.first_element_child.add_previous_sibling(doc.create_element("head")) if doc.root&.first_element_child
+            head ||= doc.add_child(doc.create_element("head"))
             head << 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.
@@ -174,17 +192,17 @@ class Premailer
         html_src = ''
         begin
           html_src = @doc.at("body").inner_html
-        rescue;
+        rescue StandardError
         end
 
-        html_src = @doc.to_html unless html_src and not html_src.empty?
+        html_src = @doc.to_html unless html_src && !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
-        if is_xhtml?
+        if xhtml?
           @doc.to_xhtml(:encoding => nil)
         else
           @doc.to_html(:encoding => nil)
@@ -198,13 +216,13 @@ class Premailer
         thing = nil
 
         # TODO: duplicate options
-        if @options[:with_html_string] or @options[:inline] or input.respond_to?(:read)
+        if @options[:with_html_string] || @options[:inline] || input.respond_to?(:read)
           thing = input
         elsif @is_local_file
           @base_dir = File.dirname(input)
           thing = File.open(input, 'r')
         else
-          thing = open(input)
+          thing = URI.parse(input).open
         end
 
         if thing.respond_to?(:read)
@@ -215,16 +233,11 @@ class Premailer
         doc = nil
 
         # Handle HTML entities
-        if @options[:replace_html_entities] == true and thing.is_a?(String)
+        if (@options[:replace_html_entities] == true) && thing.is_a?(String)
           HTML_ENTITIES.map do |entity, replacement|
             thing.gsub! entity, replacement
           end
         end
-        # Default encoding is ASCII-8BIT (binary) per http://groups.google.com/group/nokogiri-talk/msg/0b81ef0dc180dc74
-        # However, we really don't want to hardcode this. ASCII-8BIT should be the default, but not the only option.
-        if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
-          thing = thing.force_encoding(@options[:input_encoding]).encode!
-        end
         doc = if @options[:html_fragment]
           ::Nokogiri::HTML5.fragment(thing)
         else
@@ -234,15 +247,14 @@ class Premailer
         # Fix for removing any CDATA tags from both style and script tags inserted per
         # https://github.com/sparklemotion/nokogiri/issues/311 and
         # https://github.com/premailer/premailer/issues/199
-        %w(style script).each do |tag|
+        ['style', 'script'].each do |tag|
           doc.search(tag).children.each do |child|
-            child.swap(child.text()) if child.cdata?
+            child.swap(child.text) if child.cdata?
           end
         end
 
         doc
       end
-
     end
   end
 end

data/lib/premailer/adapter/rgb_to_hex.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # RGB helper for adapters, currently only nokogiri supported
 
 module AdapterHelper
@@ -6,23 +7,24 @@ module AdapterHelper
       str.to_i.to_s(16).rjust(2, '0').upcase
     end
 
-    def is_rgb?(color)
+    def rgb?(color)
       pattern = %r{
       rgb
-      \(\s*    # literal open, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*,\s*     # comma, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*,\s*     # comma, with optional whitespace
-      (\d{1,3})   # capture 1-3 digits
-      \s*\)       # literal close, with optional whitespace
+      \(\s*                    # literal open, with optional whitespace
+      (\d{1,3})                # capture 1-3 digits
+      (?:\s*,\s*|\s+)          # comma or whitespace
+      (\d{1,3})                # capture 1-3 digits
+      (?:\s*,\s*|\s+)          # comma or whitespacee
+      (\d{1,3})                # capture 1-3 digits
+      \s*(?:/\s*\d*\.?\d*%?)? # optional alpha modifier
+      \s*\)                    # literal close, with optional whitespace
       }x
 
       pattern.match(color)
     end
 
     def ensure_hex(color)
-      match_data = is_rgb?(color)
+      match_data = rgb?(color)
       if match_data
         "#{to_hex(match_data[1])}#{to_hex(match_data[2])}#{to_hex(match_data[3])}"
       else

data/lib/premailer/adapter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Premailer
   # Manages the adapter classes. Currently supports:
   #
@@ -5,7 +6,6 @@ class Premailer
   # * nokogiri_fast
   # * nokogumbo
   module Adapter
-
     autoload :Nokogiri, 'premailer/adapter/nokogiri'
     autoload :NokogiriFast, 'premailer/adapter/nokogiri_fast'
     autoload :Nokogumbo, 'premailer/adapter/nokogumbo'
@@ -14,13 +14,13 @@ class Premailer
     REQUIREMENT_MAP = [
       ["nokogiri", :nokogiri],
       ["nokogiri", :nokogiri_fast],
-      ["nokogumbo", :nokogumbo],
-    ]
+      ["nokogumbo", :nokogumbo]
+    ].freeze
 
     # Returns the adapter to use.
     def self.use
       return @use if @use
-      self.use = self.default
+      self.use = default
       @use
     end
 
@@ -34,15 +34,13 @@ class Premailer
       return :nokogumbo if defined?(::Nokogumbo)
 
       REQUIREMENT_MAP.each do |(library, adapter)|
-        begin
-          require library
-          return adapter
-        rescue LoadError
-          next
-        end
+        require library
+        return adapter
+      rescue LoadError
+        next
       end
 
-      raise RuntimeError.new("No suitable adapter for Premailer was found, please install nokogiri or nokogumbo")
+      raise "No suitable adapter for Premailer was found, please install nokogiri or nokogumbo"
     end
 
     # Sets the adapter to use.
@@ -56,10 +54,9 @@ class Premailer
     def self.find(adapter)
       return adapter if adapter.is_a?(Module)
 
-      Premailer::Adapter.const_get("#{adapter.to_s.split('_').map{|s| s.capitalize}.join('')}")
+      Premailer::Adapter.const_get(adapter.to_s.split('_').map(&:capitalize).join.to_s)
     rescue NameError
       raise ArgumentError, "Invalid adapter: #{adapter}"
     end
-
   end
 end