rails 2.0.2 → 2.0.4

data/CHANGELOG

@@ -1,3 +1,14 @@
+*2.0.4* (2nd September 2008)
+
+* Resurrect WordNet synonym lookups.  #10710 [tom./, matt]
+
+* Added that rails:update is run when you do rails:freeze:edge to ensure you also get the latest JS and config files #10565 [jeff]
+
+* SQLite: db:drop:all doesn't fail silently if the database is already open.  #10577 [Cheah Chu Yeow, mrichman]
+
+* Ruby 1.9 compatibility.  #1689, #10546 [Cheah Chu Yeow, frederico]
+
+
 *2.0.2* (December 16th, 2007)
 
 * Changed the default database from mysql to sqlite3, so now running "rails myapp" will have a config/database.yml that's setup for SQLite3 (which in OS X Leopard is installed by default, so is the gem, so everything Just Works with no database configuration at all). To get a Rails application preconfigured for MySQL, just run "rails -d mysql myapp" [DHH]

data/Rakefile

@@ -2,6 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
+require 'rake/contrib/sshpublisher'
 require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
@@ -264,7 +265,7 @@ task :generate_rails_framework_doc do
 end
 
 task :generate_app_doc do
-  File.cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
+  cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
   system %{cd #{PKG_DESTINATION}; rake doc:app}
 end
 
@@ -313,11 +314,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.7.2')
-  s.add_dependency('activesupport',    '= 2.0.2' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 2.0.2' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 2.0.2' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 2.0.2' + PKG_BUILD)
-  s.add_dependency('activeresource',   '= 2.0.2' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.0.4' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.0.4' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.0.4' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.0.4' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.0.4' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -342,8 +343,8 @@ end
 # Publishing -------------------------------------------------------
 desc "Publish the API documentation"
 task :pgem => [:gem] do 
-  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+  Rake::SshFilePublisher.new("david@greed.loudthinking.com", "/u/sites/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh david@greed.loudthinking.com '/u/sites/gems/gemupdate.sh'`
 end
 
 desc "Publish the release files to RubyForge."

data/builtin/rails_info/rails/info.rb

@@ -3,30 +3,32 @@ module Rails
     mattr_accessor :properties
     class << (@@properties = [])
       def names
-        map {|(name, )| name}
+        map &:first
       end
-      
+
       def value_for(property_name)
-        find {|(name, )| name == property_name}.last rescue nil
+        if property = assoc(property_name)
+          property.last
+        end
       end
     end
-  
+
     class << self #:nodoc:
       def property(name, value = nil)
         value ||= yield
-        properties << [name, value] if value 
+        properties << [name, value] if value
       rescue Exception
       end
 
       def components
         %w( active_record action_pack active_resource action_mailer active_support )
       end
-      
+
       def component_version(component)
         require "#{component}/version"
         "#{component.classify}::VERSION::STRING".constantize
       end
-    
+
       def edge_rails_revision(info = svn_info)
         info[/^Revision: (\d+)/, 1] || freeze_edge_version
       end
@@ -49,7 +51,7 @@ module Rails
       end
 
       alias inspect to_s
-      
+
       def to_html
         returning table = '<table>' do
           properties.each do |(name, value)|
@@ -82,25 +84,25 @@ module Rails
     property 'RubyGems version' do
       Gem::RubyGemsVersion
     end
-  
+
     # The Rails version.
     property 'Rails version' do
       Rails::VERSION::STRING
     end
-  
-    # Versions of each Rails component (Active Record, Action Pack, 
+
+    # Versions of each Rails component (Active Record, Action Pack,
     # Active Resource, Action Mailer, and Active Support).
     components.each do |component|
-      property "#{component.titlecase} version" do 
+      property "#{component.titlecase} version" do
         component_version(component)
       end
     end
-  
+
     # The Rails SVN revision, if it's checked out into vendor/rails.
     property 'Edge Rails revision' do
       edge_rails_revision
     end
-  
+
     # The application's location on the filesystem.
     property 'Application root' do
       File.expand_path(RAILS_ROOT)
@@ -110,7 +112,7 @@ module Rails
     property 'Environment' do
       RAILS_ENV
     end
-    
+
     # The name of the database adapter for the current environment.
     property 'Database adapter' do
       ActiveRecord::Base.configurations[RAILS_ENV]['adapter']

data/dispatches/gateway.cgi

@@ -31,7 +31,7 @@ def listener_socket(number)
   File.expand_path(File.join(File.dirname(__FILE__), "../log/drb_gateway/listener_#{number}.sock"))
 end
 
-unless File.exists? TrackerSocket
+unless File.exist? TrackerSocket
   message "Starting tracker and #{Listeners} listeners"
   fork do
     Process.setsid
@@ -62,7 +62,7 @@ unless File.exists? TrackerSocket
   ready = false
   10.times do
     sleep 0.5
-    break if (ready = File.exists?(TrackerSocket) && File.exists?(listener_socket(0)))
+    break if (ready = File.exist?(TrackerSocket) && File.exist?(listener_socket(0)))
   end
 
   if ready

data/environments/boot.rb

@@ -24,9 +24,8 @@ module Rails
       File.exist?("#{RAILS_ROOT}/vendor/rails")
     end
 
-    # FIXME : Ruby 1.9
     def preinitialize
-      load(preinitializer_path) if File.exists?(preinitializer_path)
+      load(preinitializer_path) if File.exist?(preinitializer_path)
     end
 
     def preinitializer_path

data/lib/commands/console.rb

@@ -16,9 +16,9 @@ libs << " -r console_sandbox" if options[:sandbox]
 libs << " -r console_with_helpers"
 
 ENV['RAILS_ENV'] = case ARGV.first
-  when "p": "production"
-  when "d": "development"
-  when "t": "test"
+  when "p"; "production"
+  when "d"; "development"
+  when "t"; "test"
   else
     ARGV.first || ENV['RAILS_ENV'] || 'development'
 end

data/lib/initializer.rb

@@ -217,11 +217,15 @@ module Rails
       end
     end
 
-    # This initialization sets $KCODE to 'u' to enable the multibyte safe operations.
-    # Plugin authors supporting other encodings should override this behaviour and
-    # set the relevant +default_charset+ on ActionController::Base
+    # For Ruby 1.8, this initialization sets $KCODE to 'u' to enable the
+    # multibyte safe operations. Plugin authors supporting other encodings
+    # should override this behaviour and set the relevant +default_charset+
+    # on ActionController::Base.
+    #
+    # For Ruby 1.9, this does nothing. Specify the default encoding in the Ruby
+    # shebang line if you don't want UTF-8.
     def initialize_encoding
-      $KCODE='u'
+      $KCODE='u' if RUBY_VERSION < '1.9'
     end
 
     # This initialization routine does nothing unless <tt>:active_record</tt>

data/lib/rails/version.rb

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

data/lib/rails_generator/commands.rb

@@ -310,26 +310,26 @@ HELP
             logger.exists relative_path
           else
             logger.create relative_path
-	    unless options[:pretend]
-	      FileUtils.mkdir_p(path)
+	          unless options[:pretend]
+	            FileUtils.mkdir_p(path)
 	      
-	      # Subversion doesn't do path adds, so we need to add
-	      # each directory individually.
-	      # So stack up the directory tree and add the paths to
-	      # subversion in order without recursion.
-	      if options[:svn]
-		stack=[relative_path]
-		until File.dirname(stack.last) == stack.last # dirname('.') == '.'
-		  stack.push File.dirname(stack.last)
-		end
-		stack.reverse_each do |rel_path|
-		  svn_path = destination_path(rel_path)
-		  system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn'))
-		end
-	      end
-	    end
-	  end
-	end
+	            # Subversion doesn't do path adds, so we need to add
+	            # each directory individually.
+	            # So stack up the directory tree and add the paths to
+	            # subversion in order without recursion.
+	            if options[:svn]
+		            stack=[relative_path]
+		            until File.dirname(stack.last) == stack.last # dirname('.') == '.'
+		              stack.push File.dirname(stack.last)
+		            end
+		            stack.reverse_each do |rel_path|
+		              svn_path = destination_path(rel_path)
+		              system("svn add -N #{svn_path}") unless File.directory?(File.join(svn_path, '.svn'))
+		            end
+	            end
+            end
+          end
+        end
 
         # Display a README.
         def readme(*relative_sources)
@@ -391,7 +391,7 @@ end_message
             raise UsageError, message
           end
 
-          SYNONYM_LOOKUP_URI = "http://wordnet.princeton.edu/cgi-bin/webwn2.0?stage=2&word=%s&posnumber=1&searchtypenumber=2&senses=&showglosses=1"
+          SYNONYM_LOOKUP_URI = "http://wordnet.princeton.edu/perl/webwn?s=%s"
 
           # Look up synonyms on WordNet.  Thanks to Florian Gross (flgr).
           def find_synonyms(word)
@@ -399,8 +399,8 @@ end_message
             require 'timeout'
             timeout(5) do
               open(SYNONYM_LOOKUP_URI % word) do |stream|
-                data = stream.read.gsub("&nbsp;", " ").gsub("<BR>", "")
-                data.scan(/^Sense \d+\n.+?\n\n/m)
+                # Grab words linked to dictionary entries as possible synonyms
+                data = stream.read.gsub("&nbsp;", " ").scan(/<a href="webwn.*?">([\w ]*?)<\/a>/s).uniq
               end
             end
           rescue Exception

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

@@ -7,8 +7,9 @@ class AppGenerator < Rails::Generator::Base
                               Config::CONFIG['ruby_install_name'])
 
   DATABASES = %w(mysql oracle postgresql sqlite2 sqlite3 frontbase)
+  DEFAULT_DATABASE = 'sqlite3'
 
-  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || "sqlite3"),
+  default_options   :db => (ENV["RAILS_DEFAULT_DATABASE"] || DEFAULT_DATABASE),
     :shebang => DEFAULT_SHEBANG, :freeze => false
   mandatory_options :source => "#{File.dirname(__FILE__)}/../../../../.."
 
@@ -119,8 +120,8 @@ class AppGenerator < Rails::Generator::Base
              "Default: #{DEFAULT_SHEBANG}") { |v| options[:shebang] = v }
 
       opt.on("-d", "--database=name", String,
-            "Preconfigure for selected database (options: mysql/oracle/postgresql/sqlite2/sqlite3).",
-            "Default: mysql") { |v| options[:db] = v }
+            "Preconfigure for selected database (options: #{DATABASES.join('/')}).",
+            "Default: #{DEFAULT_DATABASE}") { |v| options[:db] = v }
 
       opt.on("-f", "--freeze",
             "Freeze Rails in vendor/rails from the gems generating the skeleton",

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -54,8 +54,6 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
       m.template('style.css', 'public/stylesheets/scaffold.css')
 
-      m.dependency 'model', [name] + @args, :collision => :skip
-
       m.template(
         'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
       )
@@ -64,6 +62,8 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
 
       m.route_resources controller_file_name
+
+      m.dependency 'model', [name] + @args, :collision => :skip
     end
   end
 

data/lib/rails_generator/lookup.rb

@@ -139,7 +139,7 @@ module Rails
         private
           # Lookup and cache every generator from the source list.
           def cache
-            @cache ||= sources.inject([]) { |cache, source| cache + source.map }
+            @cache ||= sources.inject([]) { |cache, source| cache + source.to_a }
           end
 
           # Clear the cache whenever the source list changes.

data/lib/tasks/databases.rake

@@ -16,11 +16,7 @@ namespace :db do
         #    <<: *defaults
         next unless config['database']
         # Only connect to local databases
-        if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?
-          create_database(config)
-        else
-          p "This task only creates local databases. #{config['database']} is on a remote host."
-        end
+        local_database?(config) { create_database(config) }
       end
     end
   end
@@ -65,11 +61,7 @@ namespace :db do
         # Skip entries that don't have a database key
         next unless config['database']
         # Only connect to local databases
-        if config['host'] == 'localhost' || config['host'].blank?
-          drop_database(config)
-        else
-          p "This task only drops local databases. #{config['database']} is on a remote host."
-        end
+        local_database?(config) { drop_database(config) }
       end
     end
   end
@@ -79,6 +71,15 @@ namespace :db do
     drop_database(ActiveRecord::Base.configurations[RAILS_ENV || 'development'])
   end
 
+  def local_database?(config, &block)
+    if %w( 127.0.0.1 localhost ).include?(config['host']) || config['host'].blank?
+      yield
+    else
+      puts "This task only modifies local databases. #{config['database']} is on a remote host."
+    end
+  end
+
+
   desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x. Turn off output with VERBOSE=false."
   task :migrate => :environment do
     ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
@@ -331,9 +332,7 @@ namespace :db do
 
     desc "Clear the sessions table"
     task :clear => :environment do
-      session_table = 'session'
-      session_table = Inflector.pluralize(session_table) if ActiveRecord::Base.pluralize_table_names
-      ActiveRecord::Base.connection.execute "DELETE FROM #{session_table}"
+      ActiveRecord::Base.connection.execute "DELETE FROM #{session_table_name}"
     end
   end
 end
@@ -343,7 +342,7 @@ def drop_database(config)
   when 'mysql'
     ActiveRecord::Base.connection.drop_database config['database']
   when /^sqlite/
-    FileUtils.rm_f(File.join(RAILS_ROOT, config['database']))
+    FileUtils.rm(File.join(RAILS_ROOT, config['database']))
   when 'postgresql'
     `dropdb "#{config['database']}"`
   end
@@ -360,4 +359,4 @@ end
 
 def firebird_db_string(config)
   FireRuby::Database.db_string_for(config.symbolize_keys)
-end
+end

data/lib/tasks/documentation.rake

@@ -65,11 +65,11 @@ namespace :doc do
         options << '-T html'
 
         files.include("#{plugin_base}/lib/**/*.rb")
-        if File.exists?("#{plugin_base}/README")
+        if File.exist?("#{plugin_base}/README")
           files.include("#{plugin_base}/README")    
           options << "--main '#{plugin_base}/README'"
         end
-        files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG")
+        files.include("#{plugin_base}/CHANGELOG") if File.exist?("#{plugin_base}/CHANGELOG")
 
         options << files.to_s
 

data/lib/tasks/framework.rake

@@ -69,6 +69,9 @@ namespace :rails do
       for framework in %w(railties actionpack activerecord actionmailer activesupport activeresource)
         system "svn export #{rails_svn}/#{framework} vendor/rails/#{framework}" + (ENV['REVISION'] ? " -r #{ENV['REVISION']}" : "")
       end
+      
+      puts "Updating current scripts, javascripts, and configuration settings"
+      Rake::Task["rails:update"].invoke
     end
   end
 
@@ -105,7 +108,7 @@ namespace :rails do
       require 'railties_path'  
       project_dir = RAILS_ROOT + '/public/javascripts/'
       scripts = Dir[RAILTIES_PATH + '/html/javascripts/*.js']
-      scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js')
+      scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exist?(project_dir + 'application.js')
       FileUtils.cp(scripts, project_dir)
     end
 

data/lib/tasks/testing.rake

@@ -13,11 +13,11 @@ def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
 
       # For modified files in app/ run the tests for it. ex. /test/functional/account_controller.rb
       test = "#{modified_test_path}/#{source_file}_test.rb"
-      tests.push test if File.exists?(test)
+      tests.push test if File.exist?(test)
 
       # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
       test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
-      FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exists?(test)
+      FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exist?(test)
 		
       return tests
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors: 
 - David Heinemeier Hansson
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-20 00:00:00 -06:00
+date: 2008-09-04 00:00:00 +02:00
 default_executable: rails
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -23,48 +24,53 @@ dependencies:
     version: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: activeresource
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 2.0.2
+        version: 2.0.4
     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
@@ -87,6 +93,8 @@ files:
 - html
 - lib
 - MIT-LICENSE
+- pkg
+- rails-2.0.4.gem
 - Rakefile
 - README
 - bin/about
@@ -283,8 +291,6 @@ files:
 - lib/rails_generator/generators/components/session_migration/templates
 - lib/rails_generator/generators/components/session_migration/templates/migration.rb
 - lib/rails_generator/generators/components/session_migration/USAGE
-- lib/rails_generator/generators/components/web_service
-- lib/rails_generator/generators/components/web_service/templates
 - lib/rails_generator/lookup.rb
 - lib/rails_generator/manifest.rb
 - lib/rails_generator/options.rb
@@ -338,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rails
-rubygems_version: 1.0.0
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Web-application framework with template engine, control-flow layer, and ORM.