jpmobile 0.0.7 → 0.0.8

data/lib/jpmobile/filter.rb

@@ -1,8 +1,7 @@
+# -*- coding: utf-8 -*-
 # = 文字コードフィルタ
 # thanks to masuidrive <masuidrive (at) masuidrive.jp>
 
-require 'scanf'
-
 class ActionController::Base #:nodoc:
   def self.mobile_filter(options={})
     options = {:emoticon=>true, :hankaku=>false}.update(options)
@@ -99,7 +98,7 @@ module Jpmobile
       end
       private
       def filter(str, from, to)
-        str = str.clone
+        str = str.dup
         from.each_with_index do |int, i|
           str.gsub!(int, to[i])
         end

data/lib/jpmobile/mobile/abstract_mobile.rb

@@ -50,6 +50,12 @@ module Jpmobile::Mobile
       return false
     end
 
+    # リクエストがこのクラスに属するか調べる
+    # メソッド名に関して非常に不安
+    def self.check_request(request)
+      self::USER_AGENT_REGEXP && request.user_agent =~ self::USER_AGENT_REGEXP
+    end
+
     #XXX: lib/jpmobile.rbのautoloadで先に各キャリアの定数を定義しているから動くのです
     Jpmobile::Mobile.carriers.each do |carrier|
       carrier_class = Jpmobile::Mobile.const_get(carrier)

data/lib/jpmobile/mobile/docomo.rb

@@ -76,8 +76,31 @@ module Jpmobile::Mobile
 
     # cookieに対応しているか？
     def supports_cookie?
-      false
+      imode_browser_version != '1.0'
     end
+
+    # i-mode ブラウザのバージョンを返す。
+    # http://labs.unoh.net/2009/07/i_20.html
+    def imode_browser_version
+      ver = '1.0'
+      case @request.env['HTTP_USER_AGENT']
+      when %r{^DoCoMo/1.0/}
+        # 必ずv1.0
+      when %r{^DoCoMo/2.0 }
+        @request.env['HTTP_USER_AGENT'] =~ / (\w+)\(c(\d+);/
+        model = $1
+        cache_size = $2.to_i
+        
+        ver = cache_size >= 500 ? (%w(P03B P05B L01B).member?(model) ? '2.0LE' : '2.0') : '1.0'
+      else
+        # DoCoMo/3.0以降等は、とりあえず非v1.0扱い
+        ver = '2.0'
+      end
+
+      ver
+    end
+
+
     private
     # モデル名を返す。
     def model_name

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -1,4 +1,4 @@
-Jpmobile::Mobile::Au::IP_ADDRESSES = 
+Jpmobile::Mobile::Au::IP_ADDRESSES =
 ["210.230.128.224/28",
  "121.111.227.160/27",
  "61.117.1.0/28",
@@ -23,4 +23,5 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "111.86.142.0/26",
  "111.86.141.64/26",
  "111.86.141.128/26",
- "111.86.141.192/26"].map {|ip| IPAddr.new(ip) }
+ "111.86.141.192/26",
+ "118.159.133.192/26"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_docomo.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # = IPアドレス帯域テーブル(手動更新分)
 # == DoCoMo
 # http://www.nttdocomo.co.jp/service/imode/make/content/ip/index.html
@@ -8,5 +9,7 @@ Jpmobile::Mobile::Docomo::IP_ADDRESSES = %w(
 210.153.86.0/24
 124.146.174.0/24
 124.146.175.0/24
+202.229.176.0/24
+202.229.177.0/24
+202.229.178.0/24
 ).map {|ip| IPAddr.new(ip) }
-

data/lib/jpmobile/request_with_mobile.rb

@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+#
 # jpmobile の各機能を提供するモジュール
 # envメソッドと、parameter あるいは params メソッドが実装されている必要がある。
 # 今のところはRack::RequestとActionController::AbstractRequestに対応しているはず。
@@ -31,11 +33,12 @@ module Jpmobile
     # 携帯電話の機種に応じて Mobile::xxx を返す。
     # 携帯電話でない場合はnilを返す。
     def mobile
+      @__mobile ||= nil
       return @__mobile if @__mobile
 
       Jpmobile::Mobile.carriers.each do |const|
         c = Jpmobile::Mobile.const_get(const)
-        return @__mobile = c.new(self) if c::USER_AGENT_REGEXP && user_agent =~ c::USER_AGENT_REGEXP
+        return @__mobile = c.new(self) if c.check_request(self)
       end
       nil
     end

data/spec/spec_helper.rb

@@ -0,0 +1,36 @@
+unless Spec.const_defined?(:Rails)
+  dir = File.dirname(__FILE__)
+
+  # jpmobileの読み込み
+  require 'rubygems'
+  require 'action_controller'
+  require 'action_mailer'
+  require 'initializer'
+  require dir+'/../lib/jpmobile'
+
+  # set (dummy) RAILS_ROOT
+  RAILS_ROOT=dir+"/.."
+
+  # load RSpec on Rails
+  rspec_base = dir + '/../vendor/plugins/rspec-rails/lib'
+  $LOAD_PATH.unshift rspec_base
+  ActiveSupport::Dependencies.load_paths.unshift rspec_base
+  ActiveSupport::Dependencies.load_once_paths.unshift rspec_base
+
+  # application.rb を先に読ませる
+  $LOAD_PATH.unshift "#{dir}/../spec_resources/controllers"
+  require 'application'
+
+  # setup resources
+  Dir[File.expand_path("#{dir}/../spec_resources/**/*.rb")].sort.each do |file|
+    require file
+  end
+
+  # setup routes
+  ActionController::Routing::Routes.draw do |map|
+    map.connect ':controller/:action/:id.:format'
+    map.connect ':controller/:action/:id'
+  end
+
+  require 'spec/rails'
+end

data/spec/unit/detect_by_email_spec.rb

@@ -0,0 +1,31 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'Jpmobile::Email' do
+
+  Spec::Fixture::Base.new self, :email_addr => :carrier do
+
+    it '#detect should return :carrier when take :email_addr as EmailAddr' do |email_addr, carrier|
+      Jpmobile::Email.detect(email_addr).should == carrier 
+    end
+
+    set_fixtures([
+      ['example@example.ne.jp'  => nil                        ],
+      ['test@docomo.ne.jp'      => Jpmobile::Mobile::Docomo   ],
+      ['test@docomo.ne.jp.jp'   => nil                        ],
+      ['a(--)l@ezweb.ne.jp'     => Jpmobile::Mobile::Au       ],
+      ['a(--)l@ezweb.ne.jp.jp'  => nil                        ],
+      ['dadaea@pdx.ne.jp'       => Jpmobile::Mobile::Willcom  ],
+      ['dadaea@pdx.ne.jp.jp'    => nil                        ],
+      ['xxxe@dj.pdx.ne.jp'      => Jpmobile::Mobile::Willcom  ],
+      ['xxxe@dj.pdx.ne.jp.jp'   => nil                        ],
+      ['oeeikx@softbank.ne.jp'  => Jpmobile::Mobile::Softbank ],
+      ['oeeikx@softbank.ne.jp.jp' => nil                      ],
+      ['eaae@disney.ne.jp'      => Jpmobile::Mobile::Softbank ],
+      ['eaae@disney.ne.jp.jp'   => nil                        ],
+      ['iiiaa@r.vodafone.ne.jp' => Jpmobile::Mobile::Vodafone ],
+      ['iiiaa@r.vodafone.ne.jp.jp' => nil                     ],
+      ['aaaaa.aaaa@jp-h.ne.jp'  => Jpmobile::Mobile::Jphone    ],
+      ['aaaaa.aaaa@jp-h.ne.jp.jp' => nil                      ],
+    ])
+  end.run
+end

data/{test/rails/rails_root/vendor/plugins/jpmobile/spec → spec}/unit/detect_by_ua_spec.rb

@@ -1,25 +1,23 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
 describe 'Jpmobile::RequestWithMobile' do
-  before(:all) do
-    ReqClass = Class.new
-    ReqClass.class_eval do
-      include Jpmobile::RequestWithMobile
+  Spec::Fixture::Base.new self, :carrier => :user_agent do
+    def request_class
+      Class.new do
+        include Jpmobile::RequestWithMobile
 
-      def initialize user_agent
-        @user_agent = user_agent
-      end
+        def initialize user_agent
+          @user_agent = user_agent
+        end
 
-      def user_agent
-        @user_agent
+        def user_agent
+          @user_agent
+        end
       end
     end
-  end
-
-  Spec::Fixture::Base.new self, :carrier => :user_agent do
 
     it '#mobile should return :carrier when take :user_agent as UserAgent' do |carrier, user_agent|
-      ReqClass.new(user_agent).mobile.class.should == carrier
+      request_class.new(user_agent).mobile.class.should == carrier
     end
 
     set_fixtures([

data/spec/unit/is_carrier_spec.rb

@@ -0,0 +1,93 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'Jpmobile::Mobile' do
+  Spec::Fixture::Base.new self, [ :klass, :carrier ] => :expected do
+    filters({
+      :klass => proc {|val| Jpmobile::Mobile.const_get(val) },
+      :carrier => proc {|val| "#{val}?" },
+    })
+
+    desc_filters({
+      :klass => proc {|val| "::#{val.to_s}" },
+      :carrier => proc {|val| "#{val}?" },
+    })
+
+    it ":klass#:carrier should be return :expected" do |input, expected|
+      input[:klass].new({}).__send__(input[:carrier]).should == expected
+    end
+
+    set_fixtures([
+      [ %w[ Docomo docomo    ] => true ],
+      [ %w[ Docomo au        ] => false ],
+      [ %w[ Docomo softbank  ] => false ],
+      [ %w[ Docomo vodafone  ] => false ],
+      [ %w[ Docomo jphone    ] => false ],
+      [ %w[ Docomo emobile   ] => false ],
+      [ %w[ Docomo willcom   ] => false ],
+      [ %w[ Docomo ddipocket ] => false ],
+
+      [ %w[ Au docomo    ] => false ],
+      [ %w[ Au au        ] => true ],
+      [ %w[ Au softbank  ] => false ],
+      [ %w[ Au vodafone  ] => false ],
+      [ %w[ Au jphone    ] => false ],
+      [ %w[ Au emobile   ] => false ],
+      [ %w[ Au willcom   ] => false ],
+      [ %w[ Au ddipocket ] => false ],
+
+      [ %w[ Softbank docomo    ] => false ],
+      [ %w[ Softbank au        ] => false ],
+      [ %w[ Softbank softbank  ] => true ],
+      [ %w[ Softbank vodafone  ] => false ],
+      [ %w[ Softbank jphone    ] => false ],
+      [ %w[ Softbank emobile   ] => false ],
+      [ %w[ Softbank willcom   ] => false ],
+      [ %w[ Softbank ddipocket ] => false ],
+
+      [ %w[ Vodafone docomo    ] => false ],
+      [ %w[ Vodafone au        ] => false ],
+      [ %w[ Vodafone softbank  ] => true  ],
+      [ %w[ Vodafone vodafone  ] => true  ],
+      [ %w[ Vodafone jphone    ] => false ],
+      [ %w[ Vodafone emobile   ] => false ],
+      [ %w[ Vodafone willcom   ] => false ],
+      [ %w[ Vodafone ddipocket ] => false ],
+
+      [ %w[ Jphone docomo    ] => false ],
+      [ %w[ Jphone au        ] => false ],
+      [ %w[ Jphone softbank  ] => true  ],
+      [ %w[ Jphone vodafone  ] => true  ],
+      [ %w[ Jphone jphone    ] => true  ],
+      [ %w[ Jphone emobile   ] => false ],
+      [ %w[ Jphone willcom   ] => false ],
+      [ %w[ Jphone ddipocket ] => false ],
+
+      [ %w[ Emobile docomo    ] => false ],
+      [ %w[ Emobile au        ] => false ],
+      [ %w[ Emobile softbank  ] => false ],
+      [ %w[ Emobile vodafone  ] => false ],
+      [ %w[ Emobile jphone    ] => false ],
+      [ %w[ Emobile emobile   ] => true  ],
+      [ %w[ Emobile willcom   ] => false ],
+      [ %w[ Emobile ddipocket ] => false ],
+
+      [ %w[ Willcom docomo    ] => false ],
+      [ %w[ Willcom au        ] => false ],
+      [ %w[ Willcom softbank  ] => false ],
+      [ %w[ Willcom vodafone  ] => false ],
+      [ %w[ Willcom jphone    ] => false ],
+      [ %w[ Willcom emobile   ] => false ],
+      [ %w[ Willcom willcom   ] => true  ],
+      [ %w[ Willcom ddipocket ] => false ],
+
+      [ %w[ Ddipocket docomo    ] => false ],
+      [ %w[ Ddipocket au        ] => false ],
+      [ %w[ Ddipocket softbank  ] => false ],
+      [ %w[ Ddipocket vodafone  ] => false ],
+      [ %w[ Ddipocket jphone    ] => false ],
+      [ %w[ Ddipocket emobile   ] => false ],
+      [ %w[ Ddipocket willcom   ] => true  ],
+      [ %w[ Ddipocket ddipocket ] => true  ],
+    ])
+  end.run
+end

data/spec/unit/spec_helper.rb

@@ -0,0 +1,5 @@
+require 'rubygems'
+require 'spec'
+require 'spec/fixture' # gem rspec-fixture
+$LOAD_PATH.unshift(File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib')))
+require 'jpmobile'

data/spec/unit/util_spec.rb

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe Jpmobile::Util, ".deep_apply" do
+  it 'nilのときはnilを返すこと' do
+    Jpmobile::Util.deep_apply(nil) {|obj| obj }.should equal(nil)
+  end
+
+  it 'trueのときはtrueを返すこと' do
+    Jpmobile::Util.deep_apply(true) {|obj| obj }.should equal(true)
+  end
+
+  it 'falseのときはそのまま値を返すこと' do
+    Jpmobile::Util.deep_apply(false) {|obj| obj }.should equal(false)
+  end
+
+  it 'Tempfileのインスタンスのときはそのまま値を返すこと' do
+    temp = Tempfile.new('test')
+    Jpmobile::Util.deep_apply(temp) {|obj| obj}.object_id.should equal(temp.object_id)
+    # 本来 Jpmobile::Util.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')
+    Jpmobile::Util.deep_apply(string_io) {|obj| obj }.should equal(string_io)
+  end
+end
+

data/spec/unit/valid_ip_spec.rb

@@ -0,0 +1,60 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe 'Jpmobile::Mobile::valid_ip?' do
+  Spec::Fixture::Base.new self, :remote_ip => :carrier do
+    it 'should be return true if :remote_ip is in :carrier address' do |remote_ip, carrier|
+      Jpmobile::Mobile.const_get(carrier).valid_ip?(remote_ip).should == true
+    end
+
+    set_fixtures([
+      [ '210.153.84.1'    => :Docomo    ],
+      [ '210.153.84.254'  => :Docomo    ],
+      [ '210.230.128.225' => :Au        ],
+      [ '210.230.128.238' => :Au        ],
+      [ '123.108.236.1'   => :Softbank  ],
+      [ '123.108.236.254' => :Softbank  ],
+      [ '123.108.236.1'   => :Vodafone  ],
+      [ '123.108.236.254' => :Vodafone  ],
+      [ '123.108.236.1'   => :Jphone    ],
+      [ '123.108.236.254' => :Jphone    ],
+      [ '61.198.142.1'    => :Willcom   ],
+      [ '61.198.142.254'  => :Willcom   ],
+      [ '61.198.142.1'    => :Ddipocket ],
+      [ '61.198.142.254'  => :Ddipocket ],
+      [ '117.55.1.224'    => :Emobile   ],
+      [ '117.55.1.254'    => :Emobile   ],
+    ])
+  end.run
+
+  Spec::Fixture::Base.new self, :remote_ip => :carrier do
+    it 'should not be return true if :remote_ip is in :carrier address' do |remote_ip, carrier|
+      Jpmobile::Mobile.const_get(carrier).valid_ip?(remote_ip).should_not == true
+    end
+
+    set_fixtures([
+      [ '127.0.0.1'       => :Docomo    ],
+      [ '210.153.83.1'    => :Docomo    ],
+      [ '210.153.83.254'  => :Docomo    ],
+      [ '127.0.0.1'       => :Au        ],
+      [ '210.169.41.1'    => :Au        ],
+      [ '210.169.41.254'  => :Au        ],
+      [ '127.0.0.1'       => :Softbank  ],
+      [ '123.108.238.1'   => :Softbank  ],
+      [ '123.108.238.254' => :Softbank  ],
+      [ '127.0.0.1'       => :Vodafone  ],
+      [ '123.108.238.1'   => :Vodafone  ],
+      [ '123.108.238.254' => :Vodafone  ],
+      [ '127.0.0.1'       => :Jphone    ],
+      [ '123.108.238.1'   => :Jphone    ],
+      [ '123.108.238.254' => :Jphone    ],
+      [ '127.0.0.1'       => :Willcom  ],
+      [ '61.198.144.1'    => :Willcom   ],
+      [ '61.198.144.254'  => :Willcom   ],
+      [ '127.0.0.1'       => :Ddipocket  ],
+      [ '61.198.144.1'    => :Ddipocket ],
+      [ '61.198.144.254'  => :Ddipocket ],
+      [ '127.0.0.1'       => :Emobile  ],
+      [ '117.55.1.223'    => :Emobile   ],
+    ])
+  end.run
+end

data/{test/rails/rails_root/vendor/plugins/jpmobile/tasks → tasks}/jpmobile_tasks.rake

@@ -29,7 +29,7 @@ namespace :test do
   task :rails, [:versions] do |t, args|
     rails_root     = "test/rails/rails_root"
     relative_root  = "../../../"
-    rails_versions = args.versions.split("/") rescue ["2.3.5"]
+    rails_versions = args.versions.split("/") rescue ["2.3.8"]
 
     puts "Running tests in Rails #{rails_versions.join(', ')}"
 
@@ -70,8 +70,8 @@ END
 
       # run tests in rails
       cd rails_root
-      sh "rake db:migrate"
-      sh "rake spec"
+      ruby "-S rake db:migrate"
+      ruby "-S rake spec"
 
       cd relative_root
     end

data/test/legacy/autoload_test.rb

@@ -1,4 +1,5 @@
-require 'test/unit'
+require File.dirname(__FILE__)+'/helper'
+
 module Jpmobile
   module Mobile
     require 'jpmobile/mobile/abstract_mobile'