docomo_css 0.2.5 → 0.3.0

data/README.rdoc

@@ -17,7 +17,10 @@ docomo_css works around this by inlining all CSS automatically for you.
 
   sudo gem install docomo_css
 
-libxml 2.7 or later is required
+== Requirements
+
+ * libxml 2.7 or later is required
+ * Rails 3
 
 == Usage
 
@@ -52,13 +55,6 @@ libxml 2.7 or later is required
   </body>
   </html>
 
-In addition to the basic usage, you may also provide the css inliner with additional directive by adding a docomo_css attribute to the style tag.
-
-Options for the value of this docomo_css are
-
- * ignore - this stylesheet will not be inlined
- * remove_after_inline - remove the link to this stylesheet after processing it
-
 == Author
 
 Copyright (c) 2008 milk1000cc, released under the MIT license

data/lib/docomo_css/railtie.rb

@@ -0,0 +1,5 @@
+class DocomoCss::Railtie < Rails::Railtie
+  initializer "docomo_css.extend.action_controller" do
+    ActionController::Base.send :include, DocomoCss
+  end
+end

data/lib/docomo_css/stylesheet.rb

@@ -13,7 +13,7 @@ module DocomoCss
     private
 
     def path_from_href(href)
-      base_path = href.gsub(ActionController::Base.asset_host, '').
+      base_path = href.gsub(ActionController::Base.asset_host.to_s, '').
                        gsub(/\?\d+/, '')
       File.join(Rails.root, 'public', base_path)
     end

data/lib/docomo_css/version.rb

@@ -0,0 +1,3 @@
+class DocomoCss
+  Version = "0.3.0"
+end

data/lib/docomo_css.rb

@@ -1,6 +1,7 @@
 require 'nokogiri'
 require 'tiny_css'
 require 'docomo_css/stylesheet'
+require 'docomo_css/railtie'
 
 module DocomoCss
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docomo_css
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 5
-  version: 0.2.5
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - milk1000cc
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-29 00:00:00 +09:00
+date: 2010-11-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hpricot
+  name: nokogiri
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -53,24 +53,15 @@ executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- .gitignore
 - MIT-LICENSE
 - README.rdoc
-- Rakefile
-- VERSION
-- docomo_css.gemspec
-- init.rb
-- lib/docomo_css.rb
+- lib/docomo_css/railtie.rb
 - lib/docomo_css/stylesheet.rb
-- rails/init.rb
-- test/actual.html
-- test/docomo_css/stylesheet_test.rb
-- test/docomo_css_test.rb
-- test/expected.html
-- test/public/actual.css
+- lib/docomo_css/version.rb
+- lib/docomo_css.rb
 has_rdoc: true
 homepage: http://www.milk1000.cc/
 licenses: []
@@ -94,17 +85,18 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 23
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
-rubyforge_project: 
+rubyforge_project: docomo_css
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: CSS inliner
-test_files: 
-- test/docomo_css/stylesheet_test.rb
-- test/docomo_css_test.rb
+test_files: []
+

data/.gitignore

@@ -1,3 +0,0 @@
-*.swp
-pkg/*
-rdoc/*

data/Rakefile

@@ -1,38 +0,0 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the docomo_css plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the docomo_css plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'DocomoCss'
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "docomo_css"
-    s.summary = "CSS inliner"
-    s.description = "Inlines CSS so that you can use external CSS with docomo handsets."
-    s.email = "info@milk1000.cc"
-    s.homepage = "http://www.milk1000.cc/"
-    s.authors = ["milk1000cc", "Paul McMahon"]
-    s.add_dependency 'hpricot'
-    s.add_dependency 'tiny_css'
-  end
-rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
-end

data/VERSION

@@ -1 +0,0 @@
-0.2.5

data/docomo_css.gemspec

@@ -1,60 +0,0 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{docomo_css}
-  s.version = "0.2.5"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["milk1000cc", "Paul McMahon"]
-  s.date = %q{2010-09-29}
-  s.description = %q{Inlines CSS so that you can use external CSS with docomo handsets.}
-  s.email = %q{info@milk1000.cc}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "docomo_css.gemspec",
-     "init.rb",
-     "lib/docomo_css.rb",
-     "lib/docomo_css/stylesheet.rb",
-     "rails/init.rb",
-     "test/actual.html",
-     "test/docomo_css/stylesheet_test.rb",
-     "test/docomo_css_test.rb",
-     "test/expected.html",
-     "test/public/actual.css"
-  ]
-  s.homepage = %q{http://www.milk1000.cc/}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{CSS inliner}
-  s.test_files = [
-    "test/docomo_css/stylesheet_test.rb",
-     "test/docomo_css_test.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<hpricot>, [">= 0"])
-      s.add_runtime_dependency(%q<tiny_css>, [">= 0"])
-    else
-      s.add_dependency(%q<hpricot>, [">= 0"])
-      s.add_dependency(%q<tiny_css>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<hpricot>, [">= 0"])
-    s.add_dependency(%q<tiny_css>, [">= 0"])
-  end
-end

data/init.rb

@@ -1 +0,0 @@
-require File.join File.dirname(__FILE__), 'rails', 'init'

data/rails/init.rb

@@ -1,2 +0,0 @@
-require 'docomo_css'
-ActionController::Base.send :include, DocomoCss

data/test/actual.html

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>
-<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/2.3) 1.0//EN" "i-xhtml_4ja_10.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=Shift_JIS" />
-<link rel="stylesheet" href="/actual.css" />
-</head>
-<body>
-<div class="content">
-<a href="/">TOP</a>
-</div>
-</body>
-</html>

data/test/docomo_css/stylesheet_test.rb

@@ -1,24 +0,0 @@
-require 'test/unit'
-require File.join File.dirname(__FILE__), '..', '..', 'lib', 'docomo_css', 'stylesheet'
-
-module ActionController; module Base; def self.asset_host; "http://assets.example.com"; end; end; end
-
-class DocomoCss::StylesheetTest < Test::Unit::TestCase
-  def test_css_path
-    href = "/stylesheets/all.css?1274411517"
-    stylesheet = DocomoCss::Stylesheet.new(href)
-    assert_equal "#{Rails.root}/public/stylesheets/all.css", stylesheet.path
-  end
-
-  def test_css_path_with_asset_host
-    href = "http://assets.example.com/stylesheets/all.css?1274411517"
-    stylesheet = DocomoCss::Stylesheet.new(href)
-    assert_equal "#{Rails.root}/public/stylesheets/all.css", stylesheet.path
-  end
-
-  def test_valid
-    assert !DocomoCss::Stylesheet.new(nil).valid?
-    assert !DocomoCss::Stylesheet.new("/all.css?1274411517").valid?
-    assert DocomoCss::Stylesheet.new("/actual.css?1274411517").valid?
-  end
-end

data/test/docomo_css_test.rb

@@ -1,189 +0,0 @@
-require 'test/unit'
-require 'rubygems'
-require 'mocha'
-require File.join File.dirname(__FILE__), '..', 'lib', 'docomo_css'
-
-Rails = Mocha::Mockery.instance.unnamed_mock
-Rails.stubs(:root => File.dirname(__FILE__))
-
-class DocomoCssTest < Test::Unit::TestCase
-  def setup
-    @filter = DocomoCss::DocomoCssFilter.new
-  end
-
-  def test_invalid_response_content_type
-    response = mock("invalid_response") do
-      expects(:content_type).returns('text/html').once
-      expects(:body).never
-    end
-    controller = stub("invalid_controller", :response => response)
-    @filter.after(controller)
-  end
-
-  def test_escape_numeric_character_reference
-    assert_equal "HTMLCSSINLINERESCAPE123456789::::::::", @filter.escape_numeric_character_reference("&#123456789;")
-    assert_equal "HTMLCSSINLINERESCAPEx123def::::::::", @filter.escape_numeric_character_reference("&#x123def;")
-  end
-
-  def test_unescape_numeric_character_reference
-    assert_equal "&#123456789;", @filter.unescape_numeric_character_reference("HTMLCSSINLINERESCAPE123456789::::::::")
-    assert_equal "&#x123def;", @filter.unescape_numeric_character_reference("HTMLCSSINLINERESCAPEx123def::::::::")
-  end
-
-  def test_pseudo_selectors
-    css = TinyCss.new.read_string(<<-CSS)
-a:visited { color: FF00FF; }
-    CSS
-    assert_equal ["a:visited"], @filter.pseudo_selectors(css)
-
-    css = TinyCss.new.read_string(<<-CSS)
-.purple { color: FF00FF; }
-    CSS
-    assert_equal [], @filter.pseudo_selectors(css)
-  end
-
-  def test_stylesheet_link_node
-    doc = Nokogiri::HTML(<<-HTML)
-<link href="a.css"/>
-<link href="b.css" rel="stylesheet"/>
-    HTML
-
-    @filter.stylesheet_link_node(doc).each do |node|
-      assert_equal 'b.css', node['href']
-    end
-  end
-
-  def test_extract_pseudo_style
-    css = TinyCss.new.read_string <<-CSS
-a:link    { color: red; }
-a:focus   { color: green; }
-a:visited { color: blue; }
-div.title { background-color: #999 }
-    CSS
-
-    pseudo_style = @filter.extract_pseudo_style css
-    assert_equal('red', pseudo_style.style['a:link']['color'])
-    assert_equal('green', pseudo_style.style['a:focus']['color'])
-    assert_equal('blue', pseudo_style.style['a:visited']['color'])
-    assert_equal('#999', css.style['div.title']['background-color'])
-  end
-
-  def test_embed_pseudo_style
-    css = TinyCss.new
-    assert_equal nil, @filter.embed_pseudo_style(nil, css)
-
-    css = TinyCss.new.read_string <<-CSS
-a:link    { color: red; }
-a:focus   { color: green; }
-a:visited { color: blue; }
-    CSS
-
-    doc = Nokogiri::HTML <<-HTML
-<html>
-<head></head>
-<body></body>
-</html>
-    HTML
-    doc = @filter.embed_pseudo_style doc, css
-    assert_match %r'<style .*?/style>'m, doc.to_xhtml
-
-    doc = Nokogiri::HTML <<-HTML
-<html>
-<body></body>
-</html>
-    HTML
-    assert_raise RuntimeError do
-      @filter.embed_pseudo_style doc, css
-    end
-  end
-
-  def test_embed_style
-    css = TinyCss.new.read_string <<-CSS
-.title { color: red; }
-    CSS
-
-    doc = Nokogiri::HTML <<-HTML
-<html>
-<body>
-<div class="title">bar</div>
-</body>
-</html>
-    HTML
-    @filter.embed_style doc, css
-    assert_match %r'style="color:red"', doc.to_xhtml
-
-    doc = Nokogiri::HTML <<-HTML
-<html>
-<body>
-<div class="title" style="background-color:black">bar</div>
-</body>
-</html>
-    HTML
-    @filter.embed_style doc, css
-    assert_match %r'style="background-color:black;color:red"', doc.to_xhtml
-
-    doc = Nokogiri::HTML <<-HTML
-<html>
-<body>
-<div class="title" style="background-color:silver;">bar</div>
-</body>
-</html>
-    HTML
-    @filter.embed_style doc, css
-    assert_match %r'style="background-color:silver;color:red"', doc.to_xhtml
-  end
-
-  def test_xml_declare
-    doc = stub("doc", :encoding => "Shift_JIS")
-    assert_equal <<-XML, @filter.xml_declare(doc)
-<?xml version="1.0" encoding="Shift_JIS"?>
-    XML
-
-    doc = stub("doc", :encoding => "UTF-8")
-    assert_equal <<-XML, @filter.xml_declare(doc)
-<?xml version="1.0" encoding="UTF-8"?>
-    XML
-  end
-
-  def test_remove_xml_declare
-    assert_equal '', @filter.remove_xml_declare('<?xml version="1.0"?>')
-    assert_equal '', @filter.remove_xml_declare('<?xml encoding="Shift_JIS"?>')
-    assert_equal '', @filter.remove_xml_declare('<?xml version="1.0" encoding="Shift_JIS" ?>')
-    assert_equal '', @filter.remove_xml_declare('<?xml?>')
-  end
-
-  def test_output_with_docomo_1_0_browser
-    request = stub('request', :user_agent => 'DoCoMo/2.0 D905i(c100;TB;W24H17)')
-    response = stub("response") do
-      expects(:content_type).returns('application/xhtml+xml')
-      expects(:body).returns(File.open(File.join(File.dirname(__FILE__), 'actual.html'), 'rb'){ |f| f.read })
-      expects(:body=).with(File.open(File.join(File.dirname(__FILE__), 'expected.html'), 'rb'){ |f| f.read })
-    end
-    controller = stub("controller", :response => response, :request => request)
-
-    @filter.after(controller)
-  end
-
-  def test_output_with_docomo_1_0_browser_and_utf8_charset
-    request = stub('request', :user_agent => 'DoCoMo/2.0 D905i(c100;TB;W24H17)')
-    response = stub("response") do
-      expects(:content_type).returns('application/xhtml+xml; charset=utf-8')
-      expects(:body).returns(File.open(File.join(File.dirname(__FILE__), 'actual.html'), 'rb'){ |f| f.read })
-      expects(:body=).with(File.open(File.join(File.dirname(__FILE__), 'expected.html'), 'rb'){ |f| f.read })
-    end
-    controller = stub("controller", :response => response, :request => request)
-
-    @filter.after(controller)
-  end
-
-  def test_output_with_docomo_2_0_browser
-    request = stub('request', :user_agent => 'DoCoMo/2.0 N03B(c500;TB;W24H16)')
-    response = stub("response") do
-      expects(:content_type).returns('application/xhtml+xml')
-      expects(:body).never
-    end
-    controller = stub("controller", :response => response, :request => request)
-
-    @filter.after(controller)
-  end
-end

data/test/expected.html

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="Shift_JIS"?>
-<!DOCTYPE html PUBLIC "-//i-mode group (ja)//DTD XHTML i-XHTML(Locale/Ver.=ja/2.3) 1.0//EN" "i-xhtml_4ja_10.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=Shift_JIS" />
-<link rel="stylesheet" href="/actual.css" />
-<style type="text/css">
-<![CDATA[
-a:visited {
-	color: blue;
-}
-a:link {
-	color: red;
-}
-a:focus {
-	color: green;
-}
-
-]]>
-</style>
-</head>
-<body>
-<div class="content" style="background-color:#999">
-<a href="/">TOP</a>
-</div>
-</body>
-</html>

data/test/public/actual.css

@@ -1,4 +0,0 @@
-a:link      { color: red; }
-a:focus     { color: green; }
-a:visited   { color: blue; }
-div.content { background-color: #999 }