premailer 1.10.4 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5558b61431fcbad3d7fe4136960b75e8cecec6
-  data.tar.gz: bd3c0941de04600fae48c0e2d7d2104a676fb0a6
+  metadata.gz: c1f0cb88ede5d92fb777b596973cb59c69bd02e0
+  data.tar.gz: cb84c900b1160ca8f8c91d3ad74bcd9023dc7c79
 SHA512:
-  metadata.gz: 2a62d80a9238c76cfed3b1ad398c98221e6ece39a289d4b9435862f2c0191cba8ac7461590cdc8406e3eecb765d2c96faa51bc00158edd6abdee2baee76d041e
-  data.tar.gz: 5533bcce2a737c63f4ee3ded37d3f765739925bf89739955e068f3e79889a1e5e02ffbe6dffd13ec7f733e00c3b9d5feaba6205bf95c542cfe4e11989c253a6c
+  metadata.gz: f50e404b63d17ae55256615118585baf7eabf443dd56d634ad06ae4a83cc258c6a9b2dd647184f23d03b51decbc0770910f3e886aa558c4cd57fd0950102e1c1
+  data.tar.gz: 0aab4b4d34f52a0e81a3176e3f9508d2637f1a0fb57b0a76efcfbf6f7a24cfbebb80037605cabb8fdea8de87e27f44f69b33c2ba298e816abf68c5220539947f

data/lib/premailer/adapter/nokogiri.rb

@@ -149,11 +149,17 @@ class Premailer
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
         unless 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
+          if @options[:html_fragment]
+            style_tag = ::Nokogiri::XML::Node.new("style", doc)
+            style_tag.content = styles
+            doc.add_child(style_tag)
+          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 << style_tag
+          end
         end
         doc
       end
@@ -216,12 +222,16 @@ class Premailer
         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/
+        encoding = if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
           thing = thing.force_encoding(@options[:input_encoding]).encode!
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding]) { |c| c.recover }
+          @options[:input_encoding]
+        else
+          @options[:input_encoding] || RUBY_PLATFORM == 'java' ? nil : 'BINARY'
+        end
+        doc = if @options[:html_fragment]
+          ::Nokogiri::HTML.fragment(thing, encoding)
         else
-          default_encoding = RUBY_PLATFORM == 'java' ? nil : 'BINARY'
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding] || default_encoding) { |c| c.recover }
+          ::Nokogiri::HTML(thing, nil, encoding) { |c| c.recover }
         end
 
         # Fix for removing any CDATA tags from both style and script tags inserted per

data/lib/premailer/adapter/nokogiri_fast.rb

@@ -150,12 +150,19 @@ class Premailer
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
-        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
+        unless styles.empty?
+          if @options[:html_fragment]
+            style_tag = ::Nokogiri::XML::Node.new("style", doc)
+            style_tag.content = styles
+            doc.add_child(style_tag)
+          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 << style_tag
+          end
+        end
         doc
       end
 
@@ -217,12 +224,16 @@ class Premailer
         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/
+        encoding = if thing.is_a?(String) and RUBY_VERSION =~ /1.9/
           thing = thing.force_encoding(@options[:input_encoding]).encode!
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding]) { |c| c.recover }
+          @options[:input_encoding]
+        else
+          @options[:input_encoding] || RUBY_PLATFORM == 'java' ? nil : 'BINARY'
+        end
+        doc = if @options[:html_fragment]
+          ::Nokogiri::HTML.fragment(thing, encoding)
         else
-          default_encoding = RUBY_PLATFORM == 'java' ? nil : 'BINARY'
-          doc = ::Nokogiri::HTML(thing, nil, @options[:input_encoding] || default_encoding) { |c| c.recover }
+          ::Nokogiri::HTML(thing, nil, encoding) { |c| c.recover }
         end
 
         # Fix for removing any CDATA tags from both style and script tags inserted per

data/lib/premailer/adapter/nokogumbo.rb

@@ -148,12 +148,19 @@ class Premailer
       # @return [::Nokogiri::XML] a document.
       def write_unmergable_css_rules(doc, unmergable_rules) # :nodoc:
         styles = unmergable_rules.to_s
-        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
+        unless styles.empty?
+          if @options[:html_fragment]
+            style_tag = ::Nokogiri::XML::Node.new("style", doc)
+            style_tag.content = styles
+            doc.add_child(style_tag)
+          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 << style_tag
+          end
+        end
         doc
       end
 
@@ -217,10 +224,11 @@ class Premailer
         # 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!
-          doc = ::Nokogiri::HTML5(thing)
+        end
+        doc = if @options[:html_fragment]
+          ::Nokogiri::HTML5(thing)
         else
-          default_encoding = RUBY_PLATFORM == 'java' ? nil : 'BINARY'
-          doc = ::Nokogiri::HTML5(thing)
+          ::Nokogiri::HTML5.fragment(thing)
         end
 
         # Fix for removing any CDATA tags from both style and script tags inserted per

data/lib/premailer/premailer.rb

@@ -177,6 +177,7 @@ class Premailer
   # @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.
+  # @option options [Boolean] :html_fragment Handle HTML fragment without any HTML content wrappers. Default is false.
   def initialize(html, options = {})
     @options = {:warn_level => Warnings::SAFE,
                 :line_length => 65,
@@ -206,6 +207,7 @@ class Premailer
                 :escape_url_attributes => true,
                 :unescaped_ampersand => false,
                 :create_shorthands => true,
+                :html_fragment => false,
                 :adapter => Adapter.use,
                 }.merge(options)
 

data/lib/premailer/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: premailer
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.0
 platform: ruby
 authors:
 - Alex Dunae
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-16 00:00:00.000000000 Z
+date: 2017-09-21 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.10
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.10
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement