docomo_css 0.4.0 → 0.4.2

data/README.rdoc

@@ -13,15 +13,17 @@ 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
+Also, docomo does not support styling some elements such as h1, but does if you nest the contents in a span or div.  This library automatically handles transforming of markup such as
 
   <h1>foo</h1>
 
 to
 
-  <h1><span>foo</span></h1>
+  <h1><span style="font-size:x-small">foo</span></h1>
 
-so you don't need to change any styling.
+so you don't need to change any styling. If you were doing this manually before and don't want docomo_css to automatically update your html, use
+
+  docomo_css :inject_unsupported_style => false
 
 == Install
 

data/lib/docomo_css/embeddable_style.rb

@@ -0,0 +1,41 @@
+require 'nokogiri'
+
+module DocomoCss
+  module EmbeddableStyle
+    def embed_style(style, options = {})
+      options = {:inject_unsupported_styles => true}.merge!(options)
+      style = style.dup
+      inject_unsupported_styles(style) if options[:inject_unsupported_styles]
+      merge_style style
+    end
+
+    def merge_style(other_style)
+      return if other_style.empty?
+      if self['style'] == nil
+        self['style'] = other_style.to_s
+      else
+        self['style'] += ";" unless self['style'] =~ /;\Z/
+        self['style'] += other_style.to_s
+      end
+    end
+
+    private
+
+    def inject_unsupported_styles(style)
+      if /h\d/ =~ name 
+        if (h = style.split('color', 'font-size')) && !h.empty? && !children.empty?
+          children.wrap('<span>')
+          children.first.merge_style h
+        end
+        if (h = style.split('background-color', 'background')) && !h.empty? && !children.empty?
+          div = Nokogiri.make("<div>")
+          div.merge_style(h)
+          replace(div)
+          div.add_child(self)
+        end
+      end
+    end
+  end
+end
+
+Nokogiri::XML::Element.send(:include, DocomoCss::EmbeddableStyle)

data/lib/docomo_css/filter.rb

@@ -1,9 +1,14 @@
 require 'docomo_css/stylesheet'
+require 'docomo_css/embeddable_style'
 require 'nokogiri'
 require 'tiny_css'
 
 module DocomoCss
   class Filter
+    def initialize(options = {})
+      @options = {}
+    end
+
     def after(controller)
       return unless controller.response.content_type =~ /application\/xhtml\+xml/
       return unless controller.request.user_agent =~ /docomo/i
@@ -38,36 +43,12 @@ module DocomoCss
 
     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
+          element.embed_style(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

data/lib/docomo_css/railtie.rb

@@ -3,8 +3,8 @@ require 'docomo_css/filter'
 class DocomoCss::Railtie < Rails::Railtie
   initializer "docomo_css.extend.action_controller" do
     ActionController::Base.class_eval do
-      def self.docomo_filter
-        after_filter DocomoCss::Filter.new
+      def self.docomo_filter(options = {} )
+        after_filter DocomoCss::Filter.new(options)
       end
     end
   end

data/lib/docomo_css/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: docomo_css
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - milk1000cc
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 +09:00
+date: 2010-12-20 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,12 +39,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 25
         segments: 
         - 0
-        version: "0"
+        - 1
+        - 1
+        version: 0.1.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -74,6 +76,7 @@ extra_rdoc_files: []
 files: 
 - MIT-LICENSE
 - README.rdoc
+- lib/docomo_css/embeddable_style.rb
 - lib/docomo_css/filter.rb
 - lib/docomo_css/railtie.rb
 - lib/docomo_css/stylesheet.rb