rails 1.2.6 → 2.0.0

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2006 David Heinemeier Hansson
+Copyright (c) 2004-2007 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README

@@ -25,11 +25,11 @@ Rails.  You can read more about Action Pack in
 link:files/vendor/rails/actionpack/README.html.
 
 
-== Getting started
+== Getting Started
 
-1. At the command prompt, start a new rails application using the rails command
+1. At the command prompt, start a new Rails application using the <tt>rails</tt> command
    and your application name. Ex: rails myapp
-   (If you've downloaded rails in a complete tgz or zip, this step is already done)
+   (If you've downloaded Rails in a complete tgz or zip, this step is already done)
 2. Change directory into myapp and start the web server: <tt>script/server</tt> (run with --help for options)
 3. Go to http://localhost:3000/ and get "Welcome aboard: You’re riding the Rails!"
 4. Follow the guidelines to start developing your application
@@ -38,11 +38,11 @@ link:files/vendor/rails/actionpack/README.html.
 == Web Servers
 
 By default, Rails will try to use Mongrel and lighttpd if they are installed, otherwise
-Rails will use the WEBrick, the webserver that ships with Ruby. When you run script/server,
+Rails will use WEBrick, the webserver that ships with Ruby. When you run script/server,
 Rails will check if Mongrel exists, then lighttpd and finally fall back to WEBrick. This ensures
 that you can always get up and running quickly.
 
-Mongrel is a Ruby-based webserver with a C-component (which requires compilation) that is
+Mongrel is a Ruby-based webserver with a C component (which requires compilation) that is
 suitable for development and deployment of Rails applications. If you have Ruby Gems installed,
 getting up and running with mongrel is as easy as: <tt>gem install mongrel</tt>.
 More info at: http://mongrel.rubyforge.org
@@ -98,29 +98,27 @@ These two online (and free) books will bring you up to speed on the Ruby languag
 and also on programming in general.
 
 
-== Breakpoints
+== Debugger
 
-Breakpoint support is available through the script/breakpointer client. This
-means that you can break out of execution at any point in the code, investigate
-and change the model, AND then resume execution! Example:
+Debugger support is available through the debugger command when you start your Mongrel or
+Webrick server with --debugger. This means that you can break out of execution at any point
+in the code, investigate and change the model, AND then resume execution! Example:
 
   class WeblogController < ActionController::Base
     def index
       @posts = Post.find(:all)
-      breakpoint "Breaking out from the list"
+      debugger
     end
   end
 
 So the controller will accept the action, run the first line, then present you
-with a IRB prompt in the breakpointer window. Here you can do things like:
-
-Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in 'breakpoint'
+with a IRB prompt in the server window. Here you can do things like:
 
   >> @posts.inspect
   => "[#<Post:0x14a6be8 @attributes={\"title\"=>nil, \"body\"=>nil, \"id\"=>\"1\"}>,
        #<Post:0x14a6620 @attributes={\"title\"=>\"Rails you know!\", \"body\"=>\"Only ten..\", \"id\"=>\"2\"}>]"
-  >> @posts.first.title = "hello from a breakpoint"
-  => "hello from a breakpoint"
+  >> @posts.first.title = "hello from a debugger"
+  => "hello from a debugger"
 
 ...and even better is that you can examine how your runtime objects actually work:
 
@@ -129,7 +127,7 @@ Executing breakpoint "Breaking out from the list" at .../webrick_server.rb:16 in
   >> f.
   Display all 152 possibilities? (y or n)
 
-Finally, when you're ready to resume execution, you press CTRL-D
+Finally, when you're ready to resume execution, you enter "cont"
 
 
 == Console
@@ -142,11 +140,8 @@ Passing an argument will specify a different environment, like <tt>script/consol
 
 To reload your controllers and models after launching the console run <tt>reload!</tt>
 
-To reload your controllers and models after launching the console run <tt>reload!</tt>
-
 
-
-== Description of contents
+== Description of Contents
 
 app
   Holds all the code that's specific to this particular application.
@@ -162,13 +157,13 @@ app/models
 
 app/views
   Holds the template files for the view that should be named like
-  weblogs/index.rhtml for the WeblogsController#index action. All views use eRuby
+  weblogs/index.erb for the WeblogsController#index action. All views use eRuby
   syntax.
 
 app/views/layouts
   Holds the template files for layouts to be used with views. This models the common
   header/footer method of wrapping views. In your views, define a layout using the
-  <tt>layout :default</tt> and create a file named default.rhtml. Inside default.rhtml,
+  <tt>layout :default</tt> and create a file named default.erb. Inside default.erb,
   call <% yield %> to render the view using this layout.
 
 app/helpers
@@ -179,9 +174,6 @@ app/helpers
 config
   Configuration files for the Rails environment, the routing map, the database, and other dependencies.
 
-components
-  Self-contained mini-applications that can bundle together controllers, models, and views.
-
 db
   Contains the database schema in schema.rb.  db/migrate contains all
   the sequence of Migrations for your schema.

data/Rakefile

@@ -21,6 +21,8 @@ RUBY_FORGE_PROJECT = "rails"
 RUBY_FORGE_USER    = "webster132"
 
 
+task :default => :test
+
 ## This is required until the regular test task
 ## below passes.  It's not ideal, but at least
 ## we can see the failures
@@ -38,9 +40,27 @@ Rake::TestTask.new("regular_test") do |t|
 end
 
 
-BASE_DIRS   = %w( 
-  app config/environments components db doc log lib lib/tasks public script script/performance script/process test vendor vendor/plugins
-  tmp/sessions tmp/cache tmp/sockets tmp/pids
+BASE_DIRS = %w( 
+  app
+  config/environments
+  config/initializers
+  components
+  db
+  doc
+  log
+  lib
+  lib/tasks
+  public
+  script
+  script/performance
+  script/process
+  test
+  vendor
+  vendor/plugins
+  tmp/sessions
+  tmp/cache
+  tmp/sockets
+  tmp/pids
 )
 
 APP_DIRS    = %w( models controllers helpers views views/layouts )
@@ -48,12 +68,12 @@ PUBLIC_DIRS = %w( images javascripts stylesheets )
 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 robots.txt favicon.ico images/rails.png
+HTML_FILES   = %w( 422.html 404.html 500.html index.html robots.txt favicon.ico images/rails.png
                    javascripts/prototype.js javascripts/application.js
                    javascripts/effects.js javascripts/dragdrop.js javascripts/controls.js )
-BIN_FILES    = %w( about breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/inspector runner server plugin )
+BIN_FILES    = %w( about console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/inspector runner server plugin )
 
-VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport actionwebservice railties )
+VENDOR_LIBS = %w( actionpack activerecord actionmailer activesupport activeresource railties )
 
 
 desc "Generates a fresh Rails package with documentation"
@@ -179,11 +199,14 @@ task :copy_configs do
 
   cp "configs/apache.conf", "#{PKG_DESTINATION}/public/.htaccess"
 
-  cp "environments/boot.rb", "#{PKG_DESTINATION}/config/boot.rb"
+  cp "configs/initializers/inflections.rb", "#{PKG_DESTINATION}/config/initializers/inflections.rb"
+  cp "configs/initializers/mime_types.rb",  "#{PKG_DESTINATION}/config/initializers/mime_types.rb"
+
+  cp "environments/boot.rb",        "#{PKG_DESTINATION}/config/boot.rb"
   cp "environments/environment.rb", "#{PKG_DESTINATION}/config/environment.rb"
-  cp "environments/production.rb", "#{PKG_DESTINATION}/config/environments/production.rb"
+  cp "environments/production.rb",  "#{PKG_DESTINATION}/config/environments/production.rb"
   cp "environments/development.rb", "#{PKG_DESTINATION}/config/environments/development.rb"
-  cp "environments/test.rb", "#{PKG_DESTINATION}/config/environments/test.rb"
+  cp "environments/test.rb",        "#{PKG_DESTINATION}/config/environments/test.rb"
 end
 
 task :copy_binfiles do
@@ -237,18 +260,19 @@ desc "Generate documentation for the framework and for the empty application"
 task :generate_documentation => [ :generate_app_doc, :generate_rails_framework_doc ]
 
 task :generate_rails_framework_doc do
-  system %{cd #{PKG_DESTINATION}; rake apidoc}
+  system %{cd #{PKG_DESTINATION}; rake doc:rails}
 end
 
 task :generate_app_doc do
   File.cp "doc/README_FOR_APP", "#{PKG_DESTINATION}/doc/README_FOR_APP"
-  system %{cd #{PKG_DESTINATION}; rake appdoc}
+  system %{cd #{PKG_DESTINATION}; rake doc:app}
 end
 
 Rake::RDocTask.new { |rdoc|
   rdoc.rdoc_dir = 'doc'
   rdoc.title    = "Railties -- Gluing the Engine to the Rails"
   rdoc.options << '--line-numbers' << '--inline-source' << '--accessor' << 'cattr_accessor=object'
+  rdoc.options << '--charset' << 'utf-8'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
   rdoc.rdoc_files.include('README', 'CHANGELOG')
   rdoc.rdoc_files.include('lib/*.rb')
@@ -288,18 +312,17 @@ spec = Gem::Specification.new do |s|
   EOF
 
   s.add_dependency('rake', '>= 0.7.2')
-  s.add_dependency('activesupport',    '= 1.4.4' + PKG_BUILD)
-  s.add_dependency('activerecord',     '= 1.15.6' + PKG_BUILD)
-  s.add_dependency('actionpack',       '= 1.13.6' + PKG_BUILD)
-  s.add_dependency('actionmailer',     '= 1.3.6' + PKG_BUILD)
-  s.add_dependency('actionwebservice', '= 1.2.6' + PKG_BUILD)
+  s.add_dependency('activesupport',    '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('activerecord',     '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('actionpack',       '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('actionmailer',     '= 2.0.0' + PKG_BUILD)
+  s.add_dependency('activeresource',   '= 2.0.0' + PKG_BUILD)
 
   s.rdoc_options << '--exclude' << '.'
   s.has_rdoc = false
 
   s.files = PKG_FILES.to_a.delete_if {|f| f.include?('.svn')}
   s.require_path = 'lib'
-
   s.bindir = "bin"                               # Use these for applications.
   s.executables = ["rails"]
   s.default_executable = "rails"
@@ -331,4 +354,4 @@ task :release => [ :package ] do
   rubyforge = RubyForge.new
   rubyforge.login
   rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
-end
+end

data/bin/about

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

data/bin/console

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

data/bin/destroy

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

data/bin/generate

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

data/bin/performance/request

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

data/bin/plugin

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

data/bin/runner

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

data/bin/server

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

data/builtin/rails_info/rails/info.rb

@@ -19,7 +19,7 @@ module Rails
       end
 
       def components
-        %w( active_record action_pack action_web_service action_mailer active_support )
+        %w( active_record action_pack active_resource action_mailer active_support )
       end
       
       def component_version(component)
@@ -89,7 +89,7 @@ module Rails
     end
   
     # Versions of each Rails component (Active Record, Action Pack, 
-    # Action Web Service, Action Mailer, and Active Support).
+    # Active Resource, Action Mailer, and Active Support).
     components.each do |component|
       property "#{component.titlecase} version" do 
         component_version(component)

data/configs/apache.conf

@@ -37,4 +37,4 @@ RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
 # Example:
 #   ErrorDocument 500 /500.html
 
-ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"

data/configs/databases/mysql.yml

@@ -2,8 +2,11 @@
 #
 # Install the MySQL driver:
 #   gem install mysql
-# On MacOS X:
-#   gem install mysql -- --include=/usr/local/lib
+# On Mac OS X:
+#   sudo gem install mysql -- --with-mysql-dir=/usr/local/mysql
+# On Mac OS X Leopard:
+#   sudo env ARCHFLAGS="-arch i386" gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
+#       This sets the ARCHFLAGS environment variable to your native architecture
 # On Windows:
 #   gem install mysql
 #       Choose the win32 build.
@@ -13,6 +16,7 @@
 #   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql
+  encoding: utf8
   database: <%= app_name %>_development
   username: root
   password:
@@ -27,6 +31,7 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: mysql
+  encoding: utf8
   database: <%= app_name %>_test
   username: root
   password:
@@ -38,6 +43,7 @@ test:
 
 production:
   adapter: mysql
+  encoding: utf8
   database: <%= app_name %>_production
   username: root
   password: 
@@ -45,4 +51,4 @@ production:
   socket: <%= socket %>
 <% else -%>
   host: localhost
-<% end -%>
+<% end -%>

data/configs/databases/postgresql.yml

@@ -1,30 +1,32 @@
-# PostgreSQL versions 7.4 - 8.1
+# PostgreSQL. Versions 7.4 and 8.x are supported.
 #
-# Get the C bindings:
-#   gem install postgres
-# or use the pure-Ruby bindings on Windows:
-#   gem install postgres-pr
+# Install the ruby-postgres driver:
+#   gem install ruby-postgres
+# On Mac OS X:
+#   gem install ruby-postgres -- --include=/usr/local/pgsql
+# On Windows:
+#   gem install ruby-postgres
+#       Choose the win32 build.
+#       Install PostgreSQL and put its /bin directory on your path.
 development:
   adapter: postgresql
+  encoding: unicode
   database: <%= app_name %>_development
   username: <%= app_name %>
   password:
 
-  # Connect on a TCP socket.  Omitted by default since the client uses a
-  # domain socket that doesn't need configuration.  Windows does not have
+  # Connect on a TCP socket. Omitted by default since the client uses a
+  # domain socket that doesn't need configuration. Windows does not have
   # domain sockets, so uncomment these lines.
   #host: localhost
   #port: 5432
 
-  # Schema search path.  The server defaults to $user,public
+  # Schema search path. The server defaults to $user,public
   #schema_search_path: myapp,sharedapp,public
 
-  # Character set encoding.  The server defaults to sql_ascii.
-  #encoding: UTF8
-
   # Minimum log levels, in increasing order:
   #   debug5, debug4, debug3, debug2, debug1,
-  #   info, notice, warning, error, log, fatal, or panic
+  #   log, notice, warning, error, fatal, and panic
   # The server defaults to notice.
   #min_messages: warning
 
@@ -33,12 +35,14 @@ development:
 # Do not set this db to the same as development or production.
 test:
   adapter: postgresql
+  encoding: unicode
   database: <%= app_name %>_test
   username: <%= app_name %>
   password:
 
 production:
   adapter: postgresql
+  encoding: unicode
   database: <%= app_name %>_production
   username: <%= app_name %>
   password:

data/configs/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format 
+# (all these examples are active by default):
+# Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/configs/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/configs/routes.rb

@@ -1,23 +1,35 @@
 ActionController::Routing::Routes.draw do |map|
   # The priority is based upon order of creation: first created -> highest priority.
-  
+
   # Sample of regular route:
-  # map.connect 'products/:id', :controller => 'catalog', :action => 'view'
+  #   map.connect 'products/:id', :controller => 'catalog', :action => 'view'
   # Keep in mind you can assign values other than :controller and :action
 
   # Sample of named route:
-  # map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
+  #   map.purchase 'products/:id/purchase', :controller => 'catalog', :action => 'purchase'
   # This route can be invoked with purchase_url(:id => product.id)
 
-  # You can have the root of your site routed by hooking up '' 
-  # -- just remember to delete public/index.html.
-  # map.connect '', :controller => "welcome"
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   map.resources :products
 
-  # Allow downloading Web Service WSDL as a file with an extension
-  # instead of a file named 'wsdl'
-  map.connect ':controller/service.wsdl', :action => 'wsdl'
+  # Sample resource route with options:
+  #   map.resources :products, :member => { :short => :get, :toggle => :post }, :collection => { :sold => :get }
 
-  # Install the default route as the lowest priority.
-  map.connect ':controller/:action/:id.:format'
+  # Sample resource route with sub-resources:
+  #   map.resources :products, :has_many => [ :comments, :sales ], :has_one => :seller
+
+  # Sample resource route within a namespace:
+  #   map.namespace :admin do |admin|
+  #     # Directs /admin/products/* to Admin::ProductsController (app/controllers/admin/products_controller.rb)
+  #     admin.resources :products
+  #   end
+
+  # You can have the root of your site routed with map.root -- just remember to delete public/index.html.
+  # map.root :controller => "welcome"
+
+  # See how all your routes lay out with "rake routes"
+
+  # Install the default routes as the lowest priority.
   map.connect ':controller/:action/:id'
+  map.connect ':controller/:action/:id.:format'
 end