css_inliner 0.3.0 → 0.3.1

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 1.9.3

data/README.rdoc

@@ -1,4 +1,6 @@
 = CSS Inliner
+{<img src="https://secure.travis-ci.org/KitaitiMakoto/css_inliner.png?branch=master" alt="Build Status" />}[http://travis-ci.org/KitaitiMakoto/css_inliner]
+
 CSS Inliner is a command-line tools to inline CSS into style attribute of each HTML element.
 
 HTML here...
@@ -70,6 +72,11 @@ Note that this is <b>not stable at all</b>.
  CSSInliner.process html, 'http://example.net/stylesheets' # Passed URI will be used as base directory when resolving relative URI of CSS
 
 == History
+=== 0.3.1 / 2012-07-17
+* [BUG FIX]Fix an error which occurs when parsing non-XHTML documents
+* Change homepage: Gitorious -> GitHub
+* Reimplement some tests which have pended
+
 === 0.3.0 / 2012-05-28
 * Group external CSS files refered by <link> element by "title" attribute.
 * Work on progress: CSSPool::CSS::Declaration#expand_dimension

data/Rakefile

@@ -2,27 +2,7 @@ require 'rake/testtask'
 require 'yard'
 require "bundler/gem_tasks"
 
-task :default => ['coverage:console']
+task :default => :test
 
 Rake::TestTask.new
 YARD::Rake::YardocTask.new
-
-namespace :coverage do
-  desc "Generates and outputs code coverage report."
-  task :console => :test do
-    require 'cover_me'
-    CoverMe.config do |conf|
-      conf.formatter = CoverMe::ConsoleFormatter
-    end
-    CoverMe.complete!
-  end
-
-  desc "Generates and opens code coverage report."
-  task :html => :test do
-    require 'cover_me'
-    CoverMe.config do |conf|
-      conf.formatter = CoverMe::HtmlFormatter
-    end
-    CoverMe.complete!
-  end
-end

data/css_inliner.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = CSSInliner::VERSION
   s.authors     = ["KITAITI Makoto"]
   s.email       = ["KitaitiMakoto@gmail.com"]
-  s.homepage    = "http://gitorious.org/css_inliner"
+  s.homepage    = "https://github.com/KitaitiMakoto/css_inliner"
   s.summary     = %q{inline CSS into HTML attribute of elements}
   s.description = %q{
     inline CSS from external file(s) and/or style elment(s) in head element
@@ -24,7 +24,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "bsearch"
 
   s.add_development_dependency "test-unit-full"
-  s.add_development_dependency "cover_me", '~> 1'
   s.add_development_dependency "yard"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-doc"

data/lib/css_inliner.rb

@@ -14,7 +14,7 @@ module CSSInliner
     # @param [String] format Format to output, html or xhtml
     # @return [String] HTML source
     def process(html, basedir = '.', element = nil, format = 'html')
-      doc = html.instance_of?(Nokogiri::XML::Document) ? html : Nokogiri.XML(html)
+      doc = html.instance_of?(Nokogiri::XML::Document) ? html : Nokogiri.HTML(html)
       doc = Inliner.new(doc, basedir).inline
       doc = doc.css(element)[0] if element
       case format

data/lib/css_inliner/csspool.rb

@@ -73,9 +73,9 @@ module CSSPool
         return [self] unless expanded_properties
 
         expansion_map = EXPANSION_INDICES[expressions.length]
-        raise InvalidExpressionCountError, "has #{expressions.length} properties" unless expansion_map
+        raise InvalidExpressionCountError, "has #{expressions.length} expressions" unless expansion_map
 
-        expanded_properties.each.with_index.map {|prop, i|
+        expanded_properties.map.with_index {|prop, i|
           expression = expressions[expansion_map[i]]
           Declaration.new(prop, expression, important, rule_set)
         }

data/lib/css_inliner/extractor.rb

@@ -47,7 +47,7 @@ module CSSInliner
     def extract_from_link(remove_link_element = true)
       group = nil
       @document.css('link').inject([]) do |sources, link|
-        next unless link['rel'] == 'stylesheet'
+        next sources unless link['rel'] == 'stylesheet'
         title = link['title']
         if title
           if group.nil?

data/lib/css_inliner/version.rb

@@ -1,3 +1,3 @@
 module CSSInliner
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/helper.rb

@@ -1,4 +1,3 @@
-require 'cover_me'
 gem 'test-unit'
 require 'test/unit'
 require 'test/unit/notify'

data/test/test_css_inliner.rb

@@ -1,4 +1,5 @@
 require_relative 'helper'
+require 'tmpdir'
 require 'css_inliner'
 
 class CSSInlinerTest < CSSInlinerTestCase
@@ -7,32 +8,111 @@ class CSSInlinerTest < CSSInlinerTestCase
   end
 
   def test_process_without_inline_style
-    pend
-
-    assert_equal *process(@sample1_dir)
+    html = <<EOH
+<html>
+  <head>
+    <title>Without Inline Style</title>
+    <link rel="stylesheet" type="text/css" href="./style.css">
+  </head>
+  <body>
+    <p>This is a blue line.</p>
+  </body>
+</html>
+EOH
+    css = <<EOC
+p {
+  color: blue;
+}
+EOC
+    inlined = process(html, css)
+    doc = Nokogiri.HTML(inlined)
+    style = doc.search('p').first['style'].strip
+    assert_equal 'color: blue;', style
   end
 
   def test_process_with_inline_style
-    pend
-
-    assert_equal *process(@sample2_dir)
+    html = <<EOH
+<html>
+  <head>
+    <title>With Inline Style</title>
+    <link rel="stylesheet" type="text/css" href="./style.css">
+  </head>
+  <body>
+    <p style="font-weight: bold;">This is a bold blue line.</p>
+  </body>
+</html>
+EOH
+    css = <<EOC
+p {
+  color: blue;
+}
+EOC
+    inlined = process(html, css)
+    doc = Nokogiri.HTML(inlined)
+    style = doc.search('p').first['style'].strip.gsub(/ +/, '')
+    assert_equal 'color:blue;font-weight:bold;', style
   end
 
-  def test_process_with_style_attribute
-    pend
-
-    assert_equal *process(@sample3_dir)
+  def test_process_with_style_elem
+    html = <<EOH
+<html>
+  <head>
+    <title>With Style Attribute</title>
+    <link rel="stylesheet" type="text/css" href="./style.css">
+    <style type="text/css">
+      p {font-style: oblique;}
+    </style>
+  </head>
+  <body>
+    <p>This is a oblique blue line.</p>
+  </body>
+</html>
+EOH
+    css = <<EOC
+p {
+  color: blue;
+}
+EOC
+    inlined = process(html, css)
+    doc = Nokogiri.HTML(inlined)
+    style = doc.search('p').first['style'].strip.gsub(/ +/, '')
+    assert_equal 'color:blue;font-style:oblique;', style
   end
 
-  def test_process_with_inline_style_and_style_attibute
-    pend
-
-    assert_equal *process(@sample4_dir)
+  def test_process_with_inline_style_and_style_elem
+    html = <<EOH
+<html>
+  <head>
+    <title>With Inline Style and Style Attribute</title>
+    <link rel="stylesheet" type="text/css" href="./style.css">
+    <style type="text/css">
+      p {font-style: oblique;}
+    </style>
+  </head>
+  <body>
+    <p style="font-weight: bold;">This is a bold oblique blue line.</p>
+  </body>
+</html>
+EOH
+    css = <<EOC
+p {
+  color: blue;
+}
+EOC
+    inlined = process(html, css)
+    doc = Nokogiri.HTML(inlined)
+    style = doc.search('p').first['style'].strip.gsub(/ +/, '')
+    assert_equal 'color:blue;font-style:oblique;font-weight:bold;', style
   end
 
-  def process(basedir)
-    source = File.read(File.join(basedir, 'index.html'))
-    inlined = File.read(File.join(basedir, 'index.inlined.html'))
-    [inlined, CSSInliner.process(source, basedir)]
+  private
+
+  def process(html, css)
+    Dir.mktmpdir('css_inliner') do |dir|
+      File.open("#{dir}/style.css", 'w') do |f|
+        f.write css
+      end
+      CSSInliner.process(html, dir)
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000Z
+date: 2012-07-16 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &12120420 !ruby/object:Gem::Requirement
+  requirement: &7998240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *12120420
+  version_requirements: *7998240
 - !ruby/object:Gem::Dependency
   name: csspool
-  requirement: &12135420 !ruby/object:Gem::Requirement
+  requirement: &7997400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3'
   type: :runtime
   prerelease: false
-  version_requirements: *12135420
+  version_requirements: *7997400
 - !ruby/object:Gem::Dependency
   name: bsearch
-  requirement: &12134440 !ruby/object:Gem::Requirement
+  requirement: &7996520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *12134440
+  version_requirements: *7996520
 - !ruby/object:Gem::Dependency
   name: test-unit-full
-  requirement: &12142540 !ruby/object:Gem::Requirement
+  requirement: &7442420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,21 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12142540
-- !ruby/object:Gem::Dependency
-  name: cover_me
-  requirement: &12139920 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: *12139920
+  version_requirements: *7442420
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &12136920 !ruby/object:Gem::Requirement
+  requirement: &7439740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12136920
+  version_requirements: *7439740
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &12981720 !ruby/object:Gem::Requirement
+  requirement: &7438740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12981720
+  version_requirements: *7438740
 - !ruby/object:Gem::Dependency
   name: pry-doc
-  requirement: &12979580 !ruby/object:Gem::Requirement
+  requirement: &7437580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *12979580
+  version_requirements: *7437580
 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:
@@ -111,6 +100,7 @@ extra_rdoc_files: []
 files:
 - .gemtest
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -257,7 +247,7 @@ files:
 - test/test_css_inliner.rb
 - test/test_csspool.rb
 - test/test_extractor.rb
-homepage: http://gitorious.org/css_inliner
+homepage: https://github.com/KitaitiMakoto/css_inliner
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -271,7 +261,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4524569264957260771
+      hash: -3751475647972594840
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -280,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4524569264957260771
+      hash: -3751475647972594840
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.8