rails 2.3.9 → 2.3.10

data/CHANGELOG

@@ -1,3 +1,5 @@
+*2.3.10 (October 15, 2010)*
+
 *2.3.9 (September 4, 2010)*
 
 * Deprecates config.load_(once_)paths in favor of autolaod_(once_)paths. [fxn]

data/Rakefile

@@ -313,11 +313,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.8.3')
-  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.add_dependency('activesupport',    '= 2.3.10' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.3.10' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.3.10' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.3.10' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.3.10' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false

data/lib/rails/gem_dependency.rb

@@ -31,8 +31,10 @@ module Rails
 
     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
+      
+      version = directory_name_parts.find { |s| s.match(/^\d(\.\d|\.\w+)*$/) }
+      name    = directory_name_parts[0..directory_name_parts.index(version)-1].join('-') if version
+      
       result = self.new(name, :version => version)
       spec_filename = File.join(directory_name, '.specification')
       if load_spec

data/lib/rails/vendor_gem_source_index.rb

@@ -101,8 +101,8 @@ module Rails
     end
 
     def version_for_dir(d)
-      matches = /-([^-]+)$/.match(d)
-      Gem::Version.new(matches[1]) if matches
+      version = d.split('-').find { |s| s.match(/^\d(\.\d|\.\w+)*$/) }
+      Gem::Version.new(version)
     end
 
     def load_specification(gem_dir)

data/lib/rails/version.rb

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

data/lib/tasks/databases.rake

@@ -46,14 +46,14 @@ namespace :db do
             $stderr.puts "Couldn't create database for #{config.inspect}"
           end
         end
-        return # Skip the else clause of begin/rescue    
+        return # Skip the else clause of begin/rescue
       else
         ActiveRecord::Base.establish_connection(config)
         ActiveRecord::Base.connection
       end
     rescue
       case config['adapter']
-      when 'mysql'
+      when /^mysql/
         @charset   = ENV['CHARSET']   || 'utf8'
         @collation = ENV['COLLATION'] || 'utf8_unicode_ci'
         begin
@@ -159,7 +159,7 @@ namespace :db do
   task :charset => :environment do
     config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
     case config['adapter']
-    when 'mysql'
+    when /^mysql/
       ActiveRecord::Base.establish_connection(config)
       puts ActiveRecord::Base.connection.charset
     when 'postgresql'
@@ -174,7 +174,7 @@ namespace :db do
   task :collation => :environment do
     config = ActiveRecord::Base.configurations[RAILS_ENV || 'development']
     case config['adapter']
-    when 'mysql'
+    when /^mysql/
       ActiveRecord::Base.establish_connection(config)
       puts ActiveRecord::Base.connection.collation
     else
@@ -274,7 +274,7 @@ namespace :db do
     task :dump => :environment do
       abcs = ActiveRecord::Base.configurations
       case abcs[RAILS_ENV]["adapter"]
-      when "mysql", "oci", "oracle"
+      when /^mysql/, "oci", "oracle"
         ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
         File.open("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
       when "postgresql"
@@ -320,7 +320,7 @@ namespace :db do
     task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
       case abcs["test"]["adapter"]
-      when "mysql"
+      when /^mysql/
         ActiveRecord::Base.establish_connection(:test)
         ActiveRecord::Base.connection.execute('SET foreign_key_checks = 0')
         IO.readlines("#{RAILS_ROOT}/db/#{RAILS_ENV}_structure.sql").join.split("\n\n").each do |table|
@@ -354,14 +354,14 @@ namespace :db do
     task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
       case abcs["test"]["adapter"]
-      when "mysql"
+      when /^mysql/
         ActiveRecord::Base.establish_connection(:test)
         ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"], abcs["test"])
       when "postgresql"
         ActiveRecord::Base.clear_active_connections!
         drop_database(abcs['test'])
         create_database(abcs['test'])
-      when "sqlite","sqlite3"
+      when "sqlite", "sqlite3"
         dbfile = abcs["test"]["database"] || abcs["test"]["dbfile"]
         File.delete(dbfile) if File.exist?(dbfile)
       when "sqlserver"
@@ -408,7 +408,7 @@ end
 def drop_database(config)
   begin
     case config['adapter']
-    when 'mysql'
+    when /^mysql/
       ActiveRecord::Base.establish_connection(config)
       ActiveRecord::Base.connection.drop_database config['database']
     when /^sqlite/

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 2
   - 3
-  - 9
-  version: 2.3.9
+  - 10
+  version: 2.3.10
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-04 00:00:00 -07:00
+date: 2010-10-15 00:00:00 +13:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 8
@@ -35,70 +38,80 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
+        - 10
+        version: 2.3.10
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
+        - 10
+        version: 2.3.10
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: actionpack
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
+        - 10
+        version: 2.3.10
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: actionmailer
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
+        - 10
+        version: 2.3.10
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: activeresource
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 2
         - 3
-        - 9
-        version: 2.3.9
+        - 10
+        version: 2.3.10
   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"
@@ -113,6 +126,7 @@ files:
 - CHANGELOG
 - fresh_rakefile
 - MIT-LICENSE
+- railties-3.0.0.beta3.gem
 - Rakefile
 - README
 - bin/about
@@ -334,23 +348,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Web-application framework with template engine, control-flow layer, and ORM.