jpmobile 5.0.0 → 5.0.1

data/test/rails/overrides/Gemfile

@@ -0,0 +1,54 @@
+source 'https://rubygems.org'
+
+git_source(:github) do |repo_name|
+  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
+  "https://github.com/#{repo_name}.git"
+end
+
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 5.0.3'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3', '~> 1.3.6'
+# Use Puma as the app server
+gem 'puma', '~> 3.0'
+# Use SCSS for stylesheets
+gem 'sass-rails', '~> 5.0'
+# Use Uglifier as compressor for JavaScript assets
+gem 'uglifier', '>= 1.3.0'
+# Use CoffeeScript for .coffee assets and views
+gem 'coffee-rails', '~> 4.2'
+# See https://github.com/rails/execjs#readme for more supported runtimes
+# gem 'therubyracer', platforms: :ruby
+
+# Use jquery as the JavaScript library
+gem 'jquery-rails'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.5'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 3.0'
+# Use ActiveModel has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+# Use Capistrano for deployment
+# gem 'capistrano-rails', group: :development
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platform: :mri
+end
+
+group :development do
+  # Access an IRB console on exception pages or by using <%= console %> anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '~> 3.0.5'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+instance_eval File.read(File.expand_path(__FILE__) + '.jpmobile')

data/test/rails/overrides/Gemfile.jpmobile

@@ -11,8 +11,7 @@ gem 'pry-byebug'
 
 # Bundle gems for certain environments:
 group :development, :test do
-  gem "rspec-rails", '3.5.0.beta4'
-  gem 'capybara'
+  gem "rspec-rails"
   gem 'capybara-webkit'
   gem 'rails-controller-testing'
 end

data/test/rails/overrides/app/controllers/admin/top_controller.rb

@@ -1,5 +1,5 @@
 class Admin::TopController < ApplicationController
   def full_path
-    render "/template_path/full_path_partial"
+    render '/template_path/full_path_partial'
   end
 end

data/test/rails/overrides/app/controllers/docomo_guid_base_controller.rb

@@ -1,5 +1,5 @@
 class DocomoGuidBaseController < ApplicationController
   def link
-    render :inline=>%{<%= link_to "linkto" %>}
+    render inline: %(<%= link_to "linkto" %>)
   end
 end

data/test/rails/overrides/app/controllers/filter_controller_base.rb

@@ -1,38 +1,46 @@
-# -*- coding: utf-8 -*-
 class FilterControllerBase < ApplicationController
   def abracadabra_utf8
-    @text = "アブラカダブラ"
+    @text = 'アブラカダブラ'
     render 'filter/text_template'
   end
+
   def abracadabra_xhtml_utf8
-    response.content_type = "application/xhtml+xml"
-    @text = "アブラカダブラ"
+    response.content_type = 'application/xhtml+xml'
+    @text = 'アブラカダブラ'
     render 'filter/text_template'
   end
+
   def index
     @q = params[:q]
     render plain: @q
   end
+
   def index_hankaku
     render plain: 'ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ' == params[:q]
   end
+
   def index_zenkaku
     render plain: 'アブラカダブラ' == params[:q]
   end
+
   def empty
-    render plain: ""
+    render plain: ''
   end
+
   def rawdata
-    send_data "アブラカダブラ", :type => 'application/octet-stream'
+    send_data 'アブラカダブラ', type: 'application/octet-stream'
   end
+
   def textarea
     @text = '<textarea hoge="fuu">アブラカダブラ</textarea>'.html_safe
     render 'filter/text_template'
   end
+
   def input_tag
     @text = '<input hoge="fuu" value="アブラカダブラ" />'.html_safe
     render 'filter/text_template'
   end
+
   def nbsp_char
     @text = '<a>アブラ&nbsp;カダブラ</a>'.html_safe
     render 'filter/text_template'

data/test/rails/overrides/app/controllers/hankaku_input_filter_controller.rb

@@ -2,7 +2,7 @@ class HankakuInputFilterController < FilterControllerBase
   hankaku_filter input: true
 
   def index_xhtml
-    render "index_xhtml", layout: "xhtml"
+    render 'index_xhtml', layout: 'xhtml'
   end
 
   def with_charset

data/test/rails/overrides/app/controllers/mobile_spec_controller.rb

@@ -5,7 +5,7 @@ class MobileSpecController < ApplicationController
   end
 
   def file_render
-    render :file => File.join(Rails.public_path, '422')
+    render file: File.join(Rails.public_path, '422')
   end
 
   def no_mobile

data/test/rails/overrides/app/controllers/template_path_controller.rb

@@ -11,7 +11,7 @@ class TemplatePathController < ApplicationController
   end
 
   def optioned_index
-    render :action => "index"
+    render action: 'index'
   end
 
   def full_path_partial
@@ -26,4 +26,3 @@ class TemplatePathController < ApplicationController
   def with_ipd
   end
 end
-

data/test/rails/overrides/app/controllers/trans_sid_base_controller.rb

@@ -1,44 +1,52 @@
-# -*- coding: utf-8 -*-
 class TransSidBaseController < ApplicationController
   # 事前にセッションを作成しないと trans_sid が有効にならない
   before_action :session_init
 
   def form
-    render :inline=>%{<%= form_tag do %>Hello<% end %>}
+    render inline: %(<%= form_tag do %>Hello<% end %>)
   end
+
   def link
-    render :inline=>%{<%= link_to "linkto" %>}
+    render inline: %(<%= link_to "linkto" %>)
   end
+
   def redirect
     redirect_to('/')
   end
+
   def session_init
-    session[:jpmobile] = "everyleaf"
-    @user = User.find(1) rescue User.create(:id => 1, :name => "everyleaf")
+    session[:jpmobile] = 'everyleaf'
+    @user = User.find_by_id(1)
+    unless @user
+      @user = User.create(id: 1, name: 'everyleaf')
+    end
   end
 
   def form_path
-    render :inline=>%{<%= form_for @user do %>Hello<% end %>}
+    render inline: %(<%= form_for @user do %>Hello<% end %>)
   end
+
   def form_path_admin
-    render :inline=>%{<%= form_for [:admin, @user] do %>Hello<% end %>}
+    render inline: %(<%= form_for [:admin, @user] do %>Hello<% end %>)
   end
 
   def link_path
-    render :inline => %{<%= link_to "linkto", @user -%>}
+    render inline: %(<%= link_to "linkto", @user -%>)
   end
+
   def link_path_admin
-    render :inline => %{<%= link_to "linkto", [:admin, @user] -%>}
+    render inline: %(<%= link_to "linkto", [:admin, @user] -%>)
   end
 
   def redirect_path
     redirect_to @user
   end
+
   def redirect_path_admin
     redirect_to [:admin, @user]
   end
 
   def redirect_action
-    redirect_to :action => "form"
+    redirect_to action: 'form'
   end
 end

data/test/rails/overrides/app/controllers/trans_sid_metal_controller.rb

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 class TransSidMetalController < ActionController::Metal
   include ActionController::UrlFor
   include ActionController::Redirecting

data/test/rails/overrides/app/mailers/decorated_mailer.rb

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 class DecoratedMailer < Jpmobile::Mailer::Base
-  default :from => "info@jp.mobile"
-  default :to   => "info@jp.mobile"
+  default from: 'info@jp.mobile'
+  default to: 'info@jp.mobile'
 
   def deco_mail(to_mail)
     attachments.inline['photo.jpg'] = open(File.join(Rails.root, 'spec/fixtures/mobile_mailer/photo.jpg')).read
 
-    mail(:to => to_mail, :subject => '題名', :decorated => true)
+    mail(to: to_mail, subject: '題名', decorated: true)
   end
 end

data/test/rails/overrides/app/mailers/mobile_mailer.rb

@@ -1,11 +1,10 @@
-# -*- coding: utf-8 -*-
 class MobileMailer < Jpmobile::Mailer::Base
-  default :from => "info@jp.mobile"
-  default :to   => "info@jp.mobile"
+  default from: 'info@jp.mobile'
+  default to: 'info@jp.mobile'
 
   def view_selection(to_mail, subject_text, text)
     @text = text
-    mail(:to => to_mail, :subject => subject_text)
+    mail(to: to_mail, subject: subject_text)
   end
 
   def receive(email)
@@ -15,11 +14,11 @@ class MobileMailer < Jpmobile::Mailer::Base
   def multi_message(to_mail, subject_text, text, html)
     @html = html
     @text = text
-    mail(:to => to_mail, :subject => subject_text)
+    mail(to: to_mail, subject: subject_text)
   end
 
   def default_to_mail(subject_text, text)
     @text = text
-    mail(:subject => subject_text)
+    mail(subject: subject_text)
   end
 end

data/test/rails/overrides/app/mailers/normal_mailer.rb

@@ -1,9 +1,8 @@
-# -*- coding: utf-8 -*-
 class NormalMailer < ActionMailer::Base
-  default :from => "info@jp.mobile"
+  default from: 'info@jp.mobile'
 
   def msg(to_mail, subject_text, text)
     @text = text
-    mail(:to => to_mail, :subject => subject_text)
+    mail(to: to_mail, subject: subject_text)
   end
 end

data/test/rails/overrides/autotest/discover.rb

@@ -1,2 +1,2 @@
-Autotest.add_discovery { "rails" }
-Autotest.add_discovery { "rspec2" }
+Autotest.add_discovery { 'rails' }
+Autotest.add_discovery { 'rspec2' }

data/test/rails/overrides/config/initializers/jpmobile_generator.rb

@@ -4,9 +4,9 @@ Rails.application.config.jpmobile.form_accept_charset_conversion = true
 Rails.application.config.jpmobile.session_store do
   # # MemCacheStore
   # require 'jpmobile/session/mem_cache_store'
-  # ActionDispatch::Session::MemCacheStore.send :include, Jpmobile::TransSid::ParamsOverCookie
+  # ActionDispatch::Session::MemCacheStore.send :prepend, Jpmobile::TransSid::ParamsOverCookie
 
   # # ActiveRecordStore
   # require 'jpmobile/session/active_record_store'
-  # ActionDispatch::Session::AbstractStore.send :include, Jpmobile::TransSid::ParamsOverCookie
+  # ActionDispatch::Session::AbstractStore.send :prepend, Jpmobile::TransSid::ParamsOverCookie
 end

data/test/rails/overrides/config/routes.rb

@@ -4,8 +4,101 @@ RailsRoot::Application.routes.draw do
     resources :users
 
     controller :top do
-      get 'top/:action'
+      get 'top/full_path', to: 'top#full_path'
+    end
+  end
+
+  # get ':controller(/:action(/:id(.:format)))'
+
+  get 'trans_sid_metal/redirect', to: 'trans_sid_metal#redirect'
+
+  %w[
+    trans_sid_base
+    trans_sid_always_and_session_off
+    trans_sid_always
+    trans_sid_metal
+    trans_sid_mobile
+    trans_sid_none
+  ].each do |c|
+    %w[
+      form
+      link
+      redirect
+      form_path
+      form_path_admin
+      link_path
+      link_path_admin
+      redirect_path
+      redirect_path_admin
+      redirect_action
+    ].each do |a|
+      get "#{c}/#{a}", to: "#{c}##{a}"
+    end
+  end
+
+  %w[
+    docomo_guid_base
+    docomo_guid_always
+    docomo_guid_docomo
+  ].each do |c|
+    get "#{c}/link", to: "#{c}#link"
+  end
+
+  %w[
+    show_all
+    link
+    docomo_utn
+    docomo_openiarea
+    docomo_foma_gps
+    au_location
+    au_gps
+    softbank_location
+    willcom_location
+  ].each do |a|
+    get "links/#{a}", to: "links##{a}"
+  end
+
+  %w[
+    index
+    file_render
+    no_mobile
+  ].each do |a|
+    get "mobile_spec/#{a}", to: "mobile_spec##{a}"
+  end
+
+  %w[
+    index
+    show
+    optioned_index
+    full_path_partial
+    smart_phone_only
+    with_tblt
+    with_ipd
+    partial
+  ].each do |a|
+    get "template_path/#{a}", to: "template_path##{a}"
+  end
+
+  %w[
+    filter
+    hankaku_filter
+    hankaku_input_filter
+  ].each do |c|
+    %w[
+      abracadabra_utf8
+      abracadabra_xhtml_utf8
+      index
+      index_hankaku
+      index_zenkaku
+      empty
+      rawdata
+      textarea
+      input_tag
+      nbsp_char
+      index_xhtml
+      with_charset
+    ].each do |a|
+      get "#{c}/#{a}", to: "#{c}##{a}"
     end
   end
-  get ':controller(/:action(/:id(.:format)))'
 end

data/test/rails/overrides/db/migrate/001_add_sessions_table.rb

@@ -1,7 +1,7 @@
-class AddSessionsTable < ActiveRecord::Migration
+class AddSessionsTable < ActiveRecord::Migration[5.0]
   def change
     create_table :sessions do |t|
-      t.string :session_id, :null => false
+      t.string :session_id, null: false
       t.text :data
 
       t.timestamps null: false

data/test/rails/overrides/db/migrate/20100824062306_create_users.rb

@@ -1,4 +1,4 @@
-class CreateUsers < ActiveRecord::Migration
+class CreateUsers < ActiveRecord::Migration[5.0]
   def change
     create_table :users do |t|
       t.string :name

data/test/rails/overrides/spec/controllers/docomo_guid_spec.rb

@@ -1,56 +1,55 @@
-# -*- coding: utf-8 -*-
 require 'rails_helper'
 
-shared_examples_for "docomo_guid が起動しないとき" do
+shared_examples_for 'docomo_guid が起動しないとき' do
   render_views
 
-  it "で link_to の自動書き換えが行われない" do
+  it 'で link_to の自動書き換えが行われない' do
     get :link
 
-    expect(response.body).to match(/href=\".+\/link\"/)
+    expect(response.body).to match(%r{href=\".+/link\"})
   end
 end
 
-shared_examples_for "docomo_guid が起動するとき" do
-  it "で link_to の自動書き換えが行われる" do
+shared_examples_for 'docomo_guid が起動するとき' do
+  it 'で link_to の自動書き換えが行われる' do
     get :link
 
-    expect(response.body).to match(/href=\".+\/link\?guid=ON\"/)
+    expect(response.body).to match(%r{href=\".+/link\?guid=ON\"})
   end
 end
 
-describe DocomoGuidBaseController, :type => :controller do
+describe DocomoGuidBaseController, type: :controller do
   before(:each) do
-    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    request.user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)'
   end
 
-  it "の docomo_guid_mode は nil" do
+  it 'の docomo_guid_mode は nil' do
     get :link
 
     expect(controller.docomo_guid_mode).to be_nil
   end
-  it_should_behave_like "docomo_guid が起動しないとき"
+  it_should_behave_like 'docomo_guid が起動しないとき'
 end
 
-describe DocomoGuidAlwaysController, :type => :controller do
+describe DocomoGuidAlwaysController, type: :controller do
   before(:each) do
-    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    request.user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)'
   end
 
-  it "の docomo_guid_always は :always" do
+  it 'の docomo_guid_always は :always' do
     get :link
 
     expect(controller.docomo_guid_mode).to eq(:always)
   end
-  it_should_behave_like "docomo_guid が起動するとき"
+  it_should_behave_like 'docomo_guid が起動するとき'
 end
 
-describe DocomoGuidDocomoController, :type => :controller do
+describe DocomoGuidDocomoController, type: :controller do
   before(:each) do
-    request.user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    request.user_agent = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)'
   end
 
-  it "の docomo_guid_mode は :docomo" do
+  it 'の docomo_guid_mode は :docomo' do
     get :link
 
     expect(controller.docomo_guid_mode).to eq(:docomo)
@@ -64,11 +63,11 @@ describe DocomoGuidDocomoController, :type => :controller do
     it_should_behave_like example_name
   end
 
-  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "docomo_guid が起動するとき"
-  it_should_behave_like 'describe_mobile_with_ua', "J-PHONE/3.0/V301D", "docomo_guid が起動しないとき"
-  it_should_behave_like 'describe_mobile_with_ua', "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "docomo_guid が起動しないとき"
-  it_should_behave_like 'describe_mobile_with_ua', "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "docomo_guid が起動しないとき"
-  it_should_behave_like 'describe_mobile_with_ua', "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0", "docomo_guid が起動しないとき"
-  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/1.0/N505i/c20/TB/W20H10 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)", "docomo_guid が起動しないとき"
-  it_should_behave_like 'describe_mobile_with_ua', "DoCoMo/2.0/SO502i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)", "docomo_guid が起動しないとき"
+  it_should_behave_like 'describe_mobile_with_ua', 'DoCoMo/2.0 SH902i(c100;TB;W24H12)', 'docomo_guid が起動するとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'J-PHONE/3.0/V301D', 'docomo_guid が起動しないとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0', 'docomo_guid が起動しないとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1', 'docomo_guid が起動しないとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0', 'docomo_guid が起動しないとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'DoCoMo/1.0/N505i/c20/TB/W20H10 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html)', 'docomo_guid が起動しないとき'
+  it_should_behave_like 'describe_mobile_with_ua', 'DoCoMo/2.0/SO502i (compatible; Y!J-SRD/1.0; http://help.yahoo.co.jp/help/jp/search/indexing/indexing-27.html)', 'docomo_guid が起動しないとき'
 end