jpmobile 0.0.7 → 0.0.8

data/test/rails/rails_root/db/schema.rb

@@ -1,14 +1,31 @@
-# This file is auto-generated from the current state of the database. Instead of editing this file, 
-# please use the migrations feature of Active Record to incrementally modify your database, and
-# then regenerate this schema definition.
+# This file is auto-generated from the current state of the database. Instead
+# of editing this file, please use the migrations feature of Active Record to
+# incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your database schema. If you need
-# to create the application database on another system, you should be using db:schema:load, not running
-# all the migrations from scratch. The latter is a flawed and unsustainable approach (the more migrations
+# Note that this schema.rb definition is the authoritative source for your
+# database schema. If you need to create the application database on another
+# system, you should be using db:schema:load, not running all the migrations
+# from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 0) do
+ActiveRecord::Schema.define(:version => 20100824062306) do
+
+  create_table "sessions", :force => true do |t|
+    t.string   "session_id", :null => false
+    t.text     "data"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
+  add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
+
+  create_table "users", :force => true do |t|
+    t.string   "name"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
 
 end

data/test/rails/rails_root/db/seeds.rb

@@ -2,6 +2,6 @@
 # The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
 #
 # Examples:
-#   
+#
 #   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
-#   Major.create(:name => 'Daley', :city => cities.first)
+#   Mayor.create(:name => 'Daley', :city => cities.first)

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

@@ -1,13 +1,15 @@
+# -*- coding: utf-8 -*-
+
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Jpmobile::Helpers do
   include Jpmobile::Helpers
   it "docomo_guid_link_to が guid=ON を付けたリンクを生成すること" do
-    docomo_guid_link_to("STRING", :controller => "MyController", :action => "myaction").should == %{<a href="/mycontroller/myaction?guid=ON">STRING</a>}
+    docomo_guid_link_to("STRING", :controller => "filter", :action => "rawdata").should == %{<a href="/filter/rawdata?guid=ON">STRING</a>}
   end
 
   it "softbank_location_link_to がリンク先にパラメータを含んでいても正常に動作すること" do
     # http://d.hatena.ne.jp/mizincogrammer/20090123/1232702067
-    softbank_location_link_to("STRING", :controller => "MyController", :action => "myaction", :p => "param").should == %{<a href="location:auto?url=http://test.host/mycontroller/myaction&p=param">STRING</a>}
+    softbank_location_link_to("STRING", :controller => "filter", :action => "rawdata", :p => "param").should == %{<a href="location:auto?url=http://test.host/filter/rawdata&p=param">STRING</a>}
   end
 end

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

@@ -1,47 +1,31 @@
 # This file is copied to ~/spec when you run 'ruby script/generate rspec'
 # from the project root directory.
 ENV["RAILS_ENV"] ||= 'test'
-require File.dirname(__FILE__) + "/../config/environment" unless defined?(RAILS_ROOT)
-require 'spec/autorun'
-require 'spec/rails'
+require File.expand_path("../../config/environment", __FILE__)
+require 'rspec/rails'
 
-Spec::Runner.configure do |config|
-  # If you're not using ActiveRecord you should remove these
-  # lines, delete config/database.yml and disable :active_record
-  # in your config/boot.rb
-  config.use_transactional_fixtures = true
-  config.use_instantiated_fixtures  = false
-  config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
+# Requires supporting files with custom matchers and macros, etc,
+# in ./support/ and its subdirectories.
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
 
-  # == Fixtures
-  #
-  # You can declare fixtures for each example_group like this:
-  #   describe "...." do
-  #     fixtures :table_a, :table_b
-  #
-  # Alternatively, if you prefer to declare them only once, you can
-  # do so right here. Just uncomment the next line and replace the fixture
-  # names with your fixtures.
-  #
-  # config.global_fixtures = :table_a, :table_b
-  #
-  # If you declare global fixtures, be aware that they will be declared
-  # for all of your examples, even those that don't use them.
-  #
-  # You can also declare which fixtures to use (for example fixtures for test/fixtures):
-  #
-  # config.fixture_path = RAILS_ROOT + '/spec/fixtures/'
-  #
+RSpec.configure do |config|
   # == Mock Framework
   #
-  # RSpec uses it's own mocking framework by default. If you prefer to
-  # use mocha, flexmock or RR, uncomment the appropriate line:
+  # 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
-  #
-  # == Notes
-  # 
-  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
+  config.mock_with :rspec
+
+  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, comment the following line or assign false
+  # instead of true.
+  config.use_transactional_fixtures = true
+  config.include Webrat::HaveTagMatcher
+  config.include Jpmobile::Util
 end
+
+require 'pp'

data/test/rails/rails_root/test/performance/browsing_test.rb

@@ -1,8 +1,8 @@
 require 'test_helper'
-require 'performance_test_help'
+require 'rails/performance_test_help'
 
 # Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
+class BrowsingTest < ActionDispatch::PerformanceTest
   def test_homepage
     get '/'
   end

data/test/rails/rails_root/test/test_helper.rb

@@ -1,33 +1,8 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'test_help'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
 
 class ActiveSupport::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually 
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
-  self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
-  self.use_instantiated_fixtures  = false
-
   # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
   #
   # Note: You'll currently still have to declare fixtures explicitly in integration tests

data/test/rails/rails_root/vendor/plugins/jpmobile/init.rb

@@ -1,3 +1,3 @@
 # Include hook code here
 
-require 'jpmobile'
+require File.join(File.dirname(__FILE__), 'lib/jpmobile')

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile.rb

@@ -1,42 +1,56 @@
-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__)))
+# -*- coding: utf-8 -*-
+$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
+                                          $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 module Jpmobile
-  autoload :Email   , 'jpmobile/email'
-  autoload :Emoticon, 'jpmobile/emoticon'
-  autoload :Position, 'jpmobile/position'
+  autoload :Email,             'jpmobile/email'
+  autoload :Emoticon,          'jpmobile/emoticon'
+  autoload :Position,          'jpmobile/position'
   autoload :RequestWithMobile, 'jpmobile/request_with_mobile'
-  autoload :Util,     'jpmobile/util'
+  autoload :Util,              'jpmobile/util'
+  autoload :Encoding,          'jpmobile/encoding'
+  autoload :Version,           'jpmobile/version'
+  autoload :DatumConv,         'jpmobile/datum_conv'
 
+  # autoload mobile classes
   module Mobile
-    autoload :Docomo,    'jpmobile/mobile/docomo'
-    autoload :Au,        'jpmobile/mobile/au'
-    autoload :Softbank,  'jpmobile/mobile/softbank'
-    autoload :Vodafone,  'jpmobile/mobile/softbank'
-    autoload :Jphone,    'jpmobile/mobile/softbank'
-    autoload :Emobile,   'jpmobile/mobile/emobile'
-    autoload :Willcom,   'jpmobile/mobile/willcom'
-    autoload :Ddipocket, 'jpmobile/mobile/willcom'
+    autoload :Docomo,         'jpmobile/mobile/docomo'
+    autoload :Au,             'jpmobile/mobile/au'
+    autoload :Softbank,       'jpmobile/mobile/softbank'
+    autoload :Vodafone,       'jpmobile/mobile/vodafone'
+    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 :Display,        'jpmobile/mobile/display'
+
+    DEFAULT_CARRIERS = %w(Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Iphone Android WindowsPhone)
 
     def self.carriers
-      @carriers ||= constants
+      @carriers ||= DEFAULT_CARRIERS.dup
     end
 
     def self.carriers=(ary)
       @carriers = ary
     end
+
+    require 'jpmobile/mobile/abstract_mobile'
   end
-end
 
-%w(
-  jpmobile/version.rb
-  jpmobile/mobile/abstract_mobile.rb
-  jpmobile/mobile/display.rb
-).each do |lib|
-  require File.expand_path(File.join(File.dirname(__FILE__), lib))
+  # autoload Rack middlewares
+  module Rack
+    autoload :MobileCarrier, 'jpmobile/rack/mobile_carrier'
+    autoload :ParamsFilter,  'jpmobile/rack/params_filter'
+    autoload :Filter,        'jpmobile/rack/filter'
+    autoload :Config,        'jpmobile/rack/config'
+  end
+  autoload :Configuration, 'jpmobile/rack'
 end
 
-if defined? RAILS_ENV
-  Dir[File.expand_path(File.join(File.dirname(__FILE__), 'jpmobile/*.rb'))].sort.each { |lib|
-    require lib
-  }
+if defined?(Rails)
+  require 'jpmobile/rails'
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/docomo_guid.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #DoCoMoの時guid=onの付与
 class ActionController::Base #:nodoc:
   class_inheritable_accessor :docomo_guid_mode
@@ -13,7 +14,7 @@ end
 
 module Jpmobile::DocomoGuid #:nodoc:
   protected
-  def default_url_options options=nil
+  def default_url_options
     result = super || {}
     return result unless request # for test process
     return result unless apply_add_guid?

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/email.rb

@@ -1,19 +1,18 @@
+# -*- coding: utf-8 -*-
 # =メールアドレスモジュール
 #
 module Jpmobile
   # email関連の処理
   module Email
-
     # メールアドレスよりキャリア情報を取得する
     # _param1_:: email メールアドレス
     # return  :: Jpmobile::Mobileで定義されている携帯キャリアクラス
     def self.detect(email)
-      Jpmobile::Mobile.carriers.each do |const|
-        c = Jpmobile::Mobile.const_get(const)
+      Mobile.carriers.each do |const|
+        c = Mobile.const_get(const)
         return c if c::MAIL_ADDRESS_REGEXP && email =~ c::MAIL_ADDRESS_REGEXP
       end
       nil
     end
-
   end
 end

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon.rb

@@ -1,3 +1,6 @@
+# -*- coding: utf-8 -*-
+
+require 'scanf'
 require 'nkf'
 
 module Jpmobile
@@ -13,10 +16,10 @@ module Jpmobile
     %w( CONVERSION_TABLE_TO_DOCOMO CONVERSION_TABLE_TO_AU CONVERSION_TABLE_TO_SOFTBANK ).each do |const|
       autoload const, 'jpmobile/emoticon/conversion_table'
     end
-    %w( 
-      SJIS_TO_UNICODE UNICODE_TO_SJIS 
-      SJIS_REGEXP SOFTBANK_WEBCODE_REGEXP DOCOMO_SJIS_REGEXP AU_SJIS_REGEXP SOFTBANK_UNICODE_REGEXP 
-      EMOTICON_UNICODES UTF8_REGEXP 
+    %w(
+      SJIS_TO_UNICODE UNICODE_TO_SJIS
+      SJIS_REGEXP SOFTBANK_WEBCODE_REGEXP DOCOMO_SJIS_REGEXP AU_SJIS_REGEXP SOFTBANK_UNICODE_REGEXP
+      EMOTICON_UNICODES UTF8_REGEXP
     ).each do |const|
       autoload const, 'jpmobile/emoticon/z_combine'
     end
@@ -87,17 +90,30 @@ module Jpmobile
         when Integer
           # 変換先がUnicodeで指定されている。つまり対応する絵文字がある。
           if sjis = UNICODE_TO_SJIS[converted]
-            [sjis].pack('n')
+            if to_sjis
+              sjis_emotion = [sjis].pack('n')
+              if sjis_emotion.respond_to?(:force_encoding)
+                sjis_emotion.force_encoding("Shift_JIS")
+              end
+              sjis_emotion
+            else
+              [converted].pack("U")
+            end
           elsif webcode = SOFTBANK_UNICODE_TO_WEBCODE[converted-0x1000]
-            "\x1b\x24#{webcode}\x0f"
+            [converted-0x1000].pack('U')
           else
             # キャリア変換テーブルに指定されていたUnicodeに対応する
             # 携帯側エンコーディングが見つからない(変換テーブルの不備の可能性あり)。
             match
           end
         when String
-          # 変換先がUnicodeで指定されている。
-          to_sjis ? NKF.nkf('-m0 -x -Ws', converted) : converted
+          # 変換先が数値参照だと、再変換する
+          if converted.match(/&#x([0-9a-f]{4});/i)
+            self.unicodecr_to_external(converted, conversion_table, to_sjis)
+          else
+            # 変換先が文字列で指定されている。
+            to_sjis ? Jpmobile::Util.utf8_to_sjis(converted) : converted
+          end
         when nil
           # 変換先が定義されていない。
           match

data/test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/conversion_table.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO = {
   0xE63E=>0xE63E,
   0xE63F=>0xE63F,
@@ -417,7 +418,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO = {
   0xE58A=>'[リンク]',
   0xE51F=>0xE685,
   0xE520=>0xE6D0,
-  0xE48E=>'%i1%%i2%',
+  0xE48E=>'',
   0xE4B3=>0xE662,
   0xE4B4=>0xE6A3,
   0xE4C8=>'[サイコロ]',
@@ -740,7 +741,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO = {
   0xEAF0=>'[サンタ]',
   0xEAF1=>0xE6B3,
   0xEAF2=>'[虹]',
-  0xEAF3=>'%i44%%i139%',
+  0xEAF3=>'',
   0xEAF4=>0xE63E,
   0xEAF5=>0xE67C,
   0xEAF6=>'[デパート]',
@@ -1156,7 +1157,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO = {
   0xF40F=>0xE723,
   0xF410=>0xE6F4,
   0xF411=>0xE72D,
-  0xF412=>'%i140%%i1034%',
+  0xF412=>'',
   0xF413=>0xE72E,
   0xF414=>0xE6F0,
   0xF415=>0xE6F0,
@@ -1185,7 +1186,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO = {
   0xF449=>0xE63E,
   0xF44A=>0xE63E,
   0xF44B=>0xE6B3,
-  0xF501=>'%i44%%i139%',
+  0xF501=>'',
   0xF502=>0xE67B,
   0xF503=>0xE67C,
   0xF507=>0xE677,
@@ -1394,7 +1395,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_AU = {
   0xE71F=>0xE57A,
   0xE720=>0xEAC0,
   0xE721=>0xEAC5,
-  0xE722=>'%e257%%e330%',
+  0xE722=>'',
   0xE723=>0xE5C6,
   0xE724=>0xEB5D,
   0xE725=>0xEAC9,
@@ -2728,7 +2729,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK = {
   0xE714=>'［ドア］',
   0xE715=>0xF12F,
   0xE716=>0xF00C,
-  0xE717=>'%s103%%s340%',
+  0xE717=>'',
   0xE718=>'［レンチ］',
   0xE719=>0xF301,
   0xE71A=>0xF10E,
@@ -2739,7 +2740,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK = {
   0xE71F=>'［腕時計］',
   0xE720=>0xF403,
   0xE721=>0xF40A,
-  0xE722=>'%s421%%s349%',
+  0xE722=>'',
   0xE723=>0xF108,
   0xE724=>0xF416,
   0xE725=>0xF40E,
@@ -2958,7 +2959,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK = {
   0xE58A=>'[リンク]',
   0xE51F=>0xF112,
   0xE520=>0xF00B,
-  0xE48E=>'%s74%%s73%',
+  0xE48E=>'',
   0xE4B3=>0xF01D,
   0xE4B4=>0xF01C,
   0xE4C8=>'[サイコロ]',
@@ -3414,7 +3415,7 @@ Jpmobile::Emoticon::CONVERSION_TABLE_TO_SOFTBANK = {
   0xEB75=>0xF327,
   0xEB76=>0xF523,
   0xEB77=>'[ジーンズ]',
-  0xEB78=>'%s103%%s340%',
+  0xEB78=>'',
   0xEB79=>'↑↓',
   0xEB7A=>'⇔',
   0xEB7B=>'↑↓',