RubyGems - docomo_css - Versions diffs - 0.2.1 → 0.2.2 - Mend

docomo_css 0.2.1 → 0.2.2

Files changed (9) hide show

data/Rakefile CHANGED Viewed

@@ -31,7 +31,7 @@ begin
     s.homepage = "http://www.milk1000.cc/"
     s.authors = ["milk1000cc", "Paul McMahon"]
     s.add_dependency 'hpricot'
-    s.add_dependency 'milk1000cc-tiny_css'
+    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"

data/VERSION CHANGED Viewed

	@@ -1 +1 @@
1	- 0.0.1
1	+ 0.2.2

data/docomo_css.gemspec CHANGED Viewed

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name = %q{docomo_css}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["milk1000cc", "Paul McMahon"]
-  s.date = %q{2009-06-11}
+  s.date = %q{2010-09-15}
   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 = [
@@ -22,13 +25,15 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/docomo_css.rb",
      "rails/init.rb",
+     "test/actual.css",
+     "test/actual.html",
      "test/docomo_css_test.rb",
+     "test/expected.html"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://www.milk1000.cc/}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{CSS inliner}
   s.test_files = [
     "test/docomo_css_test.rb"
@@ -36,17 +41,18 @@ Gem::Specification.new do |s|
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<nokogiri>, [">= 0"])
+    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<nokogiri>, [">= 0"])
+      s.add_dependency(%q<hpricot>, [">= 0"])
       s.add_dependency(%q<tiny_css>, [">= 0"])
     end
   else
-    s.add_dependency(%q<nokogiri>, [">= 0"])
+    s.add_dependency(%q<hpricot>, [">= 0"])
     s.add_dependency(%q<tiny_css>, [">= 0"])
   end
 end

data/lib/docomo_css.rb CHANGED Viewed

@@ -15,8 +15,9 @@ module DocomoCss
   class DocomoCssFilter
     def after(controller)
-      return unless controller.response.content_type == 'application/xhtml+xml'
+      return unless controller.response.content_type =~ /application\/xhtml\+xml/
       return unless controller.request.user_agent =~ /docomo/i
+      return if docomo_2_0_browser?(controller)
       body = escape_numeric_character_reference controller.response.body
       body = embed_css remove_xml_declare(body)
       controller.response.body = unescape_numeric_character_reference body
@@ -105,5 +106,11 @@ module DocomoCss
     def pseudo_selectors(css)
       css.style.keys.grep(/a:(link|focus|visited)/)
     end
+    private
+    def docomo_2_0_browser?(controller)
+      controller.request.user_agent =~ /DoCoMo\/2\.0 [^(]*\(c(\d+);/ && $1.to_i >= 500
+    end
   end
 end

data/test/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/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_test.rb CHANGED Viewed

@@ -155,15 +155,40 @@ a:visited { color: blue; }
     assert_equal '', @filter.remove_xml_declare('<?xml?>')
   end
-  def test_output
+  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)
+    controller = stub("controller", :response => response, :request => request)
     @filter.stubs(:css_path).returns(File.join(File.dirname(__FILE__), 'actual.css'))
     @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.stubs(:css_path).returns(File.join(File.dirname(__FILE__), 'actual.css'))
+    @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 ADDED Viewed

@@ -0,0 +1,27 @@
+<?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>

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: docomo_css
 version: !ruby/object:Gem::Version
-  hash: 21
+  hash: 19
   prerelease: false
   segments:
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors:
 - milk1000cc
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-06-11 00:00:00 +09:00
+date: 2010-09-15 00:00:00 +09:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: hpricot
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement
     none: false
@@ -65,7 +65,10 @@ files:
 - init.rb
 - lib/docomo_css.rb
 - rails/init.rb
+- test/actual.css
+- test/actual.html
 - test/docomo_css_test.rb
+- test/expected.html
 has_rdoc: true
 homepage: http://www.milk1000.cc/
 licenses: []
@@ -98,7 +101,7 @@ requirements: []
 rubyforge_project:
 rubygems_version: 1.3.7
 signing_key:
-specification_version: 2
+specification_version: 3
 summary: CSS inliner
 test_files:
 - test/docomo_css_test.rb