rails 0.9.2 → 0.9.3

data/CHANGELOG

@@ -1,3 +1,37 @@
+*0.9.3* (January 4th, 2005)
+
+* Added support for SQLite in the auto-dumping/importing of schemas for development -> test #416
+
+* Added automated rewriting of the shebang lines on installs through the gem rails command #379 [Manfred Stienstra]
+
+* Added ActionMailer::Base.deliver_method = :test to the test environment so that mail objects are available in ActionMailer::Base.deliveries
+  for functional testing.
+
+* Added protection for creating a model through the generators with a name of an existing class, like Thread or Date.
+  It'll even offer you a synonym using wordnet.princeton.edu as a look-up. No, I'm not kidding :) [Florian Gross]
+
+* Fixed dependency management to happen in a unified fashion for Active Record and Action Pack using the new Dependencies module. This means that
+  the environment options needs to change from:
+  
+    Before in development.rb:
+      ActionController::Base.reload_dependencies = true  
+      ActiveRecord::Base.reload_associations     = true
+    
+    Now in development.rb:
+      Dependencies.mechanism = :load
+
+    Before in production.rb and test.rb:
+      ActionController::Base.reload_dependencies = false
+      ActiveRecord::Base.reload_associations     = false
+
+    Now in production.rb and test.rb:
+      Dependencies.mechanism = :require
+
+* Fixed problems with dependency caching and controller hierarchies on Ruby 1.8.2 in development mode #351
+
+* Fixed that generated action_mailers doesnt need to require the action_mailer since thats already done in the environment #382 [Lucas Carlson]
+
+
 *0.9.2*
 
 * Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping [Kent Sibilev]

data/Rakefile

@@ -5,11 +5,11 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 require 'date'
-
+require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.9.2' + PKG_BUILD
+PKG_VERSION     = '0.9.3' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -100,17 +100,14 @@ task :copy_ties_content => [
   :copy_app_doc_readme ]
 
 task :copy_dispatches do
-  cp "dispatches/dispatch.rb", "#{PKG_DESTINATION}/public/dispatch.rb"
+  copy_with_rewritten_ruby_path("dispatches/dispatch.rb", "#{PKG_DESTINATION}/public/dispatch.rb")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.rb"
 
-  cp "dispatches/dispatch.rb", "#{PKG_DESTINATION}/public/dispatch.cgi"
+  copy_with_rewritten_ruby_path("dispatches/dispatch.rb", "#{PKG_DESTINATION}/public/dispatch.cgi")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.cgi"
 
-  cp "dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi"
+  copy_with_rewritten_ruby_path("dispatches/dispatch.fcgi", "#{PKG_DESTINATION}/public/dispatch.fcgi")
   chmod 0755, "#{PKG_DESTINATION}/public/dispatch.fcgi"
-
-  cp "bin/console", "#{PKG_DESTINATION}/script/console"
-  chmod 0755, "#{PKG_DESTINATION}/script/console"
 end
 
 task :copy_html_files do
@@ -145,7 +142,7 @@ end
 task :copy_binfiles do
   BIN_FILES.each do |file|
     dest_file = File.join(PKG_DESTINATION, 'script', file)
-    cp File.join('bin', file), dest_file
+    copy_with_rewritten_ruby_path(File.join('bin', file), dest_file)
     chmod 0755, dest_file
   end
 end
@@ -174,6 +171,22 @@ task :link_apache_config do
   }
 end
 
+def copy_with_rewritten_ruby_path(src_file, dest_file)
+  ruby = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+
+  File.open(dest_file, 'w') do |df|
+    File.open(src_file) do |sf|
+      line = sf.gets
+      if (line =~ /#!.+ruby\s*/) != nil
+        df.puts("#!#{ruby}")
+      else
+        df.puts(line)
+      end
+      df.write(sf.read)
+    end
+  end
+end
+
 
 # Generate documentation ------------------------------------------------------------------
 
@@ -220,9 +233,9 @@ spec = Gem::Specification.new do |s|
     on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates.
   EOF
 
-  s.add_dependency('rake', '>= 0.4.11')
-  s.add_dependency('activerecord', '>= 1.3.0')
-  s.add_dependency('actionpack', '>= 1.1.0')
+  s.add_dependency('rake', '>= 0.4.15')
+  s.add_dependency('activerecord', '>= 1.4.0')
+  s.add_dependency('actionpack', '>= 1.2.0')
   s.add_dependency('actionmailer', '>= 0.5.0')
 
   s.has_rdoc = false
@@ -246,6 +259,6 @@ end
 # Publish beta gem
 desc "Publish the API documentation"
 task :pgem => [:gem] do 
-  Rake::SshFilePublisher.new("davidhh@one.textdrive.com", "domains/rubyonrails.org/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
-  `ssh davidhh@one.textdrive.com './gemupdate.sh'`
+  Rake::SshFilePublisher.new("davidhh@comox.textdrive.com", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh davidhh@comox.textdrive.com './gemupdate.sh'`
 end

data/bin/generate

@@ -4,10 +4,36 @@ require 'rails_generator'
 
 ARGV.shift unless ARGV.empty? or not ['--help', '-h'].include?(ARGV[0])
 
+def find_synonyms(word)
+  require 'open-uri'
+  uri = "http://wordnet.princeton.edu/cgi-bin/webwn2.0?stage=2" +
+    "&word=%s&posnumber=1&searchtypenumber=2&senses=&showglosses=1"
+
+  open(uri % word) do |stream|
+    data = stream.read.gsub("&nbsp;", " ").gsub("<BR>", "")
+    data.scan(/^Sense \d+\n.+?\n\n/m)
+  end
+rescue Exception
+  return nil
+end
+
 unless ARGV.empty?
   begin
     name = ARGV.shift
-    Rails::Generator.instance(name, ARGV).generate
+    generator = Rails::Generator.instance(name, ARGV)
+
+    if msg = generator.collision_with_builtin? then
+      $stderr.puts msg
+
+      if synonyms = find_synonyms(generator.class_name) then
+        $stderr.puts(
+          "", "Here are a few synonyms from WordNet. Maybe they will help you find an alternative name.",
+          "", synonyms
+        )
+      end
+    else
+      generator.generate
+    end
   rescue Rails::Generator::UsageError => e
     puts e.message
   end
@@ -40,4 +66,4 @@ end_usage
          #{$0} login
 end_usage
   exit 0
-end
+end

data/environments/development.rb

@@ -1,5 +1,3 @@
+Dependencies.mechanism                             = :load
 ActionController::Base.consider_all_requests_local = true
-ActionController::Base.reload_dependencies         = true
-ActiveRecord::Base.reload_associations             = true
-
 BREAKPOINT_SERVER_PORT = 42531

data/environments/production.rb

@@ -1,3 +1,2 @@
+Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = false
-ActionController::Base.reload_dependencies         = false 
-ActiveRecord::Base.reload_associations             = false

data/environments/test.rb

@@ -1,3 +1,3 @@
+Dependencies.mechanism                             = :require
 ActionController::Base.consider_all_requests_local = true
-ActionController::Base.reload_dependencies         = false
-ActiveRecord::Base.reload_associations             = false
+ActionMailer::Base.delivery_method                 = :test

data/fresh_rakefile

@@ -81,6 +81,8 @@ task :clone_development_structure_to_test => [ :db_structure_dump, :purge_test_d
     end
   elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
     `psql -U #{ActiveRecord::Base.configurations["test"]["username"]} -f db/development_structure.sql #{ActiveRecord::Base.configurations["test"]["database"]}`
+  elsif ActiveRecord::Base.configurations["test"]["adapter"] == "sqlite"
+    `sqlite #{ActiveRecord::Base.configurations["test"]["dbfile"]} < db/development_structure.sql`
   end
 end
 
@@ -91,6 +93,8 @@ task :db_structure_dump do
     File.open("db/development_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
   elsif ActiveRecord::Base.configurations["development"]["adapter"] == "postgresql"
     `pg_dump -U #{ActiveRecord::Base.configurations["development"]["username"]} -s -f db/development_structure.sql #{ActiveRecord::Base.configurations["development"]["database"]}`
+  elsif ActiveRecord::Base.configurations["development"]["adapter"] == "sqlite"
+    `sqlite #{ActiveRecord::Base.configurations["development"]["dbfile"]} .schema > db/development_structure.sql`
   end
 end
 
@@ -102,5 +106,7 @@ task :purge_test_database do
   elsif ActiveRecord::Base.configurations["test"]["adapter"] == "postgresql"
     `dropdb -U #{ActiveRecord::Base.configurations["test"]["username"]} #{ActiveRecord::Base.configurations["test"]["database"]}`
     `createdb -U #{ActiveRecord::Base.configurations["test"]["username"]}  #{ActiveRecord::Base.configurations["test"]["database"]}`
+  elsif ActiveRecord::Base.configurations["test"]["adapter"] == "sqlite"
+    File.delete(ActiveRecord::Base.configurations["test"]["dbfile"]) if File.exist?(ActiveRecord::Base.configurations["test"]["dbfile"])
   end
 end

data/generators/controller/controller_generator.rb

@@ -19,4 +19,8 @@ class ControllerGenerator < Rails::Generator::Base
       template "view.rhtml", "app/views/#{file_name}/#{action}.rhtml", binding
     end
   end
+
+  def full_class_name
+    class_name + "Controller"
+  end
 end

data/generators/controller/templates/controller.rb

@@ -1,4 +1,4 @@
-class <%= class_name %>Controller < ApplicationController
+class <%= full_class_name %> < ApplicationController
 <% if options[:scaffold] -%>
   scaffold :<%= singular_name %>
 <% end -%>

data/generators/controller/templates/functional_test.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../test_helper'
 require '<%= file_name %>_controller'
 
 # Re-raise errors caught by the controller.
-class <%= class_name %>Controller; def rescue_action(e) raise e end; end
+class <%= full_class_name %>; def rescue_action(e) raise e end; end
 
-class <%= class_name %>ControllerTest < Test::Unit::TestCase
+class <%= full_class_name %>Test < Test::Unit::TestCase
   def setup
-    @controller = <%= class_name %>Controller.new
+    @controller = <%= full_class_name %>.new
     @request, @response = ActionController::TestRequest.new, ActionController::TestResponse.new
   end
 

data/generators/mailer/templates/mailer.rb

@@ -1,5 +1,3 @@
-require 'action_mailer'
-
 class <%= class_name %> < ActionMailer::Base
 <% for action in actions -%>
 

data/generators/scaffold/scaffold_generator.rb

@@ -34,6 +34,10 @@ class ScaffoldGenerator < Rails::Generator::Base
     end
   end
 
+  def full_class_name
+    class_name + "Controller"
+  end
+
   protected
     def scaffold_views
       %w(list show new edit)

data/lib/dispatcher.rb

@@ -40,11 +40,10 @@ class Dispatcher
     rescue Object => exception
       ActionController::Base.process_with_exception(request, response, exception).out
     ensure
-      if ActionController::Base.reload_dependencies
-        Object.send(:remove_const, "ApplicationController") if Object.const_defined?(:ApplicationController)
-        Object.send(:remove_const, controller_class_name(controller_name)) if Object.const_defined?(controller_class_name(controller_name))
+      if Dependencies.mechanism == :load
         ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
-        ActiveRecord::Base.reload_associations_loaded
+        Dependencies.reload rescue nil # Ignore out of order reloading errors for Controllers
+        remove_class_hierarchy(controller_class(controller_name), ActionController::Base)
       end
       
       Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)
@@ -74,4 +73,11 @@ class Dispatcher
   def self.module_name(parameters)
     parameters["module"].gsub(/[^_a-zA-Z0-9]/, "").untaint if parameters["module"]
   end
+
+  def self.remove_class_hierarchy(klass, until_superclass)
+    while klass
+      Object.send(:remove_const, "#{klass}".intern)
+      klass = (klass.superclass unless until_superclass == klass.superclass)
+    end
+  end
 end

data/lib/rails_generator.rb

@@ -114,6 +114,32 @@ module Rails
         @args = args
       end
 
+      # Checks whether the class name that was assigned to this generator
+      # would cause a collision with a Class, Module or other constant
+      # that is already used up by Ruby or RubyOnRails.
+      def collision_with_builtin?
+        builtin = Object.const_get(full_class_name) rescue nil
+        type = case builtin
+          when Class: "Class"
+          when Module: "Module"
+          else "Constant"
+        end
+
+        if builtin then
+          "Sorry, you can't have a #{self.class.generator_name} named " +
+          "'#{full_class_name}' because Ruby or Rails already has a #{type} with that name.\n" + 
+          "Please rerun the generator with a different name."
+        end
+      end
+
+      # Returns the complete name that the resulting Class would have.
+      # Used in collision_with_builtin(). The default guess is that it is
+      # the same as class_name. Override this in your generator in case
+      # it is wrong.
+      def full_class_name
+        class_name
+      end
+
       protected
         # Look up another generator with the same arguments.
         def generator(name)

metadata

@@ -1,18 +1,19 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.1
+rubygems_version: 0.8.4
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2004-12-23
+  version: 0.9.3
+date: 2005-01-04
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
-author: David Heinemeier Hansson
 email: david@loudthinking.com
 homepage: http://www.rubyonrails.org
 rubyforge_project: rails
-description: "Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or WEBrick on top of either MySQL, PostgreSQL, or SQLite with eRuby-based templates."
+description: "Rails is a framework for building web-application using CGI, FCGI, mod_ruby, or
+  WEBrick on top of either MySQL, PostgreSQL, or SQLite with eRuby-based
+  templates."
 autorequire: 
 default_executable: rails
 bindir: bin
@@ -25,6 +26,8 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
         version: 0.0.0
   version: 
 platform: ruby
+authors: 
+  - David Heinemeier Hansson
 files: 
   - bin
   - CHANGELOG
@@ -125,7 +128,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 0.4.11
+            version: 0.4.15
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -135,7 +138,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.3.0
+            version: 1.4.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -145,7 +148,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.1.0
+            version: 1.2.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer