jpmobile 2.0.7 → 2.0.8

data/Gemfile

@@ -3,9 +3,9 @@ source 'http://rubygems.org'
 group :development, :test do
   gem 'mail', '~> 2.3.0'
   gem 'jeweler'
-  gem 'rails', '~> 3.1.0'
-  gem 'rspec'
-  gem 'rspec-rails'
+  gem 'rails', '~> 3.1.4'
+  gem 'rspec', '~> 2.8.0'
+  gem 'rspec-rails', '~> 2.8.0'
   gem 'webrat'
   gem 'geokit'
   gem 'sqlite3-ruby'

data/VERSION.yml

@@ -1,5 +1,5 @@
----
+--- 
+:build: 
+:patch: 8
 :major: 2
 :minor: 0
-:patch: 7
-:build: 

data/jpmobile.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "2.0.7"
+  s.version = "2.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]

data/lib/jpmobile.rb

@@ -22,14 +22,19 @@ module Jpmobile
     autoload :Emobile,        'jpmobile/mobile/emobile'
     autoload :Willcom,        'jpmobile/mobile/willcom'
     autoload :Ddipocket,      'jpmobile/mobile/ddipocket'
+
     autoload :SmartPhone,     'jpmobile/mobile/smart_phone'
     autoload :Iphone,         'jpmobile/mobile/iphone'
     autoload :Android,        'jpmobile/mobile/android'
     autoload :WindowsPhone,   'jpmobile/mobile/windows_phone'
 
+    autoload :Tablet,         'jpmobile/mobile/tablet'
+    autoload :AndroidTablet,  'jpmobile/mobile/android_tablet'
+    autoload :Ipad,           'jpmobile/mobile/ipad'
+
     autoload :Display,        'jpmobile/mobile/display'
 
-    DEFAULT_CARRIERS = %w(Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Iphone Android WindowsPhone)
+    DEFAULT_CARRIERS = %w(Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Ipad AndroidTablet Iphone Android WindowsPhone)
 
     def self.carriers
       @carriers ||= DEFAULT_CARRIERS.dup

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -29,16 +29,6 @@ module Jpmobile::Mobile
     # 端末を識別する文字列があれば返す。
     def ident_device; nil; end
 
-    # 当該キャリアのIPアドレス帯域からのアクセスであれば +true+ を返す。
-    # そうでなければ +false+ を返す。
-    # IP空間が定義されていない場合は +nil+ を返す。
-    def self.valid_ip? remote_addr
-      @ip_list ||= ip_address_class
-      return false unless @ip_list
-
-      @ip_list.valid_ip?(remote_addr)
-    end
-
     def valid_ip?
       @__valid_ip ||= self.class.valid_ip? @request.ip
     end
@@ -60,6 +50,11 @@ module Jpmobile::Mobile
       false
     end
 
+    # tablet かどうか
+    def tablet?
+      false
+    end
+
     # Jpmobile::Rack::Filter を適用するかどうか
     def apply_filter?
       true
@@ -90,6 +85,7 @@ module Jpmobile::Mobile
           gsub(/Jpmobile::/, '').
           gsub(/AbstractMobile::/, '').
           gsub(/Mobile::SmartPhone/, 'smart_phone').
+          gsub(/Mobile::Tablet/, 'tablet').
           gsub(/::/, '_').
           gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').
           gsub(/([a-z\d])([A-Z])/, '\1_\2').
@@ -97,8 +93,10 @@ module Jpmobile::Mobile
         klass =~ /abstract/ ? "mobile" : klass
       end
 
-      if @_variants.include?("smart_phone")
-        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile/, "smart_phone")}
+      if @_variants.include?('tablet')
+        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "tablet_")}
+      elsif @_variants.include?("smart_phone")
+        @_variants = @_variants.reject{|v| v == "mobile"}.map{|v| v.gsub(/mobile_/, "smart_phone_")}
       end
 
       @_variants || []
@@ -174,10 +172,47 @@ module Jpmobile::Mobile
       @decorated
     end
 
-    # リクエストがこのクラスに属するか調べる
-    # メソッド名に関して非常に不安
-    def self.check_carrier(env)
-      self::USER_AGENT_REGEXP && env['HTTP_USER_AGENT'] =~ self::USER_AGENT_REGEXP
+    class << self
+      # 当該キャリアのIPアドレス帯域からのアクセスであれば +true+ を返す。
+      # そうでなければ +false+ を返す。
+      # IP空間が定義されていない場合は +nil+ を返す。
+      def valid_ip? remote_addr
+        @ip_list ||= ip_address_class
+        return false unless @ip_list
+
+        @ip_list.valid_ip?(remote_addr)
+      end
+
+      # リクエストがこのクラスに属するか調べる
+      # メソッド名に関して非常に不安
+      def check_carrier(env)
+        user_agent_regexp && user_agent_regexp.match(env['HTTP_USER_AGENT'])
+      end
+
+      def user_agent_regexp
+        @_user_agent_regexp ||= self::USER_AGENT_REGEXP
+      end
+
+      def add_user_agent_regexp(regexp)
+        @_user_agent_regexp = Regexp.union(user_agent_regexp, regexp)
+      end
+
+      def carrier(env)
+        ::Jpmobile::Mobile.carriers.each do |const|
+          c = ::Jpmobile::Mobile.const_get(const)
+          if c.check_carrier(env)
+            res = ::Rack::Request.new(env)
+            return c.new(env, res)
+          end
+        end
+
+        nil
+      end
+
+      #
+      def ip_address_class
+        eval("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new rescue nil
+      end
     end
 
     #XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
@@ -190,18 +225,6 @@ module Jpmobile::Mobile
       end
     end
 
-    def self.carrier(env)
-      ::Jpmobile::Mobile.carriers.each do |const|
-        c = ::Jpmobile::Mobile.const_get(const)
-        if c.check_carrier(env)
-          res = ::Rack::Request.new(env)
-          return c.new(env, res)
-        end
-      end
-
-      nil
-    end
-
     private
     # リクエストのパラメータ。
     def params
@@ -211,10 +234,5 @@ module Jpmobile::Mobile
         @request.params
       end
     end
-
-    #
-    def self.ip_address_class
-      eval("::Jpmobile::Mobile::IpAddresses::#{self.to_s.split(/::/).last}").new rescue nil
-    end
   end
 end

data/lib/jpmobile/mobile/android_tablet.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# =Android
+
+module Jpmobile::Mobile
+  # ==AndroidTablet
+  class AndroidTablet < Tablet
+    # 対応するUser-Agentの正規表現
+    USER_AGENT_REGEXP = Regexp.union(/(?!Android.+Mobile)Android/, /Android.+SC-01C/)
+  end
+end

data/lib/jpmobile/mobile/ipad.rb

@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+# =Android
+
+module Jpmobile::Mobile
+  # ==iPad
+  class Ipad < Tablet
+    # 対応するUser-Agentの正規表現
+    USER_AGENT_REGEXP = /iPad/
+  end
+end

data/lib/jpmobile/mobile/tablet.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# =タブレットの親クラス
+
+module Jpmobile::Mobile
+  class Tablet < SmartPhone
+    # smartphone なので true
+    def smart_phone?
+      true
+    end
+
+    # tablet なので true
+    def tablet?
+      true
+    end
+  end
+end

data/spec/rack/jpmobile/mobile_by_ua_spec.rb

@@ -19,8 +19,11 @@ describe Jpmobile::Rack::MobileCarrier do
     [ Jpmobile::Mobile::Iphone       , 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_0 like Mac OS X; ja-jp) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7A341 Safari/528.16' ],
     [ Jpmobile::Mobile::Android      , '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' ],
     [ Jpmobile::Mobile::WindowsPhone , 'Mozilla/4.0 (Compatible; MSIE 6.0; Windows NT 5.1 T-01A_6.5; Windows Phone 6.5)' ],
+    [ Jpmobile::Mobile::Ipad         , 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'],
+    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'],
+    [ Jpmobile::Mobile::AndroidTablet, 'Mozilla/5.0 (Linux; U; Android 3.2; ja-jp; Sony Tablet S Build/THMAS11002) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13'],
   ].each do |carrier, user_agent|
-    it '#mobile should return #{carrier} when take #{user_agent} as UserAgent' do
+    it "#mobile should return #{carrier} when take #{user_agent} as UserAgent" do
       res = Rack::MockRequest.env_for(
         'http://jpmobile-rails.org/',
         'HTTP_USER_AGENT' => user_agent)

data/test/rails/overrides/Gemfile

@@ -1,7 +1,7 @@
 source 'http://rubygems.org'
 
-gem 'rails', '~> 3.1.0'
-gem 'mail', '2.3.0'
+gem 'rails', '~> 3.1.4'
+gem 'mail', '~> 2.3.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
@@ -28,7 +28,7 @@ gem 'hpricot'
 
 # Bundle gems for certain environments:
 group :development, :test do
-  gem "rspec", ">= 2.1.0"
-  gem "rspec-rails", ">= 2.1.0"
+  gem "rspec", ">= 2.8.0"
+  gem "rspec-rails", ">= 2.8.0"
   gem 'webrat'
 end

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

@@ -13,5 +13,17 @@ class TemplatePathController < ApplicationController
   def optioned_index
     render :action => "index"
   end
+
+  def full_path_partial
+  end
+
+  def smart_phone_only
+  end
+
+  def with_tblt
+  end
+
+  def with_ipd
+  end
 end
 

data/test/rails/overrides/app/views/template_path/smart_phone_only.html.erb

@@ -0,0 +1 @@
+<h1>smart_phone_only.html.erb</h1>

data/test/rails/overrides/app/views/template_path/smart_phone_only_smart_phone.html.erb

@@ -0,0 +1 @@
+<h1>smart_phone_only_smart_phone.html.erb</h1>

data/test/rails/overrides/app/views/template_path/with_ipd.html.erb

@@ -0,0 +1 @@
+<h1>with_ipd.html.erb</h1>

data/test/rails/overrides/app/views/template_path/with_ipd_tablet_ipad.html.erb

@@ -0,0 +1 @@
+<h1>with_ipd_tablet_ipad.html.erb</h1>

data/test/rails/overrides/app/views/template_path/with_tblt.html.erb

@@ -0,0 +1 @@
+<h1>with_tblt.html.erb</h1>

data/test/rails/overrides/app/views/template_path/with_tblt_tablet.html.erb

@@ -0,0 +1 @@
+<h1>with_tblt_tablet.html.erb</h1>

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

@@ -169,6 +169,78 @@ describe TemplatePathController, "integrated_views" do
     end
   end
 
+  context 'only smart_phone view' do
+    context 'iPadからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
+      end
+      it 'smart_phone_only.html.erbが使用されること' do
+        get '/template_path/smart_phone_only', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'smart_phone_only_smart_phone.html.erb')
+      end
+    end
+
+    context 'Android Tabletからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
+      end
+      it 'smart_phone_only.html.erbが使用されること' do
+        get '/template_path/smart_phone_only', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'smart_phone_only_smart_phone.html.erb')
+      end
+    end
+  end
+
+  context 'with_tblt view' do
+    context 'iPadからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
+      end
+      it 'with_tblt_tablet.html.erbが使用されること' do
+        get '/template_path/with_tblt', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'with_tblt_tablet.html.erb')
+      end
+    end
+
+    context 'Android Tabletからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
+      end
+      it 'with_tblt_tablet.html.erbが使用されること' do
+        get '/template_path/with_tblt', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'with_tblt_tablet.html.erb')
+      end
+    end
+  end
+
+  context 'with_ipd view' do
+    context 'iPadからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (iPad; U; CPU OS 4_3 like Mac OS X; ja-jp) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8F191 Safari/6533.18.5'
+      end
+      it 'with_ipd_tablet_ipad.html.erbが使用されること' do
+        get '/template_path/with_ipd', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'with_ipd_tablet_ipad.html.erb')
+      end
+    end
+
+    context 'Android Tabletからのアクセスの場合' do
+      before do
+        @user_agent = 'Mozilla/5.0 (Linux; U; Android 2.2; ja-jp; SC-01C Build/FROYO) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1'
+      end
+      it 'with_ipd.html.erbが使用されること' do
+        get '/template_path/with_ipd', {}, {'HTTP_USER_AGENT' => @user_agent}
+
+        response.should have_tag('h1', :content => 'with_ipd.html.erb')
+      end
+    end
+  end
+
   context "partial" do
     context "PCからのアクセスの場合" do
       before do

metadata

@@ -1,223 +1,311 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jpmobile
-version: !ruby/object:Gem::Version
-  version: 2.0.7
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 2
+  - 0
+  - 8
+  version: 2.0.8
 platform: ruby
-authors:
+authors: 
 - Yoji Shidara
 - Shin-ichiro OGAWA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: mail
-  requirement: &16558240 !ruby/object:Gem::Requirement
+
+date: 2012-05-16 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
+  prerelease: false
+  name: mail
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16558240
-- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &16555980 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 3
+        - 1
+        - 4
+        version: 3.1.4
   prerelease: false
-  version_requirements: *16555980
-- !ruby/object:Gem::Dependency
   name: rails
-  requirement: &16627280 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
   prerelease: false
-  version_requirements: *16627280
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16625740 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
+        version: 2.8.0
   prerelease: false
-  version_requirements: *16625740
-- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16623860 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16623860
-- !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &16622600 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16622600
-- !ruby/object:Gem::Dependency
   name: geokit
-  requirement: &16621500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16621500
-- !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &16619900 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   prerelease: false
-  version_requirements: *16619900
-- !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &16748440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *16748440
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &16745960 !ruby/object:Gem::Requirement
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
         version: 3.1.0
-  type: :development
   prerelease: false
-  version_requirements: *16745960
-- !ruby/object:Gem::Dependency
-  name: jeweler
-  requirement: &16745000 !ruby/object:Gem::Requirement
+  name: rails
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 1
+        - 5
+        - 1
         version: 1.5.1
+  prerelease: false
+  name: jeweler
   type: :development
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   prerelease: false
-  version_requirements: *16745000
-- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16744280 !ruby/object:Gem::Requirement
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 2
+        - 6
+        - 0
         version: 2.6.0
-  type: :development
   prerelease: false
-  version_requirements: *16744280
-- !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &16743540 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.6.0
   type: :development
-  prerelease: false
-  version_requirements: *16743540
-- !ruby/object:Gem::Dependency
-  name: webrat
-  requirement: &16742780 !ruby/object:Gem::Requirement
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 0
+        - 7
+        - 2
         version: 0.7.2
-  type: :development
   prerelease: false
-  version_requirements: *16742780
-- !ruby/object:Gem::Dependency
-  name: geokit
-  requirement: &16742080 !ruby/object:Gem::Requirement
+  name: webrat
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-  type: :development
   prerelease: false
-  version_requirements: *16742080
-- !ruby/object:Gem::Dependency
-  name: sqlite3-ruby
-  requirement: &16769020 !ruby/object:Gem::Requirement
+  name: geokit
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 31
+        segments: 
+        - 1
+        - 3
+        - 2
         version: 1.3.2
-  type: :development
   prerelease: false
-  version_requirements: *16769020
-- !ruby/object:Gem::Dependency
-  name: hpricot
-  requirement: &16768220 !ruby/object:Gem::Requirement
+  name: sqlite3-ruby
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 57
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-  type: :development
   prerelease: false
-  version_requirements: *16768220
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: &16767180 !ruby/object:Gem::Requirement
+  name: hpricot
+  type: :development
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
-  type: :development
   prerelease: false
-  version_requirements: *16767180
+  name: git
+  type: :development
+  version_requirements: *id018
 description: A Rails plugin for Japanese mobile-phones
 email: dara@shidara.net
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README
 - README.rdoc
-files:
+files: 
 - .rspec
 - CHANGELOG
 - Gemfile
@@ -251,13 +339,16 @@ files:
 - lib/jpmobile/mailer.rb
 - lib/jpmobile/mobile/abstract_mobile.rb
 - lib/jpmobile/mobile/android.rb
+- lib/jpmobile/mobile/android_tablet.rb
 - lib/jpmobile/mobile/au.rb
 - lib/jpmobile/mobile/ddipocket.rb
 - lib/jpmobile/mobile/docomo.rb
 - lib/jpmobile/mobile/emobile.rb
+- lib/jpmobile/mobile/ipad.rb
 - lib/jpmobile/mobile/iphone.rb
 - lib/jpmobile/mobile/smart_phone.rb
 - lib/jpmobile/mobile/softbank.rb
+- lib/jpmobile/mobile/tablet.rb
 - lib/jpmobile/mobile/vodafone.rb
 - lib/jpmobile/mobile/willcom.rb
 - lib/jpmobile/mobile/windows_phone.rb
@@ -384,6 +475,12 @@ files:
 - test/rails/overrides/app/views/template_path/partial.html.erb
 - test/rails/overrides/app/views/template_path/show_mobile.html.erb
 - test/rails/overrides/app/views/template_path/show_mobile_docomo.html.erb
+- test/rails/overrides/app/views/template_path/smart_phone_only.html.erb
+- test/rails/overrides/app/views/template_path/smart_phone_only_smart_phone.html.erb
+- test/rails/overrides/app/views/template_path/with_ipd.html.erb
+- test/rails/overrides/app/views/template_path/with_ipd_tablet_ipad.html.erb
+- test/rails/overrides/app/views/template_path/with_tblt.html.erb
+- test/rails/overrides/app/views/template_path/with_tblt_tablet.html.erb
 - test/rails/overrides/autotest/discover.rb
 - test/rails/overrides/config/initializers/jpmobile_generator.rb
 - test/rails/overrides/config/routes.rb
@@ -434,26 +531,36 @@ files:
 - tools/list_gps_unsupported_au.rb
 homepage: http://jpmobile-rails.org
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones
 test_files: []
+