jpmobile 0.1.0.pre → 0.1.0.pre.2

data/VERSION.yml

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

data/jpmobile.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jpmobile}
-  s.version = "0.1.0.pre"
+  s.version = "0.1.0.pre.2"
 
   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-28}
+  s.date = %q{2010-07-29}
   s.description = %q{A Rails plugin for Japanese mobile-phones}
   s.email = %q{dara@shidara.net}
   s.extra_rdoc_files = [

data/lib/jpmobile/rails.rb

@@ -1,15 +1,16 @@
+# -*- coding: utf-8 -*-
 ActiveSupport.on_load(:action_controller) do
-  # -*- coding: utf-8 -*-
   require 'jpmobile/docomo_guid'
   require 'jpmobile/filter'
   require 'jpmobile/helpers'
   require 'jpmobile/hook_action_controller'
   require 'jpmobile/hook_action_view'
   require 'jpmobile/trans_sid'
+end
 
+ActiveSupport.on_load(:before_configuration) do
   # MobileCarrierのみデフォルトで有効
   ::Rails.application.middleware.insert_before('ActionDispatch::ParamsParser', Jpmobile::Rack::MobileCarrier)
-
   module Rails
     class Application
       class Configuration

data/lib/jpmobile/trans_sid.rb

@@ -6,14 +6,15 @@ module ParamsOverCookie
   def self.included(base)
     base.class_eval do
       # cookie よりも params を先に見るパッチ
-      def load_session_with_jpmobile(env)
+      def extract_session_id_with_jpmobile(env)
         request = Rack::Request.new(env)
-        sid   = request.cookies[@key]
-        sid ||= request.params[@key] unless @cookie_only
-        sid, session = get_session(env, sid)
-        [sid, session]
+        if request.params[@key] and !@cookie_only
+          sid = request.params[@key] unless @cookie_only
+        end
+        sid ||= request.cookies[@key]
+        sid
       end
-      alias_method_chain :load_session, :jpmobile
+      alias_method_chain :extract_session_id, :jpmobile
     end
   end
 end
@@ -59,21 +60,11 @@ module ActionController
   class Base #:nodoc:
     class_inheritable_accessor :trans_sid_mode
 
-    def transit_sid_mode(*args)
-      STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
-      trans_sid_mode(*args)
-    end
-
     class << self
       def trans_sid(mode = :mobile)
         include Jpmobile::TransSid
         self.trans_sid_mode = mode
       end
-
-      def transit_sid(*args)
-        STDERR.puts "Method transit_sid is now deprecated. Use trans_sid instead."
-        trans_sid(*args)
-      end
     end
 
     private

data/lib/tasks/jpmobile_tasks.rake

@@ -62,13 +62,6 @@ namespace :test do
         FileUtils.cp_r(file, rails_root)
       end
 
-      # for 2.3.2
-      if rails_version == "2.3.2"
-        FileList["test/rails/2.3.2/*"].each do |file|
-          FileUtils.cp_r(file, rails_root)
-        end
-      end
-
       # for cookie_only option
       config_path = File.join(rails_root, 'config', 'initializers', 'session_store.rb')
       File.open(config_path, 'w') do |file|

data/test/rails/overrides/Gemfile

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

data/test/rails/overrides/spec/requests/trans_sid_spec.rb

@@ -17,7 +17,7 @@ shared_examples_for "trans_sid が起動しないとき" do
   it "で form の自動書き換えが行われない" do
     res = get_with_session(@controller, "form", @user_agent)
 
-    res.response.body.should =~ /<form action=\"\/.+?\/form\"/
+    res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/.+?\/form\"/
   end
   it "で redirect の自動書き換えが行われない" do
     res = get_with_session(@controller, "redirect", @user_agent)
@@ -35,7 +35,7 @@ shared_examples_for "trans_sid が起動するとき" do
   it "で form の自動書き換えが行われる" do
     res = get_with_session(@controller, "form", @user_agent)
 
-    res.response.body.should =~ /<form action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\"/
+    res.response.body.should =~ /<form accept-charset="#{@charset}" action=\"\/.+?\/form\?_session_id=[a-zA-Z0-9]{32}\"/
   end
   it "で redirect の自動書き換えが行われる" do
     res = get_with_session(@controller, "redirect", @user_agent)
@@ -48,6 +48,7 @@ describe TransSidBaseController, "という trans_sid が有効になってい
   before(:each) do
     @controller = "trans_sid_base"
     @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    @charset    = "UTF-8"
   end
 
   it "の trans_sid_mode は nil" do
@@ -62,6 +63,7 @@ describe TransSidNoneController, "という trans_sid :none が指定されて
   before(:each) do
     @controller = "trans_sid_none"
     @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    @charset    = "UTF-8"
   end
 
   it "の trans_sid_mode は :none" do
@@ -76,6 +78,7 @@ describe TransSidAlwaysController, "という trans_sid :always が指定され
   before(:each) do
     @controller = "trans_sid_always"
     @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    @charset    = "UTF-8"
   end
 
   it "の trans_sid_mode は :always" do
@@ -90,6 +93,7 @@ describe TransSidMobileController, "という trans_sid :mobile が指定され
   before(:each) do
     @controller = "trans_sid_mobile"
     @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    @charset    = "UTF-8"
   end
 
   it "の trans_sid_mode は :mobile" do
@@ -99,44 +103,47 @@ describe TransSidMobileController, "という trans_sid :mobile が指定され
   end
 end
 
-def describe_mobile_with_ua(user_agent, &block)
+def describe_mobile_with_ua(user_agent, charset, &block)
   describe("trans_sid :mobile が指定されているコントローラに #{user_agent} からアクセスしたとき") do
     before(:each) do
       @controller = "trans_sid_mobile"
       @user_agent = user_agent
+      @charset    = charset
     end
 
     instance_eval(&block)
   end
 end
 
-# NOTE: Rails 3.0b4 では session_id が自動的に生成されるようなので、強制的に書き換わってしまう。
-# describe TransSidAlwaysAndSessionOffController, "という trans_sid :always が指定されていて session がロードされていないとき" do
-#   before(:each) do
-#     @controller = "trans_sid_always_and_session_off"
-#     @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
-#   end
+describe TransSidAlwaysAndSessionOffController, "という trans_sid :always が指定されていて session がロードされていないとき" do
+  before(:each) do
+    @controller = "trans_sid_always_and_session_off"
+    @user_agent = "Mozilla/5.0 (Windows; U; Windows NT 5.1; ja; rv:1.9.2.3) Gecko/20100401 Firefox/3.6.3 ( .NET CLR 3.5.30729)"
+    @charset    = "UTF-8"
+  end
 
-#   it "の trans_sid_mode は :always" do
-#     res = get_with_session(@controller, "link", @user_agent)
+  it "の trans_sid_mode は :always" do
+    res = get_with_session(@controller, "link", @user_agent)
 
-#     res.controller.trans_sid_mode.should == :always
-#   end
-#   it_should_behave_like "trans_sid が起動しないとき"
-# end
+    res.controller.trans_sid_mode.should == :always
+  end
+  it_should_behave_like "trans_sid が起動しないとき"
+end
 
-describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)" do
+# NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
+describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)", "UTF-8" do
   it_should_behave_like "trans_sid が起動するとき"
 end
 
-describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0" do
+# NOTE: 3.0.0RC では accept-charset は UTF-8 で埋め込まれるので保留
+describe_mobile_with_ua "KDDI-CA32 UP.Browser/6.2.0.7.3.129 (GUI) MMP/2.0", "UTF-8" do
   it_should_behave_like "trans_sid が起動しないとき"
 end
 
-describe_mobile_with_ua "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1" do
+describe_mobile_with_ua "SoftBank/1.0/910T/TJ001/SN000000000000000 Browser/NetFront/3.3 Profile/MIDP-2.0 Configuration/CLDC-1.1", "UTF-8" do
   it_should_behave_like "trans_sid が起動しないとき"
 end
 
-describe_mobile_with_ua "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0" do
+describe_mobile_with_ua "Vodafone/1.0/V903T/TJ001 Browser/VF-Browser/1.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 Ext-J-Profile/JSCL-1.2.2 Ext-V-Profile/VSCL-2.0.0", "UTF-8" do
   it_should_behave_like "trans_sid が起動しないとき"
 end

metadata

@@ -7,7 +7,8 @@ version: !ruby/object:Gem::Version
   - 1
   - 0
   - pre
-  version: 0.1.0.pre
+  - 2
+  version: 0.1.0.pre.2
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -16,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-28 00:00:00 +09:00
+date: 2010-07-29 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency