jpmobile 0.1.0.pre.3 → 0.1.0.pre.4

data/.gitignore

@@ -1,3 +1,5 @@
 doc
 tmp
 pkg
+.bundle/
+Gemfile.lock

data/VERSION.yml

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

data/jpmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "0.1.0.pre.3"
+  s.version = "0.1.0.pre.4"
 
   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-07-29}
+  s.date = %q{2010-08-24}
   s.description = %q{A Rails plugin for Japanese mobile-phones}
   s.email = %q{dara@shidara.net}
   s.extra_rdoc_files = [
@@ -167,59 +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/rack/jpmobile/android_spec.rb",
+    "spec/rack/jpmobile/emoticon_spec.rb",
      "spec/rack/jpmobile/au_spec.rb",
+     "spec/rack/jpmobile/willcom_spec.rb",
+     "spec/rack/jpmobile/params_filter_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/windows_phone.rb",
      "spec/rack/jpmobile/mobile_by_ua_spec.rb",
-     "spec/rack/jpmobile/params_filter_spec.rb",
+     "spec/rack/jpmobile/iphone_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/rack/jpmobile/android_spec.rb",
      "spec/unit/detect_by_email_spec.rb",
-     "spec/unit/is_carrier_spec.rb",
      "spec/unit/spec_helper.rb",
-     "spec/unit/util_spec.rb",
      "spec/unit/valid_ip_spec.rb",
+     "spec/unit/util_spec.rb",
+     "spec/unit/is_carrier_spec.rb",
+     "spec/spec_helper.rb",
+     "spec/rack_helper.rb",
      "test/legacy/autoload_test.rb",
      "test/legacy/emoticon_test.rb",
      "test/legacy/helper.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/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/sinatra/guestbook.rb",
+     "test/sinatra/test/filter_test.rb",
      "test/rails/overrides/spec/helpers/helpers_spec.rb",
-     "test/rails/overrides/spec/requests/docomo_guid_spec.rb",
+     "test/rails/overrides/spec/requests/softbank_emulator_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/docomo_guid_spec.rb",
      "test/rails/overrides/spec/requests/trans_sid_spec.rb",
+     "test/rails/overrides/spec/requests/template_path_spec.rb",
+     "test/rails/overrides/spec/requests/filter_spec.rb",
+     "test/rails/overrides/spec/requests/pc_spec.rb",
+     "test/rails/overrides/spec/requests/emobile_spec.rb",
      "test/rails/overrides/spec/spec_helper.rb",
-     "test/sinatra/guestbook.rb",
-     "test/sinatra/test/filter_test.rb"
+     "test/rails/overrides/autotest/discover.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_controller.rb",
+     "test/rails/overrides/app/controllers/hankaku_filter_controller.rb",
+     "test/rails/overrides/app/controllers/filter_controller_base.rb",
+     "test/rails/overrides/app/controllers/links_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_base_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_none_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb",
+     "test/rails/overrides/app/controllers/template_path_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/mobile_spec_controller.rb",
+     "test/rails/overrides/app/controllers/trans_sid_mobile_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/db/migrate/001_add_sessions_table.rb",
+     "test/rails/overrides/config/routes.rb",
+     "test/rails/overrides/config/initializers/jpmobile_generator.rb"
   ]
 
   if s.respond_to? :specification_version then

data/lib/jpmobile/request_with_mobile.rb

@@ -12,8 +12,10 @@ module Jpmobile
 
     # for reverse proxy.
     def remote_addr
-      if respond_to? :remote_ip
-        return __send__(:remote_ip)
+      if respond_to?(:remote_ip)
+        return __send__(:remote_ip)  # for Rails
+      elsif respond_to?(:ip)
+        return __send__(:ip)         # for Rack
       else
         return ( env["HTTP_X_FORWARDED_FOR"] ? env["HTTP_X_FORWARDED_FOR"].split(',').pop : env["REMOTE_ADDR"] )
       end

data/test/rails/overrides/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.0.rc'
+gem 'rails', '3.0.0.rc2'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: jpmobile
 version: !ruby/object:Gem::Version 
+  hash: 1923831985
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
   - pre
-  - 3
-  version: 0.1.0.pre.3
+  - 4
+  version: 0.1.0.pre.4
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -17,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-29 00:00:00 +09:00
+date: 2010-08-24 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,6 +29,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 1
         - 3
@@ -43,6 +45,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 1
         - 3
@@ -58,6 +61,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 0
@@ -73,6 +77,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
@@ -247,6 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -255,6 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -268,56 +275,56 @@ signing_key:
 specification_version: 3
 summary: A Rails plugin for Japanese mobile-phones
 test_files: 
-- spec/rack/jpmobile/android_spec.rb
+- spec/rack/jpmobile/emoticon_spec.rb
 - spec/rack/jpmobile/au_spec.rb
+- spec/rack/jpmobile/willcom_spec.rb
+- spec/rack/jpmobile/params_filter_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/windows_phone.rb
 - spec/rack/jpmobile/mobile_by_ua_spec.rb
-- spec/rack/jpmobile/params_filter_spec.rb
+- spec/rack/jpmobile/iphone_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/rack/jpmobile/android_spec.rb
 - spec/unit/detect_by_email_spec.rb
-- spec/unit/is_carrier_spec.rb
 - spec/unit/spec_helper.rb
-- spec/unit/util_spec.rb
 - spec/unit/valid_ip_spec.rb
+- spec/unit/util_spec.rb
+- spec/unit/is_carrier_spec.rb
+- spec/spec_helper.rb
+- spec/rack_helper.rb
 - test/legacy/autoload_test.rb
 - test/legacy/emoticon_test.rb
 - test/legacy/helper.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/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/sinatra/guestbook.rb
+- test/sinatra/test/filter_test.rb
 - test/rails/overrides/spec/helpers/helpers_spec.rb
-- test/rails/overrides/spec/requests/docomo_guid_spec.rb
+- test/rails/overrides/spec/requests/softbank_emulator_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/docomo_guid_spec.rb
 - test/rails/overrides/spec/requests/trans_sid_spec.rb
+- test/rails/overrides/spec/requests/template_path_spec.rb
+- test/rails/overrides/spec/requests/filter_spec.rb
+- test/rails/overrides/spec/requests/pc_spec.rb
+- test/rails/overrides/spec/requests/emobile_spec.rb
 - test/rails/overrides/spec/spec_helper.rb
-- test/sinatra/guestbook.rb
-- test/sinatra/test/filter_test.rb
+- test/rails/overrides/autotest/discover.rb
+- test/rails/overrides/app/controllers/trans_sid_always_controller.rb
+- test/rails/overrides/app/controllers/hankaku_filter_controller.rb
+- test/rails/overrides/app/controllers/filter_controller_base.rb
+- test/rails/overrides/app/controllers/links_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_base_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_none_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_always_and_session_off_controller.rb
+- test/rails/overrides/app/controllers/template_path_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/mobile_spec_controller.rb
+- test/rails/overrides/app/controllers/trans_sid_mobile_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/db/migrate/001_add_sessions_table.rb
+- test/rails/overrides/config/routes.rb
+- test/rails/overrides/config/initializers/jpmobile_generator.rb