docomo_css 0.2.2 → 0.2.3

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/docomo_css.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{docomo_css}
-  s.version = "0.2.2"
+  s.version = "0.2.3"
 
   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-15}
+  s.date = %q{2010-09-21}
   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 = [
@@ -24,11 +24,13 @@ Gem::Specification.new do |s|
      "docomo_css.gemspec",
      "init.rb",
      "lib/docomo_css.rb",
+     "lib/docomo_css/stylesheet.rb",
      "rails/init.rb",
-     "test/actual.css",
      "test/actual.html",
+     "test/docomo_css/stylesheet_test.rb",
      "test/docomo_css_test.rb",
-     "test/expected.html"
+     "test/expected.html",
+     "test/public/actual.css"
   ]
   s.homepage = %q{http://www.milk1000.cc/}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -36,7 +38,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{CSS inliner}
   s.test_files = [
-    "test/docomo_css_test.rb"
+    "test/docomo_css/stylesheet_test.rb",
+     "test/docomo_css_test.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/docomo_css/stylesheet.rb

@@ -0,0 +1,21 @@
+module DocomoCss
+  class Stylesheet
+    attr_reader :path
+
+    def initialize(href)
+      @path = href && path_from_href(href)
+    end
+
+    def valid?
+      path && FileTest.exist?(path)
+    end
+
+    private
+
+    def path_from_href(href)
+      base_path = href.gsub("http://#{ActionController::Base.asset_host}", '').
+                       gsub(/\?\d+/, '')
+      File.join(Rails.root, 'public', base_path)
+    end
+  end
+end

data/lib/docomo_css.rb

@@ -1,5 +1,6 @@
 require 'nokogiri'
 require 'tiny_css'
+require 'docomo_css/stylesheet'
 
 module DocomoCss
 
@@ -27,10 +28,9 @@ module DocomoCss
       doc = Nokogiri::HTML(body)
 
       stylesheet_link_node(doc).each do |linknode|
-        href = linknode['href'] or next
-
-        next unless FileTest.exist? css_path(href)
-        css = TinyCss.new.read(css_path(href))
+        stylesheet = DocomoCss::Stylesheet.new(linknode['href'])
+        next unless stylesheet.valid?
+        css = TinyCss.new.read(stylesheet.path)
         embed_pseudo_style(doc, extract_pseudo_style(css))
         embed_style(doc, css)
       end
@@ -78,8 +78,8 @@ module DocomoCss
       document.xpath '//link[@rel="stylesheet"]'
     end
 
-    def css_path(href)
-      File.join(Rails.root, 'public', href.gsub(/\?\d+/, ''))
+    def css_path(stylesheet)
+      stylesheet.path
     end
 
     def extract_pseudo_style(css)

data/test/docomo_css/stylesheet_test.rb

@@ -0,0 +1,24 @@
+require 'test/unit'
+require File.join File.dirname(__FILE__), '..', '..', 'lib', 'docomo_css', 'stylesheet'
+
+module ActionController; module Base; def self.asset_host; "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

@@ -51,11 +51,6 @@ a:visited { color: FF00FF; }
     end
   end
 
-  def test_css_path
-    href = "/stylesheets/all.css?1274411517"
-    assert_equal "#{Rails.root}/public/stylesheets/all.css", @filter.css_path(href)
-  end
-
   def test_extract_pseudo_style
     css = TinyCss.new.read_string <<-CSS
 a:link    { color: red; }
@@ -163,7 +158,6 @@ a:visited { color: blue; }
       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
@@ -176,7 +170,6 @@ a:visited { color: blue; }
       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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docomo_css
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - milk1000cc
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-15 00:00:00 +09:00
+date: 2010-09-21 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,11 +64,13 @@ files:
 - docomo_css.gemspec
 - init.rb
 - lib/docomo_css.rb
+- lib/docomo_css/stylesheet.rb
 - rails/init.rb
-- test/actual.css
 - test/actual.html
+- test/docomo_css/stylesheet_test.rb
 - test/docomo_css_test.rb
 - test/expected.html
+- test/public/actual.css
 has_rdoc: true
 homepage: http://www.milk1000.cc/
 licenses: []
@@ -104,4 +106,5 @@ signing_key:
 specification_version: 3
 summary: CSS inliner
 test_files: 
+- test/docomo_css/stylesheet_test.rb
 - test/docomo_css_test.rb