[jruby-rack~main:c8310807] Upgrade Rails example to 2.3.5

[nicksieger@kenai.com]

Project:    jruby-rack
Repository: main
Revision:   c8310807140aa466d3e06a5b98411a88b7f08451
Author:     nicksieger
Date:       2010-01-28 22:25:23 UTC
Link:       

Log Message:
------------
Update to 0.9.7-SNAPSHOT for trunk dev
Upgrade Rails example to 2.3.5


Revisions:
----------
a251a375d0e5013122c575da451cc09600ed3c30
c8310807140aa466d3e06a5b98411a88b7f08451


Modified Paths:
---------------
pom.xml
src/main/ruby/jruby/rack/version.rb
examples/rails/app/controllers/application_controller.rb
examples/rails/config/boot.rb
examples/rails/config/environment.rb
examples/rails/config/initializers/new_rails_defaults.rb
examples/rails/config/initializers/session_store.rb
examples/rails/config/routes.rb
examples/rails/script/about
examples/rails/script/console
examples/rails/script/dbconsole
examples/rails/script/destroy
examples/rails/script/generate
examples/rails/script/performance/benchmarker
examples/rails/script/performance/profiler
examples/rails/script/plugin
examples/rails/script/runner
examples/rails/script/server


Diffs:
------
diff --git a/pom.xml b/pom.xml
index 7fe5125..bfe028b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.jruby.rack</groupId>
   <artifactId>jruby-rack</artifactId>
-  <version>0.9.6</version>
+  <version>0.9.7-SNAPSHOT</version>
   <name>JRuby-Rack</name>
   <url>http://jruby-rack.kenai.com/</url>
   <description>
diff --git a/src/main/ruby/jruby/rack/version.rb 
b/src/main/ruby/jruby/rack/version.rb
index 986959f..51efc04 100644
--- a/src/main/ruby/jruby/rack/version.rb
+++ b/src/main/ruby/jruby/rack/version.rb
@@ -7,6 +7,6 @@
 
 module JRuby
   module Rack
-    VERSION = "0.9.6"
+    VERSION = "0.9.7-SNAPSHOT"
   end
 end
diff --git a/examples/rails/app/controllers/application_controller.rb 
b/examples/rails/app/controllers/application_controller.rb
index 10d3fe5..6635a3f 100644
--- a/examples/rails/app/controllers/application_controller.rb
+++ b/examples/rails/app/controllers/application_controller.rb
@@ -3,7 +3,7 @@
 
 class ApplicationController < ActionController::Base
   helper :all # include all helpers, all the time
-  # protect_from_forgery # See ActionController::RequestForgeryProtection 
for details
+  protect_from_forgery # See ActionController::RequestForgeryProtection for 
details
 
   # Scrub sensitive parameters from your log
   # filter_parameter_logging :password
diff --git a/examples/rails/config/boot.rb b/examples/rails/config/boot.rb
index 0ad0f78..dd5e3b6 100644
--- a/examples/rails/config/boot.rb
+++ b/examples/rails/config/boot.rb
@@ -82,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
diff --git a/examples/rails/config/environment.rb 
b/examples/rails/config/environment.rb
index d905cd0..223795b 100644
--- a/examples/rails/config/environment.rb
+++ b/examples/rails/config/environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.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')
diff --git a/examples/rails/config/initializers/new_rails_defaults.rb 
b/examples/rails/config/initializers/new_rails_defaults.rb
index 8ec3186..c94db0a 100644
--- a/examples/rails/config/initializers/new_rails_defaults.rb
+++ b/examples/rails/config/initializers/new_rails_defaults.rb
@@ -11,6 +11,8 @@ if defined?(ActiveRecord)
   ActiveRecord::Base.store_full_sti_class = true
 end
 
+ActionController::Routing.generate_best_match = false
+
 # Use ISO 8601 format for JSON serialized times and dates.
 ActiveSupport.use_standard_json_time_format = true
 
diff --git a/examples/rails/config/initializers/session_store.rb 
b/examples/rails/config/initializers/session_store.rb
index f5d0211..dc1e2cc 100644
--- a/examples/rails/config/initializers/session_store.rb
+++ b/examples/rails/config/initializers/session_store.rb
@@ -2,12 +2,11 @@
 
 # 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,
+# Make sure the secret is at least 30 characters and all random, 
 # no regular words or you'll be exposed to dictionary attacks.
 ActionController::Base.session = {
-#   :disabled    => true,
   :key         => '_rails_session',
-  :secret      => 
'd652b8fa9b4e4e3018165d86310675170607c3eab5cc2e029d67187cee015a777ebf09dd19adfd3929e4e48c27f83bbec0c7eee101dfe08e1418669009fe93e9'
+  :secret      => 
'603e4819eb9da3e711dd95c56aced75a9689abf963af8e47c190b4215aa22fd1a7389c000e708a05ac6b6e8d8f7ed9168010d4e14862d9d10a602c7fccf107a1'
 }
 
 # Use the database for sessions instead of the cookie-based default,
diff --git a/examples/rails/config/routes.rb b/examples/rails/config/routes.rb
index 88c1d5d..e43b470 100644
--- a/examples/rails/config/routes.rb
+++ b/examples/rails/config/routes.rb
@@ -38,7 +38,7 @@ ActionController::Routing::Routes.draw do |map|
 
   # Install the default routes as the lowest priority.
   # Note: These default routes make all actions in every controller 
accessible via GET requests. You should
-  # consider removing the them or commenting them out if you're using named 
routes and resources.
+  # consider removing or commenting them out if you're using named routes 
and resources.
   map.connect ':controller/:action/:id'
   map.connect ':controller/:action/:id.:format'
 end
diff --git a/examples/rails/script/about b/examples/rails/script/about
index ed8deb0..1eeb6eb 100755
--- a/examples/rails/script/about
+++ b/examples/rails/script/about
@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 $LOAD_PATH.unshift "#{RAILTIES_PATH}/builtin/rails_info"
-require 'commands/about'
\ No newline at end of file
+require 'commands/about'
diff --git a/examples/rails/script/console b/examples/rails/script/console
index 498077a..235a1f2 100755
--- a/examples/rails/script/console
+++ b/examples/rails/script/console
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/console'
diff --git a/examples/rails/script/dbconsole b/examples/rails/script/dbconsole
index caa60ce..83c8436 100755
--- a/examples/rails/script/dbconsole
+++ b/examples/rails/script/dbconsole
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/dbconsole'
diff --git a/examples/rails/script/destroy b/examples/rails/script/destroy
index a4df765..88d295f 100755
--- a/examples/rails/script/destroy
+++ b/examples/rails/script/destroy
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/destroy'
diff --git a/examples/rails/script/generate b/examples/rails/script/generate
index 173a9f1..62a8a4c 100755
--- a/examples/rails/script/generate
+++ b/examples/rails/script/generate
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/generate'
diff --git a/examples/rails/script/performance/benchmarker 
b/examples/rails/script/performance/benchmarker
index c842d35..3bff809 100755
--- a/examples/rails/script/performance/benchmarker
+++ b/examples/rails/script/performance/benchmarker
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/benchmarker'
diff --git a/examples/rails/script/performance/profiler 
b/examples/rails/script/performance/profiler
index d855ac8..0764057 100755
--- a/examples/rails/script/performance/profiler
+++ b/examples/rails/script/performance/profiler
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../../config/boot'
+require File.expand_path('../../../config/boot',  __FILE__)
 require 'commands/performance/profiler'
diff --git a/examples/rails/script/plugin b/examples/rails/script/plugin
index 87cd207..b82201f 100755
--- a/examples/rails/script/plugin
+++ b/examples/rails/script/plugin
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/plugin'
diff --git a/examples/rails/script/runner b/examples/rails/script/runner
index a4a7cb2..be4c5d4 100755
--- a/examples/rails/script/runner
+++ b/examples/rails/script/runner
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/runner'
diff --git a/examples/rails/script/server b/examples/rails/script/server
index 3c67f39..b9fcb71 100755
--- a/examples/rails/script/server
+++ b/examples/rails/script/server
@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
+require File.expand_path('../../config/boot',  __FILE__)
 require 'commands/server'