?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
raw | patch | inline | side by side (parent: a6543bb)
updated to rails 2.0.2master
authorPriit Tamboom <[email protected]>
Tue, 18 Dec 2007 13:36:29 +0000 (18 21:36 +0800)
committerPriit Tamboom <[email protected]>
Tue, 18 Dec 2007 13:36:29 +0000 (18 21:36 +0800)
app/controllers/application.rb patch | blob | blame | history
config/boot.rb patch | blob | blame | history
config/database.yml patch | blob | blame | history
config/environment.rb patch | blob | blame | history
config/environments/production.rb patch | blob | blame | history

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 4852b05..8c3d5a1 100644 (file)
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -6,5 +6,5 @@ class ApplicationController < ActionController::Base
 
   # See ActionController::RequestForgeryProtection for details
   # Uncomment the :secret if you're not using the cookie session store
-  protect_from_forgery # :secret => 'fc3d46c3fbc4bb4ff24b81d2125e1662'
+  protect_from_forgery # :secret => '5589a4aab240bd6a661794c1fbf79b73'
 end
diff --git a/config/boot.rb b/config/boot.rb
index b71c198..5697cc1 100644 (file)
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -24,6 +24,7 @@ module Rails
       File.exist?("#{RAILS_ROOT}/vendor/rails")
     end
 
+    # FIXME : Ruby 1.9
     def preinitialize
       load(preinitializer_path) if File.exists?(preinitializer_path)
     end
@@ -93,7 +94,7 @@ module Rails
       end
 
       def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
       end
 
       private
diff --git a/config/database.yml b/config/database.yml
dissimilarity index 82%
index 62d36ac..b444b03 100644 (file)
--- a/config/database.yml
+++ b/config/database.yml
@@ -1,42 +1,19 @@
-# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
-#
-# Install the MySQL driver:
-#   gem install mysql
-# On Mac OS X:
-#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
-# On Mac OS X Leopard:
-#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
-#       This sets the ARCHFLAGS environment variable to your native architecture
-# On Windows:
-#   gem install mysql
-#       Choose the win32 build.
-#       Install MySQL and put its /bin directory on your path.
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
-development:
-  adapter: mysql
-  encoding: utf8
-  database: rails-skeleton_development
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
-# Warning: The database defined as 'test' will be erased and
-# re-generated from your development database when you run 'rake'.
-# Do not set this db to the same as development or production.
-test:
-  adapter: mysql
-  encoding: utf8
-  database: rails-skeleton_test
-  username: root
-  password:
-  socket: /var/run/mysqld/mysqld.sock
-
-production:
-  adapter: mysql
-  encoding: utf8
-  database: rails-skeleton_production
-  username: root
-  password: 
-  socket: /var/run/mysqld/mysqld.sock
+# SQLite version 3.x
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
+development:
+  adapter: sqlite3
+  database: db/development.sqlite3
+  timeout: 5000
+
+# Warning: The database defined as 'test' will be erased and
+# re-generated from your development database when you run 'rake'.
+# Do not set this db to the same as development or production.
+test:
+  adapter: sqlite3
+  database: db/test.sqlite3
+  timeout: 5000
+
+production:
+  adapter: sqlite3
+  database: db/production.sqlite3
+  timeout: 5000
diff --git a/config/environment.rb b/config/environment.rb
index 643ce18..b09a5fd 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -38,7 +38,7 @@ Rails::Initializer.run do |config|
   # no regular words or you'll be exposed to dictionary attacks.
   config.action_controller.session = {
     :session_key => '_rails-skeleton_session',
-    :secret      => 'd621ee17b00e1f40f6e23159735767aa4b06587e6380e8d9b153ef23a281b23d93ff52a8825e0c453d753affcbe6fedb3c71244cadfca9c8a80f1820fc455592'
+    :secret      => '4c57d67aebd343f26e4aa5186143c5ae44fd1b2dbec93c63c6300a66d27744d67220e68ef74a7aa261b8078eac05982dec989c6d57955c3343a0b0f89fb5d662'
   }
 
   # Use the database for sessions instead of the cookie-based default,
diff --git a/config/environments/production.rb b/config/environments/production.rb
index cb295b8..91f541c 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -10,6 +10,7 @@ config.cache_classes = true
 # Full error reports are disabled and caching is turned on
 config.action_controller.consider_all_requests_local = false
 config.action_controller.perform_caching             = true
+config.action_view.cache_template_loading            = true
 
 # Enable serving of images, stylesheets, and javascripts from an asset server
 # config.action_controller.asset_host                  = "http://assets.example.com"
Rails skeletons ready to use