rails 0.9.1 → 0.9.2

data/CHANGELOG

@@ -1,3 +1,20 @@
+*0.9.2*
+
+* Fixed CTRL-C exists from the Breakpointer to be a clean affair without error dumping [Kent Sibilev]
+
+* Fixed "rake stats" to work with sub-directories in models and controllers and to report the code to test ration [Scott Baron]
+
+* Added that Active Record associations are now reloaded instead of cleared to work with the new const_missing hook in Active Record.
+
+* Added graceful handling of an inaccessible log file by redirecting output to STDERR with a warning #330 [rainmkr]
+
+* Added support for a -h/--help parameter in the generator #331 [Ulysses]
+
+* Fixed that File.expand_path in config/environment.rb would fail when dealing with symlinked public directories [mjobin]
+
+* Upgraded to Action Pack 1.1.0 and Active Record 1.3.0
+
+
 *0.9.1*
 
 * Upgraded to Action Pack 1.0.1 for important bug fix

data/Rakefile

@@ -9,7 +9,7 @@ require 'date'
 
 PKG_BUILD       = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
 PKG_NAME        = 'rails'
-PKG_VERSION     = '0.9.1' + PKG_BUILD
+PKG_VERSION     = '0.9.2' + PKG_BUILD
 PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
 
@@ -153,6 +153,7 @@ end
 task :copy_rootfiles do
   cp "fresh_rakefile", "#{PKG_DESTINATION}/Rakefile"
   cp "README", "#{PKG_DESTINATION}/README"
+  cp "CHANGELOG", "#{PKG_DESTINATION}/CHANGELOG"
 end
 
 task :copy_test_helpers do
@@ -220,8 +221,8 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.4.11')
-  s.add_dependency('activerecord', '>= 1.2.0')
-  s.add_dependency('actionpack', '>= 1.0.1')
+  s.add_dependency('activerecord', '>= 1.3.0')
+  s.add_dependency('actionpack', '>= 1.1.0')
   s.add_dependency('actionmailer', '>= 0.5.0')
 
   s.has_rdoc = false

data/bin/generate

@@ -2,6 +2,8 @@
 require File.dirname(__FILE__) + '/../config/environment'
 require 'rails_generator'
 
+ARGV.shift unless ARGV.empty? or not ['--help', '-h'].include?(ARGV[0])
+
 unless ARGV.empty?
   begin
     name = ARGV.shift
@@ -25,17 +27,17 @@ else
 end_usage
 
   unless contrib_generators.empty?
-    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/generators):"
+    $stderr.puts "  Installed generators (in #{RAILS_ROOT}/script/generators):"
     $stderr.puts "    #{contrib_generators}"
     $stderr.puts
   end
 
   $stderr.puts <<end_usage
-  More generators are available at http://rubyonrails.org
-    1. Download, for example, auth_controller.zip
-    2. Unzip to directory #{RAILS_ROOT}/generators/auth_controller
+  More generators are available at http://rubyonrails.org/show/Generators
+    1. Download, for example, login_generator.tar.gz
+    2. Unzip to directory #{RAILS_ROOT}/script/generators/login
     3. Generate without args for usage information
-         #{$0} auth_controller
+         #{$0} login
 end_usage
   exit 0
 end

data/configs/apache.conf

@@ -10,7 +10,7 @@ RewriteEngine On
 RewriteBase /dispatch.cgi
 
 # Enable this rewrite rule to point to the controller/action that should serve root.
-# RewriteRule ^$ /controller/action 
+# RewriteRule ^$ /controller/action [R]
 
 # Add missing slash
 RewriteRule ^([-_a-zA-Z0-9]+)$                                            /$1/ [R]

data/environments/shared.rb

@@ -1,4 +1,4 @@
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+RAILS_ROOT = File.dirname(__FILE__) + "/../"
 RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
 
@@ -41,7 +41,17 @@ ActiveRecord::Base.establish_connection
 
 
 # Configure defaults if the included environment did not.
-RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+begin
+  RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+rescue StandardError
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  RAILS_DEFAULT_LOGGER.level = Logger::WARN
+  RAILS_DEFAULT_LOGGER.warn(
+    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0777. " +
+    "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+  )
+end
+
 [ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
   klass.logger ||= RAILS_DEFAULT_LOGGER
 end

data/environments/shared_for_gem.rb

@@ -1,4 +1,4 @@
-RAILS_ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
+RAILS_ROOT = File.dirname(__FILE__) + "/../"
 RAILS_ENV  = ENV['RAILS_ENV'] || 'development'
 
 
@@ -38,7 +38,17 @@ ActiveRecord::Base.establish_connection
 
 
 # Configure defaults if the included environment did not.
-RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+begin
+  RAILS_DEFAULT_LOGGER = Logger.new("#{RAILS_ROOT}/log/#{RAILS_ENV}.log")
+rescue StandardError
+  RAILS_DEFAULT_LOGGER = Logger.new(STDERR)
+  RAILS_DEFAULT_LOGGER.level = Logger::WARN
+  RAILS_DEFAULT_LOGGER.warn(
+    "Rails Error: Unable to access log file. Please ensure that log/#{RAILS_ENV}.log exists and is chmod 0777. " +
+    "The log level has been raised to WARN and the output directed to STDERR until the problem is fixed."
+  )
+end
+
 [ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
   klass.logger ||= RAILS_DEFAULT_LOGGER
 end

data/fresh_rakefile

@@ -63,11 +63,11 @@ Rake::RDocTask.new("apidoc") { |rdoc|
 desc "Report code statistics (KLOCs, etc) from the application"
 task :stats do
   CodeStatistics.new(
-    ["Controllers", "app/controllers"], 
     ["Helpers", "app/helpers"], 
+    ["Controllers", "app/controllers"], 
+    ["Functionals", "test/functional"],
     ["Models", "app/models"],
-    ["Units", "test/unit"],
-    ["Functionals", "test/functional"]
+    ["Units", "test/unit"]
   ).to_s
 end
 
@@ -103,4 +103,4 @@ task :purge_test_database do
     `dropdb -U #{ActiveRecord::Base.configurations["test"]["username"]} #{ActiveRecord::Base.configurations["test"]["database"]}`
     `createdb -U #{ActiveRecord::Base.configurations["test"]["username"]}  #{ActiveRecord::Base.configurations["test"]["database"]}`
   end
-end
+end

data/lib/breakpoint_client.rb

@@ -62,6 +62,10 @@ end
 
 options[:ServerURI] = ARGV[0] if ARGV[0]
 
+$running = true
+
+trap("INT"){$running = false}
+
 puts "Waiting for initial breakpoint..."
 
 loop do
@@ -138,7 +142,7 @@ loop do
 
       puts "Connection established. Waiting for breakpoint...", "" if options[:Verbose]
 
-      loop do
+      while $running
         begin
           service.ping
         rescue DRb::DRbConnError => error
@@ -152,6 +156,7 @@ loop do
       service.unregister_handler
     end
   rescue Exception => error
+    break unless $running
     if options[:RetryDelay] > 0 then
       puts "No connection to breakpoint service at #{options[:ServerURI]}:", "  (#{error.inspect})" if options[:Verbose]
       error.backtrace if $DEBUG

data/lib/code_statistics.rb

@@ -7,13 +7,15 @@ class CodeStatistics
 
   def to_s
     print_header
-    @statistics.each{ |k, v| print_line(k, v) }
+    @pairs.each { |pair| print_line(pair.first, @statistics[pair.first]) }
     print_splitter
   
     if @total
       print_line("Total", @total)
       print_splitter
     end
+
+    print_code_test_stats
   end
 
   private
@@ -25,6 +27,11 @@ class CodeStatistics
       stats = { "lines" => 0, "codelines" => 0, "classes" => 0, "methods" => 0 }
 
       Dir.foreach(directory) do |file_name| 
+        if File.stat(directory + "/" + file_name).directory? and (/^\./ !~ file_name)
+          newstats = calculate_directory_statistics(directory + "/" + file_name, pattern)
+          stats.each { |k, v| stats[k] += newstats[k] }
+        end
+
         next unless file_name =~ pattern
 
         f = File.open(directory + "/" + file_name)
@@ -46,6 +53,18 @@ class CodeStatistics
       total
     end
 
+    def calculate_code
+      code_loc = 0
+      @statistics.each { |k, v| code_loc += v['codelines'] unless ['Units', 'Functionals'].include? k }
+      code_loc
+    end
+
+    def calculate_tests
+      test_loc = 0
+      @statistics.each { |k, v| test_loc += v['codelines'] if ['Units', 'Functionals'].include? k }
+      test_loc
+    end
+
     def print_header
       print_splitter
       puts "| Name                 | Lines |   LOC | Classes | Methods | M/C | LOC/M |"
@@ -60,7 +79,13 @@ class CodeStatistics
       m_over_c   = (statistics["methods"] / statistics["classes"])   rescue m_over_c = 0
       loc_over_m = (statistics["codelines"] / statistics["methods"]) - 2 rescue loc_over_m = 0
 
-      puts "| #{name.ljust(20)} " +
+      start = if ['Units', 'Functionals'].include? name
+        "|   #{name.ljust(18)} "
+      else
+        "| #{name.ljust(20)} " 
+      end
+
+      puts start + 
            "| #{statistics["lines"].to_s.rjust(5)} " +
            "| #{statistics["codelines"].to_s.rjust(5)} " +
            "| #{statistics["classes"].to_s.rjust(7)} " +
@@ -68,4 +93,12 @@ class CodeStatistics
            "| #{m_over_c.to_s.rjust(3)} " +
            "| #{loc_over_m.to_s.rjust(5)} |"
     end
-end
+
+    def print_code_test_stats
+      code  = calculate_code
+      tests = calculate_tests
+
+      puts "  Code LOC: #{code}     Test LOC: #{tests}     Code to Test Ratio: #{sprintf("%.1f", code/tests.to_f)}:1"
+      puts ""
+    end
+  end

data/lib/dispatcher.rb

@@ -43,8 +43,8 @@ class Dispatcher
       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))
-        ActiveRecord::Base.reset_associations_loaded
         ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
+        ActiveRecord::Base.reload_associations_loaded
       end
       
       Breakpoint.deactivate_drb if defined?(BREAKPOINT_SERVER_PORT)

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
-date: 2004-12-17
+  version: 0.9.2
+date: 2004-12-23
 summary: "Web-application framework with template engine, control-flow layer, and ORM."
 require_paths: 
   - lib
@@ -135,7 +135,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.2.0
+            version: 1.3.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionpack
@@ -145,7 +145,7 @@ dependencies:
         - 
           - ">="
           - !ruby/object:Gem::Version 
-            version: 1.0.1
+            version: 1.1.0
       version: 
   - !ruby/object:Gem::Dependency 
     name: actionmailer