rails 0.9.5 → 0.10.0

data/configs/routes.rb

@@ -0,0 +1,15 @@
+ActionController::Routing::Routes.draw do |map|
+  # Add your own custom routes here.
+  # The priority is based upon order of creation: first created -> highest priority.
+  
+  # Here's a sample route:
+  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Allow downloading Web Service WSDL as a file with an extension
+  # instead of a file named 'wsdl'
+  map.connect ':controller/service.wsdl', :action => 'wsdl'
+  
+  # Install the default route as the lowest priority.
+  map.connect ':controller/:action/:id'
+end

data/environments/shared.rb

@@ -7,6 +7,7 @@ ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
 
 # Then model subdirectories.
 ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
+ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
 
 # Followed by the standard includes.
 ADDITIONAL_LOAD_PATHS.concat %w(
@@ -14,14 +15,18 @@ ADDITIONAL_LOAD_PATHS.concat %w(
   app/models
   app/controllers
   app/helpers
+  app/apis
   config
+  components
   lib
   vendor
   vendor/railties
   vendor/railties/lib
+  vendor/activesupport/lib
   vendor/activerecord/lib
   vendor/actionpack/lib
   vendor/actionmailer/lib
+  vendor/actionwebservice/lib
 ).map { |dir| "#{RAILS_ROOT}/#{dir}" }
 
 # Prepend to $LOAD_PATH
@@ -29,9 +34,11 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
 
 
 # Require Rails libraries.
+require 'active_support'
 require 'active_record'
 require 'action_controller'
 require 'action_mailer'
+require 'action_web_service'
 
 
 # Environment-specific configuration.
@@ -52,12 +59,13 @@ rescue StandardError
   )
 end
 
-[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.logger ||= RAILS_DEFAULT_LOGGER
-end
-[ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.template_root ||= "#{RAILS_ROOT}/app/views/"
-end
+[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
+[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
+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'))
+)
 
 # Include your app's configuration here:

data/environments/shared_for_gem.rb

@@ -7,6 +7,7 @@ ADDITIONAL_LOAD_PATHS = ["#{RAILS_ROOT}/test/mocks/#{RAILS_ENV}"]
 
 # Then model subdirectories.
 ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/app/models/[_a-z]*"])
+ADDITIONAL_LOAD_PATHS.concat(Dir["#{RAILS_ROOT}/components/[_a-z]*"])
 
 # Followed by the standard includes.
 ADDITIONAL_LOAD_PATHS.concat %w(
@@ -14,7 +15,9 @@ ADDITIONAL_LOAD_PATHS.concat %w(
   app/models
   app/controllers
   app/helpers
+  app/apis
   config
+  components
   lib
   vendor
 ).map { |dir| "#{RAILS_ROOT}/#{dir}" }
@@ -25,9 +28,11 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
 
 # Require Rails gems.
 require 'rubygems'
+require_gem 'activesupport'
 require_gem 'activerecord'
 require_gem 'actionpack'
 require_gem 'actionmailer'
+require_gem 'actionwebservice'
 require_gem 'rails'
 
 
@@ -49,12 +54,13 @@ rescue StandardError
   )
 end
 
-[ActiveRecord::Base, ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.logger ||= RAILS_DEFAULT_LOGGER
-end
-[ActionController::Base, ActionMailer::Base].each do |klass|
-  klass.template_root ||= "#{RAILS_ROOT}/app/views/"
-end
+[ActiveRecord, ActionController, ActionMailer].each { |mod| mod::Base.logger ||= RAILS_DEFAULT_LOGGER }
+[ActionController, ActionMailer].each { |mod| mod::Base.template_root ||= "#{RAILS_ROOT}/app/views/" }
+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'))
+)
 
 # Include your app's configuration here:

data/fresh_rakefile

@@ -3,30 +3,61 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 $VERBOSE = nil
-
-require File.dirname(__FILE__) + '/config/environment'
-require 'code_statistics'
+TEST_CHANGES_SINCE = Time.now - 600
 
 desc "Run all the tests on a fresh test database"
-task :default => [ :clone_structure_to_test, :test_units, :test_functional ]
+task :default => [ :test_units, :test_functional ]
+
+
+desc 'Require application environment.'
+task :environment do
+  unless defined? RAILS_ROOT
+    require File.dirname(__FILE__) + '/config/environment'
+  end
+end
 
 desc "Generate API documentatio, show coding stats"
 task :doc => [ :appdoc, :stats ]
 
 
+# Look up tests for recently modified sources.
+def recent_tests(source_pattern, test_path, touched_since = 10.minutes.ago)
+  FileList[source_pattern].map do |path|
+    if File.mtime(path) > touched_since
+      test = "#{test_path}/#{File.basename(path, '.rb')}_test.rb"
+      test if File.exists?(test)
+    end
+  end.compact
+end
+
+desc 'Test recent changes.'
+Rake::TestTask.new(:recent => [ :clone_structure_to_test ]) do |t|
+  since = TEST_CHANGES_SINCE
+  touched = FileList['test/**/*_test.rb'].select { |path| File.mtime(path) > since } +
+    recent_tests('app/models/*.rb', 'test/unit', since) +
+    recent_tests('app/controllers/*.rb', 'test/functional', since)
+
+  t.libs << 'test'
+  t.verbose = true
+  t.test_files = touched.uniq
+end
+task :test_recent => [ :clone_structure_to_test ]
+
 desc "Run the unit tests in test/unit"
 Rake::TestTask.new("test_units") { |t|
   t.libs << "test"
-  t.pattern = 'test/unit/*_test.rb'
+  t.pattern = 'test/unit/**/*_test.rb'
   t.verbose = true
 }
+task :test_units => [ :clone_structure_to_test ]
 
 desc "Run the functional tests in test/functional"
 Rake::TestTask.new("test_functional") { |t|
   t.libs << "test"
-  t.pattern = 'test/functional/*_test.rb'
+  t.pattern = 'test/functional/**/*_test.rb'
   t.verbose = true
 }
+task :test_functional => [ :clone_structure_to_test ]
 
 desc "Generate documentation for the application"
 Rake::RDocTask.new("appdoc") { |rdoc|
@@ -62,6 +93,7 @@ Rake::RDocTask.new("apidoc") { |rdoc|
 
 desc "Report code statistics (KLOCs, etc) from the application"
 task :stats do
+  require 'code_statistics'
   CodeStatistics.new(
     ["Helpers", "app/helpers"], 
     ["Controllers", "app/controllers"], 
@@ -91,7 +123,7 @@ task :clone_structure_to_test => [ :db_structure_dump, :purge_test_database ] do
 end
 
 desc "Dump the database structure to a SQL file"
-task :db_structure_dump do
+task :db_structure_dump => :environment do
   abcs = ActiveRecord::Base.configurations
   case abcs[RAILS_ENV]["adapter"] 
     when "mysql"
@@ -107,7 +139,7 @@ task :db_structure_dump do
 end
 
 desc "Empty the test database"
-task :purge_test_database do
+task :purge_test_database => :environment do
   abcs = ActiveRecord::Base.configurations
   case abcs["test"]["adapter"]
     when "mysql"

data/html/index.html

@@ -1 +1,70 @@
-<html><head><META HTTP-EQUIV="Refresh" CONTENT="0;URL=_doc/index.html"></head></html>
+<html>
+<head>
+  <title>Rails: Welcome on board</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p, ol, ul, td {
+      font-family: verdana, arial, helvetica, sans-serif;
+      font-size:   12px;
+      line-height: 18px;
+    }
+
+    li {
+      margin-bottom: 7px;
+    }
+
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+  </style>
+</head>
+<body>
+
+<h1>Congratulations, you've put Ruby on Rails!</h1>
+
+<p><b>Before you move on</b>, verify that the following conditions have been met:</p>
+
+<ol>
+  <li>The log and public directories must be writable to the web server (<code>chmod -R 775 log</code> and <code>chmod -R 775 public</code>).
+  <li>
+    The shebang line in the public/dispatch* files must reference your Ruby installation. <br/>
+    You might need to change it to <code>#!/usr/bin/env ruby</code> or point directly at the installation.
+  </li>
+  <li>
+    Rails on Apache needs to have the cgi handler and mod_rewrite enabled.  <br/>
+    Somewhere in your httpd.conf, you should have:<br/>
+    <code>AddHandler cgi-script .cgi</code><br/>
+    <code>LoadModule rewrite_module     libexec/httpd/mod_rewrite.so</code><br/>
+    <code>AddModule mod_rewrite.c</code>
+  </li>
+</ol>
+
+<p>Take the following steps to get started:</p>
+
+<ol>
+  <li>Create empty development and test databases for your application.<br/>
+    <small>Recommendation: Use *_development and *_test names, such as basecamp_development and basecamp_test</small><br/>
+    <small>Warning: Don't point your test database at your development database, it'll destroy the latter on test runs!</small>
+  <li>Edit config/database.yml with your database settings.
+  <li>Create controllers and models using the generator in <code>script/generate</code> <br/>
+    <small>Help: Run the generator with no arguments for documentation</small>
+  <li>See all the tests run by running <code>rake</code>.
+  <li>Develop your Rails application!
+  <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>
+  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>
+  (<a href="irc://irc.freenode.net/#rubyonrails">FreeNode#rubyonrails</a>).
+</p>
+
+</body>
+</html>

data/lib/breakpoint.rb

@@ -21,7 +21,7 @@ require 'drb'
 require 'drb/acl'
 
 module Breakpoint
-  id = %q$Id: breakpoint.rb 41 2005-01-22 20:22:10Z flgr $
+  id = %q$Id: breakpoint.rb 92 2005-02-04 22:35:53Z flgr $
   Version = id.split(" ")[2].to_i
 
   extend self
@@ -122,6 +122,7 @@ module Breakpoint
     # in the context of the client.
     class Client
       def initialize(eval_handler) # :nodoc:
+        eval_handler.untaint
         @eval_handler = eval_handler
       end
 
@@ -288,6 +289,8 @@ module Breakpoint
     def collision
       sleep(0.5) until @collision_handler
 
+      @collision_handler.untaint
+
       @collision_handler.call
     end
 
@@ -299,6 +302,7 @@ module Breakpoint
 
       sleep(0.5) until @handler
 
+      @handler.untaint
       @handler.call(workspace, message)
     end
 
@@ -456,6 +460,7 @@ module IRB # :nodoc:
       old_CurrentContext
     end
   end
+  def IRB.parse_opts() end
 
   class Context
     alias :old_evaluate :evaluate

data/lib/breakpoint_client.rb

@@ -1,193 +1,196 @@
-require 'breakpoint'
-require 'optparse'
-require 'timeout'
-
-Options = {
-  :ClientURI  => nil,
-  :ServerURI  => "druby://localhost:42531",
-  :RetryDelay => 3,
-  :Permanent  => true,
-  :Verbose    => false
-}
-
-ARGV.options do |opts|
-  script_name = File.basename($0)
-  opts.banner = [
-    "Usage: ruby #{script_name} [Options] [server uri]",
-    "",
-    "This tool lets you connect to a breakpoint service ",
-    "which was started via Breakpoint.activate_drb.",
-    "",
-    "The server uri defaults to druby://localhost:42531"
-  ].join("\n")
-
-  opts.separator ""
-
-  opts.on("-c", "--client-uri=uri",
-    "Run the client on the specified uri.",
-    "This can be used to specify the port",
-    "that the client uses to allow for back",
-    "connections from the server.",
-    "Default: Find a good URI automatically.",
-    "Example: -c druby://localhost:12345"
-  ) { |Options[:ClientURI]| }
-
-  opts.on("-s", "--server-uri=uri",
-    "Connect to the server specified at the",
-    "specified uri.",
-    "Default: druby://localhost:42531"
-  ) { |Options[:ServerURI]| }
-
-  opts.on("-R", "--retry-delay=delay", Integer,
-    "Automatically try to reconnect to the",
-    "server after delay seconds when the",
-    "connection failed or timed out.",
-    "A value of 0 disables automatical",
-    "reconnecting completely.",
-    "Default: 10"
-  ) { |Options[:RetryDelay]| }
-
-  opts.on("-P", "--[no-]permanent",
-    "Run the breakpoint client in permanent mode.",
-    "This means that the client will keep continue",
-    "running even after the server has closed the",
-    "connection. Useful for example in Rails."
-  ) { |Options[:Permanent]| }
-
-  opts.on("-V", "--[no-]verbose",
-    "Run the breakpoint client in verbose mode.",
-    "Will produce more messages, for example between",
-    "individual breakpoints. This might help in seeing",
-    "that the breakpoint client is still alive, but adds",
-    "quite a bit of clutter."
-  ) { |Options[:Verbose]| }
-
-  opts.separator ""
-
-  opts.on("-h", "--help",
-    "Show this help message."
-  ) { puts opts; exit }
-  opts.on("-v", "--version",
-    "Display the version information."
-  ) do
-    id = %q$Id: breakpoint_client.rb 40 2005-01-22 20:05:00Z flgr $
-    puts id.sub("Id: ", "")
-    puts "(Breakpoint::Version = #{Breakpoint::Version})"
-    exit
-  end
-
-  opts.parse!
-end
-
-Options[:ServerURI] = ARGV[0] if ARGV[0]
-
-module Handlers
-  extend self
-
-  def breakpoint_handler(workspace, message)
-    puts message
-    IRB.start(nil, nil, workspace)
-
-    puts ""
-    if Options[:Verbose] then
-      puts "Resumed execution. Waiting for next breakpoint...", ""
-    end
-  end
-
-  def eval_handler(code)
-    result = eval(code, TOPLEVEL_BINDING)
-    if result then
-      DRbObject.new(result)
-    else
-      result
-    end
-  end
-
-  def collision_handler()
-    msg = [
-      "  *** Breakpoint service collision ***",
-      "  Another Breakpoint service tried to use the",
-      "  port already occupied by this one. It will",
-      "  keep waiting until this Breakpoint service",
-      "  is shut down.",
-      "  ",
-      "  If you are using the Breakpoint library for",
-      "  debugging a Rails or other CGI application",
-      "  this likely means that this Breakpoint",
-      "  session belongs to an earlier, outdated",
-      "  request and should be shut down via 'exit'."
-    ].join("\n")
-
-    if RUBY_PLATFORM["win"] then
-      # This sucks. Sorry, I'm not doing this because
-      # I like funky message boxes -- I need to do this
-      # because on Windows I have no way of displaying
-      # my notification via puts() when gets() is still
-      # being performed on STDIN. I have not found a
-      # better solution.
-      begin
-        require 'tk'
-        root = TkRoot.new { withdraw }
-        Tk.messageBox('message' => msg, 'type' => 'ok')
-        root.destroy
-      rescue Exception
-        puts "", msg, ""
-      end
-    else
-      puts "", msg, ""
-    end
-  end
-end
-
-# Used for checking whether we are currently in the reconnecting loop.
-reconnecting = false
-
-loop do
-  DRb.start_service(Options[:ClientURI])
-
-  begin
-    service = DRbObject.new(nil, Options[:ServerURI])
-
-    begin
-      service.eval_handler = Handlers.method(:eval_handler)
-      service.collision_handler = Handlers.method(:collision_handler)
-      service.handler = Handlers.method(:breakpoint_handler)
-
-      reconnecting = false
-      if Options[:Verbose] then
-        puts "Connection established. Waiting for breakpoint...", ""
-      end
-
-      loop do
-        begin
-          service.ping
-        rescue DRb::DRbConnError => error
-          puts "Server exited. Closing connection...", ""
-          exit! unless Options[:Permanent]
-          break
-        end
-
-        sleep(0.5)
-      end
-    ensure
-      service.eval_handler = nil
-      service.collision_handler = nil
-      service.handler = nil
-    end
-  rescue Exception => error
-    if Options[:RetryDelay] > 0 then
-      if not reconnecting then
-        reconnecting = true
-        puts "No connection to breakpoint service at #{Options[:ServerURI]} " +
-           "(#{error.class})"
-        puts error.backtrace if $DEBUG
-        puts "Tries to connect will be made every #{Options[:RetryDelay]} seconds..."
-      end
-
-      sleep Options[:RetryDelay]
-      retry
-    else
-      raise
-    end
-  end
-end
+require 'breakpoint'
+require 'optparse'
+require 'timeout'
+
+Options = {
+  :ClientURI  => nil,
+  :ServerURI  => "druby://localhost:42531",
+  :RetryDelay => 2,
+  :Permanent  => true,
+  :Verbose    => false
+}
+
+ARGV.options do |opts|
+  script_name = File.basename($0)
+  opts.banner = [
+    "Usage: ruby #{script_name} [Options] [server uri]",
+    "",
+    "This tool lets you connect to a breakpoint service ",
+    "which was started via Breakpoint.activate_drb.",
+    "",
+    "The server uri defaults to druby://localhost:42531"
+  ].join("\n")
+
+  opts.separator ""
+
+  opts.on("-c", "--client-uri=uri",
+    "Run the client on the specified uri.",
+    "This can be used to specify the port",
+    "that the client uses to allow for back",
+    "connections from the server.",
+    "Default: Find a good URI automatically.",
+    "Example: -c druby://localhost:12345"
+  ) { |Options[:ClientURI]| }
+
+  opts.on("-s", "--server-uri=uri",
+    "Connect to the server specified at the",
+    "specified uri.",
+    "Default: druby://localhost:42531"
+  ) { |Options[:ServerURI]| }
+
+  opts.on("-R", "--retry-delay=delay", Integer,
+    "Automatically try to reconnect to the",
+    "server after delay seconds when the",
+    "connection failed or timed out.",
+    "A value of 0 disables automatical",
+    "reconnecting completely.",
+    "Default: 10"
+  ) { |Options[:RetryDelay]| }
+
+  opts.on("-P", "--[no-]permanent",
+    "Run the breakpoint client in permanent mode.",
+    "This means that the client will keep continue",
+    "running even after the server has closed the",
+    "connection. Useful for example in Rails."
+  ) { |Options[:Permanent]| }
+
+  opts.on("-V", "--[no-]verbose",
+    "Run the breakpoint client in verbose mode.",
+    "Will produce more messages, for example between",
+    "individual breakpoints. This might help in seeing",
+    "that the breakpoint client is still alive, but adds",
+    "quite a bit of clutter."
+  ) { |Options[:Verbose]| }
+
+  opts.separator ""
+
+  opts.on("-h", "--help",
+    "Show this help message."
+  ) { puts opts; exit }
+  opts.on("-v", "--version",
+    "Display the version information."
+  ) do
+    id = %q$Id: breakpoint_client.rb 91 2005-02-04 22:34:08Z flgr $
+    puts id.sub("Id: ", "")
+    puts "(Breakpoint::Version = #{Breakpoint::Version})"
+    exit
+  end
+
+  opts.parse!
+end
+
+Options[:ServerURI] = ARGV[0] if ARGV[0]
+
+module Handlers
+  extend self
+
+  def breakpoint_handler(workspace, message)
+    puts message
+    IRB.start(nil, nil, workspace)
+
+    puts ""
+    if Options[:Verbose] then
+      puts "Resumed execution. Waiting for next breakpoint...", ""
+    end
+  end
+
+  def eval_handler(code)
+    result = eval(code, TOPLEVEL_BINDING)
+    if result then
+      DRbObject.new(result)
+    else
+      result
+    end
+  end
+
+  def collision_handler()
+    msg = [
+      "  *** Breakpoint service collision ***",
+      "  Another Breakpoint service tried to use the",
+      "  port already occupied by this one. It will",
+      "  keep waiting until this Breakpoint service",
+      "  is shut down.",
+      "  ",
+      "  If you are using the Breakpoint library for",
+      "  debugging a Rails or other CGI application",
+      "  this likely means that this Breakpoint",
+      "  session belongs to an earlier, outdated",
+      "  request and should be shut down via 'exit'."
+    ].join("\n")
+
+    if RUBY_PLATFORM["win"] then
+      # This sucks. Sorry, I'm not doing this because
+      # I like funky message boxes -- I need to do this
+      # because on Windows I have no way of displaying
+      # my notification via puts() when gets() is still
+      # being performed on STDIN. I have not found a
+      # better solution.
+      begin
+        require 'tk'
+        root = TkRoot.new { withdraw }
+        Tk.messageBox('message' => msg, 'type' => 'ok')
+        root.destroy
+      rescue Exception
+        puts "", msg, ""
+      end
+    else
+      puts "", msg, ""
+    end
+  end
+end
+
+# Used for checking whether we are currently in the reconnecting loop.
+reconnecting = false
+
+loop do
+  DRb.start_service(Options[:ClientURI])
+
+  begin
+    service = DRbObject.new(nil, Options[:ServerURI])
+
+    begin
+      ehandler = Handlers.method(:eval_handler)
+      chandler = Handlers.method(:collision_handler)
+      handler = Handlers.method(:breakpoint_handler)
+      service.eval_handler = ehandler
+      service.collision_handler = chandler
+      service.handler = handler
+
+      reconnecting = false
+      if Options[:Verbose] then
+        puts "Connection established. Waiting for breakpoint...", ""
+      end
+
+      loop do
+        begin
+          service.ping
+        rescue DRb::DRbConnError => error
+          puts "Server exited. Closing connection...", ""
+          exit! unless Options[:Permanent]
+          break
+        end
+
+        sleep(0.5)
+      end
+    ensure
+      service.eval_handler = nil
+      service.collision_handler = nil
+      service.handler = nil
+    end
+  rescue Exception => error
+    if Options[:RetryDelay] > 0 then
+      if not reconnecting then
+        reconnecting = true
+        puts "No connection to breakpoint service at #{Options[:ServerURI]} " +
+           "(#{error.class})"
+        puts error.backtrace if $DEBUG
+        puts "Tries to connect will be made every #{Options[:RetryDelay]} seconds..."
+      end
+
+      sleep Options[:RetryDelay]
+      retry
+    else
+      raise
+    end
+  end
+end