jpmobile 4.2.5 → 5.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c55dcda88eb9b688229ad95addf319f2f9c5bc
-  data.tar.gz: 2c7b30902e3cd5174f4c76c2beaa34f6aa26f91a
+  metadata.gz: dbcc78220f8ee88ca102524a012cb278a111af2b
+  data.tar.gz: 7578e413d0afb4020c51127f6b6e15a5c7c57c4d
 SHA512:
-  metadata.gz: 8786691f538410a72d3ba82d91e0ebd83d0a594932b6174543ed1395125645809fee135a8c0f9ebe650aa71095bb48fc69558f3e9371731762472ce828a312a7
-  data.tar.gz: 59d9d825bc60b73fdadc69b6a233fdf19ef80960f82a6d6a5f5d86cd72ef2c23bffa8ffcdb85fca4153d6f5e9979ef31d0247c8542cd45922e0fec57d7d67694
+  metadata.gz: 1d8730c91d837df4c844138703365232a8d339e4b0cd0c0438d3812f44644fe2c9be4ee9478294e8aad2afa72195acd5458c18d0a774b0307e50138d0f94fc1d
+  data.tar.gz: 3c72edb2d3fbe357cfcdeb6a6d6a6e4a769be0bae1ba9883e4f20841da5a00f7de2497c9a2d105c2336ecd2ec52a0297c1255c449cea972398e051971680713b

data/.gitignore

@@ -17,5 +17,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-.ruby-version
-.envrc
+.ruby-version

data/jpmobile.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_development_dependency 'rails', '~> 4.2'
+  gem.add_development_dependency 'rails', '5.0.0.beta1'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'
@@ -26,5 +26,4 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
   gem.add_development_dependency 'pry'
-  gem.add_development_dependency 'mail', '2.5.5'
 end

data/lib/jpmobile.rb

@@ -2,6 +2,8 @@
 $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
                                           $:.include?(File.expand_path(File.dirname(__FILE__)))
 require "jpmobile/version"
+require 'singleton'
+require 'rack/utils'
 
 module Jpmobile
   autoload :Email,                    'jpmobile/email'
@@ -52,22 +54,30 @@ module Jpmobile
     require 'jpmobile/mobile/abstract_mobile'
   end
 
-  # autoload Rack middlewares
-  autoload :Rack, 'jpmobile/rack'
-  module Rack
-    autoload :MobileCarrier, 'jpmobile/rack/mobile_carrier'
-    autoload :ParamsFilter,  'jpmobile/rack/params_filter'
-    autoload :Filter,        'jpmobile/rack/filter'
-  end
   autoload :Configuration, 'jpmobile/configuration'
 
+  autoload :MobileCarrier, 'jpmobile/rack/mobile_carrier'
+  autoload :ParamsFilter,  'jpmobile/rack/params_filter'
+  autoload :Filter,        'jpmobile/rack/filter'
+
   autoload :Mailer,   'jpmobile/mailer'
   autoload :Resolver, 'jpmobile/resolver'
 
+  autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
+
+  autoload :TransSidRedirecting, 'jpmobile/trans_sid'
+  autoload :TransSid,            'jpmobile/trans_sid'
+
   module_function
   def config
     ::Jpmobile::Configuration.instance
   end
+
+  def mount_middlewares
+    # 漢字コード・絵文字フィルター
+    ::Rails.application.middleware.insert_after ::Jpmobile::MobileCarrier, ::Jpmobile::ParamsFilter
+    ::Rails.application.middleware.insert_after ::Jpmobile::ParamsFilter,  ::Jpmobile::Filter
+  end
 end
 
 if defined?(Rails)

data/lib/jpmobile/configuration.rb

@@ -13,7 +13,7 @@ module Jpmobile
     end
 
     def mobile_filter
-      ::Jpmobile::Rack.mount_middlewares
+      ::Jpmobile.mount_middlewares
     end
 
     def session_store(&block)

data/lib/jpmobile/encoding.rb

@@ -2,28 +2,22 @@
 # params を UTF-8 にする拡張
 module Jpmobile
   module Encoding
-    def self.included(base)
-      base.class_eval do
-        alias_method :parameters_without_jpmobile, :parameters
+    def parameters
+      return @parameters if @jpmobile_params_converted
 
-        def parameters
-          return @parameters if @jpmobile_params_converted
-
-          # load params
-          @parameters = parameters_without_jpmobile
-          # 変換
-          @parameters = Jpmobile::Util.deep_convert(@parameters) do |value|
-            value = Jpmobile::Util.utf8(value)
-          end
-
-          @jpmobile_params_converted = true
-          if @parameters.respond_to?(:with_indifferent_access)
-            @parameters = @parameters.with_indifferent_access
-          end
+      # load params
+      @parameters = super
+      # 変換
+      @parameters = Jpmobile::Util.deep_convert(@parameters) do |value|
+        value = Jpmobile::Util.utf8(value)
+      end
 
-          @parameters
-        end
+      @jpmobile_params_converted = true
+      if @parameters.respond_to?(:with_indifferent_access)
+        @parameters = @parameters.with_indifferent_access
       end
+
+      @parameters
     end
   end
 end

data/lib/jpmobile/{hook_action_controller.rb → fallback_view_selector.rb}

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 require 'jpmobile/lookup_context'
 
-module ActionController
-  module Renderers
-    def render_to_body_with_jpmobile(options)
+module Jpmobile
+  module FallbackViewSelector
+    def render_to_body(options)
       if Jpmobile.config.fallback_view_selector and
           lookup_context.mobile.present? and !lookup_context.mobile.empty?
         begin
@@ -21,9 +21,7 @@ module ActionController
         end
       end
 
-      render_to_body_without_jpmobile(options)
+      super(options)
     end
-
-    alias_method_chain :render_to_body, :jpmobile
   end
 end

data/lib/jpmobile/filter.rb

@@ -7,12 +7,6 @@ ActiveSupport.on_load(:action_controller) do
     before_action Jpmobile::HankakuFilter.new(options)
     after_action  Jpmobile::HankakuFilter.new(options)
   end
-
-  def self.mobile_filter(options={})
-    STDERR.puts "Method mobile_filter is now deprecated. Use hankaku_filter instead for Hankaku-conversion."
-
-    self.hankaku_filter(options)
-  end
 end
 
 module Jpmobile
@@ -75,10 +69,9 @@ module Jpmobile
 
     def before(controller)
       @controller = controller
+
       if apply_incoming?
-        Util.deep_apply(@controller.params) do |value|
-          value = to_internal(value)
-        end
+        @controller.params = convert_parameters(@controller.params.dup)
       end
     end
 
@@ -128,7 +121,7 @@ module Jpmobile
     end
 
     def filter(method, str)
-      str = str.dup
+      str = str.clone
 
       # 一度UTF-8に変換
       before_encoding = nil
@@ -172,5 +165,15 @@ module Jpmobile
         @controller.request.mobile.default_charset
       end
     end
+
+    def convert_parameters(params)
+      params.each do |k, v|
+        if params[k].respond_to?(:each)
+          params[k] = convert_parameters(params[k])
+        else
+          params[k] = to_internal(v)
+        end
+      end
+    end
   end
 end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -58,12 +58,12 @@ module Jpmobile::Mobile
       false
     end
 
-    # Jpmobile::Rack::Filter を適用するかどうか
+    # Jpmobile::Filter を適用するかどうか
     def apply_filter?
       true
     end
 
-    # Jpmobile::Rack::ParamsFilter を適用するかどうか
+    # Jpmobile::ParamsFilter を適用するかどうか
     def apply_params_filter?
       true
     end

data/lib/jpmobile/mobile/google_emoticon.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 module Jpmobile::Mobile
   module GoogleEmoticon
-    # Jpmobile::Rack::Filter を適用する
+    # Jpmobile::Filter を適用する
     def apply_filter?
       Jpmobile.config.smart_phone_emoticon_compatibility
     end
 
-    # Jpmobile::Rack::ParamsFilter を適用する
+    # Jpmobile::ParamsFilter を適用する
     def apply_params_filter?
       Jpmobile.config.smart_phone_emoticon_compatibility
     end

data/lib/jpmobile/mobile/smart_phone.rb

@@ -18,12 +18,12 @@ module Jpmobile::Mobile
       true
     end
 
-    # Jpmobile::Rack::Filter は適用しない
+    # Jpmobile::Filter は適用しない
     def apply_filter?
       false
     end
 
-    # Jpmobile::Rack::ParamsFilter は適用しない
+    # Jpmobile::ParamsFilter は適用しない
     def apply_params_filter?
       false
     end

data/lib/jpmobile/mobile/unicode_emoticon.rb

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 module Jpmobile::Mobile
   module UnicodeEmoticon
-    # Jpmobile::Rack::Filter を適用する
+    # Jpmobile::Filter を適用する
     def apply_filter?
       Jpmobile.config.smart_phone_emoticon_compatibility
     end
 
-    # Jpmobile::Rack::ParamsFilter を適用する
+    # Jpmobile::ParamsFilter を適用する
     def apply_params_filter?
       Jpmobile.config.smart_phone_emoticon_compatibility
     end

data/lib/jpmobile/rack/filter.rb

@@ -3,55 +3,53 @@
 require 'scanf'
 
 module Jpmobile
-  module Rack
-    class Filter
-      def initialize(app)
-        @app = app
-      end
-
-      def call(env)
-        # 入力を保存
-        mobile = env['rack.jpmobile']
+  class Filter
+    def initialize(app)
+      @app = app
+    end
 
-        status, env, response = @app.call(env)
+    def call(env)
+      # 入力を保存
+      mobile = env['rack.jpmobile']
 
-        if env['Content-Type'] =~ %r!text/html|application/xhtml\+xml!
-          if mobile and mobile.apply_filter?
-            type, charset = env['Content-Type'].split(/;\s*charset=/)
+      status, env, response = @app.call(env)
 
-            body = response_to_body(response)
-            body = body.gsub(/<input name="utf8" type="hidden" value="#{[0x2713].pack("U")}"[^>]*?>/, ' ')
-            body = body.gsub(/<input name="utf8" type="hidden" value="&#x2713;"[^>]*?>/, ' ')
+      if env['Content-Type'] =~ %r!text/html|application/xhtml\+xml!
+        if mobile and mobile.apply_filter?
+          type, charset = env['Content-Type'].split(/;\s*charset=/)
 
-            response, charset = mobile.to_external(body, type, charset)
+          body = response_to_body(response)
+          body = body.gsub(/<input name="utf8" type="hidden" value="#{[0x2713].pack("U")}"[^>]*?>/, ' ')
+          body = body.gsub(/<input name="utf8" type="hidden" value="&#x2713;"[^>]*?>/, ' ')
 
-            if type and charset
-              env['Content-Type'] = "#{type}; charset=#{charset}"
-            end
-          elsif Jpmobile::Emoticon.pc_emoticon?
-            body = response_to_body(response)
+          response, charset = mobile.to_external(body, type, charset)
 
-            response = Jpmobile::Emoticon.emoticons_to_image(body)
+          if type and charset
+            env['Content-Type'] = "#{type}; charset=#{charset}"
           end
-        end
+        elsif Jpmobile::Emoticon.pc_emoticon?
+          body = response_to_body(response)
 
-        new_response = ::Rack::Response.new(response, status, env)
-        new_response.finish
+          response = Jpmobile::Emoticon.emoticons_to_image(body)
+        end
       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
+      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

data/lib/jpmobile/rack/mobile_carrier.rb

@@ -1,21 +1,19 @@
 # -*- coding: utf-8 -*-
 # UserAgent から生成すべき class 名を判定する
 module Jpmobile
-  module Rack
-    class MobileCarrier
-      def initialize(app)
-        @app = app
-      end
+  class MobileCarrier
+    def initialize(app)
+      @app = app
+    end
 
-      def call(env)
-        env['rack.jpmobile'] = Jpmobile::Mobile::AbstractMobile.carrier(env)
+    def call(env)
+      env['rack.jpmobile'] = Jpmobile::Mobile::AbstractMobile.carrier(env)
 
-        @app.call(env)
-      end
+      @app.call(env)
     end
   end
 end
 
 class Rack::Request
-  include Jpmobile::RequestWithMobile
+  include ::Jpmobile::RequestWithMobile
 end

data/lib/jpmobile/rack/params_filter.rb

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