jpmobile 0.0.8 → 0.1.0.pre

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
-unless Spec.const_defined?(:Rails)
+# -*- coding: utf-8 -*-
+unless RSpec.const_defined?(:Rails)
   dir = File.dirname(__FILE__)
 
   # jpmobileの読み込み
@@ -32,5 +33,5 @@ unless Spec.const_defined?(:Rails)
     map.connect ':controller/:action/:id'
   end
 
-  require 'spec/rails'
+  require 'rspec/rails'
 end

data/spec/unit/detect_by_email_spec.rb

@@ -1,31 +1,25 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(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 
+  [
+    ['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                        ],
+  ].each do |email_addr, carrier|
+    it "#detect should return #{carrier} when take #{email_addr} as EmailAddr" do
+      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
 end

data/spec/unit/is_carrier_spec.rb

@@ -1,93 +1,65 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(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}?" },
-    })
+  [
+    [ %w[ Docomo docomo    ] , true ],
+    [ %w[ Docomo au        ] , false ],
+    [ %w[ Docomo softbank  ] , false ],
+    [ %w[ Docomo vodafone  ] , false ],
+    [ %w[ Docomo emobile   ] , false ],
+    [ %w[ Docomo willcom   ] , false ],
+    [ %w[ Docomo ddipocket ] , false ],
 
-    desc_filters({
-      :klass => proc {|val| "::#{val.to_s}" },
-      :carrier => proc {|val| "#{val}?" },
-    })
+    [ %w[ Au docomo    ] , false ],
+    [ %w[ Au au        ] , true ],
+    [ %w[ Au softbank  ] , false ],
+    [ %w[ Au vodafone  ] , false ],
+    [ %w[ Au emobile   ] , false ],
+    [ %w[ Au willcom   ] , false ],
+    [ %w[ Au ddipocket ] , false ],
 
-    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 emobile   ] , false ],
+    [ %w[ Softbank willcom   ] , false ],
+    [ %w[ Softbank 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 emobile   ] , false ],
+    [ %w[ Vodafone willcom   ] , false ],
+    [ %w[ Vodafone 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[ Emobile docomo    ] , false ],
+    [ %w[ Emobile au        ] , false ],
+    [ %w[ Emobile softbank  ] , false ],
+    [ %w[ Emobile vodafone  ] , false ],
+    [ %w[ Emobile emobile   ] , true  ],
+    [ %w[ Emobile willcom   ] , false ],
+    [ %w[ Emobile 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[ Willcom docomo    ] , false ],
+    [ %w[ Willcom au        ] , false ],
+    [ %w[ Willcom softbank  ] , false ],
+    [ %w[ Willcom vodafone  ] , false ],
+    [ %w[ Willcom emobile   ] , false ],
+    [ %w[ Willcom willcom   ] , true  ],
+    [ %w[ Willcom 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
+    [ %w[ Ddipocket docomo    ] , false ],
+    [ %w[ Ddipocket au        ] , false ],
+    [ %w[ Ddipocket softbank  ] , false ],
+    [ %w[ Ddipocket vodafone  ] , false ],
+    [ %w[ Ddipocket emobile   ] , false ],
+    [ %w[ Ddipocket willcom   ] , true  ],
+    [ %w[ Ddipocket ddipocket ] , true  ],
+  ].each do |carrier, expected|
+    it "#{carrier.first}##{carrier.last}? should be return #{expected}" do
+      Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?").should == expected
+    end
+  end
 end

data/spec/unit/spec_helper.rb

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

data/spec/unit/util_spec.rb

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require 'stringio'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'spec_helper')
 
 describe Jpmobile::Util, ".deep_apply" do
   it 'nilのときはnilを返すこと' do

data/spec/unit/valid_ip_spec.rb

@@ -1,60 +1,51 @@
-require File.join(File.dirname(__FILE__), 'spec_helper')
+require File.join(File.expand_path(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|
+  [
+    [ '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  ],
+    [ '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   ],
+  ].each do |remote_ip, carrier|
+    it "should be return true if #{remote_ip} is in #{:carrier} address" do
       Jpmobile::Mobile.const_get(carrier).valid_ip?(remote_ip).should == true
     end
+  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|
+  [
+    [ '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'       , :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   ],
+  ].each do |remote_ip, carrier|
+    it 'should not be return true if #{:remote_ip} is in #{carrier} address' do
       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
 end

data/test/legacy/autoload_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__)+'/helper'
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
 
 module Jpmobile
   module Mobile
@@ -29,10 +29,8 @@ class TestAutoLoad < Test::Unit::TestCase
     require 'jpmobile/mobile/softbank'
     assert_nothing_raised { Jpmobile::Mobile::Softbank::IP_ADDRESSES }
     assert_nothing_raised { Jpmobile::Mobile::Vodafone::IP_ADDRESSES }
-    assert_nothing_raised { Jpmobile::Mobile::Jphone::IP_ADDRESSES }
     assert_kind_of(Array, Jpmobile::Mobile::Softbank::IP_ADDRESSES)
     assert_kind_of(Array, Jpmobile::Mobile::Vodafone::IP_ADDRESSES)
-    assert_kind_of(Array, Jpmobile::Mobile::Jphone::IP_ADDRESSES)
   end
 
   def test_ip_addresses_willcom

data/test/legacy/emoticon_test.rb

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__)+'/helper'
+require File.expand_path(File.dirname(__FILE__)) + '/helper'
+
+include Jpmobile::Util
 
 class DocomoEmoticonTest < Test::Unit::TestCase
   def test_external_unicodecr_docomo
@@ -34,9 +36,6 @@ class AuEmoticonTest < Test::Unit::TestCase
 end
 
 class SoftbankEmoticonTest < Test::Unit::TestCase
-  def test_jphone_webcode_cr
-    assert_equal "&#xf001;&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_jphone("\x1b$G!!\x0f")
-  end
   def test_softbank_cr
     assert_equal "&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U'))
   end
@@ -44,7 +43,7 @@ class SoftbankEmoticonTest < Test::Unit::TestCase
     assert_equal "&#xf001;", Jpmobile::Emoticon::external_to_unicodecr_softbank([0xe001].pack('U'))
   end
   def test_softbank_cr_webcode
-    assert_equal "\x1b$G!\x0f", Jpmobile::Emoticon::unicodecr_to_external("&#xf001;")
+    assert_equal [0xe001].pack('U'), Jpmobile::Emoticon::unicodecr_to_external("&#xf001;")
   end
   def test_softbank_cr_utf8
     assert_equal utf8("\xef\x80\x81"), Jpmobile::Emoticon::unicodecr_to_utf8("&#xf001;")
@@ -53,7 +52,7 @@ class SoftbankEmoticonTest < Test::Unit::TestCase
     assert_equal "&#xf001;", Jpmobile::Emoticon::utf8_to_unicodecr(utf8("\xef\x80\x81"))
   end
   def test_unicodecr_external_softbank_for_string
-    assert_equal "\x1b$Gj\x0f\x1b$Gi\x0f", Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true)
+    assert_equal [0xe04a, 0xe049].pack('U*'), Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK, true)
   end
 end
 

data/test/legacy/helper.rb

@@ -1,79 +1,8 @@
 # -*- coding: utf-8 -*-
-
 require 'rubygems'
 begin
   gem 'test-unit', '= 1.2.3'
 rescue Gem::LoadError
 end
 require 'test/unit'
-action_pack_version = ENV['RAILS_VERSION'] || '2.3.0'
-gem 'actionpack', "~> #{action_pack_version}"
-require 'action_controller'
-require 'rack'
-
-RAILS_ENV = "test"
 require File.dirname(__FILE__)+'/../../lib/jpmobile'
-
-# ActionPackのTestのためのrequire
-action_pack_gem = Gem.cache.find_name('actionpack').find do |gem|
-  gem.version.version >= action_pack_version
-end
-require File.join(action_pack_gem.full_gem_path,'test/abstract_unit')
-
-class FakeCgi < CGI
-  attr_accessor :stdinput, :stdoutput, :env_table
-  def initialize(user_agent, env={})
-    self.env_table = {"HTTP_USER_AGENT"=>user_agent,"QUERY_STRING"=>""}.update(env)
-    super()
-  end
-end
-
-def request_with_ua(user_agent, env={})
-  fake_cgi = FakeCgi.new(user_agent, env)
-  [
-    Rack::Request.new(
-      Rack::MockRequest.env_for('http://www.example.jp', fake_cgi.env_table)
-    ).extend(Jpmobile::RequestWithMobile)
-  ]
-end
-
-## add helper methods to rails testing framework
-module ActionController
-  class TestRequest < Request
-    attr_accessor :user_agent
-  end
-end
-
-module Jpmobile::TestHelper
-  def user_agent(str)
-    @request.user_agent = str
-  end
-  def init(c)
-    @controller = c.new
-    @controller.logger = Logger.new(nil)
-    @request = ActionController::TestRequest.new
-    @response = ActionController::TestResponse.new
-    @request.host = "www.example.jp"
-    @request.session.session_id = "mysessionid"
-  end
-  def sjis(ascii_8bit)
-    if ascii_8bit.respond_to?(:force_encoding)
-      ascii_8bit.force_encoding("Shift_JIS")
-    end
-    ascii_8bit
-  end
-  def utf8(ascii_8bit)
-    if ascii_8bit.respond_to?(:force_encoding)
-      ascii_8bit.force_encoding("utf-8")
-    end
-    ascii_8bit
-  end
-  def to_sjis(utf8)
-    if utf8.respond_to?(:encode)
-      utf8.encode("Shift_JIS")
-    else
-      utf8.tosjis
-    end
-  end
-end
-Test::Unit::TestCase.class_eval{ include Jpmobile::TestHelper }