rack-ketai 0.1.3 → 0.2.0

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

@@ -1,11 +1,13 @@
 # -*- coding: utf-8 -*-
 
 # 一般的な環境（PCその他）
+# 現在はフィルタ用のみに利用
+# アプリ側では利用しないこと（できません）
 
 module Rack::Ketai::Carrier
   class General < Abstract
 
-    class EmoticonFilter < Rack::Ketai::Carrier::Abstract::Filter
+    class EmoticonFilter < Rack::Ketai::Filter
       EMOJIID_REGEXP = Regexp.new('\[e:([0-9A-F]{3})\]').freeze
       INSIDE_INPUT_TAG = Regexp.new('(<input\s.*?\svalue=")(.*?)(".*?>)').freeze
       INSIDE_TEXTAREA_TAG = Regexp.new('(<textarea\s.*?>)(.*?)(</textarea>)', Regexp::MULTILINE).freeze
@@ -24,7 +26,7 @@ module Rack::Ketai::Carrier
         emoticons_path = @options[:emoticons_path]
         
         output = ''
-        body.collect do |str|
+        (body.respond_to?(:each) ? body : [body]).each do |str|
           # input内・textarea内以外のものだけを置換する良い方法がわからないので、
           # とりあえず、input内、textarea内のものを別なのにしとく
           str = str.gsub(INSIDE_INPUT_TAG) do

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

@@ -1,13 +1,12 @@
 # -*- coding: utf-8 -*-
+
+require 'rack/ketai/carrier/smartphone'
+
 module Rack::Ketai::Carrier
-  class IPhone < General
+  class IPhone < Smartphone
 
-    USER_AGENT_REGEXP = /iPhone/
+    USER_AGENT_REGEXP = /iPhone|iPod/
     
-    def mobile?
-      true
-    end
-
     def supports_cookie?
       true
     end

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

@@ -0,0 +1,65 @@
+# -*- coding: utf-8 -*-
+
+require 'rack/ketai/carrier/abstract'
+
+module Rack::Ketai::Carrier
+  class Mobile < Abstract
+    
+    def mobile?
+      true
+    end
+
+  end
+end
+
+module Rack::Ketai
+  class SjisFilter < Filter
+
+    private
+    def to_internal(env)
+      request = Rack::Request.new(env)
+      
+      # 最低でも1回呼んでないと query_string, form_hash等が未設定
+      request.params
+
+      # 同一オブジェクトが両方に入ってたりして二重にかかることがあるので
+      converted_objects = []
+      converter = lambda {  |value|
+        unless converted_objects.include?(value)
+          value = NKF.nkf('-m0 -x -Sw', value)
+          converted_objects << value
+        end
+        value
+      }
+
+      full_apply(request.env["rack.request.query_hash"],
+                 request.env["rack.request.form_hash"],
+                 &converter)
+
+      request.env
+    end
+    
+    def to_external(status, headers, 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'] = headers['Content-Type'].sub(/charset=[\w\-]+/, 'charset=shift_jis')
+        else
+          headers['Content-Type'] = headers['Content-Type'] + "; charset=shift_jis"
+        end
+      end
+
+      headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
+    
+      [status, headers, [output]]
+    end
+    
+  end
+
+end

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

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+
+require 'rack/ketai/carrier/mobile'
+
+module Rack::Ketai::Carrier
+  class Smartphone < General
+    CIDRS = []
+
+    def mobile?
+      true
+    end
+
+    def smartphone?
+      true
+    end
+
+  end
+end
+
+

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

@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-# -*- coding: utf-8 -*-
+
 require 'scanf'
+require 'rack/ketai/carrier/mobile'
 
 module Rack::Ketai::Carrier
-  class Softbank < Abstract
+  class Softbank < Mobile
     autoload :CIDRS, 'rack/ketai/carrier/cidrs/softbank'
     autoload :SPECS, 'rack/ketai/carrier/specs/softbank'
     
     # Semulator はウェブコンテンツビューアのUA
     USER_AGENT_REGEXP = /^(?:Vodafone|SoftBank|Semulator)/
 
-    class Filter < ::Rack::Ketai::Carrier::Abstract::Filter
+    class Filter < ::Rack::Ketai::Filter
 
       # 絵文字コード -> 絵文字ID 対応表から、絵文字コード検出用の正規表現をつくる
       # 複数の絵文字の組み合わせのものを前におくことで
@@ -87,10 +88,6 @@ module Rack::Ketai::Carrier
       end
     end
     
-    def mobile?
-      true
-    end
-
     def subscriberid
       @env['HTTP_X_JPHONE_UID'].to_s =~ /^([A-z|0-9]+)$/
       $1

data/lib/rack/ketai/carrier.rb

@@ -1,11 +1,11 @@
 module Rack::Ketai::Carrier
 
-  autoload :Abstract, 'rack/ketai/carrier/abstract'
   autoload :General, 'rack/ketai/carrier/general'
   autoload :Docomo, 'rack/ketai/carrier/docomo'
   autoload :Au, 'rack/ketai/carrier/au'
   autoload :Softbank, 'rack/ketai/carrier/softbank'
   autoload :IPhone, 'rack/ketai/carrier/iphone'
+  autoload :Android, 'rack/ketai/carrier/android'
 
   def self.load(env)
     constants.each do |const|

data/lib/rack/ketai/filter.rb

@@ -0,0 +1,108 @@
+# -*- coding: utf-8 -*-
+module Rack::Ketai
+  class Filter
+
+    def initialize(options = { })
+      @options = options.clone
+    end
+    
+    def inbound(env)
+      apply_incoming?(env) ? to_internal(env) : env
+    end
+    
+    def outbound(status, headers, body)
+      apply_outgoing?(status, headers, body) ? to_external(status, headers, body) : [status, headers, body]
+    end
+
+    private
+    def to_internal(env)
+      env
+    end
+    
+    def to_external(status, headers, body)
+      [status, headers, body]
+    end
+    
+    def full_apply(*argv, &proc)
+      argv.each do |obj|
+        deep_apply(obj, &proc)
+      end
+    end
+    
+    def deep_apply(obj, &proc)
+      case obj
+      when Hash
+        obj.each_pair do |key, value|
+          obj[key] = deep_apply(value, &proc)
+        end
+        obj
+      when Array
+        obj.collect!{ |value| deep_apply(value, &proc)}
+      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
+        obj
+      else
+        proc.call(obj)
+      end
+    end
+
+    def apply_incoming?(env); true; end
+    def apply_outgoing?(status, headers, body)
+      headers['Content-Type'] !~ /^(.+?)(?:;|$)/
+      [nil, "text/html", "application/xhtml+xml"].include?($1)
+    end
+
+  end
+
+  
+  class SjisFilter < Filter
+
+    private
+    def to_internal(env)
+      request = Rack::Request.new(env)
+      
+      # 最低でも1回呼んでないと query_string, form_hash等が未設定
+      request.params
+
+      # 同一オブジェクトが両方に入ってたりして二重にかかることがあるので
+      converted_objects = []
+      converter = lambda { |value|
+        unless converted_objects.include?(value)
+          value = NKF.nkf('-m0 -x -Sw', value)
+          converted_objects << value
+        end
+        value
+      }
+
+      full_apply(request.env["rack.request.query_hash"],
+                 request.env["rack.request.form_hash"],
+                 &converter)
+
+      request.env
+    end
+    
+    def to_external(status, headers, 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'] = headers['Content-Type'].sub(/charset=[\w\-]+/, 'charset=shift_jis')
+        else
+          headers['Content-Type'] = headers['Content-Type'] + "; charset=shift_jis"
+        end
+      end
+
+      headers['Content-Length'] = (output.respond_to?(:bytesize) ? output.bytesize : output.size).to_s if headers.member?('Content-Length')
+    
+      [status, headers, [output]]
+    end
+    
+  end
+
+end
+
+require 'rack/ketai/carrier/emoji/emojidata'

data/lib/rack/ketai/middleware.rb

@@ -25,6 +25,9 @@ class Rack::Ketai::Middleware
       def obj.mobile?
         false
       end
+      def obj.smartphone?
+        false
+      end
       request.env['rack.ketai'] = obj      
     end
 

data/rack-ketai.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rack-ketai}
-  s.version = "0.1.3"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yuichi Takeuchi"]
-  s.date = %q{2010-09-21}
+  s.date = %q{2010-11-15}
   s.email = %q{info@takeyu-web.com}
   s.extra_rdoc_files = [
     "README.rdoc"
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "lib/rack/ketai.rb",
      "lib/rack/ketai/carrier.rb",
      "lib/rack/ketai/carrier/abstract.rb",
+     "lib/rack/ketai/carrier/android.rb",
      "lib/rack/ketai/carrier/au.rb",
      "lib/rack/ketai/carrier/cidrs/au.rb",
      "lib/rack/ketai/carrier/cidrs/docomo.rb",
@@ -36,15 +37,19 @@ Gem::Specification.new do |s|
      "lib/rack/ketai/carrier/emoji/softbankwebcodetoutf8str.rb",
      "lib/rack/ketai/carrier/general.rb",
      "lib/rack/ketai/carrier/iphone.rb",
+     "lib/rack/ketai/carrier/mobile.rb",
+     "lib/rack/ketai/carrier/smartphone.rb",
      "lib/rack/ketai/carrier/softbank.rb",
      "lib/rack/ketai/carrier/specs/au.rb",
      "lib/rack/ketai/carrier/specs/docomo.rb",
      "lib/rack/ketai/carrier/specs/softbank.rb",
      "lib/rack/ketai/display.rb",
+     "lib/rack/ketai/filter.rb",
      "lib/rack/ketai/middleware.rb",
      "lib/rack/ketai/position.rb",
      "rack-ketai.gemspec",
      "spec/spec_helper.rb",
+     "spec/unit/android_spec.rb",
      "spec/unit/au_filter_spec.rb",
      "spec/unit/au_spec.rb",
      "spec/unit/carrier_spec.rb",
@@ -86,6 +91,7 @@ Gem::Specification.new do |s|
      "spec/unit/iphone_spec.rb",
      "spec/unit/softbank_spec.rb",
      "spec/unit/carrier_spec.rb",
+     "spec/unit/android_spec.rb",
      "spec/unit/emoticon_filter_spec.rb",
      "spec/spec_helper.rb",
      "test/spec_runner.rb"

data/spec/unit/android_spec.rb

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+require 'rack/ketai/carrier/android'
+describe "Rack::Ketai::Carrier::Android" do
+
+  describe 'Android 2.1 でのアクセスのとき' do
+    
+    before(:each) do
+      @env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                       'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 2.1-update1; ja-jp; SonyEricssonSO-01B Build/2.0.B.0.138) AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17',
+                                       'REMOTE_ADDR' => '110.160.154.44')
+      @mobile = Rack::Ketai::Carrier.load(@env)
+    end
+
+    it 'PC向け絵文字フィルタが適用されること' do
+      mock_app = mock('App')
+      mock_app.should_receive(:call).twice do |env|
+        [200, { "Content-Type" => "text/html"}, ["今日は良い天気ですね[e:000]"]]
+      end
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, {})
+      middleware.call(@env)[2].should == ['今日は良い天気ですね[e:000]']
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, { :emoticons_path => '/path-to/emoticons' })
+      middleware.call(@env)[2].should == ['今日は良い天気ですね<img src="/path-to/emoticons/sun.gif" />']
+    end
+
+    it 'Rack::Ketai::Carrier::Android がセットされること' do
+      @mobile.should be_is_a(Rack::Ketai::Carrier::Android)
+    end
+
+    it '携帯端末であること' do
+      @mobile.should be_mobile
+    end
+
+    it 'スマートフォンであること' do
+      @mobile.should be_smartphone
+    end
+
+    it "#supports_cookie? は true を返すこと" do
+      @mobile.should be_respond_to(:supports_cookie?)
+      @mobile.should be_supports_cookie
+    end
+
+    it "#valid_addr? は false を返すこと" do
+      @mobile.should_not be_valid_addr
+    end
+
+  end
+
+end

data/spec/unit/au_spec.rb

@@ -39,6 +39,14 @@ describe "Rack::Ketai::Carrier::Au" do
 
     end
 
+    it 'スマートフォンではないこと' do
+      env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                      'HTTP_USER_AGENT' => 'KDDI-HI3B UP.Browser/6.2.0.13.2 (GUI) MMP/2.0',
+                                      'HTTP_X_UP_DEVCAP_MAX_PDU' => '131072')
+      mobile = Rack::Ketai::Carrier::Au.new(env)
+      mobile.should_not be_smartphone
+    end
+
     describe "#cache_size でキャッシュ容量を取得するとき" do
 
       it "環境変数を使用すること" do

data/spec/unit/docomo_spec.rb

@@ -125,6 +125,13 @@ describe "Rack::Ketai::Carrier::Docomo" do
       end
     end
 
+    it 'スマートフォンではないこと' do
+      env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                       'HTTP_USER_AGENT' => "DoCoMo/2.0 SH02A")
+      mobile = Rack::Ketai::Carrier::Docomo.new(env)
+      mobile.should_not be_smartphone
+    end
+
     describe "ディスプレイ情報を取得できること" do
       
       it "既知の端末のとき" do           

data/spec/unit/iphone_spec.rb

@@ -2,15 +2,94 @@
 require 'rack/ketai/carrier/iphone'
 describe "Rack::Ketai::Carrier::IPhone" do
 
-  describe "#supports_cookie? を使うとき" do
-    # iPhone はCookie対応
-    it "#supports_cookie? は true を返す" do
-      env = Rack::MockRequest.env_for('http://hoge.com/dummy',
-                                      'HTTP_USER_AGENT' => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7')
-      mobile = Rack::Ketai::Carrier::IPhone.new(env)
-      mobile.should be_respond_to(:supports_cookie?)
-      mobile.should be_supports_cookie
+  describe 'iPhoneでのアクセスのとき' do
+    
+    before(:each) do
+      @env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                       'HTTP_USER_AGENT' => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; ja-jp) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7',
+                                       'REMOTE_ADDR' => '126.240.0.41')
+      @mobile = Rack::Ketai::Carrier.load(@env)
     end
+
+    it 'PC向け絵文字フィルタが適用されること' do
+      mock_app = mock('App')
+      mock_app.should_receive(:call).twice do |env|
+        [200, { "Content-Type" => "text/html"}, ["今日は良い天気ですね[e:000]"]]
+      end
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, {})
+      middleware.call(@env)[2].should == ['今日は良い天気ですね[e:000]']
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, { :emoticons_path => '/path-to/emoticons' })
+      middleware.call(@env)[2].should == ['今日は良い天気ですね<img src="/path-to/emoticons/sun.gif" />']
+    end
+
+    it 'Rack::Ketai::Carrier::IPhone がセットされること' do
+      @mobile.should be_is_a(Rack::Ketai::Carrier::IPhone)
+    end
+
+    it '携帯端末であること' do
+      @mobile.should be_mobile
+    end
+
+    it 'スマートフォンであること' do
+      @mobile.should be_smartphone
+    end
+
+    it "#supports_cookie? は true を返すこと" do
+      @mobile.should be_respond_to(:supports_cookie?)
+      @mobile.should be_supports_cookie
+    end
+
+    it "#valid_addr? は false を返すこと" do
+      @mobile.should_not be_valid_addr
+    end
+
+  end
+
+  describe 'iPodでのアクセスのとき' do
+    
+    before(:each) do
+      @env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                       'HTTP_USER_AGENT' => 'Mozilla/5.0 (iPod; U; CPU like Mac OS X; en) AppleWebKit/420.1 (KHTML, like Gecko) Version/3.0 Mobile/3A100a Safari/419.3',
+                                       'REMOTE_ADDR' => '126.240.0.41')
+      @mobile = Rack::Ketai::Carrier.load(@env)
+    end
+
+    it 'PC向け絵文字フィルタが適用されること' do
+      mock_app = mock('App')
+      mock_app.should_receive(:call).twice do |env|
+        [200, { "Content-Type" => "text/html"}, ["今日は良い天気ですね[e:000]"]]
+      end
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, {})
+      middleware.call(@env)[2].should == ['今日は良い天気ですね[e:000]']
+
+      middleware = Rack::Ketai::Middleware.new(mock_app, { :emoticons_path => '/path-to/emoticons' })
+      middleware.call(@env)[2].should == ['今日は良い天気ですね<img src="/path-to/emoticons/sun.gif" />']
+    end
+
+    it 'Rack::Ketai::Carrier::IPhone がセットされること' do
+      @mobile.should be_is_a(Rack::Ketai::Carrier::IPhone)
+    end
+
+    it '携帯端末であること' do
+      @mobile.should be_mobile
+    end
+
+    it 'スマートフォンであること' do
+      @mobile.should be_smartphone
+    end
+
+    it "#supports_cookie? は true を返すこと" do
+      @mobile.should be_respond_to(:supports_cookie?)
+      @mobile.should be_supports_cookie
+    end
+
+    it "#valid_addr? は false を返すこと" do
+      @mobile.should_not be_valid_addr
+    end
+
   end
 
 end

data/spec/unit/softbank_spec.rb

@@ -197,4 +197,11 @@ describe "Rack::Ketai::Carrier::Softbank" do
     end
   end
 
+  it 'スマートフォンではないこと' do
+    env = Rack::MockRequest.env_for('http://hoge.com/dummy',
+                                    'HTTP_USER_AGENT' => 'SoftBank/1.0/930SH/SHJ001[/Serial] Browser/NetFront/3.4 Profile/MIDP-2.0 Configuration/CLDC-1.1')
+    mobile = Rack::Ketai::Carrier::Softbank.new(env)
+    mobile.should_not be_smartphone
+  end
+
 end

data/tools/generate_emoji_dic.rb

@@ -388,29 +388,25 @@ output['emojidata'] = (<<-FILE)
 
 module Rack
   module Ketai
-    module Carrier
-      class Abstract
-        class Filter
-          EMOJI_DATA = {
+    class Filter
+      EMOJI_DATA = {
 FILE
 
 emoji.each do |id, data|
   emojiid = id.to_i(16)
-  output['emojidata'] += format("            0x%03X => #{data.inspect},\n", emojiid)
+  output['emojidata'] += format("        0x%03X => #{data.inspect},\n", emojiid)
 end
 
 output['emojidata'] += <<-EOF
-          }
+      }
 
-          # 1.8系、1.9系 互換性維持のため
-          if RUBY_VERSION >= '1.9.0'
-            def EMOJI_TO_EMOJIID.index(val)
-              key(val)
-            end
-          end
-          
+      # 1.8系、1.9系 互換性維持のため
+      if RUBY_VERSION >= '1.9.0'
+        def EMOJI_DATA.index(val)
+          key(val)
         end
       end
+         
     end
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-ketai
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Yuichi Takeuchi
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-21 00:00:00 +09:00
+date: 2010-11-15 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,6 +26,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -49,6 +51,7 @@ files:
 - lib/rack/ketai.rb
 - lib/rack/ketai/carrier.rb
 - lib/rack/ketai/carrier/abstract.rb
+- lib/rack/ketai/carrier/android.rb
 - lib/rack/ketai/carrier/au.rb
 - lib/rack/ketai/carrier/cidrs/au.rb
 - lib/rack/ketai/carrier/cidrs/docomo.rb
@@ -62,15 +65,19 @@ files:
 - lib/rack/ketai/carrier/emoji/softbankwebcodetoutf8str.rb
 - lib/rack/ketai/carrier/general.rb
 - lib/rack/ketai/carrier/iphone.rb
+- lib/rack/ketai/carrier/mobile.rb
+- lib/rack/ketai/carrier/smartphone.rb
 - lib/rack/ketai/carrier/softbank.rb
 - lib/rack/ketai/carrier/specs/au.rb
 - lib/rack/ketai/carrier/specs/docomo.rb
 - lib/rack/ketai/carrier/specs/softbank.rb
 - lib/rack/ketai/display.rb
+- lib/rack/ketai/filter.rb
 - lib/rack/ketai/middleware.rb
 - lib/rack/ketai/position.rb
 - rack-ketai.gemspec
 - spec/spec_helper.rb
+- spec/unit/android_spec.rb
 - spec/unit/au_filter_spec.rb
 - spec/unit/au_spec.rb
 - spec/unit/carrier_spec.rb
@@ -105,6 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -113,6 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -138,6 +147,7 @@ test_files:
 - spec/unit/iphone_spec.rb
 - spec/unit/softbank_spec.rb
 - spec/unit/carrier_spec.rb
+- spec/unit/android_spec.rb
 - spec/unit/emoticon_filter_spec.rb
 - spec/spec_helper.rb
 - test/spec_runner.rb