jpmobile 4.2.5 → 5.0.0.beta1

data/spec/rack/jpmobile/windows_phone.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 require File.join(File.expand_path(File.dirname(__FILE__)), '../../rack_helper.rb')
 
-describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
+describe Jpmobile::MobileCarrier, "Windows Phone" do
   include Rack::Test::Methods
 
   context "端末種別で" do
@@ -9,7 +9,7 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)')
-      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::WindowsPhone)
       expect(env['rack.jpmobile'].position).to         be_nil

data/spec/rack_helper.rb

@@ -3,7 +3,6 @@ require 'rubygems'
 require 'rack/test'
 require 'rspec'
 require 'jpmobile'
-require 'jpmobile/rack'
 require 'nkf'
 
 begin

data/spec/unit/mail_spec.rb

@@ -342,16 +342,7 @@ describe "Jpmobile::Mail" do
     end
 
     it "delivers through SMTP" do
-      @mail.delivery_method :smtp, {
-                              enable_starttls_auto: false,
-                              user_name: ENV['MAILTRAP_USERNAME'],
-                              password: ENV['MAILTRAP_PASSWORD'],
-                              address: 'smtp.mailtrap.io',
-                              domain: 'smtp.mailtrap.io',
-                              port: '2525',
-                              authentication: :cram_md5
-                            }
-
+      @mail.delivery_method :smtp, {:enable_starttls_auto => false}
       expect {
         @mail.deliver
       }.not_to raise_error

data/spec/unit/util_spec.rb

@@ -6,77 +6,63 @@ require 'nkf'
 describe Jpmobile::Util do
   include Jpmobile::Util
 
-  it 'nilのときはnilを返すこと' do
-    expect(deep_apply(nil) {|obj| obj }).to equal(nil)
-  end
-
-  it 'trueのときはtrueを返すこと' do
-    expect(deep_apply(true) {|obj| obj }).to equal(true)
-  end
-
-  it 'falseのときはそのまま値を返すこと' do
-    expect(deep_apply(false) {|obj| obj }).to equal(false)
-  end
-
-  it 'Tempfileのインスタンスのときはそのまま値を返すこと' do
-    temp = Tempfile.new('test')
-    expect(deep_apply(temp) {|obj| obj}.object_id).to equal(temp.object_id)
-    # 本来 deep_apply(temp) {|obj| obj }.should equal(temp) が通るべきのような。
-    # 参考 http://blade.nagaokaut.ac.jp/cgi-bin/scat.rb/ruby/ruby-list/41720
-  end
-
-  it 'StringIOのインスタンスのときはそのまま値を返すこと' do
-    string_io = StringIO.new('test')
-    expect(deep_apply(string_io) {|obj| obj }).to equal(string_io)
-  end
-
-  it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
-    expect(utf8_to_sjis("اللغة العربية")).to eq(sjis("????? ???????"))
-  end
+  describe 'utf8_to_sjis' do
+    it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
+      expect(utf8_to_sjis("اللغة العربية")).to eq(sjis("????? ???????"))
+    end
 
-  it "utf8_to_sjis ですべての改行コードが CRLF に変更されること" do
-    expect(utf8_to_sjis("UTF8\rSAMPLE\nTEXT\r\n")).to eq(sjis("UTF8\r\nSAMPLE\r\nTEXT\r\n"))
-  end
+    it "utf8_to_sjis ですべての改行コードが CRLF に変更されること" do
+      expect(utf8_to_sjis("UTF8\rSAMPLE\nTEXT\r\n")).to eq(sjis("UTF8\r\nSAMPLE\r\nTEXT\r\n"))
+    end
 
-  it "0x8150がU+FFE3に変換されること" do
-    expect(sjis_to_utf8(sjis("\x81\x50"))).to eq([0xffe3].pack("U"))
-  end
+    it "U+FFE3が0x8150に変換されること" do
+      expect(utf8_to_sjis([0xffe3].pack("U"))).to eq(sjis("\x81\x50"))
+    end
 
-  it "U+FFE3が0x8150に変換されること" do
-    expect(utf8_to_sjis([0xffe3].pack("U"))).to eq(sjis("\x81\x50"))
-  end
+    it "U+203Eが0x8150に変換されること" do
+      expect(utf8_to_sjis([0x203e].pack("U"))).to eq(sjis("\x81\x50"))
+    end
 
-  it "U+203Eが0x8150に変換されること" do
-    expect(utf8_to_sjis([0x203e].pack("U"))).to eq(sjis("\x81\x50"))
-  end
+    it "U+2014が0x815Cに変換されること" do
+      expect(utf8_to_sjis([0x2014].pack("U"))).to eq(sjis("\x81\x5C"))
+    end
 
-  it "U+2014が0x815Cに変換されること" do
-    expect(utf8_to_sjis([0x2014].pack("U"))).to eq(sjis("\x81\x5C"))
-  end
+    it "U+2212が0x817Cに変換されること" do
+      expect(utf8_to_sjis([0x2212].pack("U"))).to eq(sjis("\x81\x7C"))
+    end
 
-  it "U+2212が0x817Cに変換されること" do
-    expect(utf8_to_sjis([0x2212].pack("U"))).to eq(sjis("\x81\x7C"))
+    it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
+      expect(utf8_to_jis("اللغة العربية")).to eq(jis("????? ???????"))
+    end
   end
 
-  it "jis_string_regexpでISO-2022-JPの文字列がマッチすること" do
-    expect(jis_string_regexp.match(ascii_8bit(utf8_to_jis("abcしからずんばこじをえずdef")))).not_to be_nil
-    expect(jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42"))).to eq("しからずんばこじをえず")
-  end
+  describe 'sjis_to_utf8' do
+    it "0x8150がU+FFE3に変換されること" do
+      expect(sjis_to_utf8(sjis("\x81\x50"))).to eq([0xffe3].pack("U"))
+    end
 
-  it "sjis_to_utf8 ですべての改行コードが LF に変更されること" do
-    expect(sjis_to_utf8("SJIS\rSAMPLE\nTEXT\r\n")).to eq(utf8("SJIS\nSAMPLE\nTEXT\n"))
+    it "sjis_to_utf8 ですべての改行コードが LF に変更されること" do
+      expect(sjis_to_utf8("SJIS\rSAMPLE\nTEXT\r\n")).to eq(utf8("SJIS\nSAMPLE\nTEXT\n"))
+    end
   end
 
-  it "utf8_to_sjis で変換できない文字列が含んでいた場合?に変換される" do
-    expect(utf8_to_jis("اللغة العربية")).to eq(jis("????? ???????"))
+  describe 'utf8_to_jis' do
+    it "utf8_to_jis ですべての改行コードが CRLF に変更されること" do
+      expect(utf8_to_jis("UTF8\rSAMPLE\nTEXT\r\n")).to eq(jis("UTF8\r\nSAMPLE\r\nTEXT\r\n"))
+    end
   end
 
-  it "utf8_to_jis ですべての改行コードが CRLF に変更されること" do
-    expect(utf8_to_jis("UTF8\rSAMPLE\nTEXT\r\n")).to eq(jis("UTF8\r\nSAMPLE\r\nTEXT\r\n"))
+  describe 'jis_string_regexp' do
+    it "jis_string_regexpでISO-2022-JPの文字列がマッチすること" do
+      expect(jis_string_regexp.match(ascii_8bit(utf8_to_jis("abcしからずんばこじをえずdef")))).not_to be_nil
+      expect(jis_to_utf8(jis("\x1b\x24\x42#{$1}\x1b\x28\x42"))).to eq("しからずんばこじをえず")
+    end
   end
 
-  it "jis_to_utf8 ですべての改行コードが LF に変更されること" do
-    expect(jis_to_utf8("JIS\rSAMPLE\nTEXT\r\n")).to eq(utf8("JIS\nSAMPLE\nTEXT\n"))
+  describe 'jis_to_utf8' do
+    it "jis_to_utf8 ですべての改行コードが LF に変更されること" do
+      expect(jis_to_utf8("JIS\rSAMPLE\nTEXT\r\n")).to eq(utf8("JIS\nSAMPLE\nTEXT\n"))
+    end
   end
 
   describe '#force_encode' do

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,14 +4,16 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store'
+gem 'activerecord-session_store', path: './vendor/activerecord-session_store'
 
-gem 'mail', '2.5.5'
+gem 'pry'
+gem 'pry-byebug'
 
 # Bundle gems for certain environments:
 group :development, :test do
   gem "rspec"
   gem "rspec-rails"
+  gem 'capybara'
   gem 'capybara-webkit'
-  gem 'pry'
+  gem 'rails-controller-testing'
 end

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

@@ -1,3 +1,2 @@
 class FilterController < FilterControllerBase
-  # mobile_filter
 end

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

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

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

@@ -1,8 +1,8 @@
 class HankakuInputFilterController < FilterControllerBase
-  hankaku_filter :input => true
+  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/trans_sid_metal_controller.rb

@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
 class TransSidMetalController < ActionController::Metal
-  include ActionController::RackDelegation
   include ActionController::UrlFor
   include ActionController::Redirecting
   include Rails.application.routes.url_helpers

data/test/rails/overrides/app/views/filter/text_template.html.erb

@@ -0,0 +1 @@
+<%= @text %>

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

@@ -1,6 +1,6 @@
 require 'rails_helper'
 
-describe MobileSpecController, :type => :controller do
+describe MobileSpecController, type: :controller do
   render_views
 
   describe "GET 'index'" do
@@ -10,7 +10,7 @@ describe MobileSpecController, :type => :controller do
         get 'index'
 
         expect(response).to be_success
-        expect(response).to render_template('index')
+        expect(response.body).to match(/RailsRoot PC/)
         expect(request.mobile?).to be_falsey
       end
     end
@@ -20,7 +20,7 @@ describe MobileSpecController, :type => :controller do
         request.user_agent = "DoCoMo/2.0 SH902i(c100;TB;W24H12)"
         get 'index'
         expect(response).to be_success
-        expect(response).to render_template('index_mobile')
+        expect(response.body).to match(/RailsRoot mobile/)
         expect(request.mobile?).to be_truthy
         expect(request.mobile).to be_a(Jpmobile::Mobile::Docomo)
       end

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

@@ -1,10 +1,10 @@
 require 'rails_helper'
 
-describe TransSidAlwaysController, :type => :controller do
+describe TransSidAlwaysController, type: :controller do
   describe "GET 'redirect_action'" do
     it "redirects 'form'" do
       get :redirect_action
-      expect(response).to redirect_to(:action => 'form')
+      expect(response).to redirect_to(action: 'form')
     end
   end
 end

data/test/rails/overrides/spec/features/filter_spec.rb

@@ -1,13 +1,14 @@
+# -*- coding: utf-8 -*-
 require 'rails_helper'
 
-describe "jpmobile integration spec", :type => :feature do
+describe "jpmobile integration spec", type: :feature do
   include Jpmobile::Util
 
   before do
     page.driver.header('User-Agent', user_agent)
   end
 
-  shared_examples_for "hankaku_filter :input => true のとき" do
+  shared_examples_for "hankaku_filter input: true のとき" do
     it "はtextareaの中では半角に変換されないこと" do
       visit "/#{controller}/textarea"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
@@ -18,11 +19,11 @@ describe "jpmobile integration spec", :type => :feature do
     end
     it "は 変換されない" do
       visit "/#{controller}/nbsp_char"
-      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 
-  shared_examples_for "hankaku_filter :input => false のとき" do
+  shared_examples_for "hankaku_filter input: false のとき" do
     it "はtextareaの中でも半角に変換されること" do
       visit "/#{controller}/textarea"
       expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ')
@@ -33,7 +34,7 @@ describe "jpmobile integration spec", :type => :feature do
     end
     it "は 変換されない" do
       visit "/#{controller}/nbsp_char"
-      expect(page.body.encode('UTF-8')).to have_content("ｱﾌﾞﾗ\xc2\xa0ｶﾀﾞﾌﾞﾗ")
+      expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗ ｶﾀﾞﾌﾞﾗ')
     end
   end
 
@@ -188,7 +189,7 @@ describe "jpmobile integration spec", :type => :feature do
       }
 
       it_should_behave_like "Shift_JISで通信する端末との通信(半角変換付き)"
-      it_should_behave_like "hankaku_filter :input => false のとき"
+      it_should_behave_like "hankaku_filter input: false のとき"
     end
 
     describe "SoftBank 910T からのアクセス" do
@@ -197,7 +198,7 @@ describe "jpmobile integration spec", :type => :feature do
       }
 
       it_should_behave_like "UTF-8で通信する端末との通信(半角変換付き)"
-      it_should_behave_like "hankaku_filter :input => false のとき"
+      it_should_behave_like "hankaku_filter input: false のとき"
     end
   end
 
@@ -210,7 +211,7 @@ describe "jpmobile integration spec", :type => :feature do
       }
 
       it_should_behave_like "Shift_JISで通信する端末との通信(半角変換付き)"
-      it_should_behave_like "hankaku_filter :input => true のとき"
+      it_should_behave_like "hankaku_filter input: true のとき"
 
       it "Content-Type が Shift_JIS であること" do
         visit "/#{controller }/with_charset"
@@ -224,7 +225,7 @@ describe "jpmobile integration spec", :type => :feature do
       end
 
       it_should_behave_like "UTF-8で通信する端末との通信(半角変換付き)"
-      it_should_behave_like "hankaku_filter :input => true のとき"
+      it_should_behave_like "hankaku_filter input: true のとき"
 
       it "Content-Type が UTF-8 であること" do
         visit "/#{controller}/with_charset"

data/test/rails/overrides/spec/helpers/helpers_spec.rb

@@ -1,13 +1,15 @@
 require 'rails_helper'
 
-describe Jpmobile::Helpers, :type => :helper do
+describe Jpmobile::Helpers, type: :helper do
   include Jpmobile::Helpers
+  include Rails.application.routes.url_helpers
+
   it "docomo_guid_link_to が guid=ON を付けたリンクを生成すること" do
-    expect(docomo_guid_link_to("STRING", :controller => "filter", :action => "rawdata")).to eq(%{<a href="/filter/rawdata?guid=ON">STRING</a>})
+    expect(docomo_guid_link_to("STRING", host: 'jpmobile.info', controller: "filter", action: "rawdata")).to eq(%{<a href="http://jpmobile.info/filter/rawdata?guid=ON">STRING</a>})
   end
 
   it "softbank_location_link_to がリンク先にパラメータを含んでいても正常に動作すること" do
     # http://d.hatena.ne.jp/mizincogrammer/20090123/1232702067
-    expect(softbank_location_link_to("STRING", :controller => "filter", :action => "rawdata", :p => "param")).to eq(%{<a href="location:auto?url=http://test.host/filter/rawdata&amp;p=param">STRING</a>})
+    expect(softbank_location_link_to("STRING", host: 'jpmobile.info', controller: "filter", action: "rawdata", p: "param")).to eq(%{<a href="location:auto?url=http://jpmobile.info/filter/rawdata&amp;p=param">STRING</a>})
   end
 end

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

@@ -1,30 +1,30 @@
 require 'rails_helper'
 
-describe "DoCoMo SH902i からのアクセス", :type => :request do
+describe "DoCoMo SH902i からのアクセス", type: :request do
   it "request.mobile は Docomo のインスタンスであるべき" do
-    get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
+    get "/mobile_spec/index", params: {}, env: {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
 
     expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Docomo)
   end
   it "request.mobile? は true であるべき" do
-    get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
+    get "/mobile_spec/index", params: {}, env: {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
 
     expect(request.mobile?).to be_truthy
   end
 end
 
-describe "DoCoMo SH902i からguid付きのアクセス", :type => :request do
+describe "DoCoMo SH902i からguid付きのアクセス", type: :request do
   before(:each) do
     @headers = {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)", 'HTTP_X_DCMGUID' => "000000a"}
   end
 
   it "guidを正しく取得できること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile.guid).to eq("000000a")
   end
   it "ident_subscriberでも正しく取得できること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile.ident_subscriber).to eq("000000a")
   end

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

@@ -10,22 +10,22 @@ describe "H11T モバイルブラウザからのアクセス" do
   end
 
   it "request.mobile は Emobile のインスタンスであること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Emobile)
   end
   it "request.mobile? は true であること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile?).to be_truthy
   end
   it "のsubscribe番号を取得できること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile.ident_subscriber).to eq("u00000000000000000")
   end
   it "のIPアドレス空間を正しく検証できること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile.valid_ip?).to be_truthy
   end
@@ -39,12 +39,12 @@ describe "S11HT からのアクセス" do
   end
 
   it "request.mobile は Emobile のインスタンスであること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile).to be_an_instance_of(Jpmobile::Mobile::Emobile)
   end
   it "request.mobile? は true であること" do
-    get "/mobile_spec/index", {}, @headers
+    get "/mobile_spec/index", params: {}, env: @headers
 
     expect(request.mobile?).to be_truthy
   end