rails 0.10.0 → 0.10.1

data/CHANGELOG

@@ -1,3 +1,38 @@
+*0.10.1* (7th March, 2005)
+
+* Fixed rake stats to ignore editor backup files like model.rb~ #791 [skanthak]
+
+* Added exception shallowing if the DRb server can't be started (not worth making a fuss about to distract new users) #779 [Tobias Luetke]
+
+* Added an empty favicon.ico file to the public directory of new applications (so the logs are not spammed by its absence)
+
+* Fixed that scaffold generator new template should use local variable instead of instance variable #778 [Dan Peterson]
+
+* Allow unit tests to run on a remote server for PostgreSQL #781 [adamm@galacticasoftware.com]
+
+* Added web_service generator (run ./script/generate web_service for help) #776 [Leon Bredt]
+
+* Added app/apis and components to code statistics report #729 [Scott Barron]
+
+* Fixed WEBrick server to use ABSOLUTE_RAILS_ROOT instead of working_directory #687 [Nicholas Seckar]
+
+* Fixed rails_generator to be usable without RubyGems #686 [Cristi BALAN]
+
+* Fixed -h/--help for generate and destroy generators #331
+
+* Added begin/rescue around the FCGI dispatcher so no uncaught exceptions can bubble up to kill the process (logs to log/fastcgi.crash.log)
+
+* Fixed that association#count would produce invalid sql when called sequentialy #659 [kanis@comcard.de]
+
+* Fixed test/mocks/testing to the correct test/mocks/test #740
+
+* Added early failure if the Ruby version isn't 1.8.2 or above #735
+
+* Removed the obsolete -i/--index option from the WEBrick servlet #743
+
+* Upgraded to Active Record 1.8.0, Action Pack 1.5.1, Action Mailer 0.7.1, Action Web Service 0.6.0, Active Support 1.0.1
+
+
 *0.10.0* (24th February, 2005)
 
 * Changed default IP binding for WEBrick from 127.0.0.1 to 0.0.0.0 so that the server is accessible both locally and remotely #696 [Marcel]

data/Rakefile

@@ -9,7 +9,7 @@ require 'rbconfig'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.10.0' + PKG_BUILD
+PKG_VERSION     = '0.10.1' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -17,10 +17,10 @@ PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 BASE_DIRS   = %w( app config/environments components db doc log lib public script test vendor )
 APP_DIRS    = %w( apis models controllers helpers views views/layouts )
 PUBLIC_DIRS = %w( images javascripts stylesheets )
-TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/testing )
+TEST_DIRS   = %w( fixtures unit functional mocks mocks/development mocks/test )
 
 LOG_FILES    = %w( server.log development.log test.log production.log )
-HTML_FILES   = %w( 404.html 500.html index.html )
+HTML_FILES   = %w( 404.html 500.html index.html favicon.ico )
 BIN_FILES    = %w( generate destroy breakpointer console server update )
 
 VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
@@ -237,11 +237,11 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.4.15')
-  s.add_dependency('activesupport',    '= 1.0.0' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.7.0' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.5.0' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 0.7.0' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 0.5.0' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 1.0.1' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 1.8.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 1.5.1' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 0.7.1' + PKG_BUILD)
+  s.add_dependency('actionwebservice', '= 0.6.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
@@ -267,4 +267,4 @@ desc "Publish the API documentation"
 task :pgem => [:gem] do 
   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
+end

data/bin/destroy

@@ -2,4 +2,6 @@
 require File.dirname(__FILE__) + '/../config/environment'
 require 'rails_generator'
 require 'rails_generator/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
 Rails::Generator::Scripts::Destroy.new.run(ARGV)

data/bin/generate

@@ -2,4 +2,6 @@
 require File.dirname(__FILE__) + '/../config/environment'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
 Rails::Generator::Scripts::Generate.new.run(ARGV)

data/bin/rails

@@ -1,4 +1,6 @@
+abort "Rails requires Ruby 1.8.2" if RUBY_VERSION < "1.8.2"
+
 require File.dirname(__FILE__) + '/../lib/rails_generator'
 require 'rails_generator/scripts/generate'
 Rails::Generator::Base.use_application_sources!
-Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')
+Rails::Generator::Scripts::Generate.new.run(ARGV, :generator => 'app')

data/bin/server

@@ -22,10 +22,7 @@ ARGV.options do |opts|
           "Default: 3000") { |OPTIONS[:port]| }
   opts.on("-b", "--binding=ip", String,
           "Binds Rails to the specified ip.",
-          "Default: 127.0.0.1") { |OPTIONS[:ip]| }
-  opts.on("-i", "--index=controller", String,
-          "Specifies an index controller that requests for root will go to (instead of congratulations screen)."
-          ) { |OPTIONS[:index_controller]| }
+          "Default: 0.0.0.0") { |OPTIONS[:ip]| }
   opts.on("-e", "--environment=name", String,
           "Specifies the environment to run this server under (test/development/production).",
           "Default: development") { |OPTIONS[:environment]| }

data/dispatches/dispatch.fcgi

@@ -4,4 +4,17 @@ require File.dirname(__FILE__) + "/../config/environment"
 require 'dispatcher'
 require 'fcgi'
 
-FCGI.each_cgi { |cgi| Dispatcher.dispatch(cgi) }
+log_file_path = "#{RAILS_ROOT}/log/fastcgi.crash.log"
+
+FCGI.each_cgi do |cgi| 
+  begin
+    Dispatcher.dispatch(cgi)
+  rescue Object => e
+    error_message = "[#{Time.now}] Dispatcher failed to catch: #{e} (#{e.class})\n  #{e.backtrace.join("\n  ")}\n"
+    begin
+      Logger.new(log_file_path).fatal(error_message)
+    rescue Object => log_error
+      STDERR << "Couldn't write to #{log_file_path} (#{log_error} [#{log_error.class}])\n" << error_message
+    end
+  end
+end

data/environments/shared.rb

@@ -64,8 +64,8 @@ end
 ActionController::Routing::Routes.reload
 
 Controllers = Dependencies::LoadingModule.root(
-  File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
-  File.expand_path(File.join(RAILS_ROOT, 'components'))
+  File.join(RAILS_ROOT, 'app', 'controllers'),
+  File.join(RAILS_ROOT, 'components')
 )
 
 # Include your app's configuration here:

data/environments/shared_for_gem.rb

@@ -59,8 +59,8 @@ end
 ActionController::Routing::Routes.reload
 
 Controllers = Dependencies::LoadingModule.root(
-  File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')),
-  File.expand_path(File.join(RAILS_ROOT, 'components'))
+  File.join(RAILS_ROOT, 'app', 'controllers'),
+  File.join(RAILS_ROOT, 'components')
 )
 
 # Include your app's configuration here:

data/fresh_rakefile

@@ -75,7 +75,6 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.options << '--line-numbers --inline-source'
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('CHANGELOG')
-  rdoc.rdoc_files.include('vendor/railties/lib/breakpoint.rb')
   rdoc.rdoc_files.include('vendor/railties/CHANGELOG')
   rdoc.rdoc_files.include('vendor/railties/MIT-LICENSE')
   rdoc.rdoc_files.include('vendor/activerecord/README')
@@ -89,14 +88,21 @@ Rake::RDocTask.new("apidoc") { |rdoc|
   rdoc.rdoc_files.include('vendor/actionmailer/README')
   rdoc.rdoc_files.include('vendor/actionmailer/CHANGELOG')
   rdoc.rdoc_files.include('vendor/actionmailer/lib/action_mailer/base.rb')
+  rdoc.rdoc_files.include('vendor/actionwebservice/README')
+  rdoc.rdoc_files.include('vendor/actionwebservice/ChangeLog')
+  rdoc.rdoc_files.include('vendor/actionwebservice/lib/action_web_service/**/*.rb')
+  rdoc.rdoc_files.include('vendor/activesupport/README')
+  rdoc.rdoc_files.include('vendor/activesupport/lib/active_support/**/*.rb')
 }
 
 desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
+task :stats => [ :environment ] do
   require 'code_statistics'
   CodeStatistics.new(
     ["Helpers", "app/helpers"], 
     ["Controllers", "app/controllers"], 
+    ["APIs", "app/apis"],
+    ["Components", "components"],
     ["Functionals", "test/functional"],
     ["Models", "app/models"],
     ["Units", "test/unit"]
@@ -114,7 +120,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
         ActiveRecord::Base.connection.execute(table)
       end
     when  "postgresql"
-      `psql -U #{abcs["test"]["username"]} -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
+      `psql -U #{abcs["test"]["username"]} -h #{abcs["test"]["host"]} -f db/#{RAILS_ENV}_structure.sql #{abcs["test"]["database"]}`
     when "sqlite", "sqlite3"
       `#{abcs[RAILS_ENV]["adapter"]} #{abcs["test"]["dbfile"]} < db/#{RAILS_ENV}_structure.sql`
     else 
@@ -130,7 +136,7 @@ task :db_structure_dump => :environment do
       ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
       File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
     when  "postgresql"
-      `pg_dump -U #{abcs[RAILS_ENV]["username"]} -s -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}`
+      `pg_dump -U #{abcs[RAILS_ENV]["username"]} -h #{abcs[RAILS_ENV]["host"]} -s -f db/#{RAILS_ENV}_structure.sql #{abcs[RAILS_ENV]["database"]}`
     when "sqlite", "sqlite3"
       `#{abcs[RAILS_ENV]["adapter"]} #{abcs[RAILS_ENV]["dbfile"]} .schema > db/#{RAILS_ENV}_structure.sql`
     else 
@@ -146,8 +152,8 @@ task :purge_test_database => :environment do
       ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
       ActiveRecord::Base.connection.recreate_database(abcs["test"]["database"])
     when "postgresql"
-      `dropdb -U #{abcs["test"]["username"]} #{abcs["test"]["database"]}`
-      `createdb -U #{abcs["test"]["username"]}  #{abcs["test"]["database"]}`
+      `dropdb -U #{abcs["test"]["username"]} -h #{abcs["test"]["host"]} #{abcs["test"]["database"]}`
+      `createdb -U #{abcs["test"]["username"]} -h #{abcs["test"]["host"]} #{abcs["test"]["database"]}`
     when "sqlite","sqlite3"
       File.delete(abcs["test"]["dbfile"]) if File.exist?(abcs["test"]["dbfile"])
     else 

data/helpers/test_helper.rb

@@ -5,10 +5,11 @@ require 'application'
 require 'test/unit'
 require 'active_record/fixtures'
 require 'action_controller/test_process'
+require 'action_web_service/test_invoke'
 require 'breakpoint'
 
 def create_fixtures(*table_names)
   Fixtures.create_fixtures(File.dirname(__FILE__) + "/fixtures", table_names)
 end
 
-Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
+Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"

data/html/index.html

@@ -60,6 +60,11 @@
   <li>Setup Apache with <a href="http://www.fastcgi.com">FastCGI</a> (and <a href="http://raa.ruby-lang.org/list.rhtml?name=fcgi">Ruby bindings</a>), if you need better performance
 </ol>
 
+<p>
+  Trying to setup a default page for Rails using Routes? You'll have to delete this file (public/index.html) to get under way. Then define a new route in <tt>config/routes.rb</tt> of the form:
+  <pre>  map.connect '', :controller => 'wiki/page', :action => 'show', :title => 'Welcome'</pre>
+</p>
+
 <p>
   Having problems getting up and running? First try debugging it yourself by looking at the log files. <br/>
   Then try the friendly Rails community <a href="http://www.rubyonrails.org">on the web</a> or <a href="http://www.rubyonrails.org/show/IRC">on IRC</a>

data/lib/code_statistics.rb

@@ -23,7 +23,7 @@ class CodeStatistics
       @pairs.inject({}) { |stats, pair| stats[pair.first] = calculate_directory_statistics(pair.last); stats }
     end
 
-    def calculate_directory_statistics(directory, pattern = /.*rb/)
+    def calculate_directory_statistics(directory, pattern = /.*\.rb$/)
       stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
 
       Dir.foreach(directory) do |file_name| 

data/lib/dispatcher.rb

@@ -40,7 +40,7 @@ class Dispatcher
     private
       def prepare_application
         ActionController::Routing::Routes.reload if Dependencies.load?
-        Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT)
+        Breakpoint.activate_drb("druby://localhost:#{BREAKPOINT_SERVER_PORT}", nil, !defined?(FastCGI)) if defined?(BREAKPOINT_SERVER_PORT) rescue nil
         Controllers.const_load!(:ApplicationController, "application") unless Controllers.const_defined?(:ApplicationController)
       end
     

data/lib/rails_generator.rb

@@ -22,9 +22,10 @@
 #++
 
 $:.unshift(File.dirname(__FILE__))
+$:.unshift(File.dirname(__FILE__) + "/../../activesupport/lib")
 
 begin
-  require 'active_support'
+  require 'active_support'  
 rescue LoadError
   require 'rubygems'
   require_gem 'activesupport'

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

@@ -65,6 +65,8 @@ class AppGenerator < Rails::Generator::Base
       %w(404 500 index).each do |file|
         m.template "html/#{file}.html", "public/#{file}.html"
       end
+      
+      m.template "html/favicon.ico", "public/favicon.ico"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
@@ -113,7 +115,7 @@ class AppGenerator < Rails::Generator::Base
     test/fixtures
     test/functional
     test/mocks/development
-    test/mocks/testing
+    test/mocks/test
     test/unit
     vendor
   )

data/lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml

@@ -1,4 +1,4 @@
-<h1>New <%= @singular_name %></h1>
+<h1>New <%= singular_name %></h1>
 
 <%%= error_messages_for '<%= singular_name %>' %>
 <%= template_for_inclusion %>

data/lib/rails_generator/generators/components/web_service/USAGE

@@ -0,0 +1,28 @@
+Description:
+    The web service generator creates the controller and API definition for 
+    a web service.
+
+    The generator takes a web service name and a list of API methods as arguments.
+    The web service name may be given in CamelCase or under_score and should
+    contain no extra suffixes.  To create a web service within a
+    module, specify the web service name as 'module/webservice'.
+
+    The generator creates a controller class in app/controllers, an API definition
+    in app/apis, and a functional test suite in test/functional.
+
+Example:
+    ./script/generate web_service User add edit list remove
+
+    User web service.
+        Controller: app/controllers/user_controller.rb
+        API:        app/apis/user_api.rb
+        Test:       test/functional/user_api_test.rb
+
+Modules Example:
+    ./script/generate web_service 'api/registration' register renew
+
+    Registration web service.
+        Controller: app/controllers/api/registration_controller.rb
+        API:        app/apis/api/registration_api.rb
+        Test:       test/functional/api/registration_api_test.rb
+

data/lib/rails_generator/generators/components/web_service/templates/api_definition.rb

@@ -0,0 +1,5 @@
+class <%= class_name %>Api < ActionWebService::API::Base
+<% for method_name in args -%>
+  api_method :<%= method_name %>
+<% end -%>
+end

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

@@ -0,0 +1,8 @@
+class <%= class_name %>Controller < ApplicationController
+  wsdl_service_name '<%= class_name %>'
+<% for method_name in args -%>
+
+  def <%= method_name %>
+  end
+<% end -%>
+end

data/lib/rails_generator/generators/components/web_service/templates/functional_test.rb

@@ -0,0 +1,19 @@
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
+require '<%= file_path %>_controller'
+
+class <%= class_name %>Controller; def rescue_action(e) raise e end; end
+
+class <%= class_name %>ControllerApiTest < Test::Unit::TestCase
+  def setup
+    @controller = <%= class_name %>Controller.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+  end
+<% for method_name in args -%>
+
+  def test_<%= method_name %>
+    result = invoke :<%= method_name %>
+    assert_equal nil, result
+  end
+<% end -%>
+end

data/lib/rails_generator/generators/components/web_service/web_service_generator.rb

@@ -0,0 +1,29 @@
+class WebServiceGenerator < Rails::Generator::NamedBase
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions class_path, "#{class_name}Api", "#{class_name}Controller", "#{class_name}ApiTest"
+
+      # API and test directories.
+      m.directory File.join('app/apis', class_path)
+      m.directory File.join('app/controllers', class_path)
+      m.directory File.join('test/functional', class_path)
+
+      # API definition, controller, and functional test.
+      m.template 'api_definition.rb',
+                  File.join('app/apis',
+                            class_path,
+                            "#{file_name}_api.rb")
+
+      m.template 'controller.rb',
+                  File.join('app/controllers',
+                            class_path,
+                            "#{file_name}_controller.rb")
+
+      m.template 'functional_test.rb',
+                  File.join('test/functional',
+                            class_path,
+                            "#{file_name}_api_test.rb")
+    end
+  end
+end

data/lib/webrick_server.rb

@@ -6,6 +6,7 @@ require 'stringio'
 
 include WEBrick
 
+ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT)
 
 class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
   REQUEST_MUTEX = Mutex.new
@@ -18,12 +19,12 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
 
     trap("INT") { server.shutdown }
     server.start
-    Dir::chdir(OPTIONS['working_directory']) if OPTIONS['working_directory']
   end
 
   def initialize(server, options)
     @server_options = options
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
+    Dir.chdir(ABSOLUTE_RAILS_ROOT)
     super
   end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.6
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.10.0
-date: 2005-02-24
+  version: 0.10.1
+date: 2005-03-07
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -70,6 +70,7 @@ files:
   - helpers/test_helper.rb
   - html/404.html
   - html/500.html
+  - html/favicon.ico
   - html/index.html
   - lib/binding_of_caller.rb
   - lib/breakpoint.rb
@@ -98,6 +99,7 @@ files:
   - lib/rails_generator/generators/components/mailer
   - lib/rails_generator/generators/components/model
   - lib/rails_generator/generators/components/scaffold
+  - lib/rails_generator/generators/components/web_service
   - lib/rails_generator/generators/components/controller/controller_generator.rb
   - lib/rails_generator/generators/components/controller/templates
   - lib/rails_generator/generators/components/controller/USAGE
@@ -131,6 +133,12 @@ files:
   - lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml
   - lib/rails_generator/generators/components/scaffold/templates/view_new.rhtml
   - lib/rails_generator/generators/components/scaffold/templates/view_show.rhtml
+  - lib/rails_generator/generators/components/web_service/templates
+  - lib/rails_generator/generators/components/web_service/USAGE
+  - lib/rails_generator/generators/components/web_service/web_service_generator.rb
+  - lib/rails_generator/generators/components/web_service/templates/api_definition.rb
+  - lib/rails_generator/generators/components/web_service/templates/controller.rb
+  - lib/rails_generator/generators/components/web_service/templates/functional_test.rb
   - lib/rails_generator/scripts/destroy.rb
   - lib/rails_generator/scripts/generate.rb
   - lib/rails_generator/scripts/update.rb
@@ -162,7 +170,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.0.0
+            version: 1.0.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: activerecord
@@ -172,7 +180,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.7.0
+            version: 1.8.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -182,7 +190,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 1.5.0
+            version: 1.5.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer
@@ -192,7 +200,7 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.7.0
+            version: 0.7.1
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionwebservice
@@ -202,5 +210,5 @@ dependencies:
         - 
           - "="
           - !ruby/object:Gem::Version 
-            version: 0.5.0
+            version: 0.6.0
       version: