jpmobile 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d1af2f3d8ba046eb0483cab4e30cf3ece9b7666
-  data.tar.gz: d23803bc647766e423a64756a20652e1c0291414
+  metadata.gz: 2f83dece3c3b1f70371b5aca9bcba8b1ded28abe
+  data.tar.gz: 28d2542170610c2d2fe9af4728c3b2b04301dc73
 SHA512:
-  metadata.gz: 44996d540aa84b9ec1a1265c6f3c447cc44391cf4b527bfacb449b9db4cdd909dadf6c29299920c02fb63b0f0e397564d4b7538dd46fb026cae6ea388cda9691
-  data.tar.gz: aa84dcbdb131aca10fe68d19838e5068fe08d53573f55ea748c12f8e06beb546e397f5c0e9af7065aeec948239db795018866f14a53ae76144aad632deafcb6e
+  metadata.gz: bbba29855f49366f51dd5a172578181d1c9c887dd8e8d1c2a3211f8faf18e3f68868236d0fc11d7ba64f22062f600e6218938abf1a68ff6673a87ce1e0add9df
+  data.tar.gz: 01147d7316262342db4fc75a3aa74c4ea165592b1542bcd738f687098fb7987e00212ac7d477949d48ff3564372657f3d5e9667c6e880af6211cc657cf666dbb

data/README.rdoc

@@ -84,7 +84,7 @@
 
 ==== 別に用意した携帯電話用コントローラへリダイレクトする例
   class PcController < ApplicationController
-    before_filter :redirect_if_mobile
+    before_action :redirect_if_mobile
 
     def index
     end

data/jpmobile.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rails'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'capybara-webkit'
   gem.add_development_dependency 'geokit'
   gem.add_development_dependency 'sqlite3-ruby'

data/lib/jpmobile/hook_action_controller.rb

@@ -4,13 +4,16 @@ require 'jpmobile/lookup_context'
 module ActionController
   class Base
     include Jpmobile::Helpers
-    before_filter :gettext_force_ja_for_mobile
-    # gettextが組み込まれている場合、携帯電話からのアクセスをjaロケールに強制する。
-    def gettext_force_ja_for_mobile
-      if Object.const_defined?(:GetText) and request.mobile?
-        begin
-          ::GetText.locale = 'ja'
-        rescue NameError
+
+    if Object.const_defined?(:GetText)
+      before_action :gettext_force_ja_for_mobile
+      # gettextが組み込まれている場合、携帯電話からのアクセスをjaロケールに強制する。
+      def gettext_force_ja_for_mobile
+        if request.mobile?
+          begin
+            ::GetText.locale = 'ja'
+          rescue NameError
+          end
         end
       end
     end

data/lib/jpmobile/position.rb

@@ -3,6 +3,7 @@
 
 # Rack 化にあわせて gem を見るように
 begin
+  require 'openssl'
   require 'geokit'
 rescue LoadError
 end

data/lib/jpmobile/rails.rb

@@ -31,7 +31,7 @@ module Jpmobile
   module ViewSelector
     def self.included(base)
       base.class_eval do
-        before_filter :register_mobile
+        before_action :register_mobile
 
         self._view_paths = self._view_paths.dup
         self.view_paths.unshift(*self.view_paths.map {|resolver| Jpmobile::Resolver.new(resolver.to_path) })

data/lib/jpmobile/resolver.rb

@@ -14,13 +14,7 @@ module Jpmobile
     def query(path, details, formats)
       query = build_query(path, details)
 
-      # deals with case-insensitive file systems.
-      sanitizer = Hash.new { |h,dir| h[dir] = Dir["#{dir}/*"] }
-
-      template_paths = Dir[query].reject { |filename|
-        File.directory?(filename) ||
-          !sanitizer[File.dirname(filename)].include?(filename)
-      }
+      template_paths = find_template_paths query
 
       template_paths.map { |template|
         handler, format, variant = extract_handler_and_format_and_variant(template, formats)

data/lib/jpmobile/trans_sid.rb

@@ -109,7 +109,7 @@ end
 
 module Jpmobile::TransSid #:nodoc:
   def self.included(controller)
-    controller.after_filter(:append_session_id_parameter)
+    controller.after_action(:append_session_id_parameter)
   end
 
   protected

data/lib/jpmobile/version.rb

@@ -1,3 +1,3 @@
 module Jpmobile
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/spec/rack/jpmobile/android_spec.rb

@@ -13,8 +13,8 @@ describe Jpmobile::Rack::MobileCarrier, "android" do
 
       env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Android
       env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_true
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].smart_phone?.should     be_truthy
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 end

data/spec/rack/jpmobile/au_spec.rb

@@ -18,7 +18,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
       env['rack.jpmobile'].ident_subscriber.should == "00000000000000_mj.ezweb.ne.jp"
 
       env['rack.jpmobile'].position.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "TK22 で判別できること" do
@@ -121,8 +121,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         env['rack.jpmobile'].device_id.should == "CA32"
-        env['rack.jpmobile'].supports_location?.should be_true
-        env['rack.jpmobile'].supports_gps?.should be_true
+        env['rack.jpmobile'].supports_location?.should be_truthy
+        env['rack.jpmobile'].supports_gps?.should be_truthy
       end
 
       it "A1402S を判定できること" do
@@ -132,8 +132,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         env['rack.jpmobile'].device_id.should == "SN26"
-        env['rack.jpmobile'].supports_location?.should be_true
-        env['rack.jpmobile'].supports_gps?.should be_false
+        env['rack.jpmobile'].supports_location?.should be_truthy
+        env['rack.jpmobile'].supports_gps?.should be_falsey
       end
 
       it "TK22 を判定できること" do
@@ -143,8 +143,8 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
         env['rack.jpmobile'].device_id.should == "KCTA"
-        env['rack.jpmobile'].supports_location?.should be_false
-        env['rack.jpmobile'].supports_gps?.should be_false
+        env['rack.jpmobile'].supports_location?.should be_falsey
+        env['rack.jpmobile'].supports_gps?.should be_falsey
       end
     end
   end
@@ -157,7 +157,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "REMOTE_ADDR" => "210.230.128.225")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_true
+      env['rack.jpmobile'].valid_ip?.should be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -167,7 +167,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_false
+      env['rack.jpmobile'].valid_ip?.should be_falsey
     end
   end
 
@@ -183,7 +183,7 @@ describe Jpmobile::Rack::MobileCarrier, "au" do
 
       env['rack.jpmobile'].display.width.should  == 240
       env['rack.jpmobile'].display.height.should == 346
-      env['rack.jpmobile'].display.color?.should be_true
+      env['rack.jpmobile'].display.color?.should be_truthy
       env['rack.jpmobile'].display.colors.should == 65536
     end
 

data/spec/rack/jpmobile/black_berry_spec.rb

@@ -13,8 +13,8 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
 
       env['rack.jpmobile'].class.should            == Jpmobile::Mobile::BlackBerry
       env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_true
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].smart_phone?.should     be_truthy
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 end

data/spec/rack/jpmobile/docomo_spec.rb

@@ -27,7 +27,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? などが false になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_false
+      @env['rack.jpmobile'].supports_cookie?.should be_falsey
     end
 
     it "#imode_browser_versionが1.0になること" do
@@ -58,7 +58,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? などが false になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_false
+      @env['rack.jpmobile'].supports_cookie?.should be_falsey
     end
 
     it "#imode_browser_versionが1.0になること" do
@@ -75,7 +75,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_true
+      @env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
@@ -92,7 +92,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_true
+      @env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
@@ -109,7 +109,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
     end
 
     it "#supports_cookie? が true になること" do
-      @env['rack.jpmobile'].supports_cookie?.should be_true
+      @env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "#imode_browser_versionが2.0になること" do
@@ -205,7 +205,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "REMOTE_ADDR" => "210.153.84.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_true
+      env['rack.jpmobile'].valid_ip?.should be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -215,7 +215,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_false
+      env['rack.jpmobile'].valid_ip?.should be_falsey
     end
   end
 
@@ -230,7 +230,7 @@ describe Jpmobile::Rack::MobileCarrier, "docomo" do
       env['rack.jpmobile'].display.browser_height.should == 256
       env['rack.jpmobile'].display.width.should          == 240
       env['rack.jpmobile'].display.height.should         == 256
-      env['rack.jpmobile'].display.color?.should be_true
+      env['rack.jpmobile'].display.color?.should be_truthy
       env['rack.jpmobile'].display.colors.should         == 262144
     end
   end

data/spec/rack/jpmobile/emoticon_spec.rb

@@ -54,7 +54,7 @@ describe "絵文字が" do
     before(:each) do
       unless FileTest.exist?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticon.yaml')) and
           FileTest.directory?(File.join(File.expand_path(File.dirname(__FILE__)), '../../../tmp/emoticons'))
-        pending "emoticon.yaml and emoticons directory don't exists"
+        skip "emoticon.yaml and emoticons directory don't exists"
       end
 
       @res = Rack::MockRequest.env_for("/", 'Content-Type' => 'text/html; charset=utf-8')
@@ -69,7 +69,7 @@ describe "絵文字が" do
     end
 
     it "Jpmobile::Emoticon.pc_emoticon? がtrueになること" do
-      Jpmobile::Emoticon.pc_emoticon?.should be_true
+      Jpmobile::Emoticon.pc_emoticon?.should be_truthy
     end
 
     it "docomo 絵文字が画像に変換されること" do

data/spec/rack/jpmobile/iphone_spec.rb

@@ -13,8 +13,8 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
 
       env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Iphone
       env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_true
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].smart_phone?.should     be_truthy
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 
@@ -26,7 +26,7 @@ describe Jpmobile::Rack::MobileCarrier, "iphone" do
         "REMOTE_ADDR"=>"202.179.204.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_false
+      env['rack.jpmobile'].valid_ip?.should be_falsey
     end
   end
 end

data/spec/rack/jpmobile/softbank_spec.rb

@@ -17,8 +17,8 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       env['rack.jpmobile'].ident.should            == "000000000000000"
       env['rack.jpmobile'].ident_device.should     == "000000000000000"
       env['rack.jpmobile'].ident_subscriber.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_true
-      env['rack.jpmobile'].smart_phone?.should     be_false
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
+      env['rack.jpmobile'].smart_phone?.should     be_falsey
     end
 
     it "X_JPHONE_UID 付きの 910T を判別できること" do
@@ -33,7 +33,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       env['rack.jpmobile'].ident.should            == "aaaaaaaaaaaaaaaa"
       env['rack.jpmobile'].ident_device.should     == "000000000000000"
       env['rack.jpmobile'].ident_subscriber.should == "aaaaaaaaaaaaaaaa"
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "V903T を判別できること" do
@@ -45,7 +45,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       env['rack.jpmobile'].class.should            == Jpmobile::Mobile::Vodafone
       env['rack.jpmobile'].position.should be_nil
       env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 
@@ -73,7 +73,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "REMOTE_ADDR"=>"210.146.7.199")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_true
+      env['rack.jpmobile'].valid_ip?.should be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -83,7 +83,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
         "REMOTE_ADDR"=>"127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_false
+      env['rack.jpmobile'].valid_ip?.should be_falsey
     end
   end
 
@@ -100,7 +100,7 @@ describe Jpmobile::Rack::MobileCarrier, "softbank" do
       env['rack.jpmobile'].display.height.should          == 320
       env['rack.jpmobile'].display.physical_width.should  == 240
       env['rack.jpmobile'].display.physical_height.should == 320
-      env['rack.jpmobile'].display.color?.should be_true
+      env['rack.jpmobile'].display.color?.should be_truthy
       env['rack.jpmobile'].display.colors.should          == 262144
     end
 

data/spec/rack/jpmobile/willcom_spec.rb

@@ -14,7 +14,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
       env['rack.jpmobile'].class.should == Jpmobile::Mobile::Willcom
       env['rack.jpmobile'].position.should be_nil
       env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
 
     it "AH-H3001V が判別できること" do
@@ -26,7 +26,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
       env['rack.jpmobile'].class.should == Jpmobile::Mobile::Ddipocket
       env['rack.jpmobile'].position.should be_nil
       env['rack.jpmobile'].ident.should be_nil
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 
@@ -51,7 +51,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "REMOTE_ADDR" => "61.198.142.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_true
+      env['rack.jpmobile'].valid_ip?.should be_truthy
     end
 
     it "正しくないIPアドレス空間からのアクセスを判断できること" do
@@ -61,7 +61,7 @@ describe Jpmobile::Rack::MobileCarrier, "willcom" do
         "REMOTE_ADDR" => "127.0.0.1")
       env = Jpmobile::Rack::MobileCarrier.new(UnitApplication.new).call(res)[1]
 
-      env['rack.jpmobile'].valid_ip?.should be_false
+      env['rack.jpmobile'].valid_ip?.should be_falsey
     end
   end
 end

data/spec/rack/jpmobile/windows_phone.rb

@@ -13,8 +13,8 @@ describe Jpmobile::Rack::MobileCarrier, "Windows Phone" do
 
       env['rack.jpmobile'].class.should            == Jpmobile::Mobile::WindowsPhone
       env['rack.jpmobile'].position.should         be_nil
-      env['rack.jpmobile'].smart_phone?.should     be_true
-      env['rack.jpmobile'].supports_cookie?.should be_true
+      env['rack.jpmobile'].smart_phone?.should     be_truthy
+      env['rack.jpmobile'].supports_cookie?.should be_truthy
     end
   end
 end

data/spec/rack_helper.rb

@@ -21,7 +21,10 @@ end
 RSpec.configure do |config|
   config.filter_run :focus => true
   config.run_all_when_everything_filtered = true
-  config.color_enabled = true
+  config.color = true
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
 end
 
 class UnitApplication

data/spec/unit/email_spec.rb

@@ -63,11 +63,11 @@ describe 'Jpmobile::Email' do
 
   describe "convertable?" do
     it "return true when text/plain; charset=iso-2022-jp" do
-      Jpmobile::Email.convertable?('text/plain; charset=iso-2022-jp').should be_true
+      Jpmobile::Email.convertable?('text/plain; charset=iso-2022-jp').should be_truthy
     end
 
     it "return true when text/html; charset=shift_jis" do
-      Jpmobile::Email.convertable?('text/html; charset=shift_jis').should be_true
+      Jpmobile::Email.convertable?('text/html; charset=shift_jis').should be_truthy
     end
 
     it "return nil when image/jpeg; name=\"20098calendar01.jpg\"" do

data/spec/unit/mobile/iphone_spec.rb

@@ -8,7 +8,7 @@ describe Jpmobile::Mobile::Iphone do
       request.stub(:user_agent) {'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_4 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8K2 Safari/6533.18.5'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_false
+      mobile.unicode_emoticon?.should be_falsey
     end
   end
 
@@ -18,7 +18,7 @@ describe Jpmobile::Mobile::Iphone do
       request.stub(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 5_1_1 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9B206 Safari/7534.48.3'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_true
+      mobile.unicode_emoticon?.should be_truthy
     end
   end
 
@@ -28,7 +28,7 @@ describe Jpmobile::Mobile::Iphone do
       request.stub(:user_agent) {'Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A403 Safari/8536.25'}
 
       mobile = Jpmobile::Mobile::Iphone.new({}, request)
-      mobile.unicode_emoticon?.should be_true
+      mobile.unicode_emoticon?.should be_truthy
     end
   end
 end

data/spec/unit/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'rspec'
+require 'rspec/its'
 $LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
 require 'jpmobile'
 begin
@@ -13,10 +14,13 @@ rescue LoadError
   puts "Terminal display information test requires jpmobile-terminfo module"
 end
 
-RSpec.configure do |c|
-  c.filter_run :focus => true
-  c.run_all_when_everything_filtered = true
-  c.color_enabled = true
-  c.filter_run_excluding :broken => true
-  # c.full_backtrace = true
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.color = true
+  config.filter_run_excluding :broken => true
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+  # config.full_backtrace = true
 end

data/spec/unit/util_spec.rb

@@ -136,12 +136,12 @@ describe Jpmobile::Util do
   describe 'check_charset' do
     it 'returns true if compatible' do
       str = 'ABC'.force_encoding('ASCII-8BIT')
-      check_charset(str, 'UTF-8').should be_true
+      check_charset(str, 'UTF-8').should be_truthy
     end
 
     it 'returns false if incompatible' do
       str = '再現'.encode('ISO-2022-JP')
-      check_charset(str, 'UTF-8').should be_false
+      check_charset(str, 'UTF-8').should be_falsey
     end
   end
 

data/test/rails/overrides/.rspec

@@ -1,5 +1,3 @@
---colour
---format
-progress
-mtime
--b
+--color
+--warnings
+--require spec_helper

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

@@ -1,4 +1,4 @@
 class TransSidAlwaysAndSessionOffController < TransSidBaseController
   trans_sid :always
-  skip_before_filter :session_init
+  skip_before_action :session_init
 end

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

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 class TransSidBaseController < ApplicationController
   # 事前にセッションを作成しないと trans_sid が有効にならない
-  before_filter :session_init
+  before_action :session_init
 
   def form
     render :inline=>%{<%= form_tag do %>Hello<% end %>}

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

@@ -6,7 +6,7 @@ class TransSidMetalController < ActionController::Metal
   include Rails.application.routes.url_helpers
 
   # 事前にセッションを作成しないと trans_sid が有効にならない
-  # before_filter :session_init
+  # before_action :session_init
   # trans_sid :always
 
   def redirect

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

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 shared_examples_for "docomo_guid が起動しないとき" do
   render_views

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

@@ -1,6 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
-require 'nokogiri'
+require 'rails_helper'
 
 describe LinksController do
   render_views

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe MobileSpecController do
   render_views
@@ -12,7 +11,7 @@ describe MobileSpecController do
 
         response.should be_success
         response.should render_template('index')
-        request.mobile?.should be_false
+        request.mobile?.should be_falsey
       end
     end
 
@@ -22,7 +21,7 @@ describe MobileSpecController do
         get 'index'
         response.should be_success
         response.should render_template('index_mobile')
-        request.mobile?.should be_true
+        request.mobile?.should be_truthy
         request.mobile.should be_a(Jpmobile::Mobile::Docomo)
       end
     end
@@ -36,7 +35,7 @@ describe MobileSpecController do
 
         response.should be_success
         response.body.should match('The change you wanted was rejected')
-        request.mobile?.should be_false
+        request.mobile?.should be_falsey
       end
     end
 
@@ -47,7 +46,7 @@ describe MobileSpecController do
 
         response.should be_success
         response.body.should match('The change you wanted was rejected')
-        request.mobile?.should be_true
+        request.mobile?.should be_truthy
         request.mobile.should be_a(Jpmobile::Mobile::Docomo)
       end
     end

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe TemplatePathController do
   before do

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe TransSidAlwaysController do
   describe "GET 'redirect_action'" do

data/test/rails/overrides/spec/features/admin/top_spec.rb

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../../spec_helper'))
+require 'rails_helper'
 
 describe Admin::TopController do
   describe "GET 'full_path'" do

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe "jpmobile integration spec" do
   include Jpmobile::Util

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe Jpmobile::Helpers do
   include Jpmobile::Helpers

data/test/rails/overrides/spec/mailers/decorated_mailer_spec.rb

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe DecoratedMailer do
   include Jpmobile::Util

data/test/rails/overrides/spec/mailers/mobile_mailer_spec.rb

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe MobileMailer do
   include Jpmobile::Util
@@ -19,7 +18,7 @@ describe MobileMailer do
       email = MobileMailer.view_selection(@to, "題名", "本文").deliver
 
       ActionMailer::Base.deliveries.size.should == 1
-      email.to.include?(@to).should be_true
+      email.to.include?(@to).should be_truthy
     end
 
     it "ISO-2022-JPに変換されること" do
@@ -450,8 +449,8 @@ describe MobileMailer, " mail address" do
 
     emails = ActionMailer::Base.deliveries
     emails.size.should == 1
-    emails.first.to.include?(to).should be_true
-    emails.first.destinations.include?(to).should be_true
+    emails.first.to.include?(to).should be_truthy
+    emails.first.destinations.include?(to).should be_truthy
   end
 
   it "@マークの直前にピリオドあるアドレスが有効になること" do
@@ -460,8 +459,8 @@ describe MobileMailer, " mail address" do
 
     emails = ActionMailer::Base.deliveries
     emails.size.should == 1
-    emails.first.to.include?(to).should be_true
-    emails.first.destinations.include?(to).should be_true
+    emails.first.to.include?(to).should be_truthy
+    emails.first.destinations.include?(to).should be_truthy
   end
 
   it "ピリオドから始まるアドレスが有効になること" do
@@ -470,8 +469,8 @@ describe MobileMailer, " mail address" do
 
     emails = ActionMailer::Base.deliveries
     emails.size.should == 1
-    emails.first.to.include?(to).should be_true
-    emails.first.destinations.include?(to).should be_true
+    emails.first.to.include?(to).should be_truthy
+    emails.first.destinations.include?(to).should be_truthy
   end
 
   it "複数のアドレスが有効になること" do
@@ -744,7 +743,7 @@ describe MobileMailer, "receiving" do
 
         email.parts.first.body.should match(/カレンダーだ/)
 
-        email.has_attachments?.should be_true
+        email.has_attachments?.should be_truthy
         email.attachments.size.should == 1
         email.attachments['20098calendar01.jpg'].content_type.should match("image/jpeg")
         email.attachments['20098calendar01.jpg'].body.to_s[2..6] == "JFIF"

data/test/rails/overrides/spec/mailers/normal_mailer_spec.rb

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe NormalMailer do
   include Jpmobile::Util

data/test/rails/overrides/spec/rails_helper.rb

@@ -0,0 +1,60 @@
+# This file is copied to spec/ when you run 'rails generate rspec:install'
+ENV["RAILS_ENV"] ||= 'test'
+require 'spec_helper'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
+# require 'capybara/rails'
+# require 'capybara/rspec'
+
+# Requires supporting ruby files with custom matchers and macros, etc, in
+# spec/support/ and its subdirectories. Files matching `spec/**/*_spec.rb` are
+# run as spec files by default. This means that files in spec/support that end
+# in _spec.rb will both be required and run as specs, causing the specs to be
+# run twice. It is recommended that you do not name files matching this glob to
+# end with _spec.rb. You can configure this pattern with with the --pattern
+# option on the command line or in ~/.rspec, .rspec or `.rspec-local`.
+Dir[Rails.root.join("spec/support/**/*.rb")].each { |f| require f }
+
+# Checks for pending migrations before tests are run.
+# If you are not using ActiveRecord, you can remove this line.
+ActiveRecord::Migration.maintain_test_schema!
+
+RSpec.configure do |config|
+  # config.mock_with :rspec
+
+  # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
+  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+
+  # If you're not using ActiveRecord, or you'd prefer not to run each of your
+  # examples within a transaction, remove the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+  config.include Jpmobile::Util
+  config.include Capybara::DSL
+
+  # RSpec Rails can automatically mix in different behaviours to your tests
+  # based on their file location, for example enabling you to call `get` and
+  # `post` in specs under `spec/controllers`.
+  #
+  # You can disable this behaviour by removing the line below, and instead
+  # explicitly tag your specs with their type, e.g.:
+  #
+  #     RSpec.describe UsersController, :type => :controller do
+  #       # ...
+  #     end
+  #
+  # The different available types are documented in the features, such as in
+  # https://relishapp.com/rspec/rspec-rails/docs
+  config.infer_spec_type_from_file_location!
+
+  config.filter_run focus: true
+  config.run_all_when_everything_filtered = true
+  config.color = true
+  config.filter_run_excluding broken: true
+  # config.full_backtrace = true
+  config.expect_with :rspec do |c|
+    c.syntax = [:should, :expect]
+  end
+end
+
+require 'pp'

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe "DoCoMo SH902i からのアクセス" do
   it "request.mobile は Docomo のインスタンスであるべき" do
@@ -10,7 +9,7 @@ describe "DoCoMo SH902i からのアクセス" do
   it "request.mobile? は true であるべき" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "DoCoMo/2.0 SH902i(c100;TB;W24H12)"}
 
-    request.mobile?.should be_true
+    request.mobile?.should be_truthy
   end
 end
 

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe "H11T モバイルブラウザからのアクセス" do
   before do
@@ -18,7 +17,7 @@ describe "H11T モバイルブラウザからのアクセス" do
   it "request.mobile? は true であること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_true
+    request.mobile?.should be_truthy
   end
   it "のsubscribe番号を取得できること" do
     get "/mobile_spec/index", {}, @headers
@@ -28,7 +27,7 @@ describe "H11T モバイルブラウザからのアクセス" do
   it "のIPアドレス空間を正しく検証できること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile.valid_ip?.should be_true
+    request.mobile.valid_ip?.should be_truthy
   end
 end
 
@@ -47,6 +46,6 @@ describe "S11HT からのアクセス" do
   it "request.mobile? は true であること" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_true
+    request.mobile?.should be_truthy
   end
 end

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe "PCからのアクセスの場合" do
   before do
@@ -16,6 +15,6 @@ describe "PCからのアクセスの場合" do
   it "request.mobile? は false であるべき" do
     get "/mobile_spec/index", {}, @headers
 
-    request.mobile?.should be_false
+    request.mobile?.should be_falsey
   end
 end

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

@@ -1,12 +1,11 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe "Softbank Emulator からのアクセスのとき" do
   it "request.mobile は Softbank のインスタンスであること" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Semulator"}
 
     request.mobile.should be_an_instance_of(Jpmobile::Mobile::Softbank)
-    request.mobile?.should be_true
+    request.mobile?.should be_truthy
   end
 end
 
@@ -15,6 +14,6 @@ describe "Vodafone Emulator からのアクセスのとき" do
     get "/mobile_spec/index", {}, {"HTTP_USER_AGENT" => "Vemulator"}
 
     request.mobile.should be_an_instance_of(Jpmobile::Mobile::Vodafone)
-    request.mobile?.should be_true
+    request.mobile?.should be_truthy
   end
 end

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 describe TemplatePathController, "integrated_views" do
   before do

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

@@ -1,5 +1,4 @@
-# -*- coding: utf-8 -*-
-require File.expand_path(File.join(File.dirname(__FILE__), '/../spec_helper'))
+require 'rails_helper'
 
 def get_with_session(controller, action, user_agent)
   open_session do |sess|

data/test/rails/overrides/spec/spec_helper.rb

@@ -1,39 +1,78 @@
-# This file is copied to ~/spec when you run 'ruby script/generate rspec'
-# from the project root directory.
-ENV["RAILS_ENV"] ||= 'test'
-require File.expand_path("../../config/environment", __FILE__)
-require 'rspec/rails'
-require 'capybara/rails'
-require 'capybara/rspec'
+# This file was generated by the `rails generate rspec:install` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause this
+# file to always be loaded, without a need to explicitly require it in any files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, make a
+# separate helper file that requires this one and then use it only in the specs
+# that actually need it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
 
-# Requires supporting files with custom matchers and macros, etc,
-# in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
 
-RSpec.configure do |config|
-  # == Mock Framework
-  #
-  # If you prefer to use mocha, flexmock or RR, uncomment the appropriate line:
-  #
-  # config.mock_with :mocha
-  # config.mock_with :flexmock
-  # config.mock_with :rr
-  config.mock_with :rspec
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
 
-  config.fixture_path = "#{::Rails.root}/spec/fixtures"
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
 
-  # If you're not using ActiveRecord, or you'd prefer not to run each of your
-  # examples within a transaction, comment the following line or assign false
-  # instead of true.
-  config.use_transactional_fixtures = true
-  config.include Jpmobile::Util
-  config.include Capybara::DSL
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
 
-  config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
-  config.color_enabled = true
-  config.filter_run_excluding :broken => true
-  # config.full_backtrace = true
-end
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+    expectations.syntax = :expect
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Enable only the newer, non-monkey-patching expect syntax.
+    # For more details, see:
+    #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+    mocks.syntax = :expect
 
-require 'pp'
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended.
+    mocks.verify_partial_doubles = true
+  end
+=end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-11 00:00:00.000000000 Z
+date: 2014-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara-webkit
   requirement: !ruby/object:Gem::Requirement
@@ -359,6 +373,7 @@ files:
 - test/rails/overrides/spec/mailers/decorated_mailer_spec.rb
 - test/rails/overrides/spec/mailers/mobile_mailer_spec.rb
 - test/rails/overrides/spec/mailers/normal_mailer_spec.rb
+- test/rails/overrides/spec/rails_helper.rb
 - test/rails/overrides/spec/rcov.opts
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb
@@ -567,6 +582,7 @@ test_files:
 - test/rails/overrides/spec/mailers/decorated_mailer_spec.rb
 - test/rails/overrides/spec/mailers/mobile_mailer_spec.rb
 - test/rails/overrides/spec/mailers/normal_mailer_spec.rb
+- test/rails/overrides/spec/rails_helper.rb
 - test/rails/overrides/spec/rcov.opts
 - test/rails/overrides/spec/requests/docomo_spec.rb
 - test/rails/overrides/spec/requests/emobile_spec.rb