galakei 0.6.1 → 0.6.2

data/lib/galakei/docomo_css/stylesheet.rb

@@ -47,6 +47,8 @@ EOD
       [BorderAdapter, BackGroundAdapter, FontAdapter]
     when 'p'
       [BackGroundAdapter, FontAdapter]
+    when 'td'
+      [FontAdapter]
     when 'div'
       [BorderAdapter]
     else

data/lib/galakei/filter/non_standard_char.rb

@@ -6,7 +6,8 @@ class Galakei::Filter::NonStandardChar < Galakei::Filter::Base
   end  
 
   def condition?
-    response.content_type =~ %r{text/html|application/xhtml+xml}
+    response.content_type =~ %r{text/html|application/xhtml+xml} &&
+      (response.charset || Rails.application.config.encoding).downcase == "utf-8"
   end
 
   def filter

data/lib/galakei/filter/recode.rb

@@ -0,0 +1,17 @@
+# Takes care of recoding pages to Shift-JIS for some handsets when required
+class Galakei::Filter::Recode < Galakei::Filter::Base
+  def self.inject(klass)
+    this_class = self
+    klass.after_filter self, :if => lambda {|c| this_class.condition?(c) }
+  end
+
+  def condition?
+    request.ssl? && request.au?
+  end
+
+  def filter
+    doc = Nokogiri::HTML(response.body)
+    response.body = doc.serialize(:encoding => 'Shift_JIS')
+    response.charset = "Shift_JIS"
+  end
+end

data/lib/galakei/railtie.rb

@@ -4,7 +4,7 @@ module Galakei
     initializer "galakei.extend.action_controller" do |app|
       ActiveSupport.on_load :action_controller do
         include Galakei::HelperMethods
-        filters = %w[Views ContentType NonStandardChar]
+        filters = %w[Views ContentType Recode NonStandardChar]
         filters << :Haml if defined?(Haml)
         filters.each {|f| Galakei::Filter.const_get(f).inject(self) }
       end

data/lib/galakei/version.rb

@@ -1,3 +1,3 @@
 module Galakei
-  VERSION = "0.6.1"
+  VERSION = "0.6.2"
 end

data/lib/galakei.rb

@@ -18,7 +18,8 @@ module Galakei
     autoload :Base, "galakei/filter/base"
     autoload :ContentType, "galakei/filter/content_type"
     autoload :Haml, "galakei/filter/haml"
-    autoload :Views, "galakei/filter/views"
     autoload :NonStandardChar, "galakei/filter/non_standard_char"
+    autoload :Recode, "galakei/filter/recode"
+    autoload :Views, "galakei/filter/views"
   end
 end

data/spec/acceptance/recode_spec.rb

@@ -0,0 +1,15 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/acceptance_helper')
+
+class RecodeController < ApplicationController
+  def index
+    render :layout => true, :inline => "Test"
+  end
+end
+
+feature 'recode' do
+  scenario 'au SSL', :driver => :au do
+    visit 'https://www.example.com/recode/index'
+    page.find(:xpath, '//head/meta')['content'].should == "text/html; charset=Shift_JIS"
+  end
+end

data/spec/galakei/docomo_css/stylesheet_spec.rb

@@ -79,7 +79,7 @@ EOD
     end
   end
 
-  ((1..6).map {|i| "h#{i}"} + %w[p]).each do |tag|
+  ((1..6).map {|i| "h#{i}"} + %w[p td]).each do |tag|
     context "style applied to #{tag}" do
       before do
         parser = CssParser::Parser.new
@@ -110,20 +110,48 @@ EOD
         doc.at("//#{tag}").to_s.should == %Q{<#{tag} class="fontsize"><span style="font-size: x-small;">foo<br>bar</span></#{tag}>}
       end
 
+      it "should applied css of tag omitted" do
+        doc = Nokogiri::HTML("<#{tag} class='classonly'>foo</#{tag}>")
+        @stylesheet.apply(doc)
+        doc.at("//#{tag}").to_s.should == %Q{<#{tag} class="classonly" style="line-height: 1px;">foo</#{tag}>}
+      end
+    end
+  end
+
+
+  ((1..6).map {|i| "h#{i}"} + %w[p]).each do |tag|
+    context "style applied to #{tag}" do
+      before do
+        parser = CssParser::Parser.new
+        parser.add_block!(<<-EOD)
+          #{tag}.backgroundcolor { background-color: blue; }
+        EOD
+        @stylesheet = described_class.new(parser)
+      end
       it "should wrap element in div for background-color" do
         doc = Nokogiri::HTML("<#{tag} class='backgroundcolor'>foo</#{tag}>")
         @stylesheet.apply(doc)
         doc.at("//div").to_s.should == %Q{<div style="background-color: blue;"><#{tag} class="backgroundcolor">foo</#{tag}></div>}
       end
+    end
+  end
 
-      it "should applied css of tag omitted" do
-        doc = Nokogiri::HTML("<#{tag} class='classonly'>foo</#{tag}>")
-        @stylesheet.apply(doc)
-        doc.at("//#{tag}").to_s.should == %Q{<#{tag} class="classonly" style="line-height: 1px;">foo</#{tag}>}
-      end
+  context "style applied to td" do
+    before do
+      parser = CssParser::Parser.new
+      parser.add_block!(<<-EOD)
+        td { background-color: blue; }
+      EOD
+      @stylesheet = described_class.new(parser)
+    end
+    it "should wrap element in div for background-color" do
+      doc = Nokogiri::HTML("<td>foo</td>")
+      @stylesheet.apply(doc)
+      doc.at("//td").to_s.should == %Q{<td style="background-color: blue;">foo</td>}
     end
   end
 
+
   context "style applied to child of h1" do
     before do
       parser = CssParser::Parser.new

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Paul McMahon
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-15 00:00:00 +09:00
+date: 2011-04-19 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - lib/galakei/filter/content_type.rb
 - lib/galakei/filter/haml.rb
 - lib/galakei/filter/non_standard_char.rb
+- lib/galakei/filter/recode.rb
 - lib/galakei/filter/views.rb
 - lib/galakei/helper_methods.rb
 - lib/galakei/input_mode.rb
@@ -125,6 +126,7 @@ files:
 - spec/acceptance/handset_detection_spec.rb
 - spec/acceptance/input_mode_spec.rb
 - spec/acceptance/non_standard_char_spec.rb
+- spec/acceptance/recode_spec.rb
 - spec/acceptance/session_spec.rb
 - spec/acceptance/support/capybara_ssl_fix.rb
 - spec/acceptance/support/handsets.rb