rails 2.3.2 → 2.3.3

data/lib/commands/performance/profiler.rb

@@ -29,7 +29,7 @@ begin
       printer_class = RubyProf::FlatPrinter
     end
     printer = printer_class.new(results)
-    printer.print($stderr, 0)
+    printer.print($stderr)
   rescue LoadError
     require "prof"
     $stderr.puts 'Using the old ruby-prof extension.'

data/lib/initializer.rb

@@ -159,6 +159,8 @@ module Rails
 
       add_support_load_paths
 
+      check_for_unbuilt_gems
+
       load_gems
       load_plugins
 
@@ -301,11 +303,30 @@ module Rails
     end
 
     def load_gems
-      unless $gems_build_rake_task
+      unless $gems_rake_task
         @configuration.gems.each { |gem| gem.load }
       end
     end
 
+    def check_for_unbuilt_gems
+      unbuilt_gems = @configuration.gems.select(&:frozen?).reject(&:built?)
+      if unbuilt_gems.size > 0
+        # don't print if the gems:build rake tasks are being run
+        unless $gems_build_rake_task
+          abort <<-end_error
+The following gems have native components that need to be built
+  #{unbuilt_gems.map { |gem| "#{gem.name}  #{gem.requirement}" } * "\n  "}
+
+You're running:
+  ruby #{Gem.ruby_version} at #{Gem.ruby}
+  rubygems #{Gem::RubyGemsVersion} at #{Gem.path * ', '}
+
+Run `rake gems:build` to build the unbuilt gems.
+          end_error
+        end
+      end
+    end
+
     def check_gem_dependencies
       unloaded_gems = @configuration.gems.reject { |g| g.loaded? }
       if unloaded_gems.size > 0
@@ -420,7 +441,8 @@ Run `rake gems:install` to install the missing gems.
 
     def initialize_database_middleware
       if configuration.frameworks.include?(:active_record)
-        if ActionController::Base.session_store == ActiveRecord::SessionStore
+        if configuration.frameworks.include?(:action_controller) &&
+            ActionController::Base.session_store == ActiveRecord::SessionStore
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::ConnectionAdapters::ConnectionManagement
           configuration.middleware.insert_before :"ActiveRecord::SessionStore", ActiveRecord::QueryCache
         else
@@ -565,7 +587,7 @@ Run `rake gems:install` to install the missing gems.
       Rails::Rack::Metal.metal_paths += plugin_loader.engine_metal_paths
 
       configuration.middleware.insert_before(
-        :"ActionController::RewindableInput",
+        :"ActionController::ParamsParser",
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
     end
 
@@ -862,7 +884,7 @@ Run `rake gems:install` to install the missing gems.
 
     # Enable threaded mode. Allows concurrent requests to controller actions and
     # multiple database connections. Also disables automatic dependency loading
-    # after boot, and disables reloading code on every request, as these are 
+    # after boot, and disables reloading code on every request, as these are
     # fundamentally incompatible with thread safety.
     def threadsafe!
       self.preload_frameworks = true
@@ -1103,3 +1125,4 @@ class Rails::OrderedOptions < Array #:nodoc:
       return false
     end
 end
+

data/lib/rails/gem_dependency.rb

@@ -29,6 +29,22 @@ module Rails
       end
     end
 
+    def self.from_directory_name(directory_name, load_spec=true)
+      directory_name_parts = File.basename(directory_name).split('-')
+      name    = directory_name_parts[0..-2].join('-')
+      version = directory_name_parts.last
+      result = self.new(name, :version => version)
+      spec_filename = File.join(directory_name, '.specification')
+      if load_spec
+        raise "Missing specification file in #{File.dirname(spec_filename)}. Perhaps you need to do a 'rake gems:refresh_specs'?" unless File.exists?(spec_filename)
+        spec = YAML::load_file(spec_filename)
+        result.specification = spec
+      end
+      result
+    rescue ArgumentError => e
+      raise "Unable to determine gem name and version from '#{directory_name}'"
+    end
+
     def initialize(name, options = {})
       require 'rubygems' unless Object.const_defined?(:Gem)
 
@@ -95,14 +111,26 @@ module Rails
       end
     end
 
+    def specification=(s)
+      @spec = s
+    end
+
     def requirement
       r = version_requirements
       (r == Gem::Requirement.default) ? nil : r
     end
 
     def built?
-      # TODO: If Rubygems ever gives us a way to detect this, we should use it
-      false
+      return false unless frozen?
+
+      if vendor_gem?
+        specification.extensions.each do |ext|
+          makefile = File.join(unpacked_gem_directory, File.dirname(ext), 'Makefile')
+          return false unless File.exists?(makefile)
+        end
+      end
+
+      true
     end
 
     def framework_gem?
@@ -155,15 +183,16 @@ module Rails
       specification && File.exists?(unpacked_gem_directory)
     end
 
-    def build
+    def build(options={})
       require 'rails/gem_builder'
-      unless built?
+      return if specification.nil?
+      if options[:force] || !built?
         return unless File.exists?(unpacked_specification_filename)
         spec = YAML::load_file(unpacked_specification_filename)
         Rails::GemBuilder.new(spec, unpacked_gem_directory).build_extensions
         puts "Built gem: '#{unpacked_gem_directory}'"
       end
-      dependencies.each { |dep| dep.build }
+      dependencies.each { |dep| dep.build(options) }
     end
 
     def install
@@ -223,7 +252,7 @@ module Rails
         real_spec = Gem::Specification.load(specification.loaded_from)
         write_specification(real_spec)
       end
-      dependencies.each { |dep| dep.unpack } if options[:recursive]
+      dependencies.each { |dep| dep.unpack(options) } if options[:recursive]
     end
 
     def write_specification(spec)

data/lib/rails/rack/metal.rb

@@ -26,7 +26,7 @@ module Rails
 
         load_list.map do |requested_metal|
           if metal = all_metals[requested_metal]
-            require metal
+            require_dependency metal
             requested_metal.constantize
           end
         end.compact

data/lib/rails/version.rb

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

data/lib/tasks/gems.rake

@@ -20,18 +20,25 @@ namespace :gems do
   desc "Build any native extensions for unpacked gems"
   task :build do
     $gems_build_rake_task = true
-    Rake::Task['gems:unpack'].invoke
-    current_gems.each &:build
+    frozen_gems.each { |gem| gem.build }
+  end
+
+  namespace :build do
+    desc "Force the build of all gems"
+    task :force do
+      $gems_build_rake_task = true
+      frozen_gems.each { |gem| gem.build(:force => true) }
+    end
   end
 
   desc "Installs all required gems."
   task :install => :base do
-    current_gems.each &:install
+    current_gems.each { |gem| gem.install }
   end
 
   desc "Unpacks all required gems into vendor/gems."
   task :unpack => :install do
-    current_gems.each &:unpack
+    current_gems.each { |gem| gem.unpack }
   end
 
   namespace :unpack do
@@ -42,8 +49,8 @@ namespace :gems do
   end
 
   desc "Regenerate gem specifications in correct format."
-  task :refresh_specs => :base do
-    current_gems.each &:refresh
+  task :refresh_specs do
+    frozen_gems(false).each { |gem| gem.refresh }
   end
 end
 
@@ -53,6 +60,12 @@ def current_gems
   gems
 end
 
+def frozen_gems(load_specs=true)
+  Dir[File.join(RAILS_ROOT, 'vendor', 'gems', '*-*')].map do |gem_dir|
+    Rails::GemDependency.from_directory_name(gem_dir, load_specs)
+  end
+end
+
 def print_gem_status(gem, indent=1)
   code = case
     when gem.framework_gem? then 'R'

data/lib/test_help.rb

@@ -29,7 +29,10 @@ end
 begin
   require_library_or_gem 'ruby-debug'
   Debugger.start
-  Debugger.settings[:autoeval] = true if Debugger.respond_to?(:settings)
+  if Debugger.respond_to?(:settings)
+    Debugger.settings[:autoeval] = true
+    Debugger.settings[:autolist] = 1
+  end
 rescue LoadError
   # ruby-debug wasn't available so neither can the debugging be
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-15 00:00:00 -05:00
+date: 2009-07-20 00:00:00 -05:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -50,7 +50,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -60,7 +60,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
@@ -70,7 +70,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.2
+        version: 2.3.3
     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
@@ -143,6 +143,122 @@ 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
+- guides/images/chapters_icon.gif
+- guides/images/check_bullet.gif
+- guides/images/credits_pic_blank.gif
+- guides/images/csrf.png
+- guides/images/customized_error_messages.png
+- guides/images/error_messages.png
+- guides/images/feature_tile.gif
+- guides/images/footer_tile.gif
+- guides/images/fxn.jpg
+- guides/images/grey_bullet.gif
+- guides/images/habtm.png
+- guides/images/has_many.png
+- guides/images/has_many_through.png
+- guides/images/has_one.png
+- 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
+- guides/images/icons/callouts/12.png
+- guides/images/icons/callouts/13.png
+- guides/images/icons/callouts/14.png
+- guides/images/icons/callouts/15.png
+- guides/images/icons/callouts/2.png
+- guides/images/icons/callouts/3.png
+- guides/images/icons/callouts/4.png
+- guides/images/icons/callouts/5.png
+- guides/images/icons/callouts/6.png
+- guides/images/icons/callouts/7.png
+- guides/images/icons/callouts/8.png
+- guides/images/icons/callouts/9.png
+- guides/images/icons/caution.png
+- guides/images/icons/example.png
+- guides/images/icons/home.png
+- guides/images/icons/important.png
+- guides/images/icons/next.png
+- guides/images/icons/note.png
+- guides/images/icons/prev.png
+- guides/images/icons/README
+- guides/images/icons/tip.png
+- guides/images/icons/up.png
+- guides/images/icons/warning.png
+- guides/images/nav_arrow.gif
+- guides/images/polymorphic.png
+- guides/images/posts_index.png
+- guides/images/rails_guides_logo.gif
+- guides/images/rails_logo_remix.gif
+- guides/images/rails_welcome.png
+- guides/images/session_fixation.png
+- guides/images/tab_grey.gif
+- guides/images/tab_info.gif
+- guides/images/tab_note.gif
+- guides/images/tab_red.gif
+- 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
+- guides/source/action_mailer_basics.textile
+- guides/source/active_record_basics.textile
+- guides/source/active_record_querying.textile
+- guides/source/activerecord_validations_callbacks.textile
+- guides/source/association_basics.textile
+- guides/source/caching_with_rails.textile
+- guides/source/command_line.textile
+- guides/source/configuring.textile
+- guides/source/contribute.textile
+- guides/source/contributing_to_rails.textile
+- guides/source/credits.erb.textile
+- guides/source/debugging_rails_applications.textile
+- guides/source/form_helpers.textile
+- guides/source/getting_started.textile
+- guides/source/i18n.textile
+- guides/source/index.erb.textile
+- guides/source/layout.html.erb
+- guides/source/layouts_and_rendering.textile
+- guides/source/migrations.textile
+- guides/source/nested_model_forms.textile
+- guides/source/performance_testing.textile
+- guides/source/plugins.textile
+- guides/source/rails_on_rack.textile
+- guides/source/routing.textile
+- guides/source/security.textile
+- guides/source/testing.textile
 - helpers/application_controller.rb
 - helpers/application_helper.rb
 - helpers/performance_test.rb