RubyGems - docomo_css - Versions diffs - 0.4.6 → 0.4.8 - Mend

docomo_css 0.4.6 → 0.4.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

data/.gitignore +4 -0
data/Rakefile +24 -0
data/docomo_css.gemspec +23 -0
data/lib/docomo_css/filter.rb +3 -3
data/lib/docomo_css/version.rb +1 -1
data/test/actual.html +13 -0
data/test/docomo_css/emeddable_style_test.rb +109 -0
data/test/docomo_css/filter_test.rb +211 -0
data/test/docomo_css/stylesheet_test.rb +24 -0
data/test/expected.html +26 -0
data/test/public/actual.css +4 -0
data/test/test_helper.rb +11 -0
metadata +19 -11

data/.gitignore ADDED Viewed

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

data/Rakefile ADDED Viewed

@@ -0,0 +1,24 @@
+require 'bundler'
+require 'rake/testtask'
+require 'rake/rdoctask'
+Bundler::GemHelper.install_tasks
+desc 'Default: run unit tests.'
+task :default => :test
+desc 'Test the docomo_css plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.libs << 'test'
+  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

data/docomo_css.gemspec ADDED Viewed

@@ -0,0 +1,23 @@
+$:.push File.expand_path("../lib", __FILE__)
+require "docomo_css/version"
+Gem::Specification.new do |s|
+  s.name = 'docomo_css'
+  s.version = DocomoCss::Version
+  s.platform = Gem::Platform::RUBY
+  s.authors = ["milk1000cc", "Paul McMahon"]
+  s.email = 'info@milk1000.cc'
+  s.homepage = 'http://www.milk1000.cc/'
+  s.summary = 'CSS inliner'
+  s.description = 'Inlines CSS so that you can use external CSS with docomo handsets.'
+  s.files         = `git ls-files`.split("\n")
+  s.require_path = 'lib'
+  s.rubyforge_project = "galakei"
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.add_dependency 'nokogiri', ">= 0"
+  s.add_dependency 'tiny_css', "~> 0.1.3"
+  s.add_dependency 'rails', ">= 3.0.0"
+end

data/lib/docomo_css/filter.rb CHANGED Viewed

@@ -20,9 +20,9 @@ module DocomoCss
     def embed_css(body)
       doc = Nokogiri::HTML(body)
-      unless doc.encoding
-        doc.at("/html/head").add_child("<!-- Please explicitly specify the encoding of your document as below. Assuming UTF-8. -->")
-        doc.at("/html/head").add_child("<meta content='application/xhtml+xml;charset=UTF-8' http-equiv='content-type' />")
+      if doc.encoding.nil? && head = doc.at("/html/head")
+        head.add_child("<!-- Please explicitly specify the encoding of your document as below. Assuming UTF-8. -->")
+        head.add_child("<meta content='application/xhtml+xml;charset=UTF-8' http-equiv='content-type' />")
         doc.encoding = "UTF-8"
       end

data/lib/docomo_css/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module DocomoCss
-  Version = "0.4.6"
+  Version = "0.4.8"
 end

data/test/actual.html ADDED Viewed

@@ -0,0 +1,13 @@
+<?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/emeddable_style_test.rb ADDED Viewed

@@ -0,0 +1,109 @@
+require 'test_helper'
+require 'tiny_css'
+require File.join File.dirname(__FILE__), '..', '..', 'lib', 'docomo_css', 'embeddable_style'
+class DocomoCss::EmbeddableStyleTest < Test::Unit::TestCase
+  def test_embed_style_in_div
+    doc = Nokogiri::HTML("<div>")
+    div = doc.at("div")
+    div.embed_style(style)
+    assert_equal '<div style="color:red"></div>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_h1_handles_empty_children
+    doc = Nokogiri::HTML("<h1>")
+    e = doc.at("h1")
+    e.embed_style(style)
+    assert_equal '<h1></h1>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_h1_handles_wrapping_of_color
+    doc = Nokogiri::HTML("<h1>foo</h1>")
+    e = doc.at("h1")
+    e.embed_style(style)
+    assert_equal '<h1><span style="color:red">foo</span></h1>', doc.at("body").children.to_html
+  end
+  def test_embed_style_obeys_inject_unsupported_styles
+    doc = Nokogiri::HTML("<h1>foo</h1>")
+    e = doc.at("h1")
+    e.embed_style(style, :inject_unsupported_styles => false)
+    assert_equal '<h1 style="color:red">foo</h1>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_h1_handles_wrapping_of_font_size
+    doc = Nokogiri::HTML("<h1>foo</h1>")
+    e = doc.at("h1")
+    e.embed_style(style('font-size', 'x-small'))
+    assert_equal '<h1><span style="font-size:x-small">foo</span></h1>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_h1_handles_wrapping_of_background_color
+    doc = Nokogiri::HTML("<h1>foo</h1>")
+    e = doc.at("h1")
+    e.embed_style(style('background-color', 'red'))
+    assert_equal '<div style="background-color:red"><h1>foo</h1></div>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_div_handles_existing_style_attribute
+    doc = Nokogiri::HTML("<div style='font-size:x-small'>foo</div>")
+    e = doc.at("div")
+    e.embed_style(style)
+    assert_equal '<div style="font-size:x-small;color:red">foo</div>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_h1_handles_style_in_h1
+    doc = Nokogiri::HTML("<h1 style='margin-top: 10px;'>foo</h1>")
+    e = doc.at("h1")
+    e.embed_style(style)
+    assert_equal %q{<h1 style="margin-top: 10px;"><span style="color:red">foo</span></h1>}, doc.at("body").children.to_html
+  end
+  def test_merge_style
+    e = Nokogiri.make("<h1>")
+    e.merge_style('color:red')
+    assert_equal '<h1 style="color:red"></h1>', e.to_html
+    e = Nokogiri.make('<h1 style="color:red">')
+    e.merge_style('font-size:small')
+    assert_equal '<h1 style="color:red;font-size:small"></h1>', e.to_html
+    e = Nokogiri.make('<h1 style="color:red;">')
+    e.merge_style('font-size:small')
+    assert_equal '<h1 style="color:red;font-size:small"></h1>', e.to_html
+  end
+  def test_embed_style_in_h1_handles_multiple_styles
+    doc = Nokogiri::HTML("<h1>foo</h1>")
+    e = doc.at("h1")
+    style = TinyCss::OrderedHash.new
+    style["font-size"] = "medium"
+    style["color"] = "#ffffff"
+    style["text-align"] = "center"
+    style["background"] = "#215f8b"
+    style["margin-top"] = "5px"
+    e.embed_style(style)
+    assert_equal %q{<div style="background:#215f8b"><h1 style="text-align:center;margin-top:5px"><span style="font-size:medium;color:#ffffff">foo</span></h1></div>}, doc.at("body").children.to_html
+  end
+  def test_embed_style_in_p_handles_color
+    doc = Nokogiri::HTML("<p>foo</p>")
+    e = doc.at("p")
+    e.embed_style(style)
+    assert_equal '<p><span style="color:red">foo</span></p>', doc.at("body").children.to_html
+  end
+  def test_embed_style_in_p_handles_background_color
+    doc = Nokogiri::HTML("<p>foo</p>")
+    e = doc.at("p")
+    e.embed_style(style('background-color', 'red'))
+    assert_equal '<div style="background-color:red"><p>foo</p></div>', doc.at("body").children.to_html
+  end
+  private
+  def style(attribute = 'color', value = 'red')
+    style = TinyCss::OrderedHash.new
+    style[attribute] = value
+    style
+  end
+end

data/test/docomo_css/filter_test.rb ADDED Viewed

@@ -0,0 +1,211 @@
+require 'test_helper'
+require File.join File.dirname(__FILE__), '..', '..', 'lib', 'docomo_css', 'filter'
+class DocomoCss::FilterTest < Test::Unit::TestCase
+  def setup
+    @filter = DocomoCss::Filter.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_embed_style_in_multiple_h1s
+    css = TinyCss.new.read_string("h1 { color: red; }")
+    doc = Nokogiri::HTML("<h1>foo</h1><h1>bar</h1>")
+    @filter.embed_style doc, css
+    assert_match '<span style="color:red">foo</span>', doc.search('h1')[0].children.to_xhtml
+    assert_match '<span style="color:red">bar</span>', doc.search('h1')[1].children.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
+  def test_embed_css_detects_missing_character_encoding
+    xml = <<-EOD
+      <?xml version='1.0' encoding='utf-8' ?>
+      <!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.2//EN" "http://www.openmobilealliance.org/tech/DTD/xhtml-mobile12.dtd">
+      <html lang='ja' xml:lang='ja' xmlns='http://www.w3.org/1999/xhtml'>
+      <head>
+      </head>
+      <body>
+        ほげ
+      </body>
+      </html>
+    EOD
+    encoded_body = @filter.embed_css(xml)
+    assert_match "ほげ", encoded_body
+    assert_match '<meta content="application/xhtml+xml;charset=UTF-8" http-equiv="content-type" />', encoded_body
+    assert_match '<!-- Please explicitly specify the encoding of your document as below. Assuming UTF-8. -->', encoded_body
+  end
+end

data/test/docomo_css/stylesheet_test.rb ADDED Viewed

@@ -0,0 +1,24 @@
+require 'test_helper'
+require File.join File.dirname(__FILE__), '..', '..', 'lib', 'docomo_css', 'stylesheet'
+class DocomoCss::StylesheetTest < Test::Unit::TestCase
+  def test_css_path
+    ActionController::Base.stubs(:asset_host => nil)
+    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
+    ActionController::Base.stubs(:asset_host => "http://assets.example.com/")
+    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/expected.html ADDED Viewed

@@ -0,0 +1,26 @@
+<?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" />
+<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 ADDED Viewed

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

data/test/test_helper.rb ADDED Viewed

@@ -0,0 +1,11 @@
+require 'test/unit'
+require 'rubygems'
+require 'mocha'
+Rails = Mocha::Mockery.instance.unnamed_mock
+Rails.stubs(:root => File.dirname(__FILE__))
+module ActionController
+  Base = Mocha::Mockery.instance.unnamed_mock
+  Base.stubs(:asset_host => nil)
+end

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: docomo_css
 version: !ruby/object:Gem::Version
-  hash: 3
+  hash: 31
   prerelease: false
   segments:
   - 0
   - 4
-  - 6
-  version: 0.4.6
+  - 8
+  version: 0.4.8
 platform: ruby
 authors:
 - milk1000cc
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-03-09 00:00:00 +09:00
+date: 2011-04-01 00:00:00 +09:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -74,14 +74,24 @@ extensions: []
 extra_rdoc_files: []
 files:
+- .gitignore
 - MIT-LICENSE
 - README.rdoc
+- Rakefile
+- docomo_css.gemspec
+- lib/docomo_css.rb
 - lib/docomo_css/embeddable_style.rb
 - lib/docomo_css/filter.rb
 - lib/docomo_css/railtie.rb
 - lib/docomo_css/stylesheet.rb
 - lib/docomo_css/version.rb
-- lib/docomo_css.rb
+- test/actual.html
+- test/docomo_css/emeddable_style_test.rb
+- test/docomo_css/filter_test.rb
+- test/docomo_css/stylesheet_test.rb
+- test/expected.html
+- test/public/actual.css
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://www.milk1000.cc/
 licenses: []
@@ -105,15 +115,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      hash: 23
+      hash: 3
       segments:
-      - 1
-      - 3
-      - 6
-      version: 1.3.6
+      - 0
+      version: "0"
 requirements: []
-rubyforge_project: docomo_css
+rubyforge_project: galakei
 rubygems_version: 1.3.7
 signing_key:
 specification_version: 3