rails 1.1.6 → 1.2.0

data/lib/rails_generator/generators/components/scaffold_resource/templates/view_edit.rhtml

@@ -0,0 +1,19 @@
+<h1>Editing <%= singular_name %></h1>
+
+<%%= error_messages_for :<%= singular_name %> %>
+
+<%% form_for(:<%= singular_name %>, :url => <%= singular_name %>_path(@<%= singular_name %>), :html => { :method => :put }) do |f| %>
+<% for attribute in attributes -%>
+  <p>
+    <b><%= attribute.column.human_name %></b><br />
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  </p>
+
+<% end -%>
+  <p>
+    <%%= submit_tag "Update" %>
+  </p>
+<%% end %>
+
+<%%= link_to 'Show', <%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/scaffold_resource/templates/view_index.rhtml

@@ -0,0 +1,24 @@
+<h1>Listing <%= plural_name %></h1>
+
+<table>
+  <tr>
+<% for attribute in attributes -%>
+    <th><%= attribute.column.human_name %></th>
+<% end -%>
+  </tr>
+  
+<%% for <%= singular_name %> in @<%= plural_name %> %>
+  <tr>
+<% for attribute in attributes -%>
+    <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td>
+<% end -%>
+    <td><%%= link_to 'Show', <%= singular_name %>_path(<%= singular_name %>) %></td>
+    <td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td>
+    <td><%%= link_to 'Destroy', <%= singular_name %>_path(<%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td>
+  </tr>
+<%% end %>
+</table>
+
+<br />
+
+<%%= link_to 'New <%= singular_name %>', new_<%= singular_name %>_path %>

data/lib/rails_generator/generators/components/scaffold_resource/templates/view_new.rhtml

@@ -0,0 +1,18 @@
+<h1>New <%= singular_name %></h1>
+
+<%%= error_messages_for :<%= singular_name %> %>
+
+<%% form_for(:<%= singular_name %>, :url => <%= plural_name %>_path) do |f| %>
+<% for attribute in attributes -%>
+  <p>
+    <b><%= attribute.column.human_name %></b><br />
+    <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %>
+  </p>
+
+<% end -%>
+  <p>
+    <%%= submit_tag "Create" %>
+  </p>
+<%% end %>
+
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/scaffold_resource/templates/view_show.rhtml

@@ -0,0 +1,10 @@
+<% for attribute in attributes -%>
+<p>
+  <b><%= attribute.column.human_name %>:</b>
+  <%%=h @<%= singular_name %>.<%= attribute.name %> %>
+</p>
+
+<% end -%>
+
+<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/lib/rails_generator/generators/components/session_migration/session_migration_generator.rb

@@ -6,7 +6,13 @@ class SessionMigrationGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      m.migration_template 'migration.rb', 'db/migrate'
+      m.migration_template 'migration.rb', 'db/migrate',
+        :assigns => { :session_table_name => default_session_table_name }
     end
   end
+
+  protected
+    def default_session_table_name
+      ActiveRecord::Base.pluralize_table_names ? 'session'.pluralize : 'session'
+    end
 end

data/lib/rails_generator/generators/components/session_migration/templates/migration.rb

@@ -1,15 +1,16 @@
 class <%= class_name %> < ActiveRecord::Migration
   def self.up
-    create_table :sessions do |t|
+    create_table :<%= session_table_name %> do |t|
       t.column :session_id, :string
       t.column :data, :text
       t.column :updated_at, :datetime
     end
-    
-    add_index :sessions, :session_id
+
+    add_index :<%= session_table_name %>, :session_id
+    add_index :<%= session_table_name %>, :updated_at
   end
 
   def self.down
-    drop_table :sessions
+    drop_table :<%= session_table_name %>
   end
 end

data/lib/rails_generator/lookup.rb

@@ -48,8 +48,7 @@ module Rails
     # the generator and how to create it.  A source is anything that
     # yields generators from #each.  PathSource and GemSource are provided.
     module Lookup
-      def self.append_features(base)
-        super
+      def self.included(base)
         base.extend(ClassMethods)
         base.use_component_sources!
       end

data/lib/rails_generator/options.rb

@@ -3,8 +3,7 @@ require 'optparse'
 module Rails
   module Generator
     module Options
-      def self.append_features(base)
-        super
+      def self.included(base)
         base.extend(ClassMethods)
         class << base
           if respond_to?(:inherited)
@@ -118,6 +117,11 @@ module Rails
 
         # Adds general options like -h and --quiet.  Usually don't override.
         def add_general_options!(opt)
+          opt.separator ''
+          opt.separator 'Rails Info:'
+          opt.on('-v', '--version', 'Show the Rails version number and quit.')
+          opt.on('-h', '--help', 'Show this help message and quit.') { |v| options[:help] = v }
+
           opt.separator ''
           opt.separator 'General Options:'
 
@@ -126,7 +130,6 @@ module Rails
           opt.on('-s', '--skip', 'Skip files that already exist.') { options[:collision] = :skip }
           opt.on('-q', '--quiet', 'Suppress normal output.') { |v| options[:quiet] = v }
           opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |v| options[:backtrace] = v }
-          opt.on('-h', '--help', 'Show this help message.') { |v| options[:help] = v }
           opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') do
             options[:svn] = `svn status`.inject({}) do |opt, e|
               opt[e.chomp[7..-1]] = true

data/lib/tasks/databases.rake

@@ -5,16 +5,16 @@ namespace :db do
     Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
   end
 
-	namespace :fixtures do
-	  desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-	  task :load => :environment do
-	    require 'active_record/fixtures'
-	    ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
-	    (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-	      Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
-	    end
-	  end
-	end
+  namespace :fixtures do
+    desc "Load fixtures into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
+    task :load => :environment do
+      require 'active_record/fixtures'
+      ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+      (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'test', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
+        Fixtures.create_fixtures('test/fixtures', File.basename(fixture_file, '.*'))
+      end
+    end
+  end
 
   namespace :schema do
     desc "Create a db/schema.rb file that can be portably used against any DB supported by AR"
@@ -36,8 +36,8 @@ namespace :db do
     desc "Dump the database structure to a SQL file"
     task :dump => :environment do
       abcs = ActiveRecord::Base.configurations
-      case abcs[RAILS_ENV]["adapter"] 
-        when "mysql", "oci"
+      case abcs[RAILS_ENV]["adapter"]
+        when "mysql", "oci", "oracle"
           ActiveRecord::Base.establish_connection(abcs[RAILS_ENV])
           File.open("db/#{RAILS_ENV}_structure.sql", "w+") { |f| f << ActiveRecord::Base.connection.structure_dump }
         when "postgresql"
@@ -54,7 +54,11 @@ namespace :db do
         when "sqlserver"
           `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /f db\\#{RAILS_ENV}_structure.sql /q /A /r`
           `scptxfr /s #{abcs[RAILS_ENV]["host"]} /d #{abcs[RAILS_ENV]["database"]} /I /F db\ /q /A /r`
-        else 
+        when "firebird"
+          set_firebird_env(abcs[RAILS_ENV])
+          db_string = firebird_db_string(abcs[RAILS_ENV])
+          sh "isql -a #{db_string} > db/#{RAILS_ENV}_structure.sql"
+        else
           raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
 
@@ -66,13 +70,13 @@ namespace :db do
 
   namespace :test do
     desc "Recreate the test database from the current environment's database schema"
-    task :clone => "db:schema:dump" do
+    task :clone => %w(db:schema:dump db:test:purge) do
       ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
       ActiveRecord::Schema.verbose = false
       Rake::Task["db:schema:load"].invoke
     end
 
-  
+
     desc "Recreate the test databases from the development structure"
     task :clone_structure => [ "db:structure:dump", "db:test:purge" ] do
       abcs = ActiveRecord::Base.configurations
@@ -93,12 +97,16 @@ namespace :db do
           `#{abcs["test"]["adapter"]} #{dbfile} < db/#{RAILS_ENV}_structure.sql`
         when "sqlserver"
           `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-        when "oci"
+        when "oci", "oracle"
           ActiveRecord::Base.establish_connection(:test)
           IO.readlines("db/#{RAILS_ENV}_structure.sql").join.split(";\n\n").each do |ddl|
             ActiveRecord::Base.connection.execute(ddl)
           end
-        else 
+        when "firebird"
+          set_firebird_env(abcs["test"])
+          db_string = firebird_db_string(abcs["test"])
+          sh "isql -i db/#{RAILS_ENV}_structure.sql #{db_string}"
+        else
           raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
     end
@@ -115,6 +123,8 @@ namespace :db do
           ENV['PGPORT']     = abcs["test"]["port"].to_s if abcs["test"]["port"]
           ENV['PGPASSWORD'] = abcs["test"]["password"].to_s if abcs["test"]["password"]
           enc_option = "-E #{abcs["test"]["encoding"]}" if abcs["test"]["encoding"]
+
+          ActiveRecord::Base.clear_active_connections!
           `dropdb -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
           `createdb #{enc_option} -U "#{abcs["test"]["username"]}" #{abcs["test"]["database"]}`
         when "sqlite","sqlite3"
@@ -124,11 +134,14 @@ namespace :db do
           dropfkscript = "#{abcs["test"]["host"]}.#{abcs["test"]["database"]}.DP1".gsub(/\\/,'-')
           `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{dropfkscript}`
           `osql -E -S #{abcs["test"]["host"]} -d #{abcs["test"]["database"]} -i db\\#{RAILS_ENV}_structure.sql`
-        when "oci"
+        when "oci", "oracle"
           ActiveRecord::Base.establish_connection(:test)
           ActiveRecord::Base.connection.structure_drop.split(";\n\n").each do |ddl|
             ActiveRecord::Base.connection.execute(ddl)
           end
+        when "firebird"
+          ActiveRecord::Base.establish_connection(:test)
+          ActiveRecord::Base.connection.recreate_database!
         else
           raise "Task not supported by '#{abcs["test"]["adapter"]}'"
       end
@@ -136,7 +149,9 @@ namespace :db do
 
     desc 'Prepare the test database and load the schema'
     task :prepare => :environment do
-      Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
+      if defined?(ActiveRecord::Base) && !ActiveRecord::Base.configurations.blank?
+        Rake::Task[{ :sql  => "db:test:clone_structure", :ruby => "db:test:clone" }[ActiveRecord::Base.schema_format]].invoke
+      end
     end
   end
 
@@ -151,7 +166,9 @@ namespace :db do
 
     desc "Clear the sessions table"
     task :clear => :environment do
-      ActiveRecord::Base.connection.execute "DELETE FROM sessions"
+      session_table = 'session'
+      session_table = Inflector.pluralize(session_table) if ActiveRecord::Base.pluralize_table_names
+      ActiveRecord::Base.connection.execute "DELETE FROM #{session_table}"
     end
   end
 end
@@ -159,3 +176,12 @@ end
 def session_table_name
   ActiveRecord::Base.pluralize_table_names ? :sessions : :session
 end
+
+def set_firebird_env(config)
+  ENV["ISC_USER"]     = config["username"].to_s if config["username"]
+  ENV["ISC_PASSWORD"] = config["password"].to_s if config["password"]
+end
+
+def firebird_db_string(config)
+  FireRuby::Database.db_string_for(config.symbolize_keys)
+end

data/lib/tasks/documentation.rake

@@ -6,6 +6,7 @@ namespace :doc do
     rdoc.options << '--line-numbers' << '--inline-source'
     rdoc.rdoc_files.include('doc/README_FOR_APP')
     rdoc.rdoc_files.include('app/**/*.rb')
+    rdoc.rdoc_files.include('lib/**/*.rb')
   }
 
   desc "Generate documentation for the Rails framework"

data/lib/tasks/framework.rake

@@ -103,11 +103,9 @@ namespace :rails do
       FileUtils.cp(scripts, project_dir)
     end
 
-    desc "Update boot/config.rb from your current rails install"
+    desc "Update config/boot.rb from your current rails install"
     task :configs do
       require 'railties_path'  
-      project_dir = RAILS_ROOT + '/public/javascripts/'
-      scripts = Dir[RAILTIES_PATH + '/html/javascripts/*.js']
       FileUtils.cp(RAILTIES_PATH + '/environments/boot.rb', RAILS_ROOT + '/config/boot.rb')
     end
   end

data/lib/tasks/pre_namespace_aliases.rake

@@ -1,46 +1,53 @@
+def deprecated_task(name, new_name)
+  task name=>new_name do 
+    $stderr.puts "The rake task #{name} has been deprecated, please use the replacement version #{new_name}"
+  end
+end
+
+
 # clear
-task :clear_logs => "log:clear"
+deprecated_task :clear_logs, "log:clear"
 
 # test
-task :recent          => "test:recent"
-task :test_units      => "test:units"
-task :test_functional => "test:functionals"
-task :test_plugins    => "test:plugins"
+deprecated_task :recent,          "test:recent"
+deprecated_task :test_units,      "test:units"
+deprecated_task :test_functional, "test:functionals"
+deprecated_task :test_plugins,    "test:plugins"
 
 
 # doc
-task :appdoc            => "doc:app"
-task :apidoc            => "doc:rails"
-task :plugindoc         => "doc:plugins"
-task :clobber_plugindoc => "doc:clobber_plugins"
+deprecated_task :appdoc,            "doc:app"
+deprecated_task :apidoc,            "doc:rails"
+deprecated_task :plugindoc,         "doc:plugins"
+deprecated_task :clobber_plugindoc, "doc:clobber_plugins"
 
 FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }.each do |plugin|
-  task :"#{plugin}_plugindoc" => "doc:plugins:#{plugin}"
+  deprecated_task :"#{plugin}_plugindoc", "doc:plugins:#{plugin}"
 end
 
 
 # rails
-task :freeze_gems        => "rails:freeze:gems"
-task :freeze_edge        => "rails:freeze:edge"
-task :unfreeze_rails     => "rails:unfreeze"
-task :add_new_scripts    => "rails:update:scripts"
-task :update_javascripts => "rails:update:javascripts"
+deprecated_task :freeze_gems,        "rails:freeze:gems"
+deprecated_task :freeze_edge,        "rails:freeze:edge"
+deprecated_task :unfreeze_rails,     "rails:unfreeze"
+deprecated_task :add_new_scripts,    "rails:update:scripts"
+deprecated_task :update_javascripts, "rails:update:javascripts"
 
 
 # db
-task :migrate                 => "db:migrate"
-task :load_fixtures           => "db:fixtures:load"
+deprecated_task :migrate,       "db:migrate"
+deprecated_task :load_fixtures, "db:fixtures:load"
 
-task :db_schema_dump          => "db:schema:dump"
-task :db_schema_import        => "db:schema:load"
+deprecated_task :db_schema_dump,   "db:schema:dump"
+deprecated_task :db_schema_import, "db:schema:load"
 
-task :db_structure_dump       => "db:structure:dump"
+deprecated_task :db_structure_dump, "db:structure:dump"
 
-task :purge_test_database     => "db:test:purge"
-task :clone_schema_to_test    => "db:test:clone"
-task :clone_structure_to_test => "db:test:clone_structure"
-task :prepare_test_database   => "db:test:prepare"
+deprecated_task :purge_test_database,     "db:test:purge"
+deprecated_task :clone_schema_to_test,    "db:test:clone"
+deprecated_task :clone_structure_to_test, "db:test:clone_structure"
+deprecated_task :prepare_test_database,   "db:test:prepare"
 
-task :create_sessions_table   => "db:sessions:create"
-task :drop_sessions_table     => "db:sessions:drop"
-task :purge_sessions_table    => "db:sessions:recreate"
+deprecated_task :create_sessions_table, "db:sessions:create"
+deprecated_task :drop_sessions_table,   "db:sessions:drop"
+deprecated_task :purge_sessions_table,  "db:sessions:recreate"

data/lib/tasks/rails.rb

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

data/lib/tasks/statistics.rake

@@ -1,13 +1,14 @@
 STATS_DIRECTORIES = [
+  %w(Controllers        app/controllers),
   %w(Helpers            app/helpers), 
-  %w(Controllers        app/controllers), 
+  %w(Models             app/models),
+  %w(Libraries          lib/),
   %w(APIs               app/apis),
   %w(Components         components),
+  %w(Integration\ tests test/integration),
   %w(Functional\ tests  test/functional),
-  %w(Models             app/models),
-  %w(Unit\ tests        test/unit),
-  %w(Libraries          lib/),
-  %w(Integration\ tests test/integration)
+  %w(Unit\ tests        test/unit)
+
 ].collect { |name, dir| [ name, "#{RAILS_ROOT}/#{dir}" ] }.select { |name, dir| File.directory?(dir) }
 
 desc "Report code statistics (KLOCs, etc) from the application"

data/lib/tasks/testing.rake

@@ -4,10 +4,25 @@ TEST_CHANGES_SINCE = Time.now - 600
 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)
+      tests = []
+      source_dir = File.dirname(path).split("/")
+      source_file = File.basename(path, '.rb')
+      
+      # Support subdirs in app/models and app/controllers
+      modified_test_path = source_dir.length > 2 ? "#{test_path}/" << source_dir[1..source_dir.length].join('/') : test_path
+
+      # For modified files in app/ run the tests for it. ex. /test/functional/account_controller.rb
+      test = "#{modified_test_path}/#{source_file}_test.rb"
+      tests.push test if File.exists?(test)
+
+      # For modified files in app, run tests in subdirs too. ex. /test/functional/account/*_test.rb
+      test = "#{modified_test_path}/#{File.basename(path, '.rb').sub("_controller","")}"
+      FileList["#{test}/*_test.rb"].each { |f| tests.push f } if File.exists?(test)
+		
+      return tests
+
     end
-  end.compact
+  end.flatten.compact
 end
 
 
@@ -36,25 +51,24 @@ task :test do
 end
 
 namespace :test do
-  desc 'Test recent changes'
   Rake::TestTask.new(:recent => "db:test:prepare") 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)
+      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
+  Rake::Task['test:recent'].comment = "Test recent changes"
   
-  desc 'Test changes since last checkin (only Subversion)'
   Rake::TestTask.new(:uncommitted => "db:test:prepare") do |t|
     def t.file_list
       changed_since_checkin = silence_stderr { `svn status` }.map { |path| path.chomp[7 .. -1] }
 
-      models      = changed_since_checkin.select { |path| path =~ /app\/models\/.*\.rb/ }
-      controllers = changed_since_checkin.select { |path| path =~ /app\/controllers\/.*\.rb/ }  
+      models      = changed_since_checkin.select { |path| path =~ /app[\\\/]models[\\\/].*\.rb/ }
+      controllers = changed_since_checkin.select { |path| path =~ /app[\\\/]controllers[\\\/].*\.rb/ }  
 
       unit_tests       = models.map { |model| "test/unit/#{File.basename(model, '.rb')}_test.rb" }
       functional_tests = controllers.map { |controller| "test/functional/#{File.basename(controller, '.rb')}_test.rb" }
@@ -65,29 +79,29 @@ namespace :test do
     t.libs << 'test'
     t.verbose = true
   end
+  Rake::Task['test:uncommitted'].comment = "Test changes since last checkin (only Subversion)"
 
-  desc "Run the unit tests in test/unit"
   Rake::TestTask.new(:units => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/unit/**/*_test.rb'
     t.verbose = true
   end
+  Rake::Task['test:units'].comment = "Run the unit tests in test/unit"
 
-  desc "Run the functional tests in test/functional"
   Rake::TestTask.new(:functionals => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/functional/**/*_test.rb'
     t.verbose = true
   end
+  Rake::Task['test:functionals'].comment = "Run the functional tests in test/functional"
 
-  desc "Run the integration tests in test/integration"
   Rake::TestTask.new(:integration => "db:test:prepare") do |t|
     t.libs << "test"
     t.pattern = 'test/integration/**/*_test.rb'
     t.verbose = true
   end
+  Rake::Task['test:integration'].comment = "Run the integration tests in test/integration"
 
-  desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
   Rake::TestTask.new(:plugins => :environment) do |t|
     t.libs << "test"
 
@@ -99,4 +113,5 @@ namespace :test do
 
     t.verbose = true
   end
+  Rake::Task['test:plugins'].comment = "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
 end