docomo_css 0.2.4 → 0.2.5

data/README.rdoc

@@ -17,6 +17,8 @@ docomo_css works around this by inlining all CSS automatically for you.
 
   sudo gem install docomo_css
 
+libxml 2.7 or later is required
+
 == Usage
 
   # app/controllers/articles_controller.rb

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.2.5

data/docomo_css.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# 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.4"
+  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-21}
+  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 = [
@@ -58,4 +58,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tiny_css>, [">= 0"])
   end
 end
-

data/lib/docomo_css.rb

@@ -34,7 +34,7 @@ module DocomoCss
         embed_pseudo_style(doc, extract_pseudo_style(css))
         embed_style(doc, css)
       end
-      xml_declare(doc) + doc.to_xhtml(:indent => 0)
+      xml_declare(doc) + doc.to_xhtml(:indent => 0, :encoding => doc.encoding)
     end
 
     def xml_declare(doc)
@@ -67,11 +67,11 @@ module DocomoCss
     end
 
     def escape_numeric_character_reference(text)
-      text.gsub /&#(\d+);/, 'HTMLCSSINLINERESCAPE\1::::::::'
+      text.gsub /&#(\d+|x[\da-fA-F]+);/, 'HTMLCSSINLINERESCAPE\1::::::::'
     end
 
     def unescape_numeric_character_reference(text)
-      text.gsub /HTMLCSSINLINERESCAPE(\d+)::::::::/, '&#\1;'
+      text.gsub /HTMLCSSINLINERESCAPE(\d+|x[\da-fA-F]+)::::::::/, '&#\1;'
     end
 
     def stylesheet_link_node(document)

data/test/docomo_css_test.rb

@@ -22,10 +22,12 @@ class DocomoCssTest < Test::Unit::TestCase
 
   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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docomo_css
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - milk1000cc
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +09:00
+date: 2010-09-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency