css_inliner 0.2.0 → 0.2.1

data/bin/css-inliner

@@ -4,18 +4,19 @@ require 'css_inliner'
 
 opt = OptionParser.new
 Version = CSSInliner::VERSION
-options = {}
+options = {format: 'html'}
 
 opt.banner = "Usage: #{File.basename($PROGRAM_NAME)} [options] htmlfile"
 opt.on('-o', '--output=OUTPUTFILE', 'file name to output result HTML') {|v| options[:output] = v}
+opt.on('-f', '--format=FORMAT', 'format to output("html", "xhtml" or "xml")', %w[html xhtml xml]) {|v| options[:format] = v}
 opt.on('-i [SUFFIX]', '--in-place', '--overwrite', 'inplace editing') do |v|
   options[:'in-place'] = true
   options[:suffix] = v
 end
-opt.on('-e ELEMENT', '--element', 'element name to extract as root') {|v| options[:element] = v}
+opt.on('-e', '--element=ELEMENT', 'element name to extract as root') {|v| options[:element] = v}
 
 opt.parse! ARGV
-processed = CSSInliner.process File.read(ARGV[0]), File.dirname(ARGV[0]), options[:element]
+processed = CSSInliner.process File.read(ARGV[0]), File.dirname(ARGV[0]), options[:element], options[:format]
 if options[:'in-place']
   FileUtils.cp(ARGV[0], ARGV[0] + options[:suffix]) if options[:suffix]
   File.open(ARGV[0], 'w') {|f| f.write processed}

data/lib/css_inliner.rb

@@ -11,12 +11,22 @@ module CSSInliner
     # @param [String] basedir Base directory or URI to traverse relative URI for images
     # @param [String] element Element name to be returned.
     #   Returns whole document when nil
+    # @param [String] format Format to output, html or xhtml
     # @return [String] HTML source
-    def process(html, basedir = '.', element = nil)
+    def process(html, basedir = '.', element = nil, format = 'html')
       doc = html.instance_of?(Nokogiri::XML::Document) ? html : Nokogiri.XML(html)
       doc = Inliner.new(doc, basedir).inline
       doc = doc.css(element)[0] if element
-      doc.to_s
+      case format
+      when 'xhtml'
+        doc.to_xhtml
+      when 'html'
+        doc.to_html
+      when 'xml'
+        doc.to_xml
+      else
+        doc.to_s
+      end
     end
   end
 end

data/lib/css_inliner/csspool.rb

@@ -13,7 +13,7 @@ module CSSPool
           if base_decls.empty?
             base << other_decl
           else
-            base_decl = base_decls.pop
+            base_decl = base_decls.shift
             base_decls.each do |decl|
               base_decl.update decl
             end

data/lib/css_inliner/version.rb

@@ -1,3 +1,3 @@
 module CSSInliner
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-29 00:00:00.000000000Z
+date: 2012-04-30 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12417000 !ruby/object:Gem::Requirement
+  requirement: &11151600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *12417000
+  version_requirements: *11151600
 - !ruby/object:Gem::Dependency
   name: csspool
-  requirement: &12415820 !ruby/object:Gem::Requirement
+  requirement: &11150260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *12415820
+  version_requirements: *11150260
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &12415220 !ruby/object:Gem::Requirement
+  requirement: &11149700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12415220
+  version_requirements: *11149700
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &12414040 !ruby/object:Gem::Requirement
+  requirement: &11148500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *12414040
+  version_requirements: *11148500
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &12430900 !ruby/object:Gem::Requirement
+  requirement: &11165460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *12430900
+  version_requirements: *11165460
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12430380 !ruby/object:Gem::Requirement
+  requirement: &11164980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12430380
+  version_requirements: *11164980
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12429780 !ruby/object:Gem::Requirement
+  requirement: &11164380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12429780
+  version_requirements: *11164380
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &12429300 !ruby/object:Gem::Requirement
+  requirement: &11163880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12429300
+  version_requirements: *11163880
 description: ! "\n    inline CSS from external file(s) and/or style elment(s) in head
   element\n    into style attibute of HTML elements\n  "
 email:
@@ -267,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019368120188778628
+      hash: 4449711269837875918
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -276,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1019368120188778628
+      hash: 4449711269837875918
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8