docomo_css 0.3.0 → 0.4.0

data/README.rdoc

@@ -13,6 +13,16 @@ Instead, every element must use its own style attribute, for example
 
 docomo_css works around this by inlining all CSS automatically for you.
 
+Also, docomo does not support styling some elements such as h1, but does if you nest the contents in a span.  This library automatically handles transforming
+
+  <h1>foo</h1>
+
+to
+
+  <h1><span>foo</span></h1>
+
+so you don't need to change any styling.
+
 == Install
 
   sudo gem install docomo_css

data/lib/docomo_css/filter.rb

@@ -0,0 +1,118 @@
+require 'docomo_css/stylesheet'
+require 'nokogiri'
+require 'tiny_css'
+
+module DocomoCss
+  class Filter
+    def after(controller)
+      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
+    end
+
+    def embed_css(body)
+      doc = Nokogiri::HTML(body)
+
+      stylesheet_link_node(doc).each do |linknode|
+        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
+      xml_declare(doc) + doc.to_xhtml(:indent => 0, :encoding => doc.encoding)
+    end
+
+    def xml_declare(doc)
+      <<-XML
+<?xml version="1.0" encoding="#{doc.encoding}"?>
+      XML
+    end
+
+    def remove_xml_declare(body)
+      body.gsub(%r'<\?xml[^\?]*?\?>', '')
+    end
+
+    def embed_style(doc, css)
+      css.style.each do |selector, style|
+        stringified_style = stringify_style(style)
+        doc.css(selector).each do |element|
+          # inject support for unsupported styles
+          if /h\d/ =~ element.name 
+            # font-size needs to be changed in span
+            element.children.wrap('<span>')
+            element.children.first['style'] = merge_style element['style'], stringified_style
+
+            # background-color should be changed in div to give 100% width
+            div = Nokogiri.make("<div>")
+            div['style'] = merge_style element['style'], stringified_style
+            element.replace(div)
+            div.add_child(element)
+          else
+            element['style'] = merge_style element['style'], stringified_style
+          end
+        end
+      end
+    end
+
+    def stringify_style(style)
+      style.map { |k, v| "#{ k }:#{ v }" }.join ';'
+    end
+
+    def merge_style(style, other_style)
+      return other_style if style == nil
+      style += ";" unless style =~ /;\Z/
+      style + other_style
+    end
+
+    def escape_numeric_character_reference(text)
+      text.gsub /&#(\d+|x[\da-fA-F]+);/, 'HTMLCSSINLINERESCAPE\1::::::::'
+    end
+
+    def unescape_numeric_character_reference(text)
+      text.gsub /HTMLCSSINLINERESCAPE(\d+|x[\da-fA-F]+)::::::::/, '&#\1;'
+    end
+
+    def stylesheet_link_node(document)
+      document.xpath '//link[@rel="stylesheet"]'
+    end
+
+    def css_path(stylesheet)
+      stylesheet.path
+    end
+
+    def extract_pseudo_style(css)
+      pseudo_style = TinyCss.new
+      pseudo_selectors(css).each do |v|
+        pseudo_style.style[v] = css.style[v]
+        css.style.delete(v)
+      end
+      pseudo_style
+    end
+
+    def embed_pseudo_style(doc, pseudo_style)
+      return if pseudo_style.style.keys.empty?
+
+      raise unless doc.at('/html/head')
+      doc.at('/html/head').add_child <<-STYLE
+<style type="text/css">
+#{pseudo_style.write_string}
+</style>
+      STYLE
+      doc
+    end
+
+    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/lib/docomo_css/railtie.rb

@@ -1,5 +1,11 @@
+require 'docomo_css/filter'
+
 class DocomoCss::Railtie < Rails::Railtie
   initializer "docomo_css.extend.action_controller" do
-    ActionController::Base.send :include, DocomoCss
+    ActionController::Base.class_eval do
+      def self.docomo_filter
+        after_filter DocomoCss::Filter.new
+      end
+    end
   end
 end

data/lib/docomo_css/version.rb

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

data/lib/docomo_css.rb

@@ -1,117 +1 @@
-require 'nokogiri'
-require 'tiny_css'
-require 'docomo_css/stylesheet'
 require 'docomo_css/railtie'
-
-module DocomoCss
-
-  def self.included(base)
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-    def docomo_filter
-      after_filter DocomoCssFilter.new
-    end
-  end
-
-  class DocomoCssFilter
-    def after(controller)
-      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
-    end
-
-    def embed_css(body)
-      doc = Nokogiri::HTML(body)
-
-      stylesheet_link_node(doc).each do |linknode|
-        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
-      xml_declare(doc) + doc.to_xhtml(:indent => 0, :encoding => doc.encoding)
-    end
-
-    def xml_declare(doc)
-      <<-XML
-<?xml version="1.0" encoding="#{doc.encoding}"?>
-      XML
-    end
-
-    def remove_xml_declare(body)
-      body.gsub(%r'<\?xml[^\?]*?\?>', '')
-    end
-
-    def embed_style(doc, css)
-      css.style.each do |selector, style|
-        stringified_style = stringify_style(style)
-        doc.css(selector).each do |element|
-          element['style'] = merge_style element['style'], stringified_style
-        end
-      end
-    end
-
-    def stringify_style(style)
-      style.map { |k, v| "#{ k }:#{ v }" }.join ';'
-    end
-
-    def merge_style(style, other_style)
-      return other_style if style == nil
-      style += ";" unless style =~ /;\Z/
-      style + other_style
-    end
-
-    def escape_numeric_character_reference(text)
-      text.gsub /&#(\d+|x[\da-fA-F]+);/, 'HTMLCSSINLINERESCAPE\1::::::::'
-    end
-
-    def unescape_numeric_character_reference(text)
-      text.gsub /HTMLCSSINLINERESCAPE(\d+|x[\da-fA-F]+)::::::::/, '&#\1;'
-    end
-
-    def stylesheet_link_node(document)
-      document.xpath '//link[@rel="stylesheet"]'
-    end
-
-    def css_path(stylesheet)
-      stylesheet.path
-    end
-
-    def extract_pseudo_style(css)
-      pseudo_style = TinyCss.new
-      pseudo_selectors(css).each do |v|
-        pseudo_style.style[v] = css.style[v]
-        css.style.delete(v)
-      end
-      pseudo_style
-    end
-
-    def embed_pseudo_style(doc, pseudo_style)
-      return if pseudo_style.style.keys.empty?
-
-      raise unless doc.at('/html/head')
-      doc.at('/html/head').add_child <<-STYLE
-<style type="text/css">
-#{pseudo_style.write_string}
-</style>
-      STYLE
-      doc
-    end
-
-    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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docomo_css
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - milk1000cc
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-24 00:00:00 +09:00
+date: 2010-12-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,22 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id003
 description: Inlines CSS so that you can use external CSS with docomo handsets.
 email: info@milk1000.cc
 executables: []
@@ -58,6 +74,7 @@ extra_rdoc_files: []
 files: 
 - MIT-LICENSE
 - README.rdoc
+- lib/docomo_css/filter.rb
 - lib/docomo_css/railtie.rb
 - lib/docomo_css/stylesheet.rb
 - lib/docomo_css/version.rb