rails 0.13.1 → 0.14.1

data/lib/rails_generator/base.rb

@@ -144,10 +144,9 @@ module Rails
     #
     # See Rails::Generator::Base for a discussion of Manifests and Commands.
     class NamedBase < Base
-      attr_reader   :name, :class_name, :singular_name, :plural_name
+      attr_reader   :name, :class_name, :singular_name, :plural_name, :table_name
       attr_reader   :class_path, :file_path, :class_nesting, :class_nesting_depth
       alias_method  :file_name,  :singular_name
-      alias_method  :table_name, :plural_name
       alias_method  :actions, :args
 
       def initialize(runtime_args, runtime_options = {})
@@ -172,6 +171,7 @@ module Rails
           @name = name
           base_name, @class_path, @file_path, @class_nesting, @class_nesting_depth = extract_modules(@name)
           @class_name_without_nesting, @singular_name, @plural_name = inflect_names(base_name)
+          @table_name = ActiveRecord::Base.pluralize_table_names ? plural_name : singular_name
           if @class_nesting.empty?
             @class_name = @class_name_without_nesting
           else

data/lib/rails_generator/commands.rb

@@ -144,13 +144,19 @@ module Rails
         # Collisions are handled by checking whether the destination file
         # exists and either skipping the file, forcing overwrite, or asking
         # the user what to do.
-        def file(relative_source, relative_destination, file_options = {})
+        def file(relative_source, relative_destination, file_options = {}, &block)
           # Determine full paths for source and destination files.
-          source      = source_path(relative_source)
-          destination = destination_path(relative_destination)
+          source              = source_path(relative_source)
+          destination         = destination_path(relative_destination)
+          destination_exists  = File.exists?(destination)
+
+          # If source and destination are identical then we're done.
+          if destination_exists and identical?(source, destination, &block)
+            return logger.identical(relative_destination) 
+          end
 
           # Check for and resolve file collisions.
-          if File.exists?(destination)
+          if destination_exists
 
             # Make a choice whether to overwrite the file.  :force and
             # :skip already have their mind made up, but give :ask a shot.
@@ -202,6 +208,19 @@ module Rails
           if file_options[:chmod]
             FileUtils.chmod(file_options[:chmod], destination)
           end
+          
+          # Optionally add file to subversion
+          system("svn add #{destination}") if options[:svn]
+        end
+
+        # Checks if the source and the destination file are identical. If
+        # passed a block then the source file is a template that needs to first
+        # be evaluated before being compared to the destination.
+        def identical?(source, destination, &block)
+          return false if File.directory? destination
+          source      = block_given? ? File.open(source) {|sf| yield(sf)} : IO.read(source)
+          destination = IO.read(destination)
+          source == destination
         end
 
         # Generate a file for a Rails application using an ERuby template.
@@ -246,6 +265,9 @@ module Rails
           else
             logger.create relative_path
             FileUtils.mkdir_p(path) unless options[:pretend]
+            
+            # Optionally add file to subversion
+            system("svn add #{path}") if options[:svn]
           end
         end
 
@@ -294,11 +316,26 @@ end_message
       # manifest and attempt to completely erase the results of each action.
       class Destroy < RewindBase
         # Remove a file if it exists and is a file.
-        def file(relative_source, relative_destination, options = {})
+        def file(relative_source, relative_destination, file_options = {})
           destination = destination_path(relative_destination)
           if File.exists?(destination)
             logger.rm relative_destination
-            FileUtils.rm(destination) unless options[:pretend]
+            unless options[:pretend]
+              if options[:svn]
+                # If the file has been marked to be added
+                # but has not yet been checked in, revert and delete
+                if options[:svn][relative_destination]
+                  system("svn revert #{destination}")
+                  FileUtils.rm(destination)
+                else
+                # If the directory is not in the status list, it
+                # has no modifications so we can simply remove it
+                  system("svn rm #{destination}")
+                end  
+              else
+                FileUtils.rm(destination)
+              end
+            end
           else
             logger.missing relative_destination
             return
@@ -319,7 +356,22 @@ end_message
             if File.exists?(path)
               if Dir[File.join(path, '*')].empty?
                 logger.rmdir partial
-                FileUtils.rmdir(path) unless options[:pretend]
+                unless options[:pretend]
+                  if options[:svn]
+                    # If the directory has been marked to be added
+                    # but has not yet been checked in, revert and delete
+                    if options[:svn][relative_path]
+                      system("svn revert #{path}")
+                      FileUtils.rmdir(path)
+                    else
+                    # If the directory is not in the status list, it
+                    # has no modifications so we can simply remove it
+                      system("svn rm #{path}")
+                    end
+                  else
+                    FileUtils.rmdir(path)
+                  end
+                end
               else
                 logger.notempty partial
               end

data/lib/rails_generator/generators/applications/app/app_generator.rb

@@ -3,7 +3,7 @@ require 'rbconfig'
 class AppGenerator < Rails::Generator::Base
   DEFAULT_SHEBANG = File.join(Config::CONFIG['bindir'],
                               Config::CONFIG['ruby_install_name'])
-
+  
   default_options   :gem => true, :shebang => DEFAULT_SHEBANG
   mandatory_options :source  => "#{File.dirname(__FILE__)}/../../../../.."
 
@@ -11,6 +11,8 @@ class AppGenerator < Rails::Generator::Base
     super
     usage if args.empty?
     @destination_root = args.shift
+    @socket = MYSQL_SOCKET_LOCATIONS.find {|f| File.exists?(f) }
+    @socket = '/path/to/your/mysql.sock' if @socket.blank?
   end
 
   def manifest
@@ -32,31 +34,29 @@ class AppGenerator < Rails::Generator::Base
       m.template "helpers/test_helper.rb",        "test/test_helper.rb"
 
       # database.yml and .htaccess
-      m.template "configs/database.yml", "config/database.yml"
+      m.template "configs/database.yml", "config/database.yml", :assigns => {
+        :app_name => File.basename(File.expand_path(@destination_root)),
+        :socket => @socket
+      }
       m.template "configs/routes.rb",    "config/routes.rb"
       m.template "configs/apache.conf",  "public/.htaccess"
 
       # Environments
+      m.file "environments/boot.rb",        "config/boot.rb"
       m.file "environments/environment.rb", "config/environment.rb"
       m.file "environments/production.rb",  "config/environments/production.rb"
       m.file "environments/development.rb", "config/environments/development.rb"
       m.file "environments/test.rb",        "config/environments/test.rb"
 
-      # Scripts (tracker listener)
-      %w(console destroy generate server runner benchmarker profiler ).each do |file|
+      # Scripts
+      %w( breakpointer console destroy generate performance/benchmarker performance/profiler process/reaper process/spawner process/spinner runner server ).each do |file|
         m.file "bin/#{file}", "script/#{file}", script_options
       end
-      if options[:gem]
-        m.file "bin/breakpointer_for_gem", "script/breakpointer", script_options
-      else
-        m.file "bin/breakpointer", "script/breakpointer", script_options
-      end
 
       # Dispatches
       m.file "dispatches/dispatch.rb",   "public/dispatch.rb", script_options
       m.file "dispatches/dispatch.rb",   "public/dispatch.cgi", script_options
       m.file "dispatches/dispatch.fcgi", "public/dispatch.fcgi", script_options
-      # m.file "dispatches/gateway.cgi",   "public/gateway.cgi", script_options
 
       # HTML files
       %w(404 500 index).each do |file|
@@ -64,12 +64,15 @@ class AppGenerator < Rails::Generator::Base
       end
       
       m.template "html/favicon.ico", "public/favicon.ico"
+      m.template "html/robots.txt", "public/robots.txt"
 
       # Javascripts
-      m.file "html/javascripts/prototype.js", "public/javascripts/prototype.js"
-      m.file "html/javascripts/effects.js",   "public/javascripts/effects.js"
-      m.file "html/javascripts/dragdrop.js",  "public/javascripts/dragdrop.js"
-      m.file "html/javascripts/controls.js",  "public/javascripts/controls.js"
+      m.file "html/javascripts/prototype.js",     "public/javascripts/prototype.js"
+      m.file "html/javascripts/scriptaculous.js", "public/javascripts/scriptaculous.js"
+      m.file "html/javascripts/effects.js",       "public/javascripts/effects.js"
+      m.file "html/javascripts/dragdrop.js",      "public/javascripts/dragdrop.js"
+      m.file "html/javascripts/controls.js",      "public/javascripts/controls.js"
+      m.file "html/javascripts/slider.js",        "public/javascripts/slider.js"
 
       # Docs
       m.file "doc/README_FOR_APP", "doc/README_FOR_APP"
@@ -110,16 +113,24 @@ class AppGenerator < Rails::Generator::Base
     db
     doc
     lib
+    lib/tasks
     log
     public/images
     public/javascripts
     public/stylesheets
-    script
+    script/performance
+    script/process
     test/fixtures
     test/functional
     test/mocks/development
     test/mocks/test
     test/unit
     vendor
+    vendor/plugins
   )
+
+  MYSQL_SOCKET_LOCATIONS = [ "/tmp/mysql.sock", #default
+                             "/var/run/mysqld/mysqld.sock", #debian
+                             "/var/tmp/mysql.sock", # freebsd
+                             "/var/lib/mysql/mysql.sock" ]  #fedora
 end

data/lib/rails_generator/generators/components/controller/controller_generator.rb

@@ -28,9 +28,10 @@ class ControllerGenerator < Rails::Generator::NamedBase
 
       # View template for each action.
       actions.each do |action|
+        path = File.join('app/views', class_path, file_name, "#{action}.rhtml")
         m.template 'view.rhtml',
-          File.join('app/views', class_path, file_name, "#{action}.rhtml"),
-          :assigns => { :action => action }
+          path,
+          :assigns => { :action => action, :path => path }
       end
     end
   end

data/lib/rails_generator/generators/components/controller/templates/view.rhtml

@@ -1,2 +1,2 @@
 <h1><%= class_name %>#<%= action %></h1>
-<p>Find me in app/views/<%= file_name %>/<%= action %>.rhtml</p>
+<p>Find me in <%= path %></p>

data/lib/rails_generator/generators/components/mailer/USAGE

@@ -2,8 +2,7 @@ Description:
     The mailer generator creates stubs for a new mailer and its views.
 
     The generator takes a mailer name and a list of views as arguments.
-    The mailer name may be given in CamelCase or under_score and should
-    not be suffixed with 'Mailer'.
+    The mailer name may be given in CamelCase or under_score.
 
     The generator creates a mailer class in app/models with view templates
     in app/views/mailer_name, and a test suite with fixtures in test/unit.
@@ -11,7 +10,7 @@ Description:
 Example:
     ./script/generate mailer Notifications signup forgot_password invoice
 
-    This will create a NotificationsMailer:
+    This will create a Notifications mailer class:
         Mailer:     app/models/notifications.rb
         Views:      app/views/notifications/signup.rhtml [...]
         Test:       test/unit/credit_card_controller_test.rb

data/lib/rails_generator/generators/components/mailer/templates/unit_test.rb

@@ -18,7 +18,7 @@ class <%= class_name %>Test < Test::Unit::TestCase
 
 <% for action in actions -%>
   def test_<%= action %>
-    @expected.subject = encode '<%= class_name %>#<%= action %>'
+    @expected.subject = '<%= class_name %>#<%= action %>'
     @expected.body    = read_fixture('<%= action %>')
     @expected.date    = Time.now
 

data/lib/rails_generator/generators/components/migration/migration_generator.rb

@@ -2,7 +2,9 @@ class MigrationGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       m.directory File.join('db/migrate')
-      next_migration_number = Dir.glob("db/migrate/[0-9]*.*").size + 1
+      existing_migrations = Dir.glob("db/migrate/[0-9]*_#{file_name}.rb")
+      raise "Another migration already exists with the same name" unless existing_migrations.empty?
+      next_migration_number = Dir.glob("db/migrate/[0-9]*.rb").size + 1
       m.template 'migration.rb', File.join('db/migrate', "#{next_migration_number}_#{file_name}.rb")
     end
   end

data/lib/rails_generator/generators/components/scaffold/scaffold_generator.rb

@@ -46,7 +46,7 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
   def initialize(runtime_args, runtime_options = {})
     super
-    @controller_name = args.shift || @name.pluralize
+    @controller_name = args.shift || ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
     base_name, @controller_class_path, @controller_file_path, @controller_class_nesting, @controller_class_nesting_depth = extract_modules(@controller_name)
     @controller_class_name_without_nesting, @controller_singular_name, @controller_plural_name = inflect_names(base_name)
     if @controller_class_nesting.empty?
@@ -58,9 +58,6 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
 
   def manifest
     record do |m|
-      # Depend on model generator but skip if the model exists.
-      m.dependency 'model', [singular_name], :collision => :skip
-
       # Check for class naming collisions.
       m.class_collisions controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper"
 
@@ -70,6 +67,31 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.directory File.join('app/views', controller_class_path, controller_file_name)
       m.directory File.join('test/functional', controller_class_path)
 
+      # Depend on model generator but skip if the model exists.
+      m.dependency 'model', [singular_name], :collision => :skip
+
+      # Scaffolded forms.
+      m.complex_template "form.rhtml",
+        File.join('app/views',
+                  controller_class_path,
+                  controller_file_name,
+                  "_form.rhtml"),
+        :insert => 'form_scaffolding.rhtml',
+        :sandbox => lambda { create_sandbox },
+        :begin_mark => 'form',
+        :end_mark => 'eoform',
+        :mark_id => singular_name
+
+
+      # Scaffolded views.
+      scaffold_views.each do |action|
+        m.template "view_#{action}.rhtml",
+                   File.join('app/views',
+                             controller_class_path,
+                             controller_file_name,
+                             "#{action}.rhtml"),
+                   :assigns => { :action => action }
+      end
 
       # Controller class, functional test, helper, and views.
       m.template 'controller.rb',
@@ -91,36 +113,15 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
       m.template 'layout.rhtml',  "app/views/layouts/#{controller_file_name}.rhtml"
       m.template 'style.css',     'public/stylesheets/scaffold.css'
 
-      # Scaffolded views.
-      scaffold_views.each do |action|
-        m.template "view_#{action}.rhtml",
-                   File.join('app/views',
-                             controller_class_path,
-                             controller_file_name,
-                             "#{action}.rhtml"),
-                   :assigns => { :action => action }
-      end
-
-      # Scaffolded forms.
-      m.complex_template "form.rhtml",
-        File.join('app/views',
-                  controller_class_path,
-                  controller_file_name,
-                  "_form.rhtml"),
-        :insert => 'form_scaffolding.rhtml',
-        :sandbox => lambda { create_sandbox },
-        :begin_mark => 'form',
-        :end_mark => 'eoform',
-        :mark_id => singular_name
 
       # Unscaffolded views.
       unscaffolded_actions.each do |action|
-        m.template "controller:view.rhtml",
-                   File.join('app/views',
-                             controller_class_path,
-                             controller_file_name,
-                             "#{action}.rhtml"),
-                   :assigns => { :action => action }
+        path = File.join('app/views',
+                          controller_class_path,
+                          controller_file_name,
+                          "#{action}.rhtml")
+        m.template "controller:view.rhtml", path,
+                   :assigns => { :action => action, :path => path}
       end
     end
   end

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

@@ -1,7 +1,7 @@
 <h1>Editing <%= singular_name %></h1>
 
 <%%= start_form_tag :action => 'update<%= @suffix %>', :id => @<%= singular_name %> %>
-  <%%= render_partial 'form' %>
+  <%%= render :partial => 'form' %>
   <%%= submit_tag 'Edit' %>
 <%%= end_form_tag %>
 

data/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml

@@ -14,7 +14,7 @@
   <%% end %>
     <td><%%= link_to 'Show', :action => 'show<%= suffix %>', :id => <%= singular_name %> %></td>
     <td><%%= link_to 'Edit', :action => 'edit<%= suffix %>', :id => <%= singular_name %> %></td>
-    <td><%%= link_to 'Destroy', {:action => 'destroy<%= suffix %>', :id => <%= singular_name %>}, :confirm => 'Are you sure?' %></td>
+    <td><%%= link_to 'Destroy', { :action => 'destroy<%= suffix %>', :id => <%= singular_name %> }, :confirm => 'Are you sure?' %></td>
   </tr>
 <%% end %>
 </table>

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

@@ -1,7 +1,7 @@
 <h1>New <%= singular_name %></h1>
 
 <%%= start_form_tag :action => 'create<%= @suffix %>' %>
-  <%%= render_partial 'form' %>
+  <%%= render :partial => 'form' %>
   <%%= submit_tag "Create" %>
 <%%= end_form_tag %>
 

data/lib/rails_generator/lookup.rb

@@ -4,7 +4,7 @@ class Object
   class << self
     # Lookup missing generators using const_missing.  This allows any
     # generator to reference another without having to know its location:
-    # RubyGems, ~/.rails/generators, and RAILS_ROOT/script/generators.
+    # RubyGems, ~/.rails/generators, and RAILS_ROOT/generators.
     def lookup_missing_generator(class_id)
       if md = /(.+)Generator$/.match(class_id.to_s)
         name = md.captures.first.demodulize.underscore
@@ -92,13 +92,13 @@ module Rails
         # Use component generators (model, controller, etc).
         # 1.  Rails application.  If RAILS_ROOT is defined we know we're
         #     generating in the context of a Rails application, so search
-        #     RAILS_ROOT/script/generators.
+        #     RAILS_ROOT/generators.
         # 2.  User home directory.  Search ~/.rails/generators.
         # 3.  RubyGems.  Search for gems named *_generator.
         # 4.  Builtins.  Model, controller, mailer, scaffold.
         def use_component_sources!
           reset_sources
-          sources << PathSource.new(:app, "#{::RAILS_ROOT}/script/generators") if defined? ::RAILS_ROOT
+          sources << PathSource.new(:app, "#{::RAILS_ROOT}/lib/generators") if defined? ::RAILS_ROOT
           sources << PathSource.new(:user, "#{Dir.user_home}/.rails/generators")
           sources << GemSource.new if Object.const_defined?(:Gem)
           sources << PathSource.new(:builtin, "#{File.dirname(__FILE__)}/generators/components")

data/lib/rails_generator/options.rb

@@ -127,6 +127,7 @@ module Rails
           opt.on('-q', '--quiet', 'Suppress normal output.') { |options[:quiet]| }
           opt.on('-t', '--backtrace', 'Debugging: show backtrace on errors.') { |options[:backtrace]| }
           opt.on('-h', '--help', 'Show this help message.') { |options[:help]| }
+          opt.on('-c', '--svn', 'Modify files with subversion. (Note: svn must be in path)') { options[:svn] = Hash[*`svn status`.collect { |e| e.chop.split.reverse unless e.chop.split.size != 2 }.flatten] }
         end
 
     end

data/lib/rails_generator/scripts.rb

@@ -59,7 +59,7 @@ end_blurb
 
             if Object.const_defined?(:RAILS_ROOT)
               usage << <<end_blurb
-     or to #{File.expand_path(RAILS_ROOT)}/script/generators/login
+     or to #{File.expand_path(RAILS_ROOT)}/generators/login
      to use with this app only.
 end_blurb
             end