jpmobile 0.0.8 → 0.1.0.pre

data/lib/jpmobile/mobile/windows_phone.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# =WindowsPhone
+
+module Jpmobile::Mobile
+  # ==WindowsPhone
+  class WindowsPhone < SmartPhone
+    # 対応するUser-Agentの正規表現
+    USER_AGENT_REGEXP = /Windows Phone/
+  end
+end

data/lib/jpmobile/position.rb

@@ -1,9 +1,10 @@
+# -*- coding: utf-8 -*-
 #= 位置情報
 
-# plugins/以下にgeokitがインストールされている場合は読み込む
+# Rack 化にあわせて gem を見るように
 begin
-  require RAILS_ROOT + '/vendor/plugins/geokit/lib/geo_kit/mappable'
-rescue MissingSourceFile, NameError
+  require 'geokit'
+rescue LoadError
 end
 
 module Jpmobile

data/lib/jpmobile/rack.rb

@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+require 'rack/utils'
+
+module Jpmobile
+  module Rack
+    module_function
+    def mount_middlewares
+      # 漢字コード・絵文字フィルター
+      ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::ParamsFilter)
+      ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::Filter)
+    end
+  end
+
+  class Configuration
+    def mobile_filter
+      ::Jpmobile::Rack.mount_middlewares
+    end
+  end
+end
+
+module Rack
+  class Request
+    def params
+      self.GET.merge(self.POST)
+    end
+  end
+
+  # UTF-8 で match させるようにする
+  module Utils
+    def escape(s)
+      s.to_s.gsub(/([^ a-zA-Z0-9_.-]+)/) {
+        '%'+$1.unpack('H2'*bytesize($1)).join('%').upcase
+      }.tr(' ', '+')
+    end
+    module_function :escape
+    def unescape(s)
+      s.tr('+', ' ').gsub(/((?:%[0-9a-fA-F]{2})+)/){
+        [$1.delete('%')].pack('H*')
+      }
+    end
+    module_function :unescape
+  end
+end

data/lib/jpmobile/rack/filter.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+# 出力変換
+module Jpmobile
+  module Rack
+    class Filter
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        # 入力を保存
+        mobile = env['rack.jpmobile']
+
+        status, env, response = @app.call(env)
+
+        if mobile
+          if content_type = env['Content-Type']
+            type, charset = content_type.split(/;\s*charset=/)
+          else
+            type    = nil
+            charset = nil
+          end
+
+          response, charset = mobile.to_external(response_to_body(response), type, charset)
+
+          if type and charset
+            env['Content-Type'] = "#{type}; charset=#{charset}"
+          end
+        end
+
+        new_response = ::Rack::Response.new(response, status, env)
+        new_response.finish
+      end
+
+      private
+      def response_to_body(response)
+        if response.respond_to?(:to_str)
+          response.to_str
+        elsif response.respond_to?(:each)
+          body = []
+          response.each do |part|
+            body << response_to_body(part)
+          end
+          body.join("\n")
+        else
+          body
+        end
+      end
+    end
+  end
+end

data/lib/jpmobile/rack/mobile_carrier.rb

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+# UserAgent から生成すべき class 名を判定する
+module Jpmobile
+  module Rack
+    class MobileCarrier
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        env['rack.jpmobile'] = carrier(env)
+
+        @app.call(env)
+      end
+
+      def carrier(env)
+        ::Jpmobile::Mobile.carriers.each do |const|
+          c = ::Jpmobile::Mobile.const_get(const)
+          if c.check_carrier(env)
+            res = ::Rack::Request.new(env)
+            return c.new(env, res)
+          end
+        end
+
+        nil
+      end
+    end
+  end
+end
+
+class Rack::Request
+  include Jpmobile::RequestWithMobile
+end

data/lib/jpmobile/rack/params_filter.rb

@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+# リクエストパラメータの変換
+module Jpmobile
+  module Rack
+    class ParamsFilter
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        # 入力
+        if @mobile = env['rack.jpmobile']
+          # パラメータをkey, valueに分解
+          # form_params
+          if env['REQUEST_METHOD'] == 'POST'
+            env['rack.input'] = StringIO.new(parse_query(env['rack.input'].read))
+          end
+
+          # query_params
+          env['QUERY_STRING'] = parse_query(env['QUERY_STRING'])
+        end
+
+        status, env, body = @app.call(env)
+
+        [status, env, body]
+      end
+
+      private
+      def to_internal(str)
+        ::Rack::Utils.escape(@mobile.to_internal(::Rack::Utils.unescape(str)))
+      end
+      def parse_query(str)
+        return nil unless str
+
+        new_array = []
+        str.split("&").each do |param_pair|
+          k, v = param_pair.split("=")
+          k = to_internal(k) if k
+          v = to_internal(v) if v
+          new_array << "#{k}=#{v}" if k and v
+        end
+
+        new_array.join("&")
+      end
+    end
+  end
+end

data/lib/jpmobile/rails.rb

@@ -0,0 +1,22 @@
+ActiveSupport.on_load(:action_controller) do
+  # -*- coding: utf-8 -*-
+  require 'jpmobile/docomo_guid'
+  require 'jpmobile/filter'
+  require 'jpmobile/helpers'
+  require 'jpmobile/hook_action_controller'
+  require 'jpmobile/hook_action_view'
+  require 'jpmobile/trans_sid'
+
+  # MobileCarrierのみデフォルトで有効
+  ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::MobileCarrier)
+
+  module Rails
+    class Application
+      class Configuration
+        def jpmobile
+          @jpmobile ||= ::Jpmobile::Configuration.new
+        end
+      end
+    end
+  end
+end

data/lib/jpmobile/request_with_mobile.rb

@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 #
 # jpmobile の各機能を提供するモジュール
-# envメソッドと、parameter あるいは params メソッドが実装されている必要がある。
-# 今のところはRack::RequestとActionController::AbstractRequestに対応しているはず。
+# envメソッドが実装されている必要がある。
 
 module Jpmobile
   module RequestWithMobile
@@ -27,21 +26,18 @@ module Jpmobile
 
     # 携帯電話からであれば +true+を、そうでなければ +false+ を返す。
     def mobile?
-      mobile != nil
+      mobile and not mobile.smart_phone?
+    end
+
+    # viewの切り替えをするかどうか
+    def smart_phone?
+      mobile and mobile.smart_phone?
     end
 
     # 携帯電話の機種に応じて Mobile::xxx を返す。
     # 携帯電話でない場合はnilを返す。
     def mobile
-      @__mobile ||= nil
-      return @__mobile if @__mobile
-
-      Jpmobile::Mobile.carriers.each do |const|
-        c = Jpmobile::Mobile.const_get(const)
-        return @__mobile = c.new(self) if c.check_request(self)
-      end
-      nil
+      env['rack.jpmobile']
     end
   end
 end
-

data/lib/jpmobile/trans_sid.rb

@@ -8,11 +8,8 @@ module ParamsOverCookie
       # cookie よりも params を先に見るパッチ
       def load_session_with_jpmobile(env)
         request = Rack::Request.new(env)
-        unless @cookie_only
-          sid = request.params[@key]
-        end
-        sid ||= request.cookies[@key]
-
+        sid   = request.cookies[@key]
+        sid ||= request.params[@key] unless @cookie_only
         sid, session = get_session(env, sid)
         [sid, session]
       end
@@ -21,35 +18,53 @@ module ParamsOverCookie
   end
 end
 
+module ActionDispatch
+  module Session
+    class AbstractStore
+      include ParamsOverCookie
+    end
+  end
+end
+
 module ActionController
-  # cookie よりも params を先に見るパッチ
-  Session::AbstractStore.send :include, ParamsOverCookie
+  module Redirecting
+    def redirect_to_with_jpmobile(options = {}, response_status = {})
+      if apply_trans_sid? and jpmobile_session_id
+        case options
+        when String
+          unless options.match(/#{session_key}/)
+            url = URI.parse(options)
+            if url.query
+              url.query += "&#{session_key}=#{jpmobile_session_id}"
+            else
+              url.query = "#{session_key}=#{jpmobile_session_id}"
+            end
+            options = url.to_s
+          end
+        when %r{^\w[\w+.-]*:.*}
+        when :back
+        else
+          unless options[session_key.to_sym]
+            options[session_key.to_sym] = jpmobile_session_id
+          end
+        end
+      end
+
+      redirect_to_without_jpmobile(options, response_status)
+    end
+
+    alias_method_chain :redirect_to, :jpmobile
+  end
 
   class Base #:nodoc:
     class_inheritable_accessor :trans_sid_mode
-    alias :redirect_to_full_url_without_jpmobile :redirect_to_full_url
 
     def transit_sid_mode(*args)
       STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
       trans_sid_mode(*args)
     end
 
-    def redirect_to_full_url(url, status)
-      if apply_trans_sid? and !url.match(/#{session_key}/) and jpmobile_session_id
-        uri = URI.parse(url)
-        if uri.query
-          uri.query += "&#{session_key}=#{jpmobile_session_id}"
-        else
-          uri.query = "#{session_key}=#{jpmobile_session_id}"
-        end
-        url = uri.to_s
-      end
-
-      redirect_to_full_url_without_jpmobile(url, status)
-    end
-
     class << self
-      # 2.3.x or higher
       def trans_sid(mode = :mobile)
         include Jpmobile::TransSid
         self.trans_sid_mode = mode
@@ -90,17 +105,20 @@ module Jpmobile::TransSid #:nodoc:
 
   protected
   # URLにsession_idを追加する。
-  def default_url_options(options=nil)
+  def default_url_options
     result = super || {}
     return result unless request # for test process
     return result unless apply_trans_sid?
-    return result.merge({ session_key => jpmobile_session_id })
+    return result.merge({session_key => jpmobile_session_id})
   end
 
   private
   # session_keyを返す。
   def session_key
-    ActionController::Base.session_options.merge(request.session_options || {})[:key]
+    unless key = Rails.application.config.session_options.merge(request.session_options || {})[:key]
+      key = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS[:key]
+    end
+    key
   end
   # session_idを返す
   def jpmobile_session_id

data/lib/jpmobile/util.rb

@@ -17,5 +17,73 @@ module Jpmobile
         proc.call(obj)
       end
     end
+
+    def deep_convert(obj, &proc)
+      case obj
+      when Hash
+        new_obj = {}
+        obj.each_pair do |key, value|
+          new_obj[deep_convert(key.dup, &proc)] = deep_convert(value, &proc)
+        end
+        new_obj
+      when Array
+        new_obj = obj.map do |value|
+          deep_convert(value, &proc)
+        end
+      when Symbol
+        new_obj = proc.call(obj.to_s).to_sym
+      when NilClass, TrueClass, FalseClass, Tempfile, StringIO
+        new_obj = obj
+      else
+        obj = obj.to_param if obj.respond_to?(:to_param)
+        new_obj = proc.call(obj)
+      end
+
+      new_obj
+    end
+
+    def sjis(ascii_8bit)
+      if ascii_8bit.respond_to?(:force_encoding)
+        ascii_8bit.force_encoding("Shift_JIS")
+      end
+      ascii_8bit
+    end
+
+    def utf8(ascii_8bit)
+      if ascii_8bit.respond_to?(:force_encoding)
+        ascii_8bit.force_encoding("utf-8")
+      end
+      ascii_8bit
+    end
+
+    def ascii_8bit(str)
+      if str.respond_to?(:force_encoding)
+        str.force_encoding("ASCII-8BIT")
+      end
+      str
+    end
+
+    def utf8_to_sjis(utf8_str)
+      if utf8_str.respond_to?(:encode)
+        utf8_str.encode("Shift_JIS")
+      else
+        NKF.nkf("-m0 -x -Ws", utf8_str)
+      end
+    end
+
+    def sjis_to_utf8(sjis_str)
+      if sjis_str.respond_to?(:encode)
+        sjis_str.encode("UTF-8")
+      else
+        NKF.nkf("-m0 -x -Sw", sjis_str)
+      end
+    end
+
+    def hash_to_utf8(hash)
+      new_hash = {}
+      hash.each do |keu, value|
+        new_hash[utf8(key)] = utf8(value)
+      end
+    end
   end
 end