rails 2.0.1 → 2.0.2

data/CHANGELOG

@@ -1,3 +1,22 @@
+*2.0.2* (December 16th, 2007)
+
+* Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" [DHH]
+
+* Turned on ActionView::Base.cache_template_loading by default in config/environments/production.rb to prevent file system stat calls for every template loading to see if it changed (this means that you have to restart the application to see template changes in production mode) [DHH]
+
+* Introduce `rake secret` to output a crytographically secure secret key for use with cookie sessions #10363 [revans]
+
+* Fixed that local database creation should consider 127.0.0.1 local #9026 [parcelbrat]
+
+* Fixed that functional tests generated for scaffolds should use fixture calls instead of hard-coded IDs #10435 [boone]
+
+* Added db:migrate:redo and db:migrate:reset for rerunning existing migrations #10431, #10432  [matt]
+
+* RAILS_GEM_VERSION may be double-quoted also.  #10443 [James Cox]
+
+* Update rails:freeze:gems to work with RubyGems 0.9.5.  [Jeremy Kemper]
+
+
 *2.0.1* (December 7th, 2007)
 
 * Fixed Active Record bug
@@ -21,7 +40,7 @@
 
 * Introduce SecretKeyGenerator for more secure session secrets than CGI::Session's pseudo-random id generator. Consider extracting to Active Support later.  #10286 [Hongli Lai]
 
-* RAILS_GEM_VERSION may be set to any valid gem version specifier.  #10057 [Chad Woolley, Chu Yeow]
+* RAILS_GEM_VERSION may be set to any valid gem version specifier.  #10057 [Chad Woolley, Cheah Chu Yeow]
 
 * Load config/preinitializer.rb, if present, before loading the environment.  #9943 [Chad Woolley]
 
@@ -35,7 +54,7 @@
 
 * Refactor Plugin Loader.  Add plugin lib paths early, and add lots of tests.  Closes #9795 [lazyatom]
 
-* Added --skip-timestamps to generators that produce models #10036 [tpope]
+* Added --skip-timestamps to generators that produce models #10036 [Tim Pope]
 
 * Update Prototype to 1.6.0 and script.aculo.us to 1.8.0.  [sam, madrobby]
 
@@ -93,7 +112,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Removed web_service generator [Koz]
 
-* Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [fcheung]. Example:
+* Added the :all option to config.plugins that'll include the rest of the plugins not already explicitly named #9613 [Frederick Cheung]. Example:
 
     # Loads :classic_pagination before all the other plugins
     config.plugins = [ :classic_pagination, :all ]
@@ -106,7 +125,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Added db:drop:all to drop all databases declared in config/database.yml [DHH]
 
-* Use attribute pairs instead of the migration name to create add and remove column migrations.  Closes #9166 [lifofifo]
+* Use attribute pairs instead of the migration name to create add and remove column migrations.  Closes #9166 [Pratik Naik]
 
 	For example:
 
@@ -124,7 +143,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Default to plural table name in Rails Generator if ActiveRecord is not present.  Closes #8963 [evan]
 
-* Added rake routes for listing all the defined routes in the system #8795 [josh]
+* Added rake routes for listing all the defined routes in the system.  #8795 [Josh Peek]
 
 * db:create creates the database for the current environment if it's on localhost. db:create:all creates local databases for all environments.  #8783 [matt]
 
@@ -136,7 +155,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Added --skip-migration option to scaffold and resource generators #8656 [Michael Glaesemann]
 
-* Fix that FCGIs would leave log files open when asked to shut down by USR2 #3028 [sebastian.kanthak/josh]
+* Fix that FCGIs would leave log files open when asked to shut down by USR2.  #3028 [Sebastian Kanthak, Josh Peek]
 
 * Fixed that dispatcher preparation callbacks only run once in production mode.  Mock Routes.reload so that dispatcher preparation callback tests run. [Rick]
 
@@ -158,7 +177,7 @@ databases on localhost.  #9753 [Trevor Wennblom]
 
 * Scaffold generator tests.  #8443 [pelle]
 
-* Generated scaffold functional tests use assert_difference.  #8421 [norbert]
+* Generated scaffold functional tests use assert_difference.  #8421 [Norbert Crombach]
 
 * Update to Prototype 1.5.1.  [Sam Stephenson]
 

data/Rakefile

@@ -303,6 +303,7 @@ PKG_FILES = FileList[
 ] - [ 'test' ]
 
 spec = Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
   s.name = 'rails'
   s.version = PKG_VERSION
   s.summary = "Web-application framework with template engine, control-flow layer, and ORM."
@@ -312,11 +313,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.7.2')
-  s.add_dependency('activesupport',    '= 2.0.1' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.0.1' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.0.1' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.0.1' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.0.1' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.0.2' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.0.2' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.0.2' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.0.2' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.0.2' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/builtin/rails_info/rails/info.rb

@@ -32,7 +32,7 @@ module Rails
       end
 
       def freeze_edge_version
-        if File.exists?(rails_vendor_root)
+        if File.exist?(rails_vendor_root)
           begin
             Dir[File.join(rails_vendor_root, 'REVISION_*')].first.scan(/_(\d+)$/).first.first
           rescue

data/configs/databases/mysql.yml

@@ -1,4 +1,4 @@
-# MySQL (default setup).  Versions 4.1 and 5.0 are recommended.
+# MySQL.  Versions 4.1 and 5.0 are recommended.
 #
 # Install the MySQL driver:
 #   gem install mysql

data/configs/databases/sqlite3.yml

@@ -1,5 +1,5 @@
 # SQLite version 3.x
-#   gem install sqlite3-ruby
+#   gem install sqlite3-ruby (not necessary on OS X Leopard)
 development:
   adapter: sqlite3
   database: db/development.sqlite3

data/environments/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

data/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"

data/lib/commands/plugin.rb

@@ -214,12 +214,12 @@ class Plugin
 
     def run_install_hook
       install_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/install.rb"
-      load install_hook_file if File.exists? install_hook_file
+      load install_hook_file if File.exist? install_hook_file
     end
 
     def run_uninstall_hook
       uninstall_hook_file = "#{rails_env.root}/vendor/plugins/#{name}/uninstall.rb"
-      load uninstall_hook_file if File.exists? uninstall_hook_file
+      load uninstall_hook_file if File.exist? uninstall_hook_file
     end
 
     def install_using_export(options = {})

data/lib/commands/runner.rb

@@ -41,7 +41,7 @@ require RAILS_ROOT + '/config/environment'
 if code_or_file.nil?
   $stderr.puts "Run '#{$0} -h' for help."
   exit 1
-elsif File.exists?(code_or_file)
+elsif File.exist?(code_or_file)
   eval(File.read(code_or_file))
 else
   eval(code_or_file)

data/lib/rails/version.rb

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

data/lib/rails_generator/commands.rb

@@ -207,7 +207,7 @@ HELP
           # Determine full paths for source and destination files.
           source              = source_path(relative_source)
           destination         = destination_path(relative_destination)
-          destination_exists  = File.exists?(destination)
+          destination_exists  = File.exist?(destination)
 
           # If source and destination are identical then we're done.
           if destination_exists and identical?(source, destination, &block)
@@ -306,7 +306,7 @@ HELP
         # Always directories which exist.
         def directory(relative_path)
           path = destination_path(relative_path)
-          if File.exists?(path)
+          if File.exist?(path)
             logger.exists relative_path
           else
             logger.create relative_path
@@ -415,7 +415,7 @@ end_message
         # Remove a file if it exists and is a file.
         def file(relative_source, relative_destination, file_options = {})
           destination = destination_path(relative_destination)
-          if File.exists?(destination)
+          if File.exist?(destination)
             logger.rm relative_destination
             unless options[:pretend]
               if options[:svn]
@@ -450,7 +450,7 @@ end_message
           until parts.empty?
             partial = File.join(parts)
             path = destination_path(partial)
-            if File.exists?(path)
+            if File.exist?(path)
               if Dir[File.join(path, '*')].empty?
                 logger.rmdir partial
                 unless options[:pretend]

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -8,7 +8,7 @@ class AppGenerator < Rails::Generator::Base
 
   DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase)
 
-  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || "mysql"),
+  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || "sqlite3"),
     :shebang => DEFAULT_SHEBANG, :freeze => false
   mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
 
@@ -128,7 +128,7 @@ class AppGenerator < Rails::Generator::Base
     end
 
     def mysql_socket_location
-      MYSQL_SOCKET_LOCATIONS.find { |f| File.exists?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
+      MYSQL_SOCKET_LOCATIONS.find { |f| File.exist?(f) } unless RUBY_PLATFORM =~ /(:?mswin|mingw)/
     end
 
 

data/lib/rails_generator/generators/components/scaffold/templates/functional_test.rb

@@ -21,23 +21,23 @@ class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   end
 
   def test_should_show_<%= file_name %>
-    get :show, :id => 1
+    get :show, :id => <%= table_name %>(:one).id
     assert_response :success
   end
 
   def test_should_get_edit
-    get :edit, :id => 1
+    get :edit, :id => <%= table_name %>(:one).id
     assert_response :success
   end
 
   def test_should_update_<%= file_name %>
-    put :update, :id => 1, :<%= file_name %> => { }
+    put :update, :id => <%= table_name %>(:one).id, :<%= file_name %> => { }
     assert_redirected_to <%= file_name %>_path(assigns(:<%= file_name %>))
   end
 
   def test_should_destroy_<%= file_name %>
     assert_difference('<%= class_name %>.count', -1) do
-      delete :destroy, :id => 1
+      delete :destroy, :id => <%= table_name %>(:one).id
     end
 
     assert_redirected_to <%= table_name %>_path

data/lib/rails_generator/secret_key_generator.rb

@@ -141,7 +141,7 @@ module Rails
       end
 
       def self.supports_urandom?
-        File.exists?('/dev/urandom')
+        File.exist?('/dev/urandom')
       end
 
       def self.supports_openssl?

data/lib/tasks/databases.rake

@@ -16,7 +16,7 @@ namespace :db do
         #    <<: *defaults
         next unless config['database']
         # Only connect to local databases
-        if config['host'] == 'localhost' || config['host'].blank?
+        if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?
           create_database(config)
         else
           p "This task only creates local databases. #{config['database']} is on a remote host."
@@ -86,6 +86,14 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
+  namespace :migrate do
+    desc  'Rollbacks the database one migration and re migrate up. If you want to rollback more than one step, define STEP=x'
+    task :redo => [ 'db:rollback', 'db:migrate' ]
+
+    desc 'Resets your database using your migrations for the current environment'
+    task :reset => ["db:drop", "db:create", "db:migrate"]
+  end
+
   desc 'Rolls the schema back to the previous version. Specify the number of steps with STEP=n'
   task :rollback => :environment do
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
@@ -127,14 +135,16 @@ namespace :db do
 
   desc "Raises an error if there are pending migrations"
   task :abort_if_pending_migrations => :environment do
-    pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
+    if defined? ActiveRecord
+      pending_migrations = ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations
 
-    if pending_migrations.any?
-      puts "You have #{pending_migrations.size} pending migrations:"
-      pending_migrations.each do |pending_migration|
-        puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+      if pending_migrations.any?
+        puts "You have #{pending_migrations.size} pending migrations:"
+        pending_migrations.each do |pending_migration|
+          puts '  %4d %s' % [pending_migration.version, pending_migration.name]
+        end
+        abort "Run `rake db:migrate` to update your database then try again."
       end
-      abort "Run `rake db:migrate` to update your database then try again."
     end
   end
 
@@ -304,7 +314,7 @@ namespace :db do
 
     desc 'Prepare the test database and load the schema'
     task :prepare => %w(environment db:abort_if_pending_migrations) do
-      if defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
+      if defined?(ActiveRecord) && !ActiveRecord::Base.configurations.blank?
         Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
       end
     end

data/lib/tasks/framework.rake

@@ -4,6 +4,7 @@ namespace :rails do
     task :gems do
       deps = %w(actionpack activerecord actionmailer activesupport activeresource)
       require 'rubygems'
+      require 'rubygems/gem_runner'
       Gem.manage_gems
 
       rails = (version = ENV['VERSION']) ?
@@ -21,14 +22,19 @@ namespace :rails do
       rm_rf   "vendor/rails"
       mkdir_p "vendor/rails"
 
-      chdir("vendor/rails") do
-        rails.dependencies.select { |g| deps.include? g.name }.each do |g|
-          Gem::GemRunner.new.run(["unpack", "-v", "#{g.version_requirements}", "#{g.name}"])
-          mv(Dir.glob("#{g.name}*").first, g.name)
-        end
+      begin
+        chdir("vendor/rails") do
+          rails.dependencies.select { |g| deps.include? g.name }.each do |g|
+            Gem::GemRunner.new.run(["unpack", g.name, "--version", g.version_requirements.to_s])
+            mv(Dir.glob("#{g.name}*").first, g.name)
+          end
 
-        Gem::GemRunner.new.run(["unpack", "-v", "=#{version}", "rails"])
-        FileUtils.mv(Dir.glob("rails*").first, "railties")
+          Gem::GemRunner.new.run(["unpack", "rails", "--version", "=#{version}"])
+          FileUtils.mv(Dir.glob("rails*").first, "railties")
+        end
+      rescue Exception
+        rm_rf "vendor/rails"
+        raise
       end
     end
 

data/lib/tasks/misc.rake

@@ -1,4 +1,10 @@
 task :default => :test
 task :environment do
   require(File.join(RAILS_ROOT, 'config', 'environment'))
-end
+end
+
+require 'rails_generator/secret_key_generator'
+desc 'Generate a crytographically secure secret key. This is typically used to generate a secret for cookie sessions. Pass a unique identifier to the generator using ID="some unique identifier" for greater security.'
+task :secret do
+  puts Rails::SecretKeyGenerator.new(ENV['ID']).generate_secret
+end

metadata

@@ -1,33 +1,79 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
-date: 2007-12-07 00:00:00 -06:00
-summary: Web-application framework with template engine, control-flow layer, and ORM.
-require_paths: 
-- lib
-email: david@loudthinking.com
-homepage: http://www.rubyonrails.org
-rubyforge_project: rails
-description: Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
-autorequire: 
-default_executable: rails
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 2.0.2
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - David Heinemeier Hansson
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-12-20 00:00:00 -06:00
+default_executable: rails
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rake
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.7.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: actionpack
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: actionmailer
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activeresource
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.0.2
+    version: 
+description: Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.
+email: david@loudthinking.com
+executables: 
+- rails
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - bin
 - builtin
@@ -269,71 +315,32 @@ files:
 - lib/tasks/tmp.rake
 - lib/test_help.rb
 - lib/webrick_server.rb
-test_files: []
-
+has_rdoc: false
+homepage: http://www.rubyonrails.org
+post_install_message: 
 rdoc_options: 
 - --exclude
 - .
-extra_rdoc_files: []
-
-executables: 
-- rails
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.7.2
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activerecord
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: actionpack
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: actionmailer
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activeresource
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 2.0.1
-    version: 
+rubyforge_project: rails
+rubygems_version: 1.0.0
+signing_key: 
+specification_version: 2
+summary: Web-application framework with template engine, control-flow layer, and ORM.
+test_files: []
+