jpmobile 0.0.8 → 0.1.0.pre

data/VERSION.yml

@@ -1,4 +1,5 @@
----
+--- 
 :major: 0
-:minor: 0
-:patch: 8
+:minor: 1
+:patch: 0
+:build: pre

data/jpmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "0.0.8"
+  s.version = "0.1.0.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara", "Shin-ichiro OGAWA"]
-  s.date = %q{2010-08-31}
+  s.date = %q{2010-07-28}
   s.description = %q{A Rails plugin for Japanese mobile-phones}
   s.email = %q{dara@shidara.net}
   s.extra_rdoc_files = [
@@ -17,6 +17,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
+     ".rspec",
      "CHANGELOG",
      "MIT-LICENSE",
      "README.rdoc",
@@ -35,18 +36,24 @@ Gem::Specification.new do |s|
      "lib/jpmobile/emoticon/docomo.rb",
      "lib/jpmobile/emoticon/softbank.rb",
      "lib/jpmobile/emoticon/z_combine.rb",
+     "lib/jpmobile/encoding.rb",
      "lib/jpmobile/filter.rb",
      "lib/jpmobile/helpers.rb",
      "lib/jpmobile/hook_action_controller.rb",
      "lib/jpmobile/hook_action_view.rb",
-     "lib/jpmobile/hook_request.rb",
      "lib/jpmobile/mobile/abstract_mobile.rb",
+     "lib/jpmobile/mobile/android.rb",
      "lib/jpmobile/mobile/au.rb",
+     "lib/jpmobile/mobile/ddipocket.rb",
      "lib/jpmobile/mobile/display.rb",
      "lib/jpmobile/mobile/docomo.rb",
      "lib/jpmobile/mobile/emobile.rb",
+     "lib/jpmobile/mobile/iphone.rb",
+     "lib/jpmobile/mobile/smart_phone.rb",
      "lib/jpmobile/mobile/softbank.rb",
+     "lib/jpmobile/mobile/vodafone.rb",
      "lib/jpmobile/mobile/willcom.rb",
+     "lib/jpmobile/mobile/windows_phone.rb",
      "lib/jpmobile/mobile/z_display_info_docomo.rb",
      "lib/jpmobile/mobile/z_ip_addresses_au.rb",
      "lib/jpmobile/mobile/z_ip_addresses_docomo.rb",
@@ -54,64 +61,96 @@ Gem::Specification.new do |s|
      "lib/jpmobile/mobile/z_ip_addresses_softbank.rb",
      "lib/jpmobile/mobile/z_ip_addresses_willcom.rb",
      "lib/jpmobile/position.rb",
-     "lib/jpmobile/rack/auth.rb",
-     "lib/jpmobile/rack/combined_logger.rb",
-     "lib/jpmobile/rack/request.rb",
-     "lib/jpmobile/rack/trans_sid.rb",
+     "lib/jpmobile/rack.rb",
+     "lib/jpmobile/rack/filter.rb",
+     "lib/jpmobile/rack/mobile_carrier.rb",
+     "lib/jpmobile/rack/params_filter.rb",
+     "lib/jpmobile/rails.rb",
      "lib/jpmobile/request_with_mobile.rb",
      "lib/jpmobile/trans_sid.rb",
      "lib/jpmobile/util.rb",
-     "lib/jpmobile/version.rb",
-     "spec/spec.opts",
+     "lib/tasks/jpmobile_tasks.rake",
+     "spec/rack/jpmobile/android_spec.rb",
+     "spec/rack/jpmobile/au_spec.rb",
+     "spec/rack/jpmobile/docomo_spec.rb",
+     "spec/rack/jpmobile/emoticon_spec.rb",
+     "spec/rack/jpmobile/filter_spec.rb",
+     "spec/rack/jpmobile/iphone_spec.rb",
+     "spec/rack/jpmobile/mobile_by_ua_spec.rb",
+     "spec/rack/jpmobile/params_filter_spec.rb",
+     "spec/rack/jpmobile/softbank_spec.rb",
+     "spec/rack/jpmobile/willcom_spec.rb",
+     "spec/rack/jpmobile/windows_phone.rb",
+     "spec/rack_helper.rb",
      "spec/spec_helper.rb",
      "spec/unit/detect_by_email_spec.rb",
-     "spec/unit/detect_by_ua_spec.rb",
      "spec/unit/is_carrier_spec.rb",
      "spec/unit/spec_helper.rb",
      "spec/unit/util_spec.rb",
      "spec/unit/valid_ip_spec.rb",
-     "tasks/jpmobile_tasks.rake",
-     "test/legacy/au_test.rb",
      "test/legacy/autoload_test.rb",
-     "test/legacy/docomo_test.rb",
-     "test/legacy/emoticon_functional_test.rb",
      "test/legacy/emoticon_test.rb",
-     "test/legacy/filter_test.rb",
      "test/legacy/helper.rb",
-     "test/legacy/helpers_test.rb",
-     "test/legacy/softbank_test.rb",
-     "test/legacy/willcom_test.rb",
      "test/rails/.gitignore",
-     "test/rails/2.3.2/spec/controllers/trans_sid_spec.rb",
+     "test/rails/overrides/.rspec",
+     "test/rails/overrides/Gemfile",
      "test/rails/overrides/app/controllers/application_controller.rb",
-     "test/rails/overrides/app/controllers/docomo_guid_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_always_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_base_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_docomo_controller.rb",
      "test/rails/overrides/app/controllers/filter_controller.rb",
+     "test/rails/overrides/app/controllers/filter_controller_base.rb",
+     "test/rails/overrides/app/controllers/hankaku_filter_controller.rb",
+     "test/rails/overrides/app/controllers/links_controller.rb",
      "test/rails/overrides/app/controllers/mobile_spec_controller.rb",
      "test/rails/overrides/app/controllers/template_path_controller.rb",
-     "test/rails/overrides/app/controllers/trans_sid_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_base_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_mobile_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_none_controller.rb",
      "test/rails/overrides/app/views/filter/index.html.erb",
      "test/rails/overrides/app/views/hankaku_filter/index.html.erb",
+     "test/rails/overrides/app/views/links/au_gps.html.erb",
+     "test/rails/overrides/app/views/links/au_location.html.erb",
+     "test/rails/overrides/app/views/links/docomo_foma_gps.html.erb",
+     "test/rails/overrides/app/views/links/docomo_openiarea.html.erb",
+     "test/rails/overrides/app/views/links/docomo_utn.html.erb",
+     "test/rails/overrides/app/views/links/link.html.erb",
+     "test/rails/overrides/app/views/links/show_all.html.erb",
+     "test/rails/overrides/app/views/links/softbank_location.html.erb",
+     "test/rails/overrides/app/views/links/willcom_location.html.erb",
      "test/rails/overrides/app/views/template_path/_partial.html.erb",
      "test/rails/overrides/app/views/template_path/_partial_mobile.html.erb",
      "test/rails/overrides/app/views/template_path/_partial_mobile_docomo.html.erb",
+     "test/rails/overrides/app/views/template_path/_partial_smart_phone.html.erb",
+     "test/rails/overrides/app/views/template_path/_partial_smart_phone_iphone.html.erb",
      "test/rails/overrides/app/views/template_path/index.html.erb",
      "test/rails/overrides/app/views/template_path/index_mobile.html.erb",
      "test/rails/overrides/app/views/template_path/index_mobile_docomo.html.erb",
+     "test/rails/overrides/app/views/template_path/index_smart_phone.html.erb",
+     "test/rails/overrides/app/views/template_path/index_smart_phone_iphone.html.erb",
      "test/rails/overrides/app/views/template_path/partial.html.erb",
-     "test/rails/overrides/lib/tasks/rspec.rake",
-     "test/rails/overrides/spec/controllers/docomo_guid_spec.rb",
-     "test/rails/overrides/spec/controllers/docomo_spec.rb",
-     "test/rails/overrides/spec/controllers/emobile_spec.rb",
-     "test/rails/overrides/spec/controllers/filter_spec.rb",
-     "test/rails/overrides/spec/controllers/pc_spec.rb",
-     "test/rails/overrides/spec/controllers/softbank_emulator_spec.rb",
-     "test/rails/overrides/spec/controllers/template_path_spec.rb",
-     "test/rails/overrides/spec/controllers/trans_sid_spec.rb",
+     "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/autotest/discover.rb",
+     "test/rails/overrides/config/initializers/jpmobile_generator.rb",
+     "test/rails/overrides/config/routes.rb",
+     "test/rails/overrides/db/migrate/001_add_sessions_table.rb",
      "test/rails/overrides/spec/helpers/helpers_spec.rb",
      "test/rails/overrides/spec/rcov.opts",
-     "test/rails/overrides/spec/rspec.rake",
-     "test/rails/overrides/spec/spec.opts",
+     "test/rails/overrides/spec/requests/docomo_guid_spec.rb",
+     "test/rails/overrides/spec/requests/docomo_spec.rb",
+     "test/rails/overrides/spec/requests/emobile_spec.rb",
+     "test/rails/overrides/spec/requests/filter_spec.rb",
+     "test/rails/overrides/spec/requests/helpers_spec.rb",
+     "test/rails/overrides/spec/requests/pc_spec.rb",
+     "test/rails/overrides/spec/requests/softbank_emulator_spec.rb",
+     "test/rails/overrides/spec/requests/template_path_spec.rb",
+     "test/rails/overrides/spec/requests/trans_sid_spec.rb",
      "test/rails/overrides/spec/spec_helper.rb",
+     "test/sinatra/guestbook.rb",
+     "test/sinatra/test/filter_test.rb",
      "tools/disabled_update_display_info_docomo.rb",
      "tools/emoji/genregexp.rb",
      "tools/generate_au_emoticon_table.rb",
@@ -128,162 +167,59 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{A Rails plugin for Japanese mobile-phones}
   s.test_files = [
-    "spec/unit/detect_by_email_spec.rb",
-     "spec/unit/detect_by_ua_spec.rb",
+    "spec/rack/jpmobile/android_spec.rb",
+     "spec/rack/jpmobile/au_spec.rb",
+     "spec/rack/jpmobile/docomo_spec.rb",
+     "spec/rack/jpmobile/emoticon_spec.rb",
+     "spec/rack/jpmobile/filter_spec.rb",
+     "spec/rack/jpmobile/iphone_spec.rb",
+     "spec/rack/jpmobile/mobile_by_ua_spec.rb",
+     "spec/rack/jpmobile/params_filter_spec.rb",
+     "spec/rack/jpmobile/softbank_spec.rb",
+     "spec/rack/jpmobile/willcom_spec.rb",
+     "spec/rack/jpmobile/windows_phone.rb",
+     "spec/rack_helper.rb",
+     "spec/spec_helper.rb",
+     "spec/unit/detect_by_email_spec.rb",
+     "spec/unit/is_carrier_spec.rb",
      "spec/unit/spec_helper.rb",
-     "spec/unit/valid_ip_spec.rb",
      "spec/unit/util_spec.rb",
-     "spec/unit/is_carrier_spec.rb",
-     "spec/spec_helper.rb",
-     "test/legacy/filter_test.rb",
+     "spec/unit/valid_ip_spec.rb",
      "test/legacy/autoload_test.rb",
-     "test/legacy/softbank_test.rb",
-     "test/legacy/au_test.rb",
-     "test/legacy/willcom_test.rb",
-     "test/legacy/emoticon_functional_test.rb",
      "test/legacy/emoticon_test.rb",
-     "test/legacy/helpers_test.rb",
-     "test/legacy/docomo_test.rb",
      "test/legacy/helper.rb",
-     "test/rails/rails_root/spec/helpers/helpers_spec.rb",
-     "test/rails/rails_root/spec/requests/softbank_emulator_spec.rb",
-     "test/rails/rails_root/spec/requests/docomo_spec.rb",
-     "test/rails/rails_root/spec/requests/helpers_spec.rb",
-     "test/rails/rails_root/spec/requests/docomo_guid_spec.rb",
-     "test/rails/rails_root/spec/requests/trans_sid_spec.rb",
-     "test/rails/rails_root/spec/requests/template_path_spec.rb",
-     "test/rails/rails_root/spec/requests/filter_spec.rb",
-     "test/rails/rails_root/spec/requests/pc_spec.rb",
-     "test/rails/rails_root/spec/requests/emobile_spec.rb",
-     "test/rails/rails_root/spec/spec_helper.rb",
-     "test/rails/rails_root/autotest/discover.rb",
-     "test/rails/rails_root/app/helpers/application_helper.rb",
-     "test/rails/rails_root/app/models/user.rb",
-     "test/rails/rails_root/app/controllers/trans_sid_always_controller.rb",
-     "test/rails/rails_root/app/controllers/hankaku_filter_controller.rb",
-     "test/rails/rails_root/app/controllers/filter_controller_base.rb",
-     "test/rails/rails_root/app/controllers/links_controller.rb",
-     "test/rails/rails_root/app/controllers/trans_sid_base_controller.rb",
-     "test/rails/rails_root/app/controllers/trans_sid_none_controller.rb",
-     "test/rails/rails_root/app/controllers/trans_sid_always_and_session_off_controller.rb",
-     "test/rails/rails_root/app/controllers/template_path_controller.rb",
-     "test/rails/rails_root/app/controllers/docomo_guid_docomo_controller.rb",
-     "test/rails/rails_root/app/controllers/filter_controller.rb",
-     "test/rails/rails_root/app/controllers/mobile_spec_controller.rb",
-     "test/rails/rails_root/app/controllers/trans_sid_mobile_controller.rb",
-     "test/rails/rails_root/app/controllers/application_controller.rb",
-     "test/rails/rails_root/app/controllers/docomo_guid_always_controller.rb",
-     "test/rails/rails_root/app/controllers/docomo_guid_base_controller.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/install.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/emoticon_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/au_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/willcom_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/params_filter_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/docomo_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/filter_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/windows_phone.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/mobile_by_ua_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/iphone_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/softbank_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack/jpmobile/android_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/detect_by_email_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/spec_helper.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/valid_ip_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/util_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/unit/is_carrier_spec.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/spec_helper.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/spec/rack_helper.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_softbank_emoticon_table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_au.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/disabled_update_display_info_docomo.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/update_ip_addresses_willcom.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/emoji/genregexp.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_emoticon_conversion_table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/list_gps_unsupported_au.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_au_emoticon_table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tools/generate_docomo_emoticon_table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/init.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/position.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/filter.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/request_with_mobile.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/docomo_guid.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/params_filter.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/filter.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack/mobile_carrier.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/datum_conv.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/encoding.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rack.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/util.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/trans_sid.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_willcom.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/abstract_mobile.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/iphone.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_emobile.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/emobile.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_au.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/docomo.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/display.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/smart_phone.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_docomo.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_ip_addresses_softbank.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/softbank.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/willcom.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/z_display_info_docomo.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/windows_phone.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/au.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/vodafone.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/android.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/mobile/ddipocket.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/helpers.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/z_combine.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/docomo.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/conversion_table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/softbank.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon/au.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_view.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/emoticon.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/email.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/rails.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/lib/jpmobile/hook_action_controller.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tmp/conversion-table.rb",
-     "test/rails/rails_root/vendor/plugins/jpmobile/tmp/utf8_to_image.rb",
-     "test/rails/rails_root/db/migrate/20100824062306_create_users.rb",
-     "test/rails/rails_root/db/migrate/001_add_sessions_table.rb",
-     "test/rails/rails_root/db/schema.rb",
-     "test/rails/rails_root/db/seeds.rb",
-     "test/rails/rails_root/config/environments/development.rb",
-     "test/rails/rails_root/config/environments/test.rb",
-     "test/rails/rails_root/config/environments/production.rb",
-     "test/rails/rails_root/config/environment.rb",
-     "test/rails/rails_root/config/routes.rb",
-     "test/rails/rails_root/config/application.rb",
-     "test/rails/rails_root/config/initializers/inflections.rb",
-     "test/rails/rails_root/config/initializers/mime_types.rb",
-     "test/rails/rails_root/config/initializers/backtrace_silencers.rb",
-     "test/rails/rails_root/config/initializers/session_store.rb",
-     "test/rails/rails_root/config/initializers/secret_token.rb",
-     "test/rails/rails_root/config/initializers/jpmobile_generator.rb",
-     "test/rails/rails_root/config/boot.rb",
-     "test/rails/rails_root/test/performance/browsing_test.rb",
-     "test/rails/rails_root/test/test_helper.rb",
-     "test/rails/overrides/spec/helpers/helpers_spec.rb",
-     "test/rails/overrides/spec/spec_helper.rb",
-     "test/rails/overrides/spec/controllers/softbank_emulator_spec.rb",
-     "test/rails/overrides/spec/controllers/docomo_spec.rb",
-     "test/rails/overrides/spec/controllers/docomo_guid_spec.rb",
-     "test/rails/overrides/spec/controllers/trans_sid_spec.rb",
-     "test/rails/overrides/spec/controllers/template_path_spec.rb",
-     "test/rails/overrides/spec/controllers/filter_spec.rb",
-     "test/rails/overrides/spec/controllers/pc_spec.rb",
-     "test/rails/overrides/spec/controllers/emobile_spec.rb",
-     "test/rails/overrides/app/controllers/trans_sid_controller.rb",
-     "test/rails/overrides/app/controllers/template_path_controller.rb",
+     "test/rails/overrides/app/controllers/application_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_always_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_base_controller.rb",
+     "test/rails/overrides/app/controllers/docomo_guid_docomo_controller.rb",
      "test/rails/overrides/app/controllers/filter_controller.rb",
+     "test/rails/overrides/app/controllers/filter_controller_base.rb",
+     "test/rails/overrides/app/controllers/hankaku_filter_controller.rb",
+     "test/rails/overrides/app/controllers/links_controller.rb",
      "test/rails/overrides/app/controllers/mobile_spec_controller.rb",
-     "test/rails/overrides/app/controllers/docomo_guid_controller.rb",
-     "test/rails/overrides/app/controllers/application_controller.rb",
-     "test/rails/2.3.2/spec/controllers/trans_sid_spec.rb"
+     "test/rails/overrides/app/controllers/template_path_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_base_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_mobile_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_none_controller.rb",
+     "test/rails/overrides/autotest/discover.rb",
+     "test/rails/overrides/config/initializers/jpmobile_generator.rb",
+     "test/rails/overrides/config/routes.rb",
+     "test/rails/overrides/db/migrate/001_add_sessions_table.rb",
+     "test/rails/overrides/spec/helpers/helpers_spec.rb",
+     "test/rails/overrides/spec/requests/docomo_guid_spec.rb",
+     "test/rails/overrides/spec/requests/docomo_spec.rb",
+     "test/rails/overrides/spec/requests/emobile_spec.rb",
+     "test/rails/overrides/spec/requests/filter_spec.rb",
+     "test/rails/overrides/spec/requests/helpers_spec.rb",
+     "test/rails/overrides/spec/requests/pc_spec.rb",
+     "test/rails/overrides/spec/requests/softbank_emulator_spec.rb",
+     "test/rails/overrides/spec/requests/template_path_spec.rb",
+     "test/rails/overrides/spec/requests/trans_sid_spec.rb",
+     "test/rails/overrides/spec/spec_helper.rb",
+     "test/sinatra/guestbook.rb",
+     "test/sinatra/test/filter_test.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -291,9 +227,21 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_development_dependency(%q<rspec-rails>, [">= 1.3.2"])
+      s.add_development_dependency(%q<rspec-fixture>, [">= 0.0.2"])
+      s.add_development_dependency(%q<jeweler>, [">= 1.4.0"])
     else
+      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<rspec-rails>, [">= 1.3.2"])
+      s.add_dependency(%q<rspec-fixture>, [">= 0.0.2"])
+      s.add_dependency(%q<jeweler>, [">= 1.4.0"])
     end
   else
+    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<rspec-rails>, [">= 1.3.2"])
+    s.add_dependency(%q<rspec-fixture>, [">= 0.0.2"])
+    s.add_dependency(%q<jeweler>, [">= 1.4.0"])
   end
 end
 

data/lib/jpmobile.rb

@@ -1,40 +1,53 @@
+# -*- coding: utf-8 -*-
 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