jpmobile 4.2.5 → 5.0.0.beta1

data/lib/jpmobile/rails.rb

@@ -3,18 +3,31 @@ ActiveSupport.on_load(:action_controller) do
   require 'jpmobile/docomo_guid'
   require 'jpmobile/filter'
   require 'jpmobile/helpers'
-  require 'jpmobile/hook_action_controller'
   require 'jpmobile/hook_action_view'
   require 'jpmobile/trans_sid'
   require 'jpmobile/hook_test_request'
+  ActionDispatch::Request.send :prepend, Jpmobile::Encoding
+  ActionDispatch::Request.send :include, Jpmobile::RequestWithMobile
+  ActionController::Base.send :prepend, Jpmobile::FallbackViewSelector
+  ActionController::Base.send :prepend, Jpmobile::TransSidRedirecting
 end
-ActiveSupport.on_load(:action_dispatch) do
-  require 'jpmobile/hook_action_dispatch'
+
+ActiveSupport.on_load(:after_initialize) do
+  case Rails.application.config.session_store.to_s
+  when "ActionDispatch::Session::MemCacheStore"
+    require 'jpmobile/session/mem_cache_store'
+    ActionDispatch::Session::MemCacheStore.send :prepend, Jpmobile::ParamsOverCookie
+  when "ActiveRecord::SessionStore"
+    require 'jpmobile/session/active_record_store'
+    ActionDispatch::Session::AbstractStore.send :prepend, Jpmobile::ParamsOverCookie
+  else
+    Rails.application.config.jpmobile.mount_session_store
+  end
 end
 
 ActiveSupport.on_load(:before_configuration) do
   # MobileCarrierのみデフォルトで有効
-  config.middleware.insert_before ActionDispatch::ParamsParser, Jpmobile::Rack::MobileCarrier
+  config.middleware.insert_after ActionDispatch::Flash, ::Jpmobile::MobileCarrier
 
   module Rails
     class Application

data/lib/jpmobile/resolver.rb

@@ -1,7 +1,7 @@
 module Jpmobile
   class Resolver < ActionView::FileSystemResolver
     EXTENSIONS = [:locale, :formats, :handlers, :mobile]
-    DEFAULT_PATTERN = ":prefix/:action{_:mobile,}{.:locale,}{.:formats,}{+:variants,}{.:handlers,}"
+    DEFAULT_PATTERN = ":prefix/:action{_:mobile,}{.:locale,}{.:formats,}{.:handlers,}"
 
     def initialize(path, pattern=nil)
       raise ArgumentError, "path already is a Resolver class" if path.is_a?(Resolver)
@@ -11,12 +11,11 @@ module Jpmobile
 
     private
 
-    def query(path, details, formats, outside_app_allowed)
+    def query(path, details, formats)
       query = build_query(path, details)
 
       begin
         template_paths = find_template_paths query
-        template_paths = reject_files_external_to_app(template_paths) unless outside_app_allowed
       rescue NoMethodError
         self.class_eval do
           def find_template_paths(query)

data/lib/jpmobile/trans_sid.rb

@@ -3,49 +3,69 @@
 require 'active_support/version'
 
 module Jpmobile
-  module TransSid
-    module ParamsOverCookie
-      def self.included(base)
-        base.class_eval do
-          # cookie よりも params を先に見るパッチ
-          def extract_session_id_with_jpmobile(env)
-            request = ::Rack::Request.new(env)
-            if request.params[@key] and !@cookie_only
-              sid = request.params[@key]
-            end
-            sid ||= request.cookies[@key]
-            sid
-          end
-          alias_method_chain :extract_session_id, :jpmobile
-        end
+  module SessionID
+    require 'action_dispatch/middleware/session/abstract_store'
+    module_function
+
+    extend ActionDispatch::Session::Compatibility
+  end
+
+  module ParamsOverCookie
+    def extract_session_id(req)
+      if req.params[@key] and !@cookie_only
+        sid = req.params[@key]
       end
+      sid ||= req.cookies[@key]
+      sid
+    end
+  end
+
+  module TransSid
+    def self.included(controller)
+      controller.after_action(:append_session_id_parameter)
+    end
+
+    protected
+    # URLにsession_idを追加する。
+    def default_url_options
+      result = super || {}.with_indifferent_access
+      return result unless request # for test process
+      return result unless apply_trans_sid?
+      return result.merge({session_key.to_sym => jpmobile_session_id})
     end
 
-    ActiveSupport.on_load(:after_initialize) do
-      case Rails.application.config.session_store.to_s
-      when "ActionDispatch::Session::MemCacheStore"
-        require 'jpmobile/session/mem_cache_store'
-        ActionDispatch::Session::MemCacheStore.send :include, ParamsOverCookie
-      when "ActiveRecord::SessionStore"
-        require 'jpmobile/session/active_record_store'
-        ActionDispatch::Session::AbstractStore.send :include, ParamsOverCookie
-      else
-        Rails.application.config.jpmobile.mount_session_store
+    private
+    # session_keyを返す。
+    def session_key
+      unless key = Rails.application.config.session_options.merge(request.session_options || {})[:key]
+        key = ActionDispatch::Session::AbstractStore::DEFAULT_OPTIONS[:key]
       end
+      key
     end
-  end
 
-  module SessionID
-    require 'action_dispatch/middleware/session/abstract_store'
-    module_function
+    # session_idを返す
+    # rack 1.4 (rails3) request.session_options[:id]
+    # rack 1.5 (rails4) request.session.id
+    def jpmobile_session_id
+      request.session_options[:id] || request.session.id
+    end
 
-    extend ActionDispatch::Session::Compatibility
+    # session_idを埋め込むためのhidden fieldを出力する。
+    def sid_hidden_field_tag
+      "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML jpmobile_session_id}\" />"
+    end
+
+    # formにsession_idを追加する。
+    def append_session_id_parameter
+      return unless request # for test process
+      return unless apply_trans_sid?
+      return unless jpmobile_session_id
+      response.body = response.body.gsub(%r{(</form>)}i, sid_hidden_field_tag+'\1')
+    end
   end
-end
 
-module ActionController
-  module Redirecting
-    def redirect_to_with_jpmobile(options = {}, response_status = {})
+  module TransSidRedirecting
+    def redirect_to(options = {}, response_status = {})
       if apply_trans_sid? and jpmobile_session_id
         case options
         when %r{^\w[\w+.-]*:.*}
@@ -71,18 +91,19 @@ module ActionController
         end
       end
 
-      redirect_to_without_jpmobile(options, response_status)
+      super(options, response_status)
     end
-
-    alias_method_chain :redirect_to, :jpmobile
   end
+end
 
+module ActionController
   class Metal #:nodoc:
     class_attribute :trans_sid_mode
 
     class << self
       def trans_sid(mode = :mobile)
         include Jpmobile::TransSid
+
         self.trans_sid_mode = mode
       end
     end
@@ -108,44 +129,3 @@ module ActionController
     end
   end
 end
-
-module Jpmobile::TransSid #:nodoc:
-  def self.included(controller)
-    controller.after_action(:append_session_id_parameter)
-  end
-
-  protected
-  # URLにsession_idを追加する。
-  def default_url_options
-    result = super || {}.with_indifferent_access
-    return result unless request # for test process
-    return result unless apply_trans_sid?
-    return result.merge({session_key.to_sym => jpmobile_session_id})
-  end
-
-  private
-  # session_keyを返す。
-  def session_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を返す
-  # rack 1.4 (rails3) request.session_options[:id]
-  # rack 1.5 (rails4) request.session.id
-  def jpmobile_session_id
-    request.session_options[:id] || request.session.id
-  end
-  # session_idを埋め込むためのhidden fieldを出力する。
-  def sid_hidden_field_tag
-    "<input type=\"hidden\" name=\"#{CGI::escapeHTML session_key}\" value=\"#{CGI::escapeHTML jpmobile_session_id}\" />"
-  end
-  # formにsession_idを追加する。
-  def append_session_id_parameter
-    return unless request # for test process
-    return unless apply_trans_sid?
-    return unless jpmobile_session_id
-    response.body = response.body.gsub(%r{(</form>)}i, sid_hidden_field_tag+'\1')
-  end
-end

data/lib/jpmobile/util.rb

@@ -24,23 +24,6 @@ module Jpmobile
     FULLWIDTH_HYPHEN_MINUS = [0xFF0D].pack("U")
 
     module_function
-    def deep_apply(obj, &proc)
-      case obj
-      when Hash
-        obj.each_pair do |key, value|
-          obj[key] = deep_apply(value, &proc)
-        end
-      when Array
-        obj.collect!{|value| deep_apply(value, &proc)}
-      when String
-        obj = obj.to_param if obj.respond_to?(:to_param)
-        proc.call(obj)
-      else
-        # NilClass, TrueClass, FalseClass, Tempfile, StringIO, etc...
-        return obj
-      end
-    end
-
     def deep_convert(obj, &proc)
       case obj
       when Hash

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.2.5"
+  VERSION = "5.0.0.beta1"
 end

data/lib/tasks/jpmobile_tasks.rake

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # desc "Explaining what the task does"
 # task :jpmobile do
 #   # Task goes here
@@ -18,28 +19,30 @@ begin
     end
   end
 rescue LoadError
-  warn 'RSpec is not installed. Some tasks were skipped. please install rspec'
+  warn "RSpec is not installed. Some tasks were skipped. please install rspec"
 end
 
 namespace :test do
-  desc 'Generate rails app and run jpmobile tests in the app'
-  task :rails, [:skip] do |_, args|
-    rails_root = 'test/rails/rails_root'
+  desc "Generate rails app and run jpmobile tests in the app"
+  task :rails, [:skip] do |t, args|
+    rails_root     = "test/rails/rails_root"
+    relative_root  = "../../../"
 
-    puts 'Running tests in Rails'
-    skip = args.skip == 'true'
+    puts "Running tests in Rails"
+    skip = args.skip == "true"
 
     unless skip
       # generate rails app
+      FileUtils.rm_rf("Gemfile.lock")
       FileUtils.rm_rf(rails_root)
       FileUtils.mkdir_p(rails_root)
-      `rails new #{rails_root} --skip-bundle`
+      `rails _5.0.0.beta1_ new #{rails_root} --skip-bundle`
     end
 
     # setup jpmobile
     plugin_path = File.join(rails_root, 'vendor', 'jpmobile')
     FileUtils.mkdir_p(plugin_path)
-    FileList['*'].exclude('test').exclude('spec').exclude('vendor').each do |file|
+    FileList["*"].exclude("test").exclude("spec").exclude('vendor').each do |file|
       FileUtils.cp_r(file, plugin_path)
     end
 
@@ -47,37 +50,37 @@ namespace :test do
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-ipaddresses')
       FileUtils.mkdir_p(plugin_path)
-      FileList['vendor/jpmobile-ipaddresses/*'].exclude('test').each do |file|
+      FileList["vendor/jpmobile-ipaddresses/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts 'IP Address test requires jpmobile-ipaddresses module'
+      puts "IP Address test requires jpmobile-ipaddresses module"
     end
 
     # setup jpmobile-terminfo
     begin
       plugin_path = File.join(rails_root, 'vendor', 'jpmobile-terminfo')
       FileUtils.mkdir_p(plugin_path)
-      FileList['vendor/jpmobile-terminfo/*'].exclude('test').each do |file|
+      FileList["vendor/jpmobile-terminfo/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts 'Terminal display information test requires jpmobile-terminfo module'
+      puts "Terminal display information test requires jpmobile-terminfo module"
     end
 
     # setup activerecord-session_store
     begin
       plugin_path = File.join(rails_root, 'vendor', 'activerecord-session_store')
       FileUtils.mkdir_p(plugin_path)
-      FileList['../activerecord-session_store/*'].exclude('test').each do |file|
+      FileList["../activerecord-session_store/*"].exclude("test").each do |file|
         FileUtils.cp_r(file, plugin_path)
       end
     rescue LoadError
-      puts 'Terminal display information test requires jpmobile-terminfo module'
+      puts "Terminal display information test requires jpmobile-terminfo module"
     end
 
     # setup tests
-    FileList['test/rails/overrides/*'].each do |file|
+    FileList["test/rails/overrides/*"].each do |file|
       FileUtils.cp_r(file, rails_root)
     end
 
@@ -85,10 +88,10 @@ namespace :test do
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
       File.open(config_path, 'w') do |file|
-        file.write <<-SESSION_CONFIG
-        Rails.application.config.session_store :active_record_store, :key => '_session_id'
-        Rails.application.config.session_options = { :cookie_only => false }
-        SESSION_CONFIG
+        file.write <<-END
+Rails.application.config.session_store :active_record_store, :key => '_session_id'
+Rails.application.config.session_options = {:cookie_only => false}
+END
       end
     end
 
@@ -96,29 +99,20 @@ namespace :test do
       # add gems for jpmobile spec
       config_path = File.join(rails_root, 'Gemfile')
       File.open(config_path, 'a+') do |file|
-        file.write <<-GEMFILE
-        instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
-        GEMFILE
+        file.write <<-END
+instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')
+END
       end
     end
 
     # run tests in rails
-    Dir.chdir(rails_root) do
-      Bundler.with_clean_env do
-        original_env = ENV.to_hash
-
-        ENV.update('RBENV_VERSION' => nil)
-        ENV.update('RBENV_DIR' => nil)
-
-        system 'bundle install'
-        system 'bin/rake db:migrate RAILS_ENV=test' unless skip
-        system 'bin/rake spec'
-
-        ENV.replace(original_env)
-      end
-    end
+    cd rails_root
+    ruby "-S bundle install"
+    ruby "-S rake db:migrate RAILS_ENV=test" unless skip
+    ruby "-S rake spec"
+    # ruby "-S rspec -b --color spec/features/filter_spec.rb"
   end
-  desc 'Run sinatra on jpmobile tests'
+  desc "Run sinatra on jpmobile tests"
   Rake::TestTask.new(:sinatra) do |t|
     t.libs << 'lib'
     t.libs << 'test/sinatra'

data/spec/rack/jpmobile/android_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::Rack::MobileCarrier, "android" do
+describe Jpmobile::MobileCarrier, "android" do
   include Rack::Test::Methods
 
   context "端末種別で" do
@@ -9,7 +9,7 @@ describe Jpmobile::Rack::MobileCarrier, "android" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => 'Mozilla/5.0 (Linux; U; Android 1.6; ja-jp; SonyEriccsonSO-01B Build/R1EA018) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1')
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to            eq(Jpmobile::Mobile::Android)
       expect(env['rack.jpmobile'].position).to         be_nil

data/spec/rack/jpmobile/au_spec.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::Rack::MobileCarrier, "au" do
+describe Jpmobile::MobileCarrier, "au" do
   include Rack::Test::Methods
 
   context "端末種別で" do
@@ -10,7 +10,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "HTTP_X_UP_SUBNO" => "00000000000000_mj.ezweb.ne.jp")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Au)
       expect(env['rack.jpmobile'].subno).to eq("00000000000000_mj.ezweb.ne.jp")
@@ -25,7 +25,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].class).to eq(Jpmobile::Mobile::Au)
     end
@@ -37,7 +37,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to eq(43.07772)
       expect(env['rack.jpmobile'].position.lon).to eq(141.34114)
@@ -48,7 +48,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "ver=1&datum=0&unit=0&lat=%2b43.05.08.95&lon=%2b141.20.25.99&alt=155&time=20060521010328&smaj=76&smin=62&vert=65&majaa=49&fm=1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08581944)
       expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3405528)
@@ -59,7 +59,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-4).of(43.07719289)
       expect(env['rack.jpmobile'].position.lon).to be_within(1e-4).of(141.3389013)
@@ -70,7 +70,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "ver=1&datum=1&unit=1&lat=%2b43.07475&lon=%2b141.34259&alt=8&time=20061017182825&smaj=113&smin=76&vert=72&majaa=108&fm=1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-4).of(43.07719289)
       expect(env['rack.jpmobile'].position.lon).to be_within(1e-4).of(141.3389013)
@@ -81,7 +81,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08194444)
       expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3474306)
@@ -92,7 +92,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "datum=tokyo&unit=dms&lat=43.04.55.00&lon=141.20.50.75")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to be_within(1e-7).of(43.08194444)
       expect(env['rack.jpmobile'].position.lon).to be_within(1e-7).of(141.3474306)
@@ -103,7 +103,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "QUERY_STRING" => "ver=1&datum=0&unit=1&lat=%2b43.07772&lon=%2b141.34114&alt=64&time=20061016192415&smaj=69&smin=18&vert=21&majaa=115&fm=1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].position.lat).to eq(43.07772)
       expect(env['rack.jpmobile'].position.lon).to eq(141.34114)
@@ -118,7 +118,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
           'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0")
-        env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+        env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         expect(env['rack.jpmobile'].device_id).to eq("CA32")
         expect(env['rack.jpmobile'].supports_location?).to be_truthy
@@ -129,7 +129,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
           'HTTP_USER_AGENT' => "KDDI-SN26 UP.Browser/6.2.0.6.2 (GUI) MMP/2.0")
-        env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+        env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         expect(env['rack.jpmobile'].device_id).to eq("SN26")
         expect(env['rack.jpmobile'].supports_location?).to be_truthy
@@ -140,7 +140,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         res = Rack::MockRequest.env_for(
           'http://jpmobile-rails.org/',
           'HTTP_USER_AGENT' => "UP.Browser/3.04-KCTA UP.Link/3.4.5.9")
-        env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+        env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         expect(env['rack.jpmobile'].device_id).to eq("KCTA")
         expect(env['rack.jpmobile'].supports_location?).to be_falsey
@@ -155,7 +155,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "REMOTE_ADDR" => "210.230.128.225")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_truthy
     end
@@ -165,7 +165,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0",
         "REMOTE_ADDR" => "127.0.0.1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].valid_ip?).to be_falsey
     end
@@ -179,7 +179,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "HTTP_X_UP_DEVCAP_SCREENDEPTH" => "16,RGB565",
         "HTTP_X_UP_DEVCAP_SCREENPIXELS" => "240,346",
         "HTTP_X_UP_DEVCAP_ISCOLOR" => "1")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.width).to  eq(240)
       expect(env['rack.jpmobile'].display.height).to eq(346)
@@ -191,7 +191,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => "KDDI-CA33 UP.Browser/6.2.0.10.4 (GUI) MMP/2.0")
-      env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
+      env = Jpmobile::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
       expect(env['rack.jpmobile'].display.width).to  be_nil
       expect(env['rack.jpmobile'].display.height).to be_nil