rails 2.3.8 → 2.3.9.pre

data/CHANGELOG

@@ -1,8 +1,9 @@
-*2.3.8 (May 24, 2010)*
+*2.3.9 (August 29, 2010)*
 
-* Version bump.
+* Deprecates config.load_(once_)paths in favor of autolaod_(once_)paths. [fxn]
 
 
+*2.3.8 (May 24, 2010)*
 *2.3.7 (May 24, 2010)*
 
 * Version bump.

data/Rakefile

@@ -296,7 +296,6 @@ PKG_FILES = FileList[
   'doc/**/*', 
   'dispatches/**/*', 
   'environments/**/*', 
-  'guides/**/*', 
   'helpers/**/*', 
   'generators/**/*', 
   'html/**/*', 
@@ -314,16 +313,16 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.8' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.8' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.8' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.8' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.8' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.9' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.9' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.9' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.9' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.9' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 
-  s.files = PKG_FILES.to_a.delete_if {|f| f =~ %r{\.svn|guides/output}}
+  s.files = PKG_FILES
   s.require_path = 'lib'
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["rails"]

data/builtin/rails_info/rails/info.rb

@@ -55,7 +55,7 @@ module Rails
       alias inspect to_s
 
       def to_html
-        returning table = '<table>' do
+        '<table>'.tap do |table|
           properties.each do |(name, value)|
             table << %(<tr><td class="name">#{CGI.escapeHTML(name.to_s)}</td>)
             table << %(<td class="value">#{CGI.escapeHTML(value.to_s)}</td></tr>)

data/environments/boot.rb

@@ -62,8 +62,12 @@ module Rails
         gem 'rails'
       end
     rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
-      exit 1
+      if load_error.message =~ /Could not find RubyGem rails/
+        STDERR.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+        exit 1
+      else
+        raise
+      end
     end
 
     class << self

data/environments/environment.rb

@@ -12,7 +12,7 @@ Rails::Initializer.run do |config|
   # -- all .rb files in that directory are automatically loaded.
 
   # Add additional load paths for your own custom dirs
-  # config.load_paths += %W( #{RAILS_ROOT}/extras )
+  # config.autoload_paths += %W( #{RAILS_ROOT}/extras )
 
   # Specify gems that this application depends on and have them installed with rake gems:install
   # config.gem "bj"

data/lib/initializer.rb

@@ -236,9 +236,9 @@ module Rails
     end
 
     # Set the <tt>$LOAD_PATH</tt> based on the value of
-    # Configuration#load_paths. Duplicates are removed.
+    # Configuration#autoload_paths. Duplicates are removed.
     def set_load_path
-      load_paths = configuration.load_paths + configuration.framework_paths
+      load_paths = configuration.autoload_paths + configuration.framework_paths
       load_paths.reverse_each { |dir| $LOAD_PATH.unshift(dir) if File.directory?(dir) }
       $LOAD_PATH.uniq!
     end
@@ -246,19 +246,19 @@ module Rails
     # Set the paths from which Rails will automatically load source files, and
     # the load_once paths.
     def set_autoload_paths
-      ActiveSupport::Dependencies.load_paths = configuration.load_paths.uniq
-      ActiveSupport::Dependencies.load_once_paths = configuration.load_once_paths.uniq
+      ActiveSupport::Dependencies.autoload_paths = configuration.autoload_paths.uniq
+      ActiveSupport::Dependencies.autoload_once_paths = configuration.autoload_once_paths.uniq
 
-      extra = ActiveSupport::Dependencies.load_once_paths - ActiveSupport::Dependencies.load_paths
+      extra = ActiveSupport::Dependencies.autoload_once_paths - ActiveSupport::Dependencies.autoload_paths
       unless extra.empty?
         abort <<-end_error
-          load_once_paths must be a subset of the load_paths.
-          Extra items in load_once_paths: #{extra * ','}
+          autoload_once_paths must be a subset of the autoload_paths.
+          Extra items in autoload_once_paths: #{extra * ','}
         end_error
       end
 
       # Freeze the arrays so future modifications will fail rather than do nothing mysteriously
-      configuration.load_once_paths.freeze
+      configuration.autoload_once_paths.freeze
     end
 
     # Requires all frameworks specified by the Configuration#frameworks
@@ -406,7 +406,7 @@ Run `rake gems:install` to install the missing gems.
 
     # Eager load application classes
     def load_application_classes
-      return if $rails_rake_task
+      return if $rails_rake_task && configuration.dependency_loading
       if configuration.cache_classes
         configuration.eager_load_paths.each do |load_path|
           matcher = /\A#{Regexp.escape(load_path)}(.*)\.rb\Z/
@@ -696,15 +696,39 @@ Run `rake gems:install` to install the missing gems.
 
     # An array of additional paths to prepend to the load path. By default,
     # all +app+, +lib+, +vendor+ and mock paths are included in this list.
-    attr_accessor :load_paths
+    attr_accessor :autoload_paths
+
+    # Deprecated, use autoload_paths.
+    def load_paths
+      $stderr.puts("config.load_paths is deprecated and removed in Rails 3, please use autoload_paths instead")
+      autoload_paths
+    end
+
+    # Deprecated, use autoload_paths=.
+    def load_paths=(paths)
+      $stderr.puts("config.load_paths= is deprecated and removed in Rails 3, please use autoload_paths= instead")
+      self.autoload_paths = paths
+    end
 
     # An array of paths from which Rails will automatically load from only once.
-    # All elements of this array must also be in +load_paths+.
-    attr_accessor :load_once_paths
+    # All elements of this array must also be in +autoload_paths+.
+    attr_accessor :autoload_once_paths
+
+    # Deprecated, use autoload_once_paths.
+    def load_once_paths
+      $stderr.puts("config.load_once_paths is deprecated and removed in Rails 3, please use autoload_once_paths instead")
+      autoload_once_paths
+    end
+
+    # Deprecated, use autoload_once_paths=.
+    def load_once_paths=(paths)
+      $stderr.puts("config.load_once_paths= is deprecated and removed in Rails 3, please use autoload_once_paths= instead")
+      self.autoload_once_paths = paths
+    end
 
     # An array of paths from which Rails will eager load on boot if cache
     # classes is enabled. All elements of this array must also be in
-    # +load_paths+.
+    # +autoload_paths+.
     attr_accessor :eager_load_paths
 
     # The log level to use for the default Rails logger. In production mode,
@@ -764,12 +788,12 @@ Run `rake gems:install` to install the missing gems.
     # If <tt>reload_plugins?</tt> is false, add this to your plugin's <tt>init.rb</tt>
     # to make it reloadable:
     #
-    #   ActiveSupport::Dependencies.load_once_paths.delete lib_path
+    #   ActiveSupport::Dependencies.autoload_once_paths.delete lib_path
     #
     # If <tt>reload_plugins?</tt> is true, add this to your plugin's <tt>init.rb</tt>
     # to only load it once:
     #
-    #   ActiveSupport::Dependencies.load_once_paths << lib_path
+    #   ActiveSupport::Dependencies.autoload_once_paths << lib_path
     #
     attr_accessor :reload_plugins
 
@@ -836,8 +860,8 @@ Run `rake gems:install` to install the missing gems.
       set_root_path!
 
       self.frameworks                   = default_frameworks
-      self.load_paths                   = default_load_paths
-      self.load_once_paths              = default_load_once_paths
+      self.autoload_paths               = default_autoload_paths
+      self.autoload_once_paths          = default_autoload_once_paths
       self.eager_load_paths             = default_eager_load_paths
       self.log_path                     = default_log_path
       self.log_level                    = default_log_level
@@ -967,7 +991,7 @@ Run `rake gems:install` to install the missing gems.
         [ :active_record, :action_controller, :action_view, :action_mailer, :active_resource ]
       end
 
-      def default_load_paths
+      def default_autoload_paths
         paths = []
 
         # Add the old mock paths only if the directories exists
@@ -991,8 +1015,8 @@ Run `rake gems:install` to install the missing gems.
         paths.concat builtin_directories
       end
 
-      # Doesn't matter since plugins aren't in load_paths yet.
-      def default_load_once_paths
+      # Doesn't matter since plugins aren't in autoload_paths yet.
+      def default_autoload_once_paths
         []
       end
 

data/lib/rails/plugin.rb

@@ -35,7 +35,7 @@ module Rails
     def load_paths
       report_nonexistant_or_empty_plugin! unless valid?
       
-      returning [] do |load_paths|
+      [].tap do |load_paths|
         load_paths << lib_path  if has_lib_directory?
         load_paths << app_paths if has_app_directory?
       end.flatten

data/lib/rails/plugin/loader.rb

@@ -48,16 +48,16 @@ module Rails
       # added *after* the application's <tt>lib</tt> directory, to ensure that an application
       # can always override code within a plugin.
       #
-      # Plugin load paths are also added to Dependencies.load_paths, and Dependencies.load_once_paths.
+      # Plugin load paths are also added to Dependencies.autoload_paths, and Dependencies.autoload_once_paths.
       def add_plugin_load_paths
         plugins.each do |plugin|
           plugin.load_paths.each do |path|
             $LOAD_PATH.insert(application_lib_index + 1, path)
 
-            ActiveSupport::Dependencies.load_paths << path
+            ActiveSupport::Dependencies.autoload_paths << path
 
             unless configuration.reload_plugins?
-              ActiveSupport::Dependencies.load_once_paths << path
+              ActiveSupport::Dependencies.autoload_once_paths << path
             end
           end
         end

data/lib/rails/version.rb

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

data/lib/rails_generator/generators/components/migration/migration_generator.rb

@@ -8,7 +8,7 @@ class MigrationGenerator < Rails::Generator::NamedBase
   
   private  
     def get_local_assigns
-      returning(assigns = {}) do
+      {}.tap do |assigns|
         if class_name.underscore =~ /^(add|remove)_.*_(?:to|from)_(.*)/
           assigns[:migration_action] = $1
           assigns[:table_name]       = $2.pluralize

data/lib/rails_generator/generators/components/plugin/templates/test_helper.rb

@@ -1,3 +1,4 @@
 require 'rubygems'
+require 'test/unit'
 require 'active_support'
-require 'active_support/test_case'
+require 'active_support/test_case'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 2
   - 3
-  - 8
-  version: 2.3.8
+  - 9
+  - pre
+  version: 2.3.9.pre
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-24 00:00:00 -07:00
+date: 2010-08-29 00:00:00 -07:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +42,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 9
+        - pre
+        version: 2.3.9.pre
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,8 +57,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 9
+        - pre
+        version: 2.3.9.pre
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -69,8 +72,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 9
+        - pre
+        version: 2.3.9.pre
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -83,8 +87,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 9
+        - pre
+        version: 2.3.9.pre
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -97,8 +102,9 @@ dependencies:
         segments: 
         - 2
         - 3
-        - 8
-        version: 2.3.8
+        - 9
+        - pre
+        version: 2.3.9.pre
   type: :runtime
   version_requirements: *id006
 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"
@@ -157,113 +163,6 @@ files:
 - environments/environment.rb
 - environments/production.rb
 - environments/test.rb
-- guides/files/javascripts/code_highlighter.js
-- guides/files/javascripts/guides.js
-- guides/files/javascripts/highlighters.js
-- 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/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/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/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/generator.rb
-- guides/rails_guides/helpers.rb
-- guides/rails_guides/indexer.rb
-- guides/rails_guides/textile_extensions.rb
-- guides/rails_guides.rb
-- 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
@@ -449,11 +348,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rails