RubyGems - css_inliner - Versions diffs - 0.1.0 → 0.1.1 - Mend

css_inliner 0.1.0 → 0.1.1

Files changed (13) hide show

data/.gemtest ADDED Viewed

File without changes

data/.gitignore CHANGED Viewed

@@ -4,5 +4,7 @@
 .bundle
 Gemfile.lock
 pkg/*
+doc/*
+vendor/*
 coverage.data
 coverage

data/LICENSE CHANGED Viewed

@@ -1,21 +1,21 @@
-MIT License
-Copyright (c) 2011, KITAITI Makoto
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+Copyright (c) 2011,2012 KITAITI Makoto
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

data/README CHANGED Viewed

@@ -1,6 +1,32 @@
 = CSS Inliner
 CSS Inliner is a command-line tools to inline CSS into style attribute of each HTML element.
+HTML here...
+ <html>
+   <head>
+     <title>Sample HTML</title>
+     <style type="text/css">
+       body {color: black;}
+       p {line-height: 2em;}
+     </style>
+   </head>
+   <body>
+     <p>This is sample HTML document. In this paragraph, text is black and line has double height of font size.</p>
+   </body>
+ </html>
+... becomes like this:
+ <html>
+   <head>
+     <title>Sample HTML</title>
+   </head>
+   <body style="color: black;">
+     <p style="line-height: 2em;">This is sample HTML document. In paragraph, text is black and line height is twice of font size.</p>
+   </body>
+ </html>
 = INSTALL
 == As a RubyGem
  $ gem install css_inliner
@@ -17,11 +43,11 @@ Note that options are not stable.
  $ css-inliner --help
  $ css-inliner file1.html(output to stdout)
- $ css-inliner file2.html --output=result2.html
- $ css-inliner file3.html > result3.html
- $ css-inliner file4.html --element body(output only body element)
- $ css-inliner file5.html --in-place(overwrite result to file5.html)
- $ css-inliner file5.html --in-place=.bak(create a backup file as file5.html.bak)
+ $ css-inliner file2.html > result2.html
+ $ css-inliner file3.html --output=result3.html
+ $ css-inliner file4.html --element=body(output only body element)
+ $ css-inliner file5.html --in-place(overwrite file5.html)
+ $ css-inliner file6.html --in-place=.bak(create a backup file as file6.html.bak)
 === css-inliner-multifile
  $  css-inliner --help
@@ -32,7 +58,16 @@ Note that options are not stable.
  $  css-inliner-multifile ./dir4/*.html --in-place=.bak
 == As a Library
-Not stable. Wait please.
+Note that this is <b>not stable at all</b>.
+ require 'css_inliner'
+ html = File.read(sample.html)
+ CSSInliner.process html, '.' # => CSS-inlined HTML
+ CSSInliner.process html, '.', 'body' # => body element(<body> ... </body>)
+ CSSInliner.process html, '.', 'article' # => The first article element
+ CSSInliner.process html, 'http://example.net/stylesheets' # Passed URI will be used as base directory when resolving relative URI of CSS
 == Note
 Note that
@@ -42,5 +77,5 @@ and
 will be removed in process.
 = LICENSE
-CSS Inliner is copyright (c) 2011 KITAITI Makoto.
+CSS Inliner is copyright (c) 2011, 2012 KITAITI Makoto.
 Distribued under the MIT license, see LISENCE file for the term.

data/Rakefile CHANGED Viewed

@@ -2,22 +2,27 @@ require 'rake/testtask'
 require 'yard'
 require "bundler/gem_tasks"
-task :default => [:test]
+task :default => ['coverage:console']
 Rake::TestTask.new
 YARD::Rake::YardocTask.new
-desc "Generates and opens code coverage report."
-namespace :cover_me do
-  task :report do
-    begin
-      require 'cover_me'
-      CoverMe.complete!
-    rescue LoadError
+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
-end
-task :test do
-  Rake::Task['cover_me:report'].invoke
+  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 CHANGED Viewed

@@ -6,7 +6,7 @@ Gem::Specification.new do |s|
   s.version     = CSSInliner::VERSION
   s.authors     = ["KITAITI Makoto"]
   s.email       = ["KitaitiMakoto@gmail.com"]
-  s.homepage    = "https://gitorious.org/css_inliner"
+  s.homepage    = "http://gitorious.org/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
@@ -19,11 +19,12 @@ Gem::Specification.new do |s|
   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.has_rdoc      = false
   s.add_runtime_dependency "nokogiri", '~> 1'
   s.add_runtime_dependency "css_parser", '~> 1'
+  s.add_runtime_dependency "sass", '~> 3'
   s.add_development_dependency "test-unit", '~> 2'
   s.add_development_dependency "cover_me", '~> 1'
+  s.add_development_dependency "yard"
 end

data/lib/css_inliner/extractor.rb CHANGED Viewed

@@ -21,7 +21,7 @@ module CSSInliner
         begin
           open(File.join(basedir, link['href'])) {|f| sources << f.read}
         rescue Errno::ENOENT
-          warn File.join(basedir, link['href']) + 'not found'
+          warn File.join(basedir, link['href']) + ' not found'
         end
         link.remove if remove_link_element
         sources

data/lib/css_inliner/inliner.rb CHANGED Viewed

@@ -4,8 +4,10 @@ require 'css_inliner/extractor'
 module CSSInliner
   class Inliner
-    def initialize(html, basedir)
-      @document = Nokogiri.HTML html
+    # @param [Nokogiri::XML::Document] document
+    # @param [String] basedir
+    def initialize(document, basedir)
+      @document = document
       @basedir = basedir
       @extractor = Extractor.new @document, @basedir
     end

data/lib/css_inliner/version.rb CHANGED Viewed

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

data/lib/css_inliner.rb CHANGED Viewed

@@ -6,7 +6,13 @@ require 'css_inliner/inliner'
 module CSSInliner
   class << self
+    # @param [Nokogiri::XML::Document, String] html
+    # @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
+    # @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 = doc.css(element)[0] if element
       doc.to_s

data/test/test_css_inliner.rb CHANGED Viewed

@@ -7,14 +7,32 @@ class CSSInlinerTest < CSSInlinerTestCase
   end
   def test_process_without_inline_style
+    pend
     assert_equal *process(@sample1_dir)
   end
   def test_process_with_inline_style
+    pend
     assert_equal *process(@sample2_dir)
   end
+  def test_process_with_style_attribute
+    pend
+    assert_equal *process(@sample3_dir)
+  end
+  def test_process_with_inline_style_and_style_attibute
+    pend
+    assert_equal *process(@sample4_dir)
+  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 CHANGED Viewed

@@ -1,7 +1,7 @@
 require_relative 'helper'
 require 'nokogiri'
-class ExtractorTest < CSSInlinerTestCase
+class TestExtractor < CSSInlinerTestCase
   def setup
     super
     @extractor1 = Extractor.new @doc1, @sample1_dir
@@ -51,4 +51,29 @@ class ExtractorTest < CSSInlinerTestCase
     @extractor3.extract_from_style(false)
     assert_equal expected, @doc3.css('style').to_s
   end
+  def test_integrate_basic
+    sources = [
+      '
+h2 {
+  color: gray;
+}',
+'
+h2 p {
+  color: blue;
+}
+',
+'
+a {
+  text-decoration: none;
+}
+'
+    ]
+    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
+  end
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: css_inliner
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease:
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2012-01-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21093240 !ruby/object:Gem::Requirement
+  requirement: &18228900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *21093240
+  version_requirements: *18228900
 - !ruby/object:Gem::Dependency
   name: css_parser
-  requirement: &21092680 !ruby/object:Gem::Requirement
+  requirement: &17749120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,21 @@ dependencies:
         version: '1'
   type: :runtime
   prerelease: false
-  version_requirements: *21092680
+  version_requirements: *17749120
+- !ruby/object:Gem::Dependency
+  name: sass
+  requirement: &17735720 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :runtime
+  prerelease: false
+  version_requirements: *17735720
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &21092160 !ruby/object:Gem::Requirement
+  requirement: &17738800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +54,10 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *21092160
+  version_requirements: *17738800
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &21091680 !ruby/object:Gem::Requirement
+  requirement: &17741120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +65,18 @@ dependencies:
         version: '1'
   type: :development
   prerelease: false
-  version_requirements: *21091680
+  version_requirements: *17741120
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &17743320 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *17743320
 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:
@@ -65,6 +87,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- .gemtest
 - .gitignore
 - Gemfile
 - LICENSE
@@ -207,7 +230,7 @@ files:
 - test/helper.rb
 - test/test_css_inliner.rb
 - test/test_extractor.rb
-homepage: https://gitorious.org/css_inliner
+homepage: http://gitorious.org/css_inliner
 licenses: []
 post_install_message:
 rdoc_options: []
@@ -219,12 +242,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1616189382576311129
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1616189382576311129
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.8
@@ -232,3 +261,4 @@ signing_key:
 specification_version: 3
 summary: inline CSS into HTML attribute of elements
 test_files: []
+has_rdoc: