rails 1.2.6 → 2.0.0

data/lib/tasks/documentation.rake

@@ -1,9 +1,11 @@
 namespace :doc do
-  desc "Generate documentation for the application"
+  desc "Generate documentation for the application. Set custom template with TEMPLATE=/path/to/rdoc/template.rb"
   Rake::RDocTask.new("app") { |rdoc|
     rdoc.rdoc_dir = 'doc/app'
+    rdoc.template = ENV['template'] if ENV['template']
     rdoc.title    = "Rails Application Documentation"
     rdoc.options << '--line-numbers' << '--inline-source'
+    rdoc.options << '--charset' << 'utf-8'
     rdoc.rdoc_files.include('doc/README_FOR_APP')
     rdoc.rdoc_files.include('app/**/*.rb')
     rdoc.rdoc_files.include('lib/**/*.rb')
@@ -18,10 +20,16 @@ namespace :doc do
     rdoc.rdoc_files.include('README')
     rdoc.rdoc_files.include('vendor/rails/railties/CHANGELOG')
     rdoc.rdoc_files.include('vendor/rails/railties/MIT-LICENSE')
+    rdoc.rdoc_files.include('vendor/rails/railties/README')
+    rdoc.rdoc_files.include('vendor/rails/railties/lib/{*.rb,commands/*.rb,rails_generator/*.rb}')
     rdoc.rdoc_files.include('vendor/rails/activerecord/README')
     rdoc.rdoc_files.include('vendor/rails/activerecord/CHANGELOG')
     rdoc.rdoc_files.include('vendor/rails/activerecord/lib/active_record/**/*.rb')
     rdoc.rdoc_files.exclude('vendor/rails/activerecord/lib/active_record/vendor/*')
+    rdoc.rdoc_files.include('vendor/rails/activeresource/README')
+    rdoc.rdoc_files.include('vendor/rails/activeresource/CHANGELOG')
+    rdoc.rdoc_files.include('vendor/rails/activeresource/lib/active_resource.rb')
+    rdoc.rdoc_files.include('vendor/rails/activeresource/lib/active_resource/*')
     rdoc.rdoc_files.include('vendor/rails/actionpack/README')
     rdoc.rdoc_files.include('vendor/rails/actionpack/CHANGELOG')
     rdoc.rdoc_files.include('vendor/rails/actionpack/lib/action_controller/**/*.rb')
@@ -29,16 +37,6 @@ namespace :doc do
     rdoc.rdoc_files.include('vendor/rails/actionmailer/README')
     rdoc.rdoc_files.include('vendor/rails/actionmailer/CHANGELOG')
     rdoc.rdoc_files.include('vendor/rails/actionmailer/lib/action_mailer/base.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/README')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/CHANGELOG')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/api/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/client/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/container/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/dispatcher/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/protocol/*.rb')
-    rdoc.rdoc_files.include('vendor/rails/actionwebservice/lib/action_web_service/support/*.rb')
     rdoc.rdoc_files.include('vendor/rails/activesupport/README')
     rdoc.rdoc_files.include('vendor/rails/activesupport/CHANGELOG')
     rdoc.rdoc_files.include('vendor/rails/activesupport/lib/active_support/**/*.rb')
@@ -46,7 +44,7 @@ namespace :doc do
 
   plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
 
-  desc "Generate documation for all installed plugins"
+  desc "Generate documentation for all installed plugins"
   task :plugins => plugins.collect { |plugin| "doc:plugins:#{plugin}" }
 
   desc "Remove plugin documentation"
@@ -79,4 +77,4 @@ namespace :doc do
       end
     end
   end
-end
+end

data/lib/tasks/framework.rake

@@ -2,7 +2,7 @@ namespace :rails do
   namespace :freeze do
     desc "Lock this application to the current gems (by unpacking them into vendor/rails)"
     task :gems do
-      deps = %w(actionpack activerecord actionmailer activesupport actionwebservice)
+      deps = %w(actionpack activerecord actionmailer activesupport activeresource)
       require 'rubygems'
       Gem.manage_gems
 

data/lib/tasks/rails.rb

@@ -5,4 +5,4 @@ Dir["#{File.dirname(__FILE__)}/*.rake"].each { |ext| load ext }
 
 # Load any custom rakefile extensions
 Dir["#{RAILS_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
-Dir["#{RAILS_ROOT}/vendor/plugins/**/tasks/**/*.rake"].sort.each { |ext| load ext }
+Dir["#{RAILS_ROOT}/vendor/plugins/*/**/tasks/**/*.rake"].sort.each { |ext| load ext }

data/lib/tasks/testing.rake

@@ -40,17 +40,15 @@ end
 
 desc 'Test all units and functionals'
 task :test do
-  exceptions = ["test:units", "test:functionals", "test:integration"].collect do |task|
+  errors = %w(test:units test:functionals test:integration).collect do |task|
     begin
       Rake::Task[task].invoke
       nil
     rescue => e
-      e
+      task
     end
   end.compact
-  
-  exceptions.each {|e| puts e;puts e.backtrace }
-  raise "Test failures" unless exceptions.empty?
+  abort "Errors running #{errors.to_sentence}!" if errors.any?
 end
 
 namespace :test do
@@ -111,10 +109,10 @@ namespace :test do
     if ENV['PLUGIN']
       t.pattern = "vendor/plugins/#{ENV['PLUGIN']}/test/**/*_test.rb"
     else
-      t.pattern = 'vendor/plugins/**/test/**/*_test.rb'
+      t.pattern = 'vendor/plugins/*/**/test/**/*_test.rb'
     end
 
     t.verbose = true
   end
-  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
+  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/*/**/test (or specify with PLUGIN=name)"
 end

data/lib/test_help.rb

@@ -5,15 +5,16 @@ require_dependency 'application'
 silence_warnings { RAILS_ENV = "test" }
 
 require 'test/unit'
+require 'active_support/test_case'
 require 'active_record/fixtures'
+require 'action_controller/test_case'
 require 'action_controller/test_process'
 require 'action_controller/integration'
-require 'action_web_service/test_invoke'
-require 'breakpoint'
+require 'action_mailer/test_case' if defined?(ActionMailer)
 
 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)
+  Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
 end

data/lib/webrick_server.rb

@@ -59,16 +59,15 @@ class DispatchServlet < WEBrick::HTTPServlet::AbstractServlet
     server.mount('/', DispatchServlet, options)
 
     trap("INT") { server.shutdown }
-    
     server.start
   end
 
   def initialize(server, options) #:nodoc:
     @server_options = options
     @file_handler = WEBrick::HTTPServlet::FileHandler.new(server, options[:server_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']) 
+    # 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
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: rails
 version: !ruby/object:Gem::Version 
-  version: 1.2.6
-date: 2007-11-24 00:00:00 +13:00
+  version: 2.0.0
+date: 2007-12-06 00:00:00 -06:00
 summary: Web-application framework with template engine, control-flow layer, and ORM.
 require_paths: 
 - lib
@@ -44,13 +44,13 @@ files:
 - Rakefile
 - README
 - bin/about
-- bin/breakpointer
 - bin/console
 - bin/destroy
 - bin/generate
 - bin/performance
 - bin/performance/benchmarker
 - bin/performance/profiler
+- bin/performance/request
 - bin/plugin
 - bin/process
 - bin/process/inspector
@@ -74,6 +74,9 @@ files:
 - configs/databases/sqlite2.yml
 - configs/databases/sqlite3.yml
 - configs/empty.log
+- configs/initializers
+- configs/initializers/inflections.rb
+- configs/initializers/mime_types.rb
 - configs/lighttpd.conf
 - configs/routes.rb
 - doc/README_FOR_APP
@@ -89,6 +92,7 @@ files:
 - helpers/application_helper.rb
 - helpers/test_helper.rb
 - html/404.html
+- html/422.html
 - html/500.html
 - html/favicon.ico
 - html/images
@@ -101,13 +105,9 @@ files:
 - html/javascripts/effects.js
 - html/javascripts/prototype.js
 - html/robots.txt
-- lib/binding_of_caller.rb
-- lib/breakpoint.rb
-- lib/breakpoint_client.rb
 - lib/code_statistics.rb
 - lib/commands
 - lib/commands/about.rb
-- lib/commands/breakpointer.rb
 - lib/commands/console.rb
 - lib/commands/destroy.rb
 - lib/commands/generate.rb
@@ -117,6 +117,7 @@ files:
 - lib/commands/performance
 - lib/commands/performance/benchmarker.rb
 - lib/commands/performance/profiler.rb
+- lib/commands/performance/request.rb
 - lib/commands/plugin.rb
 - lib/commands/process
 - lib/commands/process/inspector.rb
@@ -139,6 +140,10 @@ files:
 - lib/fcgi_handler.rb
 - lib/initializer.rb
 - lib/rails
+- lib/rails/plugin
+- lib/rails/plugin/loader.rb
+- lib/rails/plugin/locator.rb
+- lib/rails/plugin.rb
 - lib/rails/version.rb
 - lib/rails_generator
 - lib/rails_generator/base.rb
@@ -156,7 +161,7 @@ files:
 - lib/rails_generator/generators/components/controller/templates/controller.rb
 - lib/rails_generator/generators/components/controller/templates/functional_test.rb
 - lib/rails_generator/generators/components/controller/templates/helper.rb
-- lib/rails_generator/generators/components/controller/templates/view.rhtml
+- lib/rails_generator/generators/components/controller/templates/view.html.erb
 - lib/rails_generator/generators/components/controller/USAGE
 - lib/rails_generator/generators/components/integration_test
 - lib/rails_generator/generators/components/integration_test/integration_test_generator.rb
@@ -166,9 +171,11 @@ files:
 - lib/rails_generator/generators/components/mailer
 - lib/rails_generator/generators/components/mailer/mailer_generator.rb
 - lib/rails_generator/generators/components/mailer/templates
+- lib/rails_generator/generators/components/mailer/templates/fixture.erb
 - lib/rails_generator/generators/components/mailer/templates/fixture.rhtml
 - lib/rails_generator/generators/components/mailer/templates/mailer.rb
 - lib/rails_generator/generators/components/mailer/templates/unit_test.rb
+- lib/rails_generator/generators/components/mailer/templates/view.erb
 - lib/rails_generator/generators/components/mailer/templates/view.rhtml
 - lib/rails_generator/generators/components/mailer/USAGE
 - lib/rails_generator/generators/components/migration
@@ -196,6 +203,7 @@ files:
 - lib/rails_generator/generators/components/plugin/templates/generator.rb
 - lib/rails_generator/generators/components/plugin/templates/init.rb
 - lib/rails_generator/generators/components/plugin/templates/install.rb
+- lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE
 - lib/rails_generator/generators/components/plugin/templates/plugin.rb
 - lib/rails_generator/generators/components/plugin/templates/Rakefile
 - lib/rails_generator/generators/components/plugin/templates/README
@@ -208,45 +216,22 @@ files:
 - 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/resource/USAGE
 - lib/rails_generator/generators/components/scaffold
 - lib/rails_generator/generators/components/scaffold/scaffold_generator.rb
 - lib/rails_generator/generators/components/scaffold/templates
 - lib/rails_generator/generators/components/scaffold/templates/controller.rb
-- lib/rails_generator/generators/components/scaffold/templates/form.rhtml
-- lib/rails_generator/generators/components/scaffold/templates/form_scaffolding.rhtml
 - lib/rails_generator/generators/components/scaffold/templates/functional_test.rb
 - lib/rails_generator/generators/components/scaffold/templates/helper.rb
-- lib/rails_generator/generators/components/scaffold/templates/layout.rhtml
+- lib/rails_generator/generators/components/scaffold/templates/layout.html.erb
 - lib/rails_generator/generators/components/scaffold/templates/style.css
-- lib/rails_generator/generators/components/scaffold/templates/view_edit.rhtml
-- 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/templates/view_edit.html.erb
+- lib/rails_generator/generators/components/scaffold/templates/view_index.html.erb
+- lib/rails_generator/generators/components/scaffold/templates/view_new.html.erb
+- lib/rails_generator/generators/components/scaffold/templates/view_show.html.erb
 - lib/rails_generator/generators/components/scaffold/USAGE
-- lib/rails_generator/generators/components/scaffold_resource
-- 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/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/scaffold_resource/USAGE
 - lib/rails_generator/generators/components/session_migration
 - lib/rails_generator/generators/components/session_migration/session_migration_generator.rb
 - lib/rails_generator/generators/components/session_migration/templates
@@ -254,11 +239,6 @@ files:
 - lib/rails_generator/generators/components/session_migration/USAGE
 - lib/rails_generator/generators/components/web_service
 - lib/rails_generator/generators/components/web_service/templates
-- 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/generators/components/web_service/USAGE
-- lib/rails_generator/generators/components/web_service/web_service_generator.rb
 - lib/rails_generator/lookup.rb
 - lib/rails_generator/manifest.rb
 - lib/rails_generator/options.rb
@@ -267,19 +247,21 @@ files:
 - lib/rails_generator/scripts/generate.rb
 - lib/rails_generator/scripts/update.rb
 - lib/rails_generator/scripts.rb
+- lib/rails_generator/secret_key_generator.rb
 - lib/rails_generator/simple_logger.rb
 - lib/rails_generator/spec.rb
 - lib/rails_generator.rb
 - lib/railties_path.rb
 - lib/ruby_version_check.rb
 - lib/rubyprof_ext.rb
+- lib/source_annotation_extractor.rb
 - lib/tasks
+- lib/tasks/annotations.rake
 - lib/tasks/databases.rake
 - lib/tasks/documentation.rake
 - lib/tasks/framework.rake
 - lib/tasks/log.rake
 - lib/tasks/misc.rake
-- lib/tasks/pre_namespace_aliases.rake
 - lib/tasks/rails.rb
 - lib/tasks/routes.rake
 - lib/tasks/statistics.rake
@@ -317,7 +299,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.4.4
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -326,7 +308,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.15.6
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionpack
@@ -335,7 +317,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.13.6
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: actionmailer
@@ -344,14 +326,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.3.6
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: actionwebservice
+  name: activeresource
   version_requirement: 
   version_requirements: !ruby/object:Gem::Version::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.2.6
+        version: 2.0.0
     version: 

data/bin/breakpointer

@@ -1,3 +0,0 @@
-#!/usr/bin/env ruby
-require File.dirname(__FILE__) + '/../config/boot'
-require 'commands/breakpointer'

data/lib/binding_of_caller.rb

@@ -1,85 +0,0 @@
-begin
-  require 'simplecc'
-rescue LoadError
-  # to satisfy rdoc
-  class Continuation #:nodoc:
-  end
-  def Continuation.create(*args, &block) # :nodoc:
-    cc = nil; result = callcc {|c| cc = c; block.call(cc) if block and args.empty?}
-    result ||= args
-    return *[cc, *result]
-  end
-end
-
-class Binding; end # for RDoc
-# This method returns the binding of the method that called your
-# method. It will raise an Exception when you're not inside a method.
-#
-# It's used like this:
-#   def inc_counter(amount = 1)
-#     Binding.of_caller do |binding|
-#       # Create a lambda that will increase the variable 'counter'
-#       # in the caller of this method when called.
-#       inc = eval("lambda { |arg| counter += arg }", binding)
-#       # We can refer to amount from inside this block safely.
-#       inc.call(amount)
-#     end
-#     # No other statements can go here. Put them inside the block.
-#   end
-#   counter = 0
-#   2.times { inc_counter }
-#   counter # => 2
-#
-# Binding.of_caller must be the last statement in the method.
-# This means that you will have to put everything you want to
-# do after the call to Binding.of_caller into the block of it.
-# This should be no problem however, because Ruby has closures.
-# If you don't do this an Exception will be raised. Because of
-# the way that Binding.of_caller is implemented it has to be
-# done this way.
-def Binding.of_caller(&block)
-  old_critical = Thread.critical
-  Thread.critical = true
-  count = 0
-  cc, result, error, extra_data = Continuation.create(nil, nil)
-  error.call if error
-
-  tracer = lambda do |*args|
-    type, context, extra_data = args[0], args[4], args
-    if type == "return"
-      count += 1
-      # First this method and then calling one will return --
-      # the trace event of the second event gets the context
-      # of the method which called the method that called this
-      # method.
-      if count == 2
-        # It would be nice if we could restore the trace_func
-        # that was set before we swapped in our own one, but
-        # this is impossible without overloading set_trace_func
-        # in current Ruby.
-        set_trace_func(nil)
-        cc.call(eval("binding", context), nil, extra_data)
-      end
-    elsif type == "line" then
-      nil
-    elsif type == "c-return" and extra_data[3] == :set_trace_func then
-      nil
-    else
-      set_trace_func(nil)
-      error_msg = "Binding.of_caller used in non-method context or " +
-        "trailing statements of method using it aren't in the block."
-      cc.call(nil, lambda { raise(ArgumentError, error_msg) }, nil)
-    end
-  end
-
-  unless result
-    set_trace_func(tracer)
-    return nil
-  else
-    Thread.critical = old_critical
-    case block.arity
-      when 1 then yield(result)
-      else yield(result, extra_data)        
-    end
-  end
-end