jpmobile 0.0.6 → 0.0.7

data/lib/jpmobile/mobile/z_ip_addresses_au.rb

@@ -19,4 +19,8 @@ Jpmobile::Mobile::Au::IP_ADDRESSES =
  "118.152.214.192/26",
  "118.159.131.0/25",
  "118.159.133.0/25",
- "118.159.132.160/27"].map {|ip| IPAddr.new(ip) }
+ "118.159.132.160/27",
+ "111.86.142.0/26",
+ "111.86.141.64/26",
+ "111.86.141.128/26",
+ "111.86.141.192/26"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_softbank.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # = IPアドレス帯域テーブル(手動更新分)
 # == SoftBank
 # http://developers.softbankmobile.co.jp/dp/tech_svc/web/ip.php
@@ -10,8 +11,7 @@ Jpmobile::Mobile::Softbank::IP_ADDRESSES = %w(
 210.146.7.192/26
 210.146.60.192/26
 210.151.9.128/26
-210.169.130.112/28
 210.175.1.128/25
-210.228.189.0/24
 211.8.159.128/25
+210.175.1.128/25
 ).map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/mobile/z_ip_addresses_willcom.rb

@@ -56,12 +56,28 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "61.204.93.0/24",
  "61.204.94.0/24",
  "61.204.95.0/24",
+ "114.20.49.0/24",
+ "114.20.50.0/24",
+ "114.20.51.0/24",
+ "114.20.52.0/24",
+ "114.20.53.0/24",
+ "114.20.54.0/24",
+ "114.20.55.0/24",
+ "114.20.56.0/24",
+ "114.20.57.0/24",
+ "114.20.58.0/24",
+ "114.20.59.0/24",
+ "114.20.60.0/24",
+ "114.20.61.0/24",
+ "114.20.62.0/24",
+ "114.20.63.0/24",
+ "114.20.64.0/24",
+ "114.20.65.0/24",
+ "114.20.66.0/24",
+ "114.20.67.0/24",
+ "114.21.255.0/27",
  "125.28.0.0/24",
  "125.28.1.0/24",
- "125.28.11.0/24",
- "125.28.12.0/24",
- "125.28.13.0/24",
- "125.28.14.0/24",
  "125.28.15.0/24",
  "125.28.16.0/24",
  "125.28.17.0/24",
@@ -69,8 +85,6 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "125.28.3.0/24",
  "125.28.4.0/24",
  "125.28.5.0/24",
- "125.28.6.0/24",
- "125.28.7.0/24",
  "125.28.8.0/24",
  "210.168.246.0/24",
  "210.168.247.0/24",
@@ -89,17 +103,12 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "211.18.235.0/24",
  "211.18.236.0/24",
  "211.18.237.0/24",
- "211.18.238.0/24",
- "211.18.239.0/24",
  "219.108.10.0/24",
  "219.108.11.0/24",
  "219.108.12.0/24",
  "219.108.13.0/24",
  "219.108.14.0/24",
  "219.108.15.0/24",
- "219.108.4.0/24",
- "219.108.5.0/24",
- "219.108.6.0/24",
  "219.108.7.0/24",
  "219.108.8.0/24",
  "219.108.9.0/24",
@@ -108,10 +117,41 @@ Jpmobile::Mobile::Willcom::IP_ADDRESSES =
  "221.119.2.0/24",
  "221.119.3.0/24",
  "221.119.4.0/24",
- "221.119.5.0/24",
  "221.119.6.0/24",
  "221.119.7.0/24",
  "221.119.8.0/24",
  "221.119.9.0/24",
+ "114.20.49.0/24",
+ "114.20.50.0/24",
+ "114.20.51.0/24",
+ "114.20.52.0/24",
+ "114.20.53.0/24",
+ "114.20.54.0/24",
+ "114.20.55.0/24",
+ "114.20.56.0/24",
+ "114.20.57.0/24",
+ "114.20.58.0/24",
+ "114.20.59.0/24",
+ "114.20.60.0/24",
+ "114.20.61.0/24",
+ "114.20.62.0/24",
+ "114.20.63.0/24",
+ "114.20.64.0/24",
+ "114.20.65.0/24",
+ "114.20.66.0/24",
+ "114.20.67.0/24",
+ "114.21.255.0/27",
  "219.108.2.0/24",
- "219.108.3.0/24"].map {|ip| IPAddr.new(ip) }
+ "219.108.3.0/24",
+ "125.28.6.0/24",
+ "125.28.7.0/24",
+ "125.28.11.0/24",
+ "125.28.12.0/24",
+ "125.28.13.0/24",
+ "125.28.14.0/24",
+ "211.18.238.0/24",
+ "211.18.239.0/24",
+ "219.108.4.0/24",
+ "219.108.5.0/24",
+ "219.108.6.0/24",
+ "221.119.5.0/24"].map {|ip| IPAddr.new(ip) }

data/lib/jpmobile/trans_sid.rb

@@ -1,10 +1,12 @@
+# -*- coding: utf-8 -*-
 # = セッションIDの付与
+require 'active_support/version'
 
-module ActionController
-  # cookie よりも params を先に見るパッチ
-  module Session
-    class AbstractStore
-      def load_session(env)
+module ParamsOverCookie
+  def self.included(base)
+    base.class_eval do
+      # cookie よりも params を先に見るパッチ
+      def load_session_with_jpmobile(env)
         request = Rack::Request.new(env)
         unless @cookie_only
           sid = request.params[@key]
@@ -14,8 +16,14 @@ module ActionController
         sid, session = get_session(env, sid)
         [sid, session]
       end
+      alias_method_chain :load_session, :jpmobile
     end
   end
+end
+
+module ActionController
+  # cookie よりも params を先に見るパッチ
+  Session::AbstractStore.send :include, ParamsOverCookie
 
   class Base #:nodoc:
     class_inheritable_accessor :trans_sid_mode
@@ -27,7 +35,7 @@ module ActionController
     end
 
     def redirect_to_full_url(url, status)
-      if apply_trans_sid? and !url.match(/#{session_key}/)
+      if apply_trans_sid? and !url.match(/#{session_key}/) and jpmobile_session_id
         uri = URI.parse(url)
         if uri.query
           uri.query += "&#{session_key}=#{jpmobile_session_id}"
@@ -56,15 +64,20 @@ module ActionController
     private
     # trans_sidを適用すべきかを返す。
     def apply_trans_sid?
-      return false if trans_sid_mode == :none
-      return true if trans_sid_mode == :always
-      if trans_sid_mode == :mobile
-        if request.mobile?
-          return !request.mobile.supports_cookie?
-        else
-          return false
+      # session_id が blank の場合は適用しない
+      return false if trans_sid_mode and jpmobile_session_id.blank?
+
+      case trans_sid_mode
+      when :always
+        session.inspect
+        return true
+      when :mobile
+        if request.mobile? and !request.mobile.supports_cookie?
+          session.inspect
+          return true
         end
       end
+
       return false
     end
   end
@@ -87,7 +100,7 @@ module Jpmobile::TransSid #:nodoc:
   private
   # session_keyを返す。
   def session_key
-    (request.session_options || ActionController::Base.session_options)[:key]
+    ActionController::Base.session_options.merge(request.session_options || {})[:key]
   end
   # session_idを返す
   def jpmobile_session_id
@@ -101,6 +114,7 @@ module Jpmobile::TransSid #:nodoc:
   def append_session_id_parameter
     return unless request # for test process
     return unless apply_trans_sid?
+    return unless jpmobile_session_id
     response.body.gsub!(%r{(</form>)}i, sid_hidden_field_tag+'\1')
   end
 end

data/lib/jpmobile/version.rb

@@ -2,7 +2,7 @@ module Jpmobile #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 6
+    TINY  = 7
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/test/legacy/emoticon_test.rb

@@ -7,6 +7,9 @@ class DocomoEmoticonTest < Test::Unit::TestCase
   def test_unicodecr_external_docomo
     assert_equal "\xf8\x9f", Jpmobile::Emoticon::unicodecr_to_external("&#xe63e;")
   end
+  def test_unicodecr_external_docomo_for_string
+    assert_equal "\xf8\x9f\xf8\xa0", Jpmobile::Emoticon::unicodecr_to_external("&#xE48E;", Jpmobile::Emoticon::CONVERSION_TABLE_TO_DOCOMO, true)
+  end
   def test_unicodecr_utf8_docomo
     assert_equal "\356\230\276", Jpmobile::Emoticon::unicodecr_to_utf8("&#xe63e;")
   end
@@ -49,6 +52,9 @@ class SoftbankEmoticonTest < Test::Unit::TestCase
   def test_softbank_utf8_cr
     assert_equal "&#xf001;", Jpmobile::Emoticon::utf8_to_unicodecr("\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)
+  end
 end
 
 class KoukaiEmoticonTest < Test::Unit::TestCase

data/test/legacy/helpers_test.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__)+'/helper'
 require 'hpricot'
 
@@ -32,7 +33,7 @@ class HelpersTest < Test::Unit::TestCase
     text,attrs,path,params = links.first
     assert_equal("STRING", text)
     assert_equal("http://example.jp", path)
-    assert(attrs.include?("lcs"))
+    assert(attrs.to_hash.include?("lcs"))
   end
 
   # get_position_link_to(自動判別), TUKA
@@ -77,7 +78,7 @@ class HelpersTest < Test::Unit::TestCase
     text,attrs,path,params = links.first
     assert_equal("STRING", text)
     assert_equal("http://example.jp", path)
-    assert(attrs.include?("z"))
+    assert(attrs.to_hash.include?("z"))
   end
 
   # get_position_link_to(自動判別), Vodafone
@@ -119,7 +120,7 @@ class HelpersTest < Test::Unit::TestCase
     text,attrs,path,params = links.first
     assert_equal("STRING", text)
     assert_equal("http://example.jp", path)
-    assert(attrs.include?("utn"))
+    assert(attrs.to_hash.include?("utn"))
   end
 
   # DoCoMo オープンiエリア取得用のリンクが正しく出力されるか。
@@ -142,7 +143,7 @@ class HelpersTest < Test::Unit::TestCase
     text,attrs,path,params = links.first
     assert_equal("STRING", text)
     assert_equal("http://example.jp", path)
-    assert(attrs.include?("lcs"))
+    assert(attrs.to_hash.include?("lcs"))
   end
 
   # au簡易位置情報取得用のリンクが正しく出力されるか。
@@ -177,7 +178,7 @@ class HelpersTest < Test::Unit::TestCase
     text,attrs,path,params = links.first
     assert_equal("STRING", text)
     assert_equal("http://example.jp", path)
-    assert(attrs.include?("z"))
+    assert(attrs.to_hash.include?("z"))
   end
 
   # Softbank 3G 位置情報取得用のリンクが正しく出力されるか。

data/test/rails/2.3.2/spec/controllers/trans_sid_spec.rb

@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "trans_sid が起動しないとき", :shared => true do
+  it "で link_to の自動書き換えが行われない" do
+    get :link
+    response.body.should =~ %r{^<a href="/.+?/link">linkto</a>$}
+  end
+  it "で form の自動書き換えが行われない" do
+    get :form
+    response.body.should =~ %r{^<form action="/.+?/form" method="post">Hello</form>$}
+  end
+  it "で redirect の自動書き換えが行われない" do
+    get :redirect
+    response.should redirect_to('/')
+  end
+end
+
+describe "trans_sid が起動するとき", :shared => true do
+  before :each do
+    request.session.session_id = "mysessionid"
+  end
+  it "で link_to の自動書き換えが行われる" do
+    get :link
+    response.body.should =~ %r{^<a href="/.+?/link\?_session_id=mysessionid">linkto</a>$}
+  end
+  it "で form の自動書き換えが行われる" do
+    get :form
+    response.body.should =~ %r{^<form action="/.+?/form\?_session_id=mysessionid" method="post">Hello<input type="hidden" name="_session_id" value="mysessionid" /></form>$}
+  end
+  it "で redirect の自動書き換えが行われる" do
+    get :redirect
+    response.should redirect_to('/?_session_id=mysessionid')
+  end
+end
+
+describe TransSidBaseController, "という trans_sid が有効になっていないコントローラ" do
+  controller_name :trans_sid_base
+  it "の trans_sid_mode は nil" do
+    controller.trans_sid_mode.should be_nil
+  end
+  it_should_behave_like "trans_sid が起動しないとき"
+end
+
+describe TransSidNoneController, "という trans_sid :none が指定されているコントローラ" do
+  controller_name :trans_sid_none
+  it "の trans_sid_mode は :none" do
+    controller.trans_sid_mode.should == :none
+  end
+  it_should_behave_like "trans_sid が起動しないとき"
+end
+
+describe TransSidAlwaysController, "という trans_sid :always が指定されているコントローラ" do
+  controller_name :trans_sid_always
+  before :each do
+    request.session.session_id = "mysessionid"
+  end
+  it "の trans_sid_mode は :always" do
+    controller.trans_sid_mode.should == :always
+  end
+  it_should_behave_like "trans_sid が起動するとき"
+end
+
+describe TransSidMobileController, "という trans_sid :mobile が指定されているコントローラ" do
+  controller_name :trans_sid_mobile
+  it "の trans_sid_mode は :mobile" do
+    controller.trans_sid_mode.should == :mobile
+  end
+end
+
+def describe_mobile_with_ua(user_agent, &block)
+  describe("trans_sid :mobile が指定されているコントローラに #{user_agent} からアクセスしたとき") do
+    controller_name :trans_sid_mobile
+    before do
+      request.user_agent = user_agent
+    end
+    instance_eval(&block)
+  end
+end
+
+describe_mobile_with_ua "DoCoMo/2.0 SH902i(c100;TB;W24H12)" do
+  it_should_behave_like "trans_sid が起動するとき"
+end
+
+describe_mobile_with_ua "J-PHONE/3.0/V301D" 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
+  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
+  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
+  it_should_behave_like "trans_sid が起動しないとき"
+end

data/test/rails/overrides/app/controllers/filter_controller.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 class FilterControllerBase < ApplicationController
   def abracadabra_utf8
     render :text => "アブラカダブラ"

data/test/rails/overrides/spec/controllers/filter_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "文字コードフィルタが動作しているとき", :shared => true do

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

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "trans_sid が起動しないとき", :shared => true do
@@ -17,7 +18,7 @@ end
 
 describe "trans_sid が起動するとき", :shared => true do
   before :each do
-    request.session.session_id = "mysessionid"
+    request.session_options[:id] = "mysessionid"
   end
   it "で link_to の自動書き換えが行われる" do
     get :link
@@ -31,6 +32,11 @@ describe "trans_sid が起動するとき", :shared => true do
     get :redirect
     response.should redirect_to('/?_session_id=mysessionid')
   end
+  it "でセッションIDが空のときには有効にならない" do
+    request.session_options[:id] = ""
+    get :link
+    response.body.should =~ %r{^<a href="/.+?/link">linkto</a>$}
+  end
 end
 
 describe TransSidBaseController, "という trans_sid が有効になっていないコントローラ" do
@@ -52,7 +58,7 @@ end
 describe TransSidAlwaysController, "という trans_sid :always が指定されているコントローラ" do
   controller_name :trans_sid_always
   before :each do
-    request.session.session_id = "mysessionid"
+    request.session_options[:id] = "mysessionid"
   end
   it "の trans_sid_mode は :always" do
     controller.trans_sid_mode.should == :always
@@ -77,6 +83,18 @@ def describe_mobile_with_ua(user_agent, &block)
   end
 end
 
+describe TransSidAlwaysController, "という trans_sid :always が指定されているコントローラで reset_session したとき" do
+  controller_name :trans_sid_always
+  before :each do
+    # 擬似的 reset_session
+    request.session_options[:id] = nil
+  end
+  it "の trans_sid_mode は :always" do
+    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
   it_should_behave_like "trans_sid が起動するとき"
 end

data/test/rails/rails_root/README

@@ -36,32 +36,19 @@ link:files/vendor/rails/actionpack/README.html.
 
 == Web Servers
 
-By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise
-Rails will use WEBrick, the webserver that ships with Ruby. When you run script/server,
-Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures
-that you can always get up and running quickly.
+By default, Rails will try to use Mongrel if it's are installed when started with script/server, otherwise Rails will use WEBrick, the webserver that ships with Ruby. But you can also use Rails
+with a variety of other web servers.
 
 Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
 suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
 getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
 More info at: http://mongrel.rubyforge.org
 
-If Mongrel is not installed, Rails will look for lighttpd. It's considerably faster than
-Mongrel and WEBrick and also suited for production use, but requires additional
-installation and currently only works well on OS X/Unix (Windows users are encouraged
-to start with Mongrel). We recommend version 1.4.11 and higher. You can download it from
-http://www.lighttpd.net.
+Say other Ruby web servers like Thin and Ebb or regular web servers like Apache or LiteSpeed or
+Lighttpd or IIS. The Ruby web servers are run through Rack and the latter can either be setup to use
+FCGI or proxy to a pack of Mongrels/Thin/Ebb servers.
 
-And finally, if neither Mongrel or lighttpd are installed, Rails will use the built-in Ruby
-web server, WEBrick. WEBrick is a small Ruby web server suitable for development, but not
-for production.
-
-But of course its also possible to run Rails on any platform that supports FCGI.
-Apache, LiteSpeed, IIS are just a few. For more information on FCGI,
-please visit: http://wiki.rubyonrails.com/rails/pages/FastCGI
-
-
-== Apache .htaccess example
+== Apache .htaccess example for FCGI/CGI
 
 # General Apache options
 AddHandler fastcgi-script .fcgi

data/test/rails/rails_root/app/controllers/trans_sid_controller.rb

@@ -1,11 +1,14 @@
 class TransSidBaseController < ApplicationController
-  session :session_key => '_session_id'
+  ActionController::Base.session_options[:key] = '_session_id'
   def form
     render :inline=>%{<% form_tag do %>Hello<% end %>}
   end
   def link
     render :inline=>%{<%= link_to "linkto" %>}
   end
+  def redirect
+    redirect_to('/')
+  end
 end
 
 class TransSidAlwaysController < TransSidBaseController
@@ -22,5 +25,4 @@ end
 
 class TransSidAlwaysAndSessionOffController < TransSidBaseController
   trans_sid :always
-  session :off
 end

data/test/rails/rails_root/app/views/template_path/_partial.html.erb

@@ -0,0 +1 @@
+<h2>_partial.html.erb</h2>

data/test/rails/rails_root/app/views/template_path/_partial_mobile.html.erb

@@ -0,0 +1 @@
+<h2>_partial_mobile.html.erb</h2>

data/test/rails/rails_root/app/views/template_path/_partial_mobile_docomo.html.erb

@@ -0,0 +1 @@
+<h2>_partial_mobile_docomo.html.erb</h2>

data/test/rails/rails_root/app/views/template_path/partial.html.erb

@@ -0,0 +1,2 @@
+<h1>partial.html.erb</h1>
+<%= render :partial => 'partial' %>

data/test/rails/rails_root/config/boot.rb

@@ -44,6 +44,7 @@ module Rails
     def load_initializer
       require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
       Rails::Initializer.run(:install_gem_spec_stubs)
+      Rails::GemDependency.add_frozen_gem_path
     end
   end
 
@@ -81,8 +82,8 @@ module Rails
       end
 
       def load_rubygems
+        min_version = '1.3.2'
         require 'rubygems'
-        min_version = '1.3.1'
         unless rubygems_version >= min_version
           $stderr.puts %Q(Rails requires RubyGems >= #{min_version} (you have #{rubygems_version}). Please `gem update --system` and try again.)
           exit 1

data/test/rails/rails_root/config/environment.rb

@@ -1,11 +1,7 @@
 # Be sure to restart your server when you modify this file
 
-# Uncomment below to force Rails into production mode when
-# you don't control web/app server and can't set it the proper way
-# ENV['RAILS_ENV'] ||= 'production'
-
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -14,62 +10,33 @@ Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
-  # See Rails::Configuration for more options.
 
-  # Skip frameworks you're not going to use. To use Rails without a database
-  # you must remove the Active Record framework.
-  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
+  # Add additional load paths for your own custom dirs
+  # config.load_paths += %W( #{RAILS_ROOT}/extras )
 
-  # Specify gems that this application depends on. 
-  # They can then be installed with "rake gems:install" on new installations.
-  # You have to specify the :lib option for libraries, where the Gem name (sqlite3-ruby) differs from the file itself (sqlite3)
+  # Specify gems that this application depends on and have them installed with rake gems:install
   # config.gem "bj"
   # config.gem "hpricot", :version => '0.6', :source => "http://code.whytheluckystiff.net"
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   # config.gem "aws-s3", :lib => "aws/s3"
 
-  # Only load the plugins named here, in the order given. By default, all plugins 
-  # in vendor/plugins are loaded in alphabetical order.
+  # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named
   # config.plugins = [ :exception_notification, :ssl_requirement, :all ]
 
-  # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+  # Skip frameworks you're not going to use. To use Rails without a database,
+  # you must remove the Active Record framework.
+  # config.frameworks -= [ :active_record, :active_resource, :action_mailer ]
 
-  # Force all environments to use the same logger level
-  # (by default production uses :info, the others :debug)
-  # config.log_level = :debug
+  # Activate observers that should always be running
+  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 
-  # Make Time.zone default to the specified zone, and make Active Record store time values
-  # in the database in UTC, and return them converted to the specified local zone.
-  # Run "rake -D time" for a list of tasks for finding time zone names. Comment line to use default local time.
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names.
   config.time_zone = 'UTC'
 
-  # The internationalization framework can be changed to have another default locale (standard is :en) or more load paths.
-  # All files from config/locales/*.rb,yml are added automatically.
-  # config.i18n.load_path << Dir[File.join(RAILS_ROOT, 'my', 'locales', '*.{rb,yml}')]
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}')]
   # config.i18n.default_locale = :de
-
-  # Your secret key for verifying cookie session data integrity.
-  # If you change this key, all old sessions will become invalid!
-  # Make sure the secret is at least 30 characters and all random, 
-  # no regular words or you'll be exposed to dictionary attacks.
-  config.action_controller.session = {
-    :session_key => '_rails_root_session',
-    :secret      => '15aff507586a8efbe016f95e62060ea3bea4abedee54b79b1173484080764854dfec4304d872c01d493184dfd6831bcf355d69e94ce1b6547ae64952589f1dbc'
-  }
-
-  # Use the database for sessions instead of the cookie-based default,
-  # which shouldn't be used to store highly confidential information
-  # (create the session table with "rake db:sessions:create")
-  # config.action_controller.session_store = :active_record_store
-
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
-
-  # Activate observers that should always be running
-  # Please note that observers generated using script/generate observer need to have an _observer suffix
-  # config.active_record.observers = :cacher, :garbage_collector, :forum_observer
 end
+ActionController::Base.session = {:key => "_session_id", :cookie_only => false}