jpmobile 4.2.5 → 5.0.0.beta1

data/test/rails/overrides/spec/requests/pc_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe "PCからのアクセスの場合", :type => :request do
+describe "PCからのアクセスの場合", type: :request do
   before do
     @headers = {
       "HTTP_USER_AGENT" => "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; Trident/4.0; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 1.1.4322)",
@@ -8,12 +8,12 @@ describe "PCからのアクセスの場合", :type => :request do
   end
 
   it "request.mobile は nil であるべき" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile).to be_nil
   end
   it "request.mobile? は false であるべき" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile?).to be_falsey
   end

data/test/rails/overrides/spec/requests/softbank_emulator_spec.rb

@@ -1,17 +1,17 @@
 require 'rails_helper'
 
-describe "Softbank Emulator からのアクセスのとき", :type => :request do
+describe "Softbank Emulator からのアクセスのとき", type: :request do
   it "request.mobile は Softbank のインスタンスであること" do
-    get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Semulator"}
+    get "/mobile_spec/index", params: {}, env: {"HTTP_USER_AGENT" => "Semulator"}
 
     expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Softbank)
     expect(request.mobile?).to be_truthy
   end
 end
 
-describe "Vodafone Emulator からのアクセスのとき", :type => :request do
+describe "Vodafone Emulator からのアクセスのとき", type: :request do
   it "request.mobile は Vodafone のインスタンスであること" do
-    get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Vemulator"}
+    get "/mobile_spec/index", params: {}, env: {"HTTP_USER_AGENT" => "Vemulator"}
 
     expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Vodafone)
     expect(request.mobile?).to be_truthy

data/test/rails/overrides/spec/requests/template_path_spec.rb

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe TemplatePathController, "integrated_views", :type => :request do
+describe TemplatePathController, "integrated_views", type: :request do
   before do
     page.driver.header('User-Agent', user_agent)
   end

data/test/rails/overrides/spec/requests/trans_sid_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 def get_with_session(controller, action, user_agent)
   open_session do |sess|
-    sess.get "/#{controller}/#{action}", {}, {"HTTP_USER_AGENT" => user_agent}
+    sess.get "/#{controller}/#{action}", params: {}, env: {"HTTP_USER_AGENT" => user_agent}
   end
 end
 
@@ -18,9 +18,9 @@ def describe_mobile_with_ua(user_agent, charset, &block)
   end
 end
 
-describe "trans_sid functional", :type => :request do
+describe "trans_sid functional", type: :request do
   before(:each) do
-    @user ||= User.create(:name => "hoge")
+    @user ||= User.create(name: "hoge")
   end
 
   shared_examples_for "trans_sid が起動しないとき" do
@@ -105,7 +105,7 @@ describe "trans_sid functional", :type => :request do
     end
 
     it "の trans_sid_mode は nil" do
-      get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
+      get "/#{@controller}/link", params: {}, env: {"HTTP_USER_AGENT" => @user_agent}
 
       expect(controller.trans_sid_mode).to be_nil
     end
@@ -120,7 +120,7 @@ describe "trans_sid functional", :type => :request do
     end
 
     it "の trans_sid_mode は :none" do
-      get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
+      get "/#{@controller}/link", params: {}, env: {"HTTP_USER_AGENT" => @user_agent}
 
       expect(controller.trans_sid_mode).to eq(:none)
     end
@@ -135,7 +135,7 @@ describe "trans_sid functional", :type => :request do
     end
 
     it "の trans_sid_mode は :always" do
-      get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
+      get "/#{@controller}/link", params: {}, env: {"HTTP_USER_AGENT" => @user_agent}
 
       expect(controller.trans_sid_mode).to eq(:always)
     end
@@ -164,7 +164,7 @@ describe "trans_sid functional", :type => :request do
     end
 
     it "の trans_sid_mode は :mobile" do
-      get "/#{@controller}/link", {}, {"HTTP_USER_AGENT" => @user_agent}
+      get "/#{@controller}/link", params: {}, env: {"HTTP_USER_AGENT" => @user_agent}
 
       expect(controller.trans_sid_mode).to eq(:mobile)
     end
@@ -185,12 +185,10 @@ describe "trans_sid functional", :type => :request do
     it_should_behave_like "trans_sid が起動しないとき"
   end
 
-  # NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
   describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "Shift_JIS" do
     it_should_behave_like "trans_sid が起動するとき"
   end
 
-  # NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
   describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "Shift_JIS" do
     it_should_behave_like "trans_sid が起動しないとき"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.2.5
+  version: 5.0.0.beta1
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-14 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: 5.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -151,20 +151,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.5
 description: A Rails plugin for mobile devices in Japan
 email:
 - rust.stnard@gmail.com
@@ -196,10 +182,9 @@ files:
 - lib/jpmobile/emoticon/unicode.rb
 - lib/jpmobile/emoticon/z_combine.rb
 - lib/jpmobile/encoding.rb
+- lib/jpmobile/fallback_view_selector.rb
 - lib/jpmobile/filter.rb
 - lib/jpmobile/helpers.rb
-- lib/jpmobile/hook_action_controller.rb
-- lib/jpmobile/hook_action_dispatch.rb
 - lib/jpmobile/hook_action_view.rb
 - lib/jpmobile/hook_test_request.rb
 - lib/jpmobile/lookup_context.rb
@@ -225,7 +210,6 @@ files:
 - lib/jpmobile/mobile/windows_phone.rb
 - lib/jpmobile/path_set.rb
 - lib/jpmobile/position.rb
-- lib/jpmobile/rack.rb
 - lib/jpmobile/rack/filter.rb
 - lib/jpmobile/rack/mobile_carrier.rb
 - lib/jpmobile/rack/params_filter.rb
@@ -295,7 +279,6 @@ files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
 - test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb
@@ -322,6 +305,7 @@ files:
 - test/rails/overrides/app/views/decorated_mailer/deco_mail.html.erb
 - test/rails/overrides/app/views/decorated_mailer/deco_mail.text.erb
 - test/rails/overrides/app/views/filter/index.html.erb
+- test/rails/overrides/app/views/filter/text_template.html.erb
 - test/rails/overrides/app/views/hankaku_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index_xhtml.html.erb
@@ -444,12 +428,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A Rails plugin for mobile devices in Japan
@@ -510,7 +494,6 @@ test_files:
 - spec/unit/variants_spec.rb
 - test/rails/.gitignore
 - test/rails/overrides/.rspec
-- test/rails/overrides/Gemfile
 - test/rails/overrides/Gemfile.jpmobile
 - test/rails/overrides/app/controllers/admin/top_controller.rb
 - test/rails/overrides/app/controllers/application_controller.rb
@@ -537,6 +520,7 @@ test_files:
 - test/rails/overrides/app/views/decorated_mailer/deco_mail.html.erb
 - test/rails/overrides/app/views/decorated_mailer/deco_mail.text.erb
 - test/rails/overrides/app/views/filter/index.html.erb
+- test/rails/overrides/app/views/filter/text_template.html.erb
 - test/rails/overrides/app/views/hankaku_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index.html.erb
 - test/rails/overrides/app/views/hankaku_input_filter/index_xhtml.html.erb

data/lib/jpmobile/hook_action_dispatch.rb

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-ActionDispatch::Request.send :include, Jpmobile::Encoding

data/lib/jpmobile/rack.rb

@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'rack/utils'
-require 'singleton'
-
-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
-end