rails 2.3.3 → 2.3.4

data/CHANGELOG

@@ -1,7 +1,13 @@
+*2.3.4 (September 4, 2009)*
+
+* I18n support for plugins.  #2325 [Antonio Tapiador, Sven Fuchs]
+
+
 *2.3.3 (July 12 2009)
 
 * Version bump
 
+
 *2.3.2 [Final] (March 15, 2009)*
 
 * Allow metal to live in plugins #2045 [Matthew Rudy]

data/Rakefile

@@ -199,11 +199,14 @@ task :copy_configs do
 
   cp "configs/locales/en.yml", "#{PKG_DESTINATION}/config/locales/en.yml"
 
+  cp "configs/seeds.rb", "#{PKG_DESTINATION}/db/seeds.rb"
+
   cp "environments/boot.rb",        "#{PKG_DESTINATION}/config/boot.rb"
   cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb"
   cp "environments/production.rb",  "#{PKG_DESTINATION}/config/environments/production.rb"
   cp "environments/development.rb", "#{PKG_DESTINATION}/config/environments/development.rb"
   cp "environments/test.rb",        "#{PKG_DESTINATION}/config/environments/test.rb"
+
 end
 
 task :copy_binfiles do
@@ -311,11 +314,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.3' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.3' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.4' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.4' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -340,7 +343,6 @@ end
 # Publishing -------------------------------------------------------
 desc "Publish the rails gem"
 task :pgem => [:gem] do 
-  require 'rake/contrib/sshpublisher'
   Rake::SshFilePublisher.new("gems.rubyonrails.org", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
   `ssh gems.rubyonrails.org '/u/sites/gems/gemupdate.sh'`
 end

data/bin/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'
+require 'commands/about'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/bin/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'

data/builtin/rails_info/rails/info.rb

@@ -25,8 +25,10 @@ module Rails
       end
 
       def framework_version(framework)
-        require "#{framework}/version"
-        "#{framework.classify}::VERSION::STRING".constantize
+        if Object.const_defined?(framework.classify)
+          require "#{framework}/version"
+          "#{framework.classify}::VERSION::STRING".constantize
+        end
       end
 
       def edge_rails_revision(info = git_info)

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

data/configs/seeds.rb

@@ -0,0 +1,7 @@
+# This file should contain all the record creation needed to seed the database with its default values.
+# The data can then be loaded with the rake db:seed (or created alongside the db with db:setup).
+#
+# Examples:
+#   
+#   cities = City.create([{ :name => 'Chicago' }, { :name => 'Copenhagen' }])
+#   Major.create(:name => 'Daley', :city => cities.first)

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

data/lib/commands/dbconsole.rb

@@ -33,11 +33,15 @@ end
 def find_cmd(*commands)
   dirs_on_path = ENV['PATH'].to_s.split(File::PATH_SEPARATOR)
   commands += commands.map{|cmd| "#{cmd}.exe"} if RUBY_PLATFORM =~ /win32/
-  commands.detect do |cmd|
-    dirs_on_path.detect do |path|
-      File.executable? File.join(path, cmd)
+
+  full_path_command = nil
+  found = commands.detect do |cmd|
+    dir = dirs_on_path.detect do |path|
+      full_path_command = File.join(path, cmd)
+      File.executable? full_path_command
     end
-  end || abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
+  end
+  found ? full_path_command : abort("Couldn't find database client: #{commands.join(', ')}. Check your $PATH and try again.")
 end
 
 case config["adapter"]

data/lib/initializer.rb

@@ -442,7 +442,7 @@ Run `rake gems:install` to install the missing gems.
     def initialize_database_middleware
       if configuration.frameworks.include?(:active_record)
         if configuration.frameworks.include?(:action_controller) &&
-            ActionController::Base.session_store == ActiveRecord::SessionStore
+            ActionController::Base.session_store.name == 'ActiveRecord::SessionStore'
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
         else

data/lib/rails/plugin.rb

@@ -71,6 +71,10 @@ module Rails
       File.exist?(routing_file)
     end
 
+    # Returns true if there is any localization file in locale_path
+    def localized?
+      locale_files.any?
+    end
 
     def view_path
       File.join(directory, 'app', 'views')
@@ -87,6 +91,14 @@ module Rails
     def routing_file
       File.join(directory, 'config', 'routes.rb')
     end
+
+    def locale_path
+      File.join(directory, 'config', 'locales')
+    end
+
+    def locale_files
+      Dir[ File.join(locale_path, '*.{rb,yml}') ]
+    end
     
 
     private

data/lib/rails/plugin/loader.rb

@@ -73,6 +73,7 @@ module Rails
         def configure_engines
           if engines.any?
             add_engine_routing_configurations
+            add_engine_locales
             add_engine_controller_paths
             add_engine_view_paths
           end
@@ -84,6 +85,12 @@ module Rails
           end
         end
 
+        def add_engine_locales
+          # reverse it such that the last engine can overwrite translations from the first, like with routes
+          locale_files = engines.select(&:localized?).collect(&:locale_files).reverse.flatten
+          I18n.load_path += locale_files - I18n.load_path
+        end
+
         def add_engine_controller_paths
           ActionController::Routing.controller_paths += engines.collect(&:controller_path)
         end

data/lib/rails/version.rb

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

data/lib/rails_generator/base.rb

@@ -233,13 +233,13 @@ module Rails
           base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
           @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
           @table_name = (!defined?(ActiveRecord::Base) || ActiveRecord::Base.pluralize_table_names) ? plural_name : singular_name
-          @table_name.gsub! '/', '_'
           if @class_nesting.empty?
             @class_name = @class_name_without_nesting
           else
             @table_name = @class_nesting.underscore << "_" << @table_name
             @class_name = "#{@class_nesting}::#{@class_name_without_nesting}"
           end
+          @table_name.gsub! '/', '_'
         end
 
         # Extract modules from filesystem-style or ruby-style path:

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

@@ -125,6 +125,7 @@ class AppGenerator < Rails::Generator::Base
       create_database_configuration_file(m)
       create_routes_file(m)
       create_locale_file(m)
+      create_seeds_file(m)
       create_initializer_files(m)
       create_environment_files(m)
     end
@@ -176,6 +177,10 @@ class AppGenerator < Rails::Generator::Base
       m.file "configs/routes.rb", "config/routes.rb"
     end
 
+    def create_seeds_file(m)
+      m.file "configs/seeds.rb", "db/seeds.rb"
+    end
+
     def create_initializer_files(m)
       %w( 
         backtrace_silencers 

data/lib/rails_generator/generators/applications/app/scm/git.rb

@@ -1,16 +1,18 @@
+STDOUT.sync = true
+
 module Rails
   class Git < Scm
     def self.clone(repos, branch=nil)
-      `git clone #{repos}`
+      system "git clone #{repos}"
 
       if branch
-        `cd #{repos.split('/').last}/`
-        `git checkout #{branch}`
+        system "cd #{repos.split('/').last}/"
+        system "git checkout #{branch}"
       end
     end
 
     def self.run(command)
-      `git #{command}`
+      system "git #{command}"
     end
   end
 end

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

@@ -237,7 +237,7 @@ module Rails
     # ==== Example
     #
     #   inside('vendor') do
-    #     run('ln -s ~/edge rails)
+    #     run('ln -s ~/edge rails')
     #   end
     #
     def run(command, log_action = true)

data/lib/rails_generator/generators/components/model/model_generator.rb

@@ -19,10 +19,17 @@ class ModelGenerator < Rails::Generator::NamedBase
        	m.template 'fixtures.yml',  File.join('test/fixtures', "#{table_name}.yml")
       end
 
+      migration_file_path = file_path.gsub(/\//, '_')
+      migration_name = class_name
+      if ActiveRecord::Base.pluralize_table_names
+        migration_name = migration_name.pluralize
+        migration_file_path = migration_file_path.pluralize
+      end
+
       unless options[:skip_migration]
         m.migration_template 'migration.rb', 'db/migrate', :assigns => {
-          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
-        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+          :migration_name => "Create#{migration_name.gsub(/::/, '')}"
+        }, :migration_file_name => "create_#{migration_file_path}"
       end
     end
   end

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -19,6 +19,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
     if @name == @name.pluralize && !options[:force_plural]
       logger.warning "Plural version of the model detected, using singularized version.  Override with --force-plural."
       @name = @name.singularize
+      assign_names!(@name)
     end
 
     @controller_name = @name.pluralize

data/lib/tasks/databases.rake

@@ -55,7 +55,7 @@ namespace :db do
       case config['adapter']
       when 'mysql'
         @charset   = ENV['CHARSET']   || 'utf8'
-        @collation = ENV['COLLATION'] || 'utf8_general_ci'
+        @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
         begin
           ActiveRecord::Base.establish_connection(config.merge('database' => nil))
           ActiveRecord::Base.connection.create_database(config['database'], :charset => (config['charset'] || @charset), :collation => (config['collation'] || @collation))
@@ -156,8 +156,8 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-  desc 'Drops and recreates the database from db/schema.rb for the current environment.'
-  task :reset => ['db:drop', 'db:create', 'db:schema:load']
+  desc 'Drops and recreates the database from db/schema.rb for the current environment and loads the seeds.'
+  task :reset => [ 'db:drop', 'db:setup' ]
 
   desc "Retrieves the charset for the current environment's database"
   task :charset => :environment do
@@ -206,6 +206,15 @@ namespace :db do
     end
   end
 
+  desc 'Create the database, load the schema, and initialize with the seed data'
+  task :setup => [ 'db:create', 'db:schema:load', 'db:seed' ]
+
+  desc 'Load the seed data from db/seeds.rb'
+  task :seed => :environment do
+    seed_file = File.join(Rails.root, 'db', 'seeds.rb')
+    load(seed_file) if File.exist?(seed_file)
+  end
+
   namespace :fixtures do
     desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y. Load from subdirectory in test/fixtures using FIXTURES_DIR=z. Specify an alternative path (eg. spec/fixtures) using FIXTURES_PATH=spec/fixtures."
     task :load => :environment do
@@ -256,7 +265,11 @@ namespace :db do
     desc "Load a schema.rb file into the database"
     task :load => :environment do
       file = ENV['SCHEMA'] || "#{RAILS_ROOT}/db/schema.rb"
-      load(file)
+      if File.exists?(file)
+        load(file)
+      else
+        abort %{#{file} doesn't exist yet. Run "rake db:migrate" to create it then try again. If you do not intend to use a database, you should instead alter #{RAILS_ROOT}/config/environment.rb to prevent active_record from loading: config.frameworks -= [ :active_record ]}
+      end
     end
   end
 

data/lib/tasks/routes.rake

@@ -1,6 +1,7 @@
-desc 'Print out all defined routes in match order, with names.'
+desc 'Print out all defined routes in match order, with names. Target specific controller with CONTROLLER=x.'
 task :routes => :environment do
-  routes = ActionController::Routing::Routes.routes.collect do |route|
+  all_routes = ENV['CONTROLLER'] ? ActionController::Routing::Routes.routes.select { |route| route.defaults[:controller] == ENV['CONTROLLER'] } : ActionController::Routing::Routes.routes
+  routes = all_routes.collect do |route|
     name = ActionController::Routing::Routes.named_routes.routes.index(route).to_s
     verb = route.conditions[:method].to_s.upcase
     segs = route.segments.inject("") { |str,s| str << s.to_s }
@@ -14,4 +15,4 @@ task :routes => :environment do
   routes.each do |r|
     puts "#{r[:name].rjust(name_width)} #{r[:verb].ljust(verb_width)} #{r[:segs].ljust(segs_width)} #{r[:reqs]}"
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-20 00:00:00 -05:00
+date: 2009-09-04 00:00:00 +12:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
@@ -70,9 +70,9 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.3
+        version: 2.3.4
     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.
+description: "    Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick\n    on top of either MySQL, PostgreSQL, SQLite, DB2, SQL Server, or Oracle with eRuby- or Builder-based templates.\n"
 email: david@loudthinking.com
 executables: 
 - rails
@@ -81,20 +81,10 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- bin
-- builtin
 - CHANGELOG
-- configs
-- dispatches
-- doc
-- environments
 - fresh_rakefile
-- guides
-- helpers
-- html
-- lib
 - MIT-LICENSE
-- pkg
+- rails-2.3.4.gem
 - Rakefile
 - README
 - bin/about
@@ -102,20 +92,16 @@ files:
 - bin/dbconsole
 - bin/destroy
 - bin/generate
-- bin/performance
 - bin/performance/benchmarker
 - bin/performance/profiler
 - bin/plugin
 - bin/rails
 - bin/runner
 - bin/server
-- builtin/rails_info
-- builtin/rails_info/rails
 - builtin/rails_info/rails/info.rb
 - builtin/rails_info/rails/info_controller.rb
 - builtin/rails_info/rails/info_helper.rb
 - builtin/rails_info/rails_info_controller.rb
-- configs/databases
 - configs/databases/frontbase.yml
 - configs/databases/ibm_db.yml
 - configs/databases/mysql.yml
@@ -124,15 +110,14 @@ files:
 - configs/databases/sqlite2.yml
 - configs/databases/sqlite3.yml
 - configs/empty.log
-- configs/initializers
 - configs/initializers/backtrace_silencers.rb
 - configs/initializers/inflections.rb
 - configs/initializers/mime_types.rb
 - configs/initializers/new_rails_defaults.rb
 - configs/initializers/session_store.rb
-- configs/locales
 - configs/locales/en.yml
 - configs/routes.rb
+- configs/seeds.rb
 - doc/README_FOR_APP
 - dispatches/config.ru
 - dispatches/dispatch.fcgi
@@ -143,18 +128,14 @@ files:
 - environments/environment.rb
 - environments/production.rb
 - environments/test.rb
-- guides/files
-- guides/files/javascripts
 - guides/files/javascripts/code_highlighter.js
 - guides/files/javascripts/guides.js
 - guides/files/javascripts/highlighters.js
-- guides/files/stylesheets
 - guides/files/stylesheets/main.css
 - guides/files/stylesheets/print.css
 - guides/files/stylesheets/reset.css
 - guides/files/stylesheets/style.css
 - guides/files/stylesheets/syntax.css
-- guides/images
 - guides/images/belongs_to.png
 - guides/images/book_icon.gif
 - guides/images/bullet.gif
@@ -175,14 +156,11 @@ files:
 - guides/images/has_one_through.png
 - guides/images/header_backdrop.png
 - guides/images/header_tile.gif
-- guides/images/i18n
 - guides/images/i18n/demo_localized_pirate.png
 - guides/images/i18n/demo_translated_en.png
 - guides/images/i18n/demo_translated_pirate.png
 - guides/images/i18n/demo_translation_missing.png
 - guides/images/i18n/demo_untranslated.png
-- guides/images/icons
-- guides/images/icons/callouts
 - guides/images/icons/callouts/1.png
 - guides/images/icons/callouts/10.png
 - guides/images/icons/callouts/11.png
@@ -223,13 +201,11 @@ files:
 - guides/images/tab_yellow.gif
 - guides/images/tab_yellow.png
 - guides/images/validation_error_messages.png
-- guides/rails_guides
 - guides/rails_guides/generator.rb
 - guides/rails_guides/helpers.rb
 - guides/rails_guides/indexer.rb
 - guides/rails_guides/textile_extensions.rb
 - guides/rails_guides.rb
-- guides/source
 - guides/source/2_2_release_notes.textile
 - guides/source/2_3_release_notes.textile
 - guides/source/action_controller_overview.textile
@@ -267,10 +243,8 @@ files:
 - html/422.html
 - html/500.html
 - html/favicon.ico
-- html/images
 - html/images/rails.png
 - html/index.html
-- html/javascripts
 - html/javascripts/application.js
 - html/javascripts/controls.js
 - html/javascripts/dragdrop.js
@@ -278,16 +252,13 @@ files:
 - html/javascripts/prototype.js
 - html/robots.txt
 - lib/code_statistics.rb
-- lib/commands
 - lib/commands/about.rb
 - lib/commands/console.rb
 - lib/commands/dbconsole.rb
 - lib/commands/destroy.rb
 - lib/commands/generate.rb
-- lib/commands/ncgi
 - lib/commands/ncgi/listener
 - lib/commands/ncgi/tracker
-- lib/commands/performance
 - lib/commands/performance/benchmarker.rb
 - lib/commands/performance/profiler.rb
 - lib/commands/plugin.rb
@@ -302,15 +273,12 @@ files:
 - lib/fcgi_handler.rb
 - lib/initializer.rb
 - lib/performance_test_help.rb
-- lib/rails
 - lib/rails/backtrace_cleaner.rb
 - lib/rails/gem_builder.rb
 - lib/rails/gem_dependency.rb
-- lib/rails/plugin
 - lib/rails/plugin/loader.rb
 - lib/rails/plugin/locator.rb
 - lib/rails/plugin.rb
-- lib/rails/rack
 - lib/rails/rack/debugger.rb
 - lib/rails/rack/log_tailer.rb
 - lib/rails/rack/metal.rb
@@ -318,44 +286,30 @@ files:
 - lib/rails/rack.rb
 - lib/rails/vendor_gem_source_index.rb
 - lib/rails/version.rb
-- lib/rails_generator
 - lib/rails_generator/base.rb
 - lib/rails_generator/commands.rb
 - lib/rails_generator/generated_attribute.rb
-- lib/rails_generator/generators
-- lib/rails_generator/generators/applications
-- lib/rails_generator/generators/applications/app
 - lib/rails_generator/generators/applications/app/app_generator.rb
-- lib/rails_generator/generators/applications/app/scm
 - lib/rails_generator/generators/applications/app/scm/git.rb
 - lib/rails_generator/generators/applications/app/scm/scm.rb
 - lib/rails_generator/generators/applications/app/scm/svn.rb
 - lib/rails_generator/generators/applications/app/template_runner.rb
 - lib/rails_generator/generators/applications/app/USAGE
-- lib/rails_generator/generators/components
-- lib/rails_generator/generators/components/controller
 - lib/rails_generator/generators/components/controller/controller_generator.rb
-- lib/rails_generator/generators/components/controller/templates
 - lib/rails_generator/generators/components/controller/templates/controller.rb
 - lib/rails_generator/generators/components/controller/templates/functional_test.rb
 - lib/rails_generator/generators/components/controller/templates/helper.rb
 - lib/rails_generator/generators/components/controller/templates/helper_test.rb
 - lib/rails_generator/generators/components/controller/templates/view.html.erb
 - lib/rails_generator/generators/components/controller/USAGE
-- lib/rails_generator/generators/components/helper
 - lib/rails_generator/generators/components/helper/helper_generator.rb
-- lib/rails_generator/generators/components/helper/templates
 - lib/rails_generator/generators/components/helper/templates/helper.rb
 - lib/rails_generator/generators/components/helper/templates/helper_test.rb
 - lib/rails_generator/generators/components/helper/USAGE
-- lib/rails_generator/generators/components/integration_test
 - lib/rails_generator/generators/components/integration_test/integration_test_generator.rb
-- lib/rails_generator/generators/components/integration_test/templates
 - lib/rails_generator/generators/components/integration_test/templates/integration_test.rb
 - lib/rails_generator/generators/components/integration_test/USAGE
-- lib/rails_generator/generators/components/mailer
 - lib/rails_generator/generators/components/mailer/mailer_generator.rb
-- lib/rails_generator/generators/components/mailer/templates
 - lib/rails_generator/generators/components/mailer/templates/fixture.erb
 - lib/rails_generator/generators/components/mailer/templates/fixture.rhtml
 - lib/rails_generator/generators/components/mailer/templates/mailer.rb
@@ -363,38 +317,26 @@ files:
 - lib/rails_generator/generators/components/mailer/templates/view.erb
 - lib/rails_generator/generators/components/mailer/templates/view.rhtml
 - lib/rails_generator/generators/components/mailer/USAGE
-- lib/rails_generator/generators/components/metal
 - lib/rails_generator/generators/components/metal/metal_generator.rb
-- lib/rails_generator/generators/components/metal/templates
 - lib/rails_generator/generators/components/metal/templates/metal.rb
 - lib/rails_generator/generators/components/metal/USAGE
-- lib/rails_generator/generators/components/migration
 - lib/rails_generator/generators/components/migration/migration_generator.rb
-- lib/rails_generator/generators/components/migration/templates
 - lib/rails_generator/generators/components/migration/templates/migration.rb
 - lib/rails_generator/generators/components/migration/USAGE
-- lib/rails_generator/generators/components/model
 - lib/rails_generator/generators/components/model/model_generator.rb
-- lib/rails_generator/generators/components/model/templates
 - lib/rails_generator/generators/components/model/templates/fixtures.yml
 - lib/rails_generator/generators/components/model/templates/migration.rb
 - lib/rails_generator/generators/components/model/templates/model.rb
 - lib/rails_generator/generators/components/model/templates/unit_test.rb
 - lib/rails_generator/generators/components/model/USAGE
-- lib/rails_generator/generators/components/observer
 - lib/rails_generator/generators/components/observer/observer_generator.rb
-- lib/rails_generator/generators/components/observer/templates
 - lib/rails_generator/generators/components/observer/templates/observer.rb
 - lib/rails_generator/generators/components/observer/templates/unit_test.rb
 - lib/rails_generator/generators/components/observer/USAGE
-- lib/rails_generator/generators/components/performance_test
 - lib/rails_generator/generators/components/performance_test/performance_test_generator.rb
-- lib/rails_generator/generators/components/performance_test/templates
 - lib/rails_generator/generators/components/performance_test/templates/performance_test.rb
 - lib/rails_generator/generators/components/performance_test/USAGE
-- lib/rails_generator/generators/components/plugin
 - lib/rails_generator/generators/components/plugin/plugin_generator.rb
-- lib/rails_generator/generators/components/plugin/templates
 - lib/rails_generator/generators/components/plugin/templates/generator.rb
 - lib/rails_generator/generators/components/plugin/templates/init.rb
 - lib/rails_generator/generators/components/plugin/templates/install.rb
@@ -408,17 +350,13 @@ files:
 - lib/rails_generator/generators/components/plugin/templates/unit_test.rb
 - lib/rails_generator/generators/components/plugin/templates/USAGE
 - lib/rails_generator/generators/components/plugin/USAGE
-- lib/rails_generator/generators/components/resource
 - lib/rails_generator/generators/components/resource/resource_generator.rb
-- lib/rails_generator/generators/components/resource/templates
 - lib/rails_generator/generators/components/resource/templates/controller.rb
 - lib/rails_generator/generators/components/resource/templates/functional_test.rb
 - lib/rails_generator/generators/components/resource/templates/helper.rb
 - lib/rails_generator/generators/components/resource/templates/helper_test.rb
 - lib/rails_generator/generators/components/resource/USAGE
-- lib/rails_generator/generators/components/scaffold
 - lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
-- lib/rails_generator/generators/components/scaffold/templates
 - lib/rails_generator/generators/components/scaffold/templates/controller.rb
 - lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
 - lib/rails_generator/generators/components/scaffold/templates/helper.rb
@@ -430,15 +368,12 @@ files:
 - lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
 - lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
 - lib/rails_generator/generators/components/scaffold/USAGE
-- lib/rails_generator/generators/components/session_migration
 - lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
-- lib/rails_generator/generators/components/session_migration/templates
 - lib/rails_generator/generators/components/session_migration/templates/migration.rb
 - lib/rails_generator/generators/components/session_migration/USAGE
 - lib/rails_generator/lookup.rb
 - lib/rails_generator/manifest.rb
 - lib/rails_generator/options.rb
-- lib/rails_generator/scripts
 - lib/rails_generator/scripts/destroy.rb
 - lib/rails_generator/scripts/generate.rb
 - lib/rails_generator/scripts/update.rb
@@ -451,7 +386,6 @@ files:
 - lib/ruby_version_check.rb
 - lib/rubyprof_ext.rb
 - lib/source_annotation_extractor.rb
-- lib/tasks
 - lib/tasks/annotations.rake
 - lib/tasks/databases.rake
 - lib/tasks/documentation.rake
@@ -469,6 +403,8 @@ files:
 - lib/webrick_server.rb
 has_rdoc: false
 homepage: http://www.rubyonrails.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --exclude
@@ -490,9 +426,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 test_files: []