rails 2.1.2 → 2.2.2

data/lib/tasks/misc.rake

@@ -3,10 +3,9 @@ task :environment do
   require(File.join(RAILS_ROOT, 'config', 'environment'))
 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.'
+desc 'Generate a crytographically secure secret key. This is typically used to generate a secret for cookie sessions.'
 task :secret do
-  puts Rails::SecretKeyGenerator.new(ENV['ID']).generate_secret
+  puts ActiveSupport::SecureRandom.hex(64)
 end
 
 require 'active_support'
@@ -54,4 +53,4 @@ namespace :time do
       puts "\n"
     end
   end
-end
+end

data/lib/tasks/testing.rake

@@ -66,10 +66,16 @@ namespace :test do
   
   Rake::TestTask.new(:uncommitted => "db:test:prepare") do |t|
     def t.file_list
-      changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
+      if File.directory?(".svn")
+        changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
+      elsif File.directory?(".git")
+        changed_since_checkin = silence_stderr { `git ls-files --modified --others` }.map { |path| path.chomp }
+      else
+        abort "Not a Subversion or Git checkout."
+      end
 
-      models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb/ }
-      controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb/ }  
+      models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb$/ }
+      controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb$/ }
 
       unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
       functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
@@ -80,7 +86,7 @@ namespace :test do
     t.libs << 'test'
     t.verbose = true
   end
-  Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion)"
+  Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion and Git)"
 
   Rake::TestTask.new(:units => "db:test:prepare") do |t|
     t.libs << "test"
@@ -103,6 +109,21 @@ namespace :test do
   end
   Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
 
+  Rake::TestTask.new(:benchmark => 'db:test:prepare') do |t|
+    t.libs << 'test'
+    t.pattern = 'test/performance/**/*_test.rb'
+    t.verbose = true
+    t.options = '-- --benchmark'
+  end
+  Rake::Task['test:benchmark'].comment = 'Benchmark the performance tests'
+
+  Rake::TestTask.new(:profile => 'db:test:prepare') do |t|
+    t.libs << 'test'
+    t.pattern = 'test/performance/**/*_test.rb'
+    t.verbose = true
+  end
+  Rake::Task['test:profile'].comment = 'Profile the performance tests'
+
   Rake::TestTask.new(:plugins => :environment) do |t|
     t.libs << "test"
 

data/lib/test_help.rb

@@ -8,7 +8,6 @@ require 'test/unit'
 require 'active_support/test_case'
 require 'active_record/fixtures'
 require 'action_controller/test_case'
-require 'action_controller/test_process'
 require 'action_controller/integration'
 require 'action_mailer/test_case' if defined?(ActionMailer)
 
@@ -25,4 +24,4 @@ begin
   Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
-end
+end

data/lib/webrick_server.rb

@@ -43,8 +43,6 @@ end
 # can change this behavior by setting ActionController::Base.allow_concurrency
 # to true.
 class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
-  REQUEST_MUTEX = Mutex.new
-
   # Start the WEBrick server with the given options, mounting the
   # DispatchServlet at <tt>/</tt>.
   def self.dispatch(options = {})
@@ -73,15 +71,8 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
   def service(req, res) #:nodoc:
     unless handle_file(req, res)
-      begin
-        REQUEST_MUTEX.lock unless ActionController::Base.allow_concurrency
-        unless handle_dispatch(req, res)
-          raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
-        end
-      ensure
-        unless ActionController::Base.allow_concurrency
-          REQUEST_MUTEX.unlock if REQUEST_MUTEX.locked?
-        end
+      unless handle_dispatch(req, res)
+        raise WEBrick::HTTPStatus::NotFound, "`#{req.path}' not found."
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.2.2
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-23 00:00:00 +02:00
+date: 2008-11-21 00:00:00 +01:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.1
+        version: 0.8.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.2
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.1.2
+        version: 2.2.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
@@ -84,6 +84,7 @@ files:
 - bin
 - builtin
 - CHANGELOG
+- config.ru
 - configs
 - dispatches
 - doc
@@ -93,6 +94,7 @@ files:
 - html
 - lib
 - MIT-LICENSE
+- pkg
 - Rakefile
 - README
 - bin/about
@@ -121,6 +123,7 @@ files:
 - configs/apache.conf
 - configs/databases
 - configs/databases/frontbase.yml
+- configs/databases/ibm_db.yml
 - configs/databases/mysql.yml
 - configs/databases/oracle.yml
 - configs/databases/postgresql.yml
@@ -132,7 +135,146 @@ files:
 - configs/initializers/mime_types.rb
 - configs/initializers/new_rails_defaults.rb
 - configs/lighttpd.conf
+- configs/locales
+- configs/locales/en.yml
 - configs/routes.rb
+- doc/guides
+- doc/guides/html
+- doc/guides/html/2_2_release_notes.html
+- doc/guides/html/actioncontroller_basics.html
+- doc/guides/html/activerecord_validations_callbacks.html
+- doc/guides/html/association_basics.html
+- doc/guides/html/authors.html
+- doc/guides/html/benchmarking_and_profiling.html
+- doc/guides/html/caching_with_rails.html
+- doc/guides/html/command_line.html
+- doc/guides/html/configuring.html
+- doc/guides/html/creating_plugins.html
+- doc/guides/html/debugging_rails_applications.html
+- doc/guides/html/finders.html
+- doc/guides/html/form_helpers.html
+- doc/guides/html/getting_started_with_rails.html
+- doc/guides/html/index.html
+- doc/guides/html/layouts_and_rendering.html
+- doc/guides/html/migrations.html
+- doc/guides/html/routing_outside_in.html
+- doc/guides/html/security.html
+- doc/guides/html/testing_rails_applications.html
+- doc/guides/source
+- doc/guides/source/2_2_release_notes.txt
+- doc/guides/source/actioncontroller_basics
+- doc/guides/source/actioncontroller_basics/changelog.txt
+- doc/guides/source/actioncontroller_basics/cookies.txt
+- doc/guides/source/actioncontroller_basics/csrf.txt
+- doc/guides/source/actioncontroller_basics/filters.txt
+- doc/guides/source/actioncontroller_basics/http_auth.txt
+- doc/guides/source/actioncontroller_basics/index.txt
+- doc/guides/source/actioncontroller_basics/introduction.txt
+- doc/guides/source/actioncontroller_basics/methods.txt
+- doc/guides/source/actioncontroller_basics/parameter_filtering.txt
+- doc/guides/source/actioncontroller_basics/params.txt
+- doc/guides/source/actioncontroller_basics/request_response_objects.txt
+- doc/guides/source/actioncontroller_basics/rescue.txt
+- doc/guides/source/actioncontroller_basics/session.txt
+- doc/guides/source/actioncontroller_basics/streaming.txt
+- doc/guides/source/actioncontroller_basics/verification.txt
+- doc/guides/source/active_record_basics.txt
+- doc/guides/source/activerecord_validations_callbacks.txt
+- doc/guides/source/association_basics.txt
+- doc/guides/source/authors.txt
+- doc/guides/source/benchmarking_and_profiling
+- doc/guides/source/benchmarking_and_profiling/appendix.txt
+- doc/guides/source/benchmarking_and_profiling/digging_deeper.txt
+- doc/guides/source/benchmarking_and_profiling/edge_rails_features.txt
+- doc/guides/source/benchmarking_and_profiling/gameplan.txt
+- doc/guides/source/benchmarking_and_profiling/index.txt
+- doc/guides/source/benchmarking_and_profiling/rubyprof.txt
+- doc/guides/source/benchmarking_and_profiling/statistics.txt
+- doc/guides/source/caching_with_rails.txt
+- doc/guides/source/command_line.txt
+- doc/guides/source/configuring.txt
+- doc/guides/source/creating_plugins
+- doc/guides/source/creating_plugins/acts_as_yaffle.txt
+- doc/guides/source/creating_plugins/appendix.txt
+- doc/guides/source/creating_plugins/controllers.txt
+- doc/guides/source/creating_plugins/core_ext.txt
+- doc/guides/source/creating_plugins/custom_route.txt
+- doc/guides/source/creating_plugins/gem.txt
+- doc/guides/source/creating_plugins/generator_method.txt
+- doc/guides/source/creating_plugins/helpers.txt
+- doc/guides/source/creating_plugins/index.txt
+- doc/guides/source/creating_plugins/migration_generator.txt
+- doc/guides/source/creating_plugins/models.txt
+- doc/guides/source/creating_plugins/odds_and_ends.txt
+- doc/guides/source/creating_plugins/test_setup.txt
+- doc/guides/source/debugging_rails_applications.txt
+- doc/guides/source/finders.txt
+- doc/guides/source/form_helpers.txt
+- doc/guides/source/getting_started_with_rails.txt
+- doc/guides/source/images
+- doc/guides/source/images/belongs_to.png
+- doc/guides/source/images/bullet.gif
+- doc/guides/source/images/csrf.png
+- doc/guides/source/images/habtm.png
+- doc/guides/source/images/has_many.png
+- doc/guides/source/images/has_many_through.png
+- doc/guides/source/images/has_one.png
+- doc/guides/source/images/has_one_through.png
+- doc/guides/source/images/header_backdrop.png
+- doc/guides/source/images/icons
+- doc/guides/source/images/icons/callouts
+- doc/guides/source/images/icons/callouts/1.png
+- doc/guides/source/images/icons/callouts/10.png
+- doc/guides/source/images/icons/callouts/11.png
+- doc/guides/source/images/icons/callouts/12.png
+- doc/guides/source/images/icons/callouts/13.png
+- doc/guides/source/images/icons/callouts/14.png
+- doc/guides/source/images/icons/callouts/15.png
+- doc/guides/source/images/icons/callouts/2.png
+- doc/guides/source/images/icons/callouts/3.png
+- doc/guides/source/images/icons/callouts/4.png
+- doc/guides/source/images/icons/callouts/5.png
+- doc/guides/source/images/icons/callouts/6.png
+- doc/guides/source/images/icons/callouts/7.png
+- doc/guides/source/images/icons/callouts/8.png
+- doc/guides/source/images/icons/callouts/9.png
+- doc/guides/source/images/icons/caution.png
+- doc/guides/source/images/icons/example.png
+- doc/guides/source/images/icons/home.png
+- doc/guides/source/images/icons/important.png
+- doc/guides/source/images/icons/next.png
+- doc/guides/source/images/icons/note.png
+- doc/guides/source/images/icons/prev.png
+- doc/guides/source/images/icons/README
+- doc/guides/source/images/icons/tip.png
+- doc/guides/source/images/icons/up.png
+- doc/guides/source/images/icons/warning.png
+- doc/guides/source/images/polymorphic.png
+- doc/guides/source/images/rails_logo_remix.gif
+- doc/guides/source/images/ruby_on_rails_by_mike_rundle2.gif
+- doc/guides/source/images/session_fixation.png
+- doc/guides/source/index.txt
+- doc/guides/source/layouts_and_rendering.txt
+- doc/guides/source/migrations
+- doc/guides/source/migrations/anatomy_of_a_migration.txt
+- doc/guides/source/migrations/changelog.txt
+- doc/guides/source/migrations/creating_a_migration.txt
+- doc/guides/source/migrations/foreign_keys.txt
+- doc/guides/source/migrations/index.txt
+- doc/guides/source/migrations/rakeing_around.txt
+- doc/guides/source/migrations/scheming.txt
+- doc/guides/source/migrations/using_models_in_migrations.txt
+- doc/guides/source/migrations/writing_a_migration.txt
+- doc/guides/source/routing_outside_in.txt
+- doc/guides/source/security.txt
+- doc/guides/source/stylesheets
+- doc/guides/source/stylesheets/base.css
+- doc/guides/source/stylesheets/forms.css
+- doc/guides/source/stylesheets/more.css
+- doc/guides/source/templates
+- doc/guides/source/templates/guides.html.erb
+- doc/guides/source/templates/inline.css
+- doc/guides/source/testing_rails_applications.txt
 - doc/README_FOR_APP
 - dispatches/dispatch.fcgi
 - dispatches/dispatch.rb
@@ -144,6 +286,7 @@ files:
 - environments/test.rb
 - helpers/application.rb
 - helpers/application_helper.rb
+- helpers/performance_test.rb
 - helpers/test_helper.rb
 - html/404.html
 - html/422.html
@@ -186,6 +329,7 @@ files:
 - lib/commands/servers/lighttpd.rb
 - lib/commands/servers/mongrel.rb
 - lib/commands/servers/new_mongrel.rb
+- lib/commands/servers/thin.rb
 - lib/commands/servers/webrick.rb
 - lib/commands/update.rb
 - lib/commands.rb
@@ -195,6 +339,7 @@ files:
 - lib/dispatcher.rb
 - lib/fcgi_handler.rb
 - lib/initializer.rb
+- lib/performance_test_help.rb
 - lib/rails
 - lib/rails/gem_builder.rb
 - lib/rails/gem_dependency.rb
@@ -205,6 +350,11 @@ files:
 - lib/rails/plugin/loader.rb
 - lib/rails/plugin/locator.rb
 - lib/rails/plugin.rb
+- lib/rails/rack
+- lib/rails/rack/logger.rb
+- lib/rails/rack/static.rb
+- lib/rails/rack.rb
+- lib/rails/vendor_gem_source_index.rb
 - lib/rails/version.rb
 - lib/rails_generator
 - lib/rails_generator/base.rb
@@ -258,6 +408,11 @@ files:
 - 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
@@ -269,6 +424,7 @@ files:
 - lib/rails_generator/generators/components/plugin/templates/Rakefile
 - lib/rails_generator/generators/components/plugin/templates/README
 - lib/rails_generator/generators/components/plugin/templates/tasks.rake
+- lib/rails_generator/generators/components/plugin/templates/test_helper.rb
 - lib/rails_generator/generators/components/plugin/templates/uninstall.rb
 - lib/rails_generator/generators/components/plugin/templates/unit_test.rb
 - lib/rails_generator/generators/components/plugin/templates/USAGE
@@ -352,7 +508,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Web-application framework with template engine, control-flow layer, and ORM.