rack-ketai 0.1.2 → 0.1.3

data/README.rdoc

@@ -1,7 +1,7 @@
 = rack-ketai: A Rack Middleware for Japanese mobile-phones
 
 == rack-ketaiとは
-携帯電話向けサイトを構築する際に役立ちそうな機能を提供する（ことが目標の）ミドルウェアです。
+携帯電話向けサイトを構築する際に役立ちそうな機能を提供する（ことが目標の）Rackミドルウェアです。
 
 * 携帯電話キャリア判別
 * 端末名の取得
@@ -26,7 +26,25 @@ JRuby 1.4.0
 
 == 使用例
 
-=== 携帯電話の識別
+=== Rails 3.0
+config/application.rb
+  module Example
+    class Application < Rails::Application
+      
+      # 省略
+
+      config.middleware.use "::Rack::Ketai"
+    end
+  end
+
+app/controllers/example_controller.rb
+  class ExampleController < ApplicationController
+    def index
+      render :text => (request.env['rack.ketai'].mobile? "mobile" ? : "PC")
+    end
+  end
+
+=== Sinatra
   require 'rubygems'
   require 'sinatra'
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/rack/ketai/carrier/abstract.rb

@@ -86,8 +86,8 @@ module Rack::Ketai::Carrier
     def filtering(env, options = { }, &block)
       env = options[:disable_filter] ? env : filters(options).inject(env) { |env, filter| filter.inbound(env) }
       ret = block.call(env)
-      ret[2] = ret[2].body if ret[2].is_a?(Rack::Response)
-      options[:disable_filter] ? ret : filters(options).reverse.inject(ret) { |r, filter| filter.outbound(*r) }
+      ret = options[:disable_filter] ? ret : filters(options).reverse.inject(ret) { |r, filter| filter.outbound(*r) }
+      ret
     end
 
     def filters(options = { })
@@ -163,7 +163,6 @@ class Rack::Ketai::Carrier::Abstract
     end
     
     def outbound(status, headers, body)
-      body = [body].flatten
       apply_outgoing?(status, headers, body) ? to_external(status, headers, body) : [status, headers, body]
     end
 
@@ -173,14 +172,6 @@ class Rack::Ketai::Carrier::Abstract
     end
     
     def to_external(status, headers, body)
-      if headers['Content-Type']
-        case headers['Content-Type']
-        when /charset=[\w\-]+/i
-          headers['Content-Type'].sub!(/charset=[\w\-]+/, 'charset=utf-8')
-        else
-          headers['Content-Type'] << "; charset=utf-8"
-        end
-      end
       [status, headers, body]
     end
     
@@ -242,27 +233,24 @@ class Rack::Ketai::Carrier::Abstract
     end
     
     def to_external(status, headers, body)
-      if body.is_a?(Array)
-        body = body.collect do |str|
-          NKF.nkf('-m0 -x -Ws', str)
-        end
-      else
-        body = NKF.nkf('-m0 -x -Ws', body)
+      output = ''
+
+      (body.respond_to?(:each) ? body : [body]).each do |str|
+        output << NKF.nkf('-m0 -x -Ws', str)
       end
 
       if headers['Content-Type']
         case headers['Content-Type']
         when /charset=[\w\-]+/i
-          headers['Content-Type'].sub!(/charset=[\w\-]+/, 'charset=shift_jis')
+          headers['Content-Type'] = headers['Content-Type'].sub(/charset=[\w\-]+/, 'charset=shift_jis')
         else
-          headers['Content-Type'] << "; charset=shift_jis"
+          headers['Content-Type'] = headers['Content-Type'] + "; charset=shift_jis"
         end
       end
 
-      content = (body.is_a?(Array) ? body[0] : body).to_s
-      headers['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s if headers.member?('Content-Length')
+      headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
     
-      [status, headers, body]
+      [status, headers, [output]]
     end
     
   end

data/lib/rack/ketai/carrier/au.rb

@@ -49,10 +49,10 @@ module Rack
           def to_external(status, headers, body)
             status, headers, body = super
             
-            return [status, headers, body] unless body[0]
-            
-            body = body.collect do |str|
-              str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
+            output = ''
+            (body.respond_to?(:each) ? body : [body]).each do |str|
+              next unless str
+              output << str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
                 emojiid = $1.scanf('%X').first
                 sjis = EMOJIID_TO_EMOJI[emojiid]
                 if sjis
@@ -66,10 +66,9 @@ module Rack
               end
             end
             
-            content = (body.is_a?(Array) ? body[0] : body).to_s
-            headers['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s if headers.member?('Content-Length')
+            headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
             
-            [status, headers, body]
+            [status, headers, [output]]
           end
         end
         

data/lib/rack/ketai/carrier/docomo.rb

@@ -48,10 +48,10 @@ module Rack::Ketai::Carrier
       def to_external(status, headers, body)
         status, headers, body = super
         
-        return [status, headers, body] unless body[0]
-        
-        body = body.collect do |str|
-          str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
+        output = ''
+        (body.respond_to?(:each) ? body : [body]).each do |str|
+          next unless str
+          output << str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
             emojiid = $1.scanf('%X').first
             sjis = EMOJIID_TO_EMOJI[emojiid]
             if sjis
@@ -65,12 +65,11 @@ module Rack::Ketai::Carrier
           end
         end
         
-        content = (body.is_a?(Array) ? body[0] : body).to_s
-        headers['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s if headers.member?('Content-Length')
+        headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
         
-        headers['Content-Type'].sub! Regexp.new(Regexp.quote('text/html')), 'application/xhtml+xml' if headers['Content-Type']
+        headers['Content-Type'] = headers['Content-Type'].sub Regexp.new(Regexp.quote('text/html')), 'application/xhtml+xml' if headers['Content-Type']
 
-        [status, headers, body]
+        [status, headers, [output]]
       end
     end
       

data/lib/rack/ketai/carrier/general.rb

@@ -19,11 +19,12 @@ module Rack::Ketai::Carrier
       # ただし、content-type がhtmlでないときおよび、
       # input内、textarea内では変換しない
       def to_external(status, headers, body)
-        return [status, headers, body] unless body[0] && !@options[:emoticons_path].to_s.empty? && (headers['Content-Type'].to_s.empty? || headers['Content-Type'].to_s =~ /html/)
+        return [status, headers, body] unless body && !@options[:emoticons_path].to_s.empty? && (headers['Content-Type'].to_s.empty? || headers['Content-Type'].to_s =~ /html/)
 
         emoticons_path = @options[:emoticons_path]
-
-        body = body.collect do |str|
+        
+        output = ''
+        body.collect do |str|
           # input内・textarea内以外のものだけを置換する良い方法がわからないので、
           # とりあえず、input内、textarea内のものを別なのにしとく
           str = str.gsub(INSIDE_INPUT_TAG) do
@@ -50,13 +51,12 @@ module Rack::Ketai::Carrier
           end
 
           # とりあえず変えておいたものを戻す
-          str.gsub(/\[E:([0-9A-F]{3})\]/){ "[e:#{$1}]" }
+          output << str.gsub(/\[E:([0-9A-F]{3})\]/){ "[e:#{$1}]" }
         end
         
-        content = (body.is_a?(Array) ? body[0] : body).to_s
-        headers['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s if headers.member?('Content-Length')
+        headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
         
-        [status, headers, body]
+        [status, headers, [output]]
       end
       
     end

data/lib/rack/ketai/carrier/softbank.rb

@@ -47,10 +47,12 @@ module Rack::Ketai::Carrier
       
       def to_external(status, headers, body)
         status, headers, body = super
-        return [status, headers, body] unless body[0]
+        return [status, headers, body] unless body
         
-        body = body.collect do |str|
-          str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
+        output = ''
+        (body.respond_to?(:each) ? body : [body]).each do |str|
+          next unless str
+          output << str.gsub(/\[e:([0-9A-F]{3})\]/) do |match|
             emojiid = $1.scanf('%X').first
             utf8str = EMOJIID_TO_EMOJI[emojiid]
             if utf8str
@@ -64,10 +66,18 @@ module Rack::Ketai::Carrier
           end
         end
         
-        content = (body.is_a?(Array) ? body[0] : body).to_s
-        headers['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s if headers.member?('Content-Length')
+        headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
+
+        if headers['Content-Type']
+          case headers['Content-Type']
+          when /charset=[\w\-]+/i
+            headers['Content-Type'] = headers['Content-Type'].sub(/charset=[\w\-]+/, 'charset=utf-8')
+          else
+            headers['Content-Type'] = headers['Content-Type'] + "; charset=utf-8"
+          end
+        end
         
-        [status, headers, body]
+        [status, headers, [output]]
       end
     end