css_inliner 0.1.1 → 0.2.0

data/bin/css-inliner

@@ -6,6 +6,7 @@ opt = OptionParser.new
 Version = CSSInliner::VERSION
 options = {}
 
+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('-i [SUFFIX]', '--in-place', '--overwrite', 'inplace editing') do |v|
   options[:'in-place'] = true
@@ -23,5 +24,3 @@ elsif options[:output]
 else
   $stdout.write processed
 end
-
-exit 0

data/css_inliner.gemspec

@@ -13,18 +13,18 @@ Gem::Specification.new do |s|
     into style attibute of HTML elements
   }
 
-  # s.rubyforge_project = "css_inliner"
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency "nokogiri", '~> 1'
-  s.add_runtime_dependency "css_parser", '~> 1'
-  s.add_runtime_dependency "sass", '~> 3'
+  s.add_runtime_dependency "csspool", '~> 3'
+  s.add_runtime_dependency "bsearch"
 
   s.add_development_dependency "test-unit", '~> 2'
   s.add_development_dependency "cover_me", '~> 1'
   s.add_development_dependency "yard"
+  s.add_development_dependency "pry"
+  s.add_development_dependency "pry-doc"
 end

data/lib/css_inliner/csspool.rb

@@ -0,0 +1,58 @@
+require 'csspool'
+
+module CSSPool
+  module CSS
+    class << self
+      # Update declarations in base with ones in other
+      # @param [Array<Declaration>] base updated array of declarations
+      # @param [Array<Declaration>] other array of declarations
+      # @return [Array<Declaration>] base itself
+      def update_declarations(base, other)
+        other.each do |other_decl|
+          base_decls = base.find_all {|base_decl| base_decl.property == other_decl.property}
+          if base_decls.empty?
+            base << other_decl
+          else
+            base_decl = base_decls.pop
+            base_decls.each do |decl|
+              base_decl.update decl
+            end
+            base_decl.update other_decl
+          end
+        end
+        base
+      end
+
+      # Merge declarations in each argument
+      # @param [Array<Declaration>] base Array of declarations
+      # @param [Array<Declaration>] other Array of declarations
+      # @return [Aarray<Declaration>] merged array of declarations
+      def merge_declarations(base, other)
+        update_declarations base.dup, other
+      end
+    end
+
+    class Declaration
+      # @param [Declaration] other
+      # @return [Declaration] self
+      def update(other)
+        raise ArgumentError('different property') unless property == other.property
+        self.expressions = other.expressions if !important? or other.important?
+        self
+      end
+      alias merge! update
+
+      # @param [Declaration] other
+      # @return [Declaration] merged declaration
+      def merge(other)
+        dup.update other
+      end
+    end
+  end
+
+  module Visitors
+    class ToCSS
+      alias visit_CSSInliner_CSSDocument visit_CSSPool_CSS_Document
+    end
+  end
+end

data/lib/css_inliner/extractor.rb

@@ -1,7 +1,35 @@
+require 'English'
 require 'open-uri'
-require 'css_parser'
+require 'bsearch'
+require 'css_inliner/csspool'
 
 module CSSInliner
+  class CSSDocument < CSSPool::CSS::Document
+    # @return [Array<CSSPool::Selector>] Array of selectors in specificity order
+    attr_reader :sorted_selectors
+
+    def initialize
+      super
+      @sorted_selectors = []
+    end
+  end
+
+  class CSSDocumentHandler < CSSPool::CSS::DocumentHandler
+    def start_document
+      @document = CSSDocument.new
+    end
+
+    def start_selector selector_list
+      super
+      selector_list.each do |selector|
+        index = @document.sorted_selectors.bsearch_upper_boundary { |existing|
+          existing.specificity <=> selector.specificity
+        }
+        @document.sorted_selectors.insert index, selector
+      end
+    end
+  end
+
   class Extractor
     attr_reader :document
 
@@ -17,9 +45,11 @@ module CSSInliner
     end
 
     def extract_from_link(remove_link_element = true)
-      @document.css('link[rel="stylesheet"]').inject([]) do |sources, link|
+      @document.css('link').inject([]) do |sources, link|
+        next unless link['rel'] == 'stylesheet'
         begin
-          open(File.join(basedir, link['href'])) {|f| sources << f.read}
+          # To do: detect file encoding before open it(read only @charset value)
+          open(File.join(basedir, link['href']), 'r:BOM|UTF-8') {|f| sources << f.read}
         rescue Errno::ENOENT
           warn File.join(basedir, link['href']) + ' not found'
         end
@@ -37,17 +67,10 @@ module CSSInliner
     end
 
     def integrate(*sources)
-      parser = CssParser::Parser.new
-      parser.add_block!(sources * $/)
-      rule_sets = parser.enum_for :each_rule_set
-      i = 0
-      rule_sets = rule_sets.sort_by {|rs| [rs.specificity, i += 1]}
-      blank_rule_set = CssParser::RuleSet.new(nil, nil)
-      rule_sets.inject(Hash.new(blank_rule_set)) do |rules, rs|
-        sel = rs.selectors * ','
-        rules[sel] = CssParser.merge rules[sel], rs
-        rules
-      end
+      source = sources.collect {|src| src * $RS}.join($RS)
+      source = 'book {}' if source.empty?
+      handler = CSSDocumentHandler.new
+      CSSPool::SAC::Parser.new(handler).parse(source)
     end
 
     def basedir

data/lib/css_inliner/inliner.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'nokogiri'
 require 'css_inliner/extractor'
+require 'css_inliner/csspool'
 
 module CSSInliner
   class Inliner
@@ -13,29 +14,27 @@ module CSSInliner
     end
 
     def inline
-      original_style = {}
-      @document.css('*[style]').each do |elem|
-        original_style[elem] = elem['style']
+      original_styles = {}
+      @document.search('.//*[@style]').each do |elem|
+        original_styles[elem] = elem['style']
+        elem.remove_attribute('style')
       end
 
-      styles = {}
-      @extractor.extract.each_pair do |sel, rs|
+      css = @extractor.extract
+      css.sorted_selectors.each do |selector|
+        sel = selector.to_s
         next if sel =~ /@|:/
-        body = @document.css('body')
-        body.css(sel).each_with_index do |elem, i|
-          styles[elem] = CssParser::RuleSet.new(nil, nil) unless styles[elem]
-          styles[elem] = CssParser.merge styles[elem], rs
+        sel = 'body' if sel == '*' or sel == 'html'
+        @document.css(sel).each do |elem|
+          base = CSSPool.CSS("* {#{elem['style']}}").rule_sets.first.declarations
+          elem['style'] = CSSPool::CSS.update_declarations(base, selector.declarations).join
         end
       end
 
-      original_style.each_pair do |elem, style|
-        styles[elem] = CssParser::RuleSet.new(nil, nil) unless styles[elem]
-        rs = CssParser::RuleSet.new(nil, style)
-        styles[elem] = CssParser.merge styles[elem], rs
-      end
-
-      styles.each_pair do |elem, rule_set|
-        elem['style'] = rule_set.declarations_to_s
+      original_styles.each_pair do |elem, style|
+        base = CSSPool.CSS("* {#{elem['style']}}").rule_sets.first.declarations
+        orig = CSSPool.CSS("* {#{style}}").rule_sets.first.declarations
+        elem['style'] = CSSPool::CSS.update_declarations(base, orig).join
       end
 
       @document

data/lib/css_inliner/version.rb

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

data/lib/css_inliner.rb

@@ -2,6 +2,7 @@ require 'open-uri'
 require 'rubygems'
 require 'nokogiri'
 require 'css_inliner/version'
+require 'css_inliner/csspool'
 require 'css_inliner/inliner'
 
 module CSSInliner
@@ -12,8 +13,8 @@ module CSSInliner
     #   Returns whole document when nil
     # @return [String] HTML source
     def process(html, basedir = '.', element = nil)
-      doc = html.instance_of? Nokogiri::XML::Document ? html : Nokogiri.HTML(html)
-      doc = Inliner.new(html, basedir).inline
+      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
     end

data/test/fixtures/sample1/rdoc.css

@@ -615,7 +615,7 @@ div.method-source-code pre {
 
 * html #TB_overlay { /* ie6 hack */
   position: absolute;
-  height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+  /* height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); */
 }
 
 #TB_window {
@@ -632,7 +632,7 @@ div.method-source-code pre {
 
 * html #TB_window { /* ie6 hack */
   position: absolute;
-  margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+  /* margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); */
 }
 
 #TB_window img#TB_Image {
@@ -710,7 +710,7 @@ div.method-source-code pre {
 
 * html #TB_load { /* ie6 hack */
   position: absolute;
-  margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px');
+  /* margin-top: expression(0 - parseInt(this.offsetHeight / 2) + (TBWindowMargin = document.documentElement && document.documentElement.scrollTop || document.body.scrollTop) + 'px'); */
 }
 
 #TB_HideSelect{
@@ -729,7 +729,7 @@ div.method-source-code pre {
 
 * html #TB_HideSelect { /* ie6 hack */
   position: absolute;
-  height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+  /* height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px'); */
 }
 
 #TB_iframeContent{

data/test/test_css_inliner.rb

@@ -31,8 +31,6 @@ class CSSInlinerTest < CSSInlinerTestCase
   end
 
   def process(basedir)
-    pend
-
     source = File.read(File.join(basedir, 'index.html'))
     inlined = File.read(File.join(basedir, 'index.inlined.html'))
     [inlined, CSSInliner.process(source, basedir)]

data/test/test_extractor.rb

@@ -33,10 +33,8 @@ class TestExtractor < CSSInlinerTestCase
       color:  gray ;
     }
 '
-    expected = CssParser::Parser.new
-    expected.add_block! src
-    actual = CssParser::Parser.new
-    actual.add_block! @extractor3.extract_from_style[0]
+    expected = CSSPool.CSS src
+    actual = CSSPool.CSS @extractor3.extract_from_style[0]
 
     assert_equal expected.to_s, actual.to_s
   end
@@ -69,11 +67,17 @@ a {
 }
 '
     ]
-    expected = {
-      'h2'   => CssParser::RuleSet.new(nil, 'color: gray;'),
-      'h2 p' => CssParser::RuleSet.new(nil, 'color:blue'),
-      'a'    => CssParser::RuleSet.new(nil, 'text-decoration: none;')
-    }
-    assert_equal expected.to_s, @extractor1.integrate(sources).to_s
+    expected = <<EOC
+h2 {
+  color: gray;
+}
+h2 p {
+  color: blue;
+}
+a {
+  text-decoration: none;
+}
+EOC
+    assert_equal expected.chomp, @extractor1.integrate(sources).to_css.chomp
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000Z
+date: 2012-04-29 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &18228900 !ruby/object:Gem::Requirement
+  requirement: &12417000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,32 +21,32 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *18228900
+  version_requirements: *12417000
 - !ruby/object:Gem::Dependency
-  name: css_parser
-  requirement: &17749120 !ruby/object:Gem::Requirement
+  name: csspool
+  requirement: &12415820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *17749120
+  version_requirements: *12415820
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &17735720 !ruby/object:Gem::Requirement
+  name: bsearch
+  requirement: &12415220 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *17735720
+  version_requirements: *12415220
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &17738800 !ruby/object:Gem::Requirement
+  requirement: &12414040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *17738800
+  version_requirements: *12414040
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &17741120 !ruby/object:Gem::Requirement
+  requirement: &12430900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,32 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *17741120
+  version_requirements: *12430900
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &17743320 !ruby/object:Gem::Requirement
+  requirement: &12430380 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12430380
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: &12429780 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *12429780
+- !ruby/object:Gem::Dependency
+  name: pry-doc
+  requirement: &12429300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *17743320
+  version_requirements: *12429300
 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:
@@ -91,12 +113,13 @@ files:
 - .gitignore
 - Gemfile
 - LICENSE
-- README
+- README.rdoc
 - Rakefile
 - bin/css-inliner
 - bin/css-inliner-multifile
 - css_inliner.gemspec
 - lib/css_inliner.rb
+- lib/css_inliner/csspool.rb
 - lib/css_inliner/extractor.rb
 - lib/css_inliner/inliner.rb
 - lib/css_inliner/version.rb
@@ -244,7 +267,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1616189382576311129
+      hash: -1019368120188778628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -253,7 +276,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1616189382576311129
+      hash: -1019368120188778628
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8