rails 1.1.6 → 1.2.0

data/lib/tasks/tmp.rake

@@ -4,7 +4,7 @@ namespace :tmp do
 
   desc "Creates tmp directories for sessions, cache, and sockets"
   task :create do
-    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets ))
+    FileUtils.mkdir_p(%w( tmp/sessions tmp/cache tmp/sockets tmp/pids ))
   end
 
   namespace :sessions do
@@ -27,4 +27,11 @@ namespace :tmp do
       FileUtils.rm(Dir['tmp/sockets/[^.]*'])
     end
   end
+
+  namespace :pids do
+    desc "Clears all files in tmp/pids"
+    task :clear do
+      FileUtils.rm(Dir['tmp/pids/[^.]*'])
+    end
+  end
 end

data/lib/test_help.rb

@@ -1,6 +1,6 @@
-require 'application'
+require_dependency 'application'
 
-# Make double-sure the RAILS_ENV is set to test, 
+# Make double-sure the RAILS_ENV is set to test,
 # so fixtures are loaded to the right database
 silence_warnings { RAILS_ENV = "test" }
 
@@ -12,6 +12,7 @@ require 'action_web_service/test_invoke'
 require 'breakpoint'
 
 Test::Unit::TestCase.fixture_path = RAILS_ROOT + "/test/fixtures/"
+ActionController::IntegrationTest.fixture_path = Test::Unit::TestCase.fixture_path
 
 def create_fixtures(*table_names)
   Fixtures.create_fixtures(RAILS_ROOT + "/test/fixtures", table_names)

data/lib/webrick_server.rb

@@ -3,11 +3,10 @@
 require 'webrick'
 require 'cgi'
 require 'stringio'
+require 'dispatcher'
 
 include WEBrick
 
-ABSOLUTE_RAILS_ROOT = File.expand_path(RAILS_ROOT)
-
 class CGI #:nodoc:
   def stdinput
     @stdin || $stdin
@@ -60,17 +59,16 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     server.mount('/', DispatchServlet, options)
 
     trap("INT") { server.shutdown }
-
-    require File.join(@server_options[:server_root], "..", "config", "environment") unless defined?(RAILS_ROOT)
-    require "dispatcher"
-
+    
     server.start
   end
 
   def initialize(server, options) #:nodoc:
     @server_options = options
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_root])
-    Dir.chdir(ABSOLUTE_RAILS_ROOT)
+    # Change to the RAILS_ROOT, since Webrick::Daemon.start does a Dir::cwd("/") 
+    # OPTIONS['working_directory'] is an absolute path of the RAILS_ROOT, set in railties/lib/commands/servers/webrick.rb 
+    Dir.chdir(OPTIONS['working_directory']) if defined?(OPTIONS) && File.directory?(OPTIONS['working_directory']) 
     super
   end
 
@@ -145,7 +143,7 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
       data.rewind
       data = data.read
 
-      raw_header, body = *data.split(/^[\xd\xa]+/on, 2)
+      raw_header, body = *data.split(/^[\xd\xa]{2}/on, 2)
       header = WEBrick::HTTPUtils::parse_header(raw_header)
       
       return header, body

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
-date: 2006-08-10 00:00:00 -05:00
+  version: 1.2.0
+date: 2007-01-17 00:00:00 -06:00
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 require_paths: 
 - lib
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - David Heinemeier Hansson
 files: 
@@ -42,7 +43,6 @@ files:
 - MIT-LICENSE
 - Rakefile
 - README
-- test
 - bin/about
 - bin/breakpointer
 - bin/console
@@ -56,6 +56,7 @@ files:
 - bin/server
 - bin/performance/benchmarker
 - bin/performance/profiler
+- bin/process/inspector
 - bin/process/reaper
 - bin/process/spawner
 - builtin/rails_info
@@ -69,6 +70,7 @@ files:
 - configs/empty.log
 - configs/lighttpd.conf
 - configs/routes.rb
+- configs/databases/frontbase.yml
 - configs/databases/mysql.yml
 - configs/databases/oracle.yml
 - configs/databases/postgresql.yml
@@ -137,14 +139,18 @@ files:
 - lib/commands/ncgi/tracker
 - lib/commands/performance/benchmarker.rb
 - lib/commands/performance/profiler.rb
+- lib/commands/process/inspector.rb
 - lib/commands/process/reaper.rb
 - lib/commands/process/spawner.rb
 - lib/commands/process/spinner.rb
+- lib/commands/servers/base.rb
 - lib/commands/servers/lighttpd.rb
+- lib/commands/servers/mongrel.rb
 - lib/commands/servers/webrick.rb
 - lib/rails/version.rb
 - lib/rails_generator/base.rb
 - lib/rails_generator/commands.rb
+- lib/rails_generator/generated_attribute.rb
 - lib/rails_generator/generators
 - lib/rails_generator/lookup.rb
 - lib/rails_generator/manifest.rb
@@ -163,8 +169,11 @@ files:
 - lib/rails_generator/generators/components/mailer
 - lib/rails_generator/generators/components/migration
 - lib/rails_generator/generators/components/model
+- lib/rails_generator/generators/components/observer
 - lib/rails_generator/generators/components/plugin
+- lib/rails_generator/generators/components/resource
 - lib/rails_generator/generators/components/scaffold
+- lib/rails_generator/generators/components/scaffold_resource
 - lib/rails_generator/generators/components/session_migration
 - lib/rails_generator/generators/components/web_service
 - lib/rails_generator/generators/components/controller/controller_generator.rb
@@ -196,6 +205,11 @@ files:
 - lib/rails_generator/generators/components/model/templates/migration.rb
 - lib/rails_generator/generators/components/model/templates/model.rb
 - lib/rails_generator/generators/components/model/templates/unit_test.rb
+- lib/rails_generator/generators/components/observer/observer_generator.rb
+- lib/rails_generator/generators/components/observer/templates
+- lib/rails_generator/generators/components/observer/USAGE
+- lib/rails_generator/generators/components/observer/templates/observer.rb
+- lib/rails_generator/generators/components/observer/templates/unit_test.rb
 - lib/rails_generator/generators/components/plugin/plugin_generator.rb
 - lib/rails_generator/generators/components/plugin/templates
 - lib/rails_generator/generators/components/plugin/USAGE
@@ -206,8 +220,19 @@ files:
 - lib/rails_generator/generators/components/plugin/templates/Rakefile
 - lib/rails_generator/generators/components/plugin/templates/README
 - lib/rails_generator/generators/components/plugin/templates/tasks.rake
+- lib/rails_generator/generators/components/plugin/templates/uninstall.rb
 - lib/rails_generator/generators/components/plugin/templates/unit_test.rb
 - lib/rails_generator/generators/components/plugin/templates/USAGE
+- lib/rails_generator/generators/components/resource/resource_generator.rb
+- lib/rails_generator/generators/components/resource/templates
+- lib/rails_generator/generators/components/resource/templates/controller.rb
+- lib/rails_generator/generators/components/resource/templates/fixtures.yml
+- lib/rails_generator/generators/components/resource/templates/functional_test.rb
+- lib/rails_generator/generators/components/resource/templates/helper.rb
+- lib/rails_generator/generators/components/resource/templates/migration.rb
+- lib/rails_generator/generators/components/resource/templates/model.rb
+- lib/rails_generator/generators/components/resource/templates/unit_test.rb
+- lib/rails_generator/generators/components/resource/templates/USAGE
 - lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
 - lib/rails_generator/generators/components/scaffold/templates
 - lib/rails_generator/generators/components/scaffold/USAGE
@@ -222,6 +247,22 @@ 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/scaffold_resource/scaffold_resource_generator.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates
+- lib/rails_generator/generators/components/scaffold_resource/USAGE
+- lib/rails_generator/generators/components/scaffold_resource/templates/controller.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/fixtures.yml
+- lib/rails_generator/generators/components/scaffold_resource/templates/functional_test.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/helper.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/layout.rhtml
+- lib/rails_generator/generators/components/scaffold_resource/templates/migration.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/model.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/style.css
+- lib/rails_generator/generators/components/scaffold_resource/templates/unit_test.rb
+- lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml
+- lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml
+- lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml
+- lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml
 - lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
 - lib/rails_generator/generators/components/session_migration/templates
 - lib/rails_generator/generators/components/session_migration/USAGE
@@ -275,7 +316,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.1
+        version: 1.4.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -284,7 +325,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.14.4
+        version: 1.15.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -293,7 +334,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.12.5
+        version: 1.13.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -302,7 +343,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.5
+        version: 1.3.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionwebservice
@@ -311,5 +352,5 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.6
+        version: 1.2.0
     version: