Permalink
Browse files

Using rails 3.0.3. Ensuring it all runs under ruby-1.9.2

  • Loading branch information...
1 parent 4ac111b commit a133fc38b117627ede353a600f0b43150f966bc7 @gus gus committed Nov 17, 2010
View
@@ -6,3 +6,4 @@ test/rails/public/*/cache/*
pkg/*
.bundle
Gemfile.lock
+.rvmrc
View
@@ -1,9 +1,8 @@
source :rubygems
-gem "rails", "3.0.0"
+gem "rails", "3.0.3"
group :test do
- gem "ruby-debug"
- gem "riot", "0.11.0"
+ gem "riot", "0.12.0"
end
@@ -84,7 +84,7 @@ def peek(aheadCount=1)
return history.last.chr
end
- # mynext -- get the next character, excluding legitiment comments.
+ # mynext -- get the next character, excluding legitimate comments.
# peek() is used to see if a '/' is followed by a '/' or '*'.
def mynext()
c = get
@@ -9,6 +9,7 @@
module Smurf
class Application < Rails::Application
+ config.consider_all_requests_local = true
config.session_store :cookie_store, {:key => "_smurf_session"}
config.secret_token = "i own you." * 3
@@ -1,7 +1,7 @@
Smurf::Application.configure do
+ config.active_support.deprecation = :stderr
config.cache_classes = true
config.whiny_nils = true
- config.action_controller.consider_all_requests_local = true
config.action_controller.perform_caching = true # THIS IS IMPORTANT FOR THE TESTS
end
@@ -1,5 +1,3 @@
-Smurf::Application.routes.draw do |map|
- map.connect ':controller/service.wsdl', :action => 'wsdl'
- map.connect ':controller/:action/:id.:format'
- map.connect ':controller/:action/:id'
+Smurf::Application.routes.draw do
+ match '/:controller(/:action(/:id))'
end

0 comments on commit a133fc3

Please sign in to comment.