rails 2.3.5 → 2.3.6

data/CHANGELOG

@@ -1,8 +1,14 @@
-*Edge*
+*2.3.6 (May 23, 2010)*
+
+* Added config/initializers/cookie_verification_secret.rb with an auto-generated secret for using ActionController::Base#cookies.signed [DHH]
 
 * Fixed that the debugger wouldn't go into IRB mode because of left-over ARGVs [DHH]
 
-* 1.9 compatibility
+
+*2.3.5 (November 25, 2009)*
+
+* Ruby 1.9 compatibility
+
 
 *2.3.4 (September 4, 2009)*
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2009 David Heinemeier Hansson
+Copyright (c) 2004-2010 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -314,11 +314,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  s.add_dependency('activesupport',    '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.3.5' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.3.5' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.3.6' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.6' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.6' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.6' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.6' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/bin/rails

@@ -1,19 +1,20 @@
-require File.dirname(__FILE__) + '/../lib/ruby_version_check'
+$:.unshift File.expand_path("../../lib", __FILE__)
+
+require 'ruby_version_check'
 Signal.trap("INT") { puts; exit }
 
-require File.dirname(__FILE__) + '/../lib/rails/version'
+require 'rails/version'
 if %w(--version -v).include? ARGV.first
   puts "Rails #{Rails::VERSION::STRING}"
   exit(0)
 end
 
 freeze   = ARGV.any? { |option| %w(--freeze -f).include?(option) }
-
 app_path = ARGV.first
 
-require File.dirname(__FILE__) + '/../lib/rails_generator'
-
+require 'rails_generator'
 require 'rails_generator/scripts/generate'
+
 Rails::Generator::Base.use_application_sources!
 Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
 

data/builtin/rails_info/rails/info.rb

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

data/configs/initializers/cookie_verification_secret.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random, 
+# no regular words or you'll be exposed to dictionary attacks.
+ActionController::Base.cookie_verifier_secret = '<%= app_secret %>';

data/guides/source/getting_started.textile

@@ -1255,8 +1255,8 @@ You'll also need to modify +views/posts/_form.html.erb+ to include the tags:
     </p>
     <% unless tag_form.object.nil? || tag_form.object.new_record? %>
       <p>
-        <%= tag_form.label :_delete, 'Remove:' %>
-        <%= tag_form.check_box :_delete %>
+        <%= tag_form.label :_destroy, 'Remove:' %>
+        <%= tag_form.check_box :_destroy %>
       </p>
     <% end %>
   <% end %>

data/lib/commands/dbconsole.rb

@@ -45,7 +45,7 @@ def find_cmd(*commands)
 end
 
 case config["adapter"]
-when "mysql"
+when /^mysql/
   args = {
     'host'      => '--host',
     'port'      => '--port',

data/lib/commands/runner.rb

@@ -18,7 +18,7 @@ ARGV.clone.options do |opts|
   opts.on("-h", "--help",
           "Show this help message.") { $stderr.puts opts; exit }
 
-  if RUBY_PLATFORM !~ /mswin/
+  if RUBY_PLATFORM !~ /(:?mswin|mingw)/
     opts.separator ""
     opts.separator "You can also use runner as a shebang line for your scripts like this:"
     opts.separator "-------------------------------------------------------------"

data/lib/dispatcher.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2009 David Heinemeier Hansson
+# Copyright (c) 2004-2010 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the

data/lib/rails/gem_dependency.rb

@@ -83,7 +83,7 @@ module Rails
       specification.dependencies.reject do |dependency|
         dependency.type == :development
       end.map do |dependency|
-        GemDependency.new(dependency.name, :requirement => dependency.version_requirements)
+        GemDependency.new(dependency.name, :requirement => (dependency.respond_to?(:requirement) ? dependency.requirement : dependency.version_requirements))
       end
     end
 
@@ -115,9 +115,16 @@ module Rails
       @spec = s
     end
 
-    def requirement
-      r = version_requirements
-      (r == Gem::Requirement.default) ? nil : r
+    if method_defined?(:requirement)
+      def requirement
+        req = super
+        req unless req == Gem::Requirement.default
+      end
+    else
+      def requirement
+        req = version_requirements
+        req unless req == Gem::Requirement.default
+      end
     end
 
     def built?

data/lib/rails/vendor_gem_source_index.rb

@@ -37,7 +37,7 @@ module Rails
       # handle vendor Rails gems - they are identified by having loaded_from set to ""
       # we add them manually to the list, so that other gems can find them via dependencies
       Gem.loaded_specs.each do |n, s|
-        next unless s.loaded_from.empty?
+        next unless s.loaded_from.to_s.empty?
         vendor_gems[s.full_name] = s
       end
 

data/lib/rails/version.rb

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

data/lib/rails_generator.rb

@@ -21,8 +21,11 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-$:.unshift(File.dirname(__FILE__))
-$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
+railties = File.expand_path("..", __FILE__)
+$:.unshift(railties) unless $:.include?(railties)
+
+activesupport = File.expand_path("../../../activesupport/lib", __FILE__)
+$:.unshift(activesupport) unless $:.include?(activesupport)
 
 begin
   require 'active_support'  

data/lib/rails_generator/generated_attribute.rb

@@ -12,12 +12,13 @@ module Rails
 
       def field_type
         @field_type ||= case type
-          when :integer, :float, :decimal   then :text_field
-          when :datetime, :timestamp, :time then :datetime_select
-          when :date                        then :date_select
-          when :string                      then :text_field
-          when :text                        then :text_area
-          when :boolean                     then :check_box
+          when :integer, :float, :decimal then :text_field
+          when :time                      then :time_select
+          when :datetime, :timestamp      then :datetime_select
+          when :date                      then :date_select
+          when :string                    then :text_field
+          when :text                      then :text_area
+          when :boolean                   then :check_box
           else
             :text_field
         end      

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

@@ -193,6 +193,9 @@ class AppGenerator < Rails::Generator::Base
 
       m.template "configs/initializers/session_store.rb", "config/initializers/session_store.rb", 
         :assigns => { :app_name => @app_name, :app_secret => ActiveSupport::SecureRandom.hex(64) }
+
+      m.template "configs/initializers/cookie_verification_secret.rb", "config/initializers/cookie_verification_secret.rb", 
+        :assigns => { :app_secret => ActiveSupport::SecureRandom.hex(64) }
     end
 
     def create_locale_file(m)

data/lib/rails_generator/generators/components/model/templates/fixtures.yml

@@ -11,9 +11,13 @@ two:
   <%= attribute.name %>: <%= attribute.default %>
 <% end -%>
 <% else -%>
-# one:
-#   column: value
+# This model initially had no columns defined.  If you add columns to the
+# model remove the '{}' from the fixture names and add the columns immediately
+# below each fixture, per the syntax in the comments below
 #
-# two:
-#   column: value
-<% end -%>
+one: {}
+# column: value
+#
+two: {}
+#  column: value
+<% end -%>

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -13,7 +13,7 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.class_collisions class_name
 
       m.directory "#{plugin_path}/lib"
-      m.directory "#{plugin_path}/tasks"
+      m.directory "#{plugin_path}/lib/tasks"
       m.directory "#{plugin_path}/test"
 
       m.template 'README',         "#{plugin_path}/README"
@@ -23,7 +23,7 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.template 'install.rb',     "#{plugin_path}/install.rb"
       m.template 'uninstall.rb',   "#{plugin_path}/uninstall.rb"
       m.template 'plugin.rb',      "#{plugin_path}/lib/#{file_name}.rb"
-      m.template 'tasks.rake',     "#{plugin_path}/tasks/#{file_name}_tasks.rake"
+      m.template 'tasks.rake',     "#{plugin_path}/lib/tasks/#{file_name}.rake"
       m.template 'unit_test.rb',   "#{plugin_path}/test/#{file_name}_test.rb"
       m.template 'test_helper.rb', "#{plugin_path}/test/test_helper.rb"
       if @with_generator

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

@@ -44,8 +44,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.save
-        flash[:notice] = '<%= class_name %> was successfully created.'
-        format.html { redirect_to(@<%= file_name %>) }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully created.') }
         format.xml  { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> }
       else
         format.html { render :action => "new" }
@@ -61,8 +60,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
     respond_to do |format|
       if @<%= file_name %>.update_attributes(params[:<%= file_name %>])
-        flash[:notice] = '<%= class_name %> was successfully updated.'
-        format.html { redirect_to(@<%= file_name %>) }
+        format.html { redirect_to(@<%= file_name %>, :notice => '<%= class_name %> was successfully updated.') }
         format.xml  { head :ok }
       else
         format.html { render :action => "edit" }

data/lib/rails_generator/generators/components/scaffold/templates/layout.html.erb

@@ -9,7 +9,7 @@
 </head>
 <body>
 
-<p style="color: green"><%%= flash[:notice] %></p>
+<p style="color: green"><%%= notice %></p>
 
 <%%= yield %>
 

data/lib/tasks/databases.rake

@@ -94,11 +94,7 @@ namespace :db do
   desc 'Drops the database for the current RAILS_ENV'
   task :drop => :load_config do
     config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
-    begin
-      drop_database(config)
-    rescue Exception => e
-      puts "Couldn't drop #{config['database']} : #{e.inspect}"
-    end
+    drop_database(config)
   end
 
   def local_database?(config, &block)
@@ -410,15 +406,19 @@ namespace :db do
 end
 
 def drop_database(config)
-  case config['adapter']
-  when 'mysql'
-    ActiveRecord::Base.establish_connection(config)
-    ActiveRecord::Base.connection.drop_database config['database']
-  when /^sqlite/
-    FileUtils.rm(File.join(RAILS_ROOT, config['database']))
-  when 'postgresql'
-    ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
-    ActiveRecord::Base.connection.drop_database config['database']
+  begin
+    case config['adapter']
+    when 'mysql'
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection.drop_database config['database']
+    when /^sqlite/
+      FileUtils.rm(File.join(RAILS_ROOT, config['database']))
+    when 'postgresql'
+      ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
+      ActiveRecord::Base.connection.drop_database config['database']
+    end
+  rescue Exception => e
+    puts "Couldn't drop #{config['database']} : #{e.inspect}"
   end
 end
 

data/lib/tasks/framework.rake

@@ -64,7 +64,10 @@ namespace :rails do
           rm_f goner
         end
 
-        touch "rails/REVISION_#{latest_revision}"
+        puts "Frozen to git revision #{latest_revision}"
+        File.open('rails/REVISION', 'w') do |revision|
+          revision.puts latest_revision
+        end
       end
 
       puts 'Updating current scripts, javascripts, and configuration settings'

data/lib/tasks/rails.rb

@@ -4,6 +4,11 @@ $VERBOSE = nil
 Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
-Dir["#{RAILS_ROOT}/vendor/plugins/*/tasks/**/*.rake"].sort.each { |ext| load ext }
+deprecated_paths = Dir["#{RAILS_ROOT}/vendor/plugins/*/tasks/**/*.rake"].sort
+if deprecated_paths.any?
+  plugins = deprecated_paths.map { |p| $1 if p =~ %r((vendor/plugins/[^/]+/tasks)) }.compact
+  ActiveSupport::Deprecation.warn "Rake tasks in #{plugins.to_sentence} are deprecated. Use lib/tasks instead."
+  deprecated_paths.each { |ext| load ext }
+end
 Dir["#{RAILS_ROOT}/vendor/plugins/*/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.3.5
+  prerelease: false
+  segments: 
+  - 2
+  - 3
+  - 6
+  version: 2.3.6
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,69 +14,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-27 00:00:00 +13:00
+date: 2010-05-23 00:00:00 -07:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 3
         version: 0.8.3
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 6
+        version: 2.3.6
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 6
+        version: 2.3.6
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: actionpack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 6
+        version: 2.3.6
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: actionmailer
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 6
+        version: 2.3.6
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activeresource
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.3.5
-    version: 
+        segments: 
+        - 2
+        - 3
+        - 6
+        version: 2.3.6
+  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"
 email: david@loudthinking.com
 executables: 
@@ -110,6 +139,7 @@ files:
 - configs/databases/sqlite3.yml
 - configs/empty.log
 - configs/initializers/backtrace_silencers.rb
+- configs/initializers/cookie_verification_secret.rb
 - configs/initializers/inflections.rb
 - configs/initializers/mime_types.rb
 - configs/initializers/new_rails_defaults.rb
@@ -400,7 +430,7 @@ files:
 - lib/tasks/tmp.rake
 - lib/test_help.rb
 - lib/webrick_server.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://www.rubyonrails.org
 licenses: []
 
@@ -414,18 +444,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Web-application framework with template engine, control-flow layer, and ORM.