rails 1.2.6 → 2.0.0

data/lib/rails_generator/generators/components/plugin/plugin_generator.rb

@@ -17,6 +17,7 @@ class PluginGenerator < Rails::Generator::NamedBase
       m.directory "#{plugin_path}/test"
 
       m.template 'README',        "#{plugin_path}/README"
+      m.template 'MIT-LICENSE',   "#{plugin_path}/MIT-LICENSE"
       m.template 'Rakefile',      "#{plugin_path}/Rakefile"
       m.template 'init.rb',       "#{plugin_path}/init.rb"
       m.template 'install.rb',    "#{plugin_path}/install.rb"

data/lib/rails_generator/generators/components/plugin/templates/MIT-LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) <%= Date.today.year %> [name of plugin creator]
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/rails_generator/generators/components/plugin/templates/README

@@ -1,4 +1,13 @@
 <%= class_name %>
 <%= "=" * class_name.size %>
 
-Description goes here
+Introduction goes here.
+
+
+Example
+=======
+
+Example goes here.
+
+
+Copyright (c) <%= Date.today.year %> [name of plugin creator], released under the MIT license

data/lib/rails_generator/generators/components/plugin/templates/USAGE

@@ -5,4 +5,4 @@ Example:
     ./script/generate <%= file_name %> Thing
 
     This will create:
-        what/will/it/create
+        what/will/it/create

data/lib/rails_generator/generators/components/plugin/templates/init.rb

@@ -1 +1 @@
-# Include hook code here
+# Include hook code here

data/lib/rails_generator/generators/components/plugin/templates/plugin.rb

@@ -1 +1 @@
-# <%= class_name %>
+# <%= class_name %>

data/lib/rails_generator/generators/components/plugin/templates/tasks.rake

@@ -1,4 +1,4 @@
 # desc "Explaining what the task does"
 # task :<%= file_name %> do
 #   # Task goes here
-# end
+# end

data/lib/rails_generator/generators/components/resource/USAGE

@@ -0,0 +1,23 @@
+Description:
+    Stubs out a new resource including an empty model and controller suitable
+    for a restful, resource-oriented application. Pass the singular model name,
+    either CamelCased or under_scored, as the first argument, and an optional
+    list of attribute pairs.
+
+    Attribute pairs are column_name:sql_type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+    You don't have to think up every attribute up front, but it helps to
+    sketch out a few so you can start working with the resource immediately.
+
+    This creates a model, controller, tests and fixtures for both, and the
+    corresponding map.resources declaration in config/routes.rb
+
+    Unlike the scaffold generator, the resource generator does not create
+    views or add any methods to the generated controller.
+
+Examples:
+    `./script/generate resource post` # no attributes
+    `./script/generate resource post title:string body:text published:boolean`
+    `./script/generate resource purchase order_id:integer amount:decimal`

data/lib/rails_generator/generators/components/resource/resource_generator.rb

@@ -1,4 +1,6 @@
 class ResourceGenerator < Rails::Generator::NamedBase
+  default_options :skip_timestamps => false, :skip_migration => false
+
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
@@ -39,7 +41,7 @@ class ResourceGenerator < Rails::Generator::NamedBase
       m.directory(File.join('test/functional', controller_class_path))
       m.directory(File.join('test/unit', class_path))
 
-      m.template('model.rb', File.join('app/models', class_path, "#{file_name}.rb"))
+      m.dependency 'model', [name] + @args, :collision => :skip
 
       m.template(
         'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
@@ -47,19 +49,6 @@ class ResourceGenerator < Rails::Generator::NamedBase
 
       m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
       m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
-      m.template('unit_test.rb',       File.join('test/unit',       class_path, "#{file_name}_test.rb"))
-      m.template('fixtures.yml',       File.join('test/fixtures', "#{table_name}.yml"))
-
-      unless options[:skip_migration]
-        m.migration_template(
-          'migration.rb', 'db/migrate', 
-          :assigns => {
-            :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}",
-            :attributes     => attributes
-          }, 
-          :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
-        )
-      end
 
       m.route_resources controller_file_name
     end
@@ -70,7 +59,16 @@ class ResourceGenerator < Rails::Generator::NamedBase
       "Usage: #{$0} resource ModelName [field:type, field:type]"
     end
 
-    def model_name 
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--skip-timestamps",
+             "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
+      opt.on("--skip-migration",
+             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
+    end
+
+    def model_name
       class_name.demodulize
     end
 end

data/lib/rails_generator/generators/components/resource/templates/controller.rb

@@ -1,2 +1,2 @@
 class <%= controller_class_name %>Controller < ApplicationController
-end
+end

data/lib/rails_generator/generators/components/resource/templates/functional_test.rb

@@ -1,18 +1,6 @@
-require File.dirname(__FILE__) + '<%= '/..' * controller_class_nesting_depth %>/../test_helper'
-require '<%= controller_file_path %>_controller'
-
-# Re-raise errors caught by the controller.
-class <%= controller_class_name %>Controller; def rescue_action(e) raise e end; end
-
-class <%= controller_class_name %>ControllerTest < Test::Unit::TestCase
-  fixtures :<%= table_name %>
-
-  def setup
-    @controller = <%= controller_class_name %>Controller.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-  end
+require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../test_helper'
 
+class <%= controller_class_name %>ControllerTest < ActionController::TestCase
   # Replace this with your real tests.
   def test_truth
     assert true

data/lib/rails_generator/generators/components/scaffold/USAGE

@@ -1,32 +1,25 @@
 Description:
-    The scaffold generator creates a controller to interact with a model.
-    If the model does not exist, it creates the model as well.  The generated
-    code is equivalent to the "scaffold :model" declaration, making it easy
-    to migrate when you wish to customize your controller and views.
-
-    The generator takes a model name, an optional controller name, and a
-    list of views as arguments.  Scaffolded actions and views are created
-    automatically.  Any views left over generate empty stubs.
-
-    The scaffolded actions and views are:
-        index, list, show, new, create, edit, update, destroy
-
-    If a controller name is not given, the plural form of the model name
-    will be used.  The model and controller names may be given in CamelCase
-    or under_score and should not be suffixed with 'Model' or 'Controller'.
-    Both model and controller names may be prefixed with a module like a
-    file path; see the Modules Example for usage.
-
-Example:
-    ./script/generate scaffold Account Bank debit credit
-
-    This will generate an Account model and BankController with a full test
-    suite and a basic user interface.  Now create the accounts table in your
-    database and browse to http://localhost/bank/ -- voila, you're on Rails!
-
-Modules Example:
-    ./script/generate scaffold CreditCard 'admin/credit_card' suspend late_fee
-
-    This will generate a CreditCard model and CreditCardController controller
-    in the admin module.
-
+    Scaffolds an entire resource, from model and migration to controller and
+    views, along with a full test suite. The resource is ready to use as a
+    starting point for your restful, resource-oriented application.
+
+    Pass the name of the model, either CamelCased or under_scored, as the first
+    argument, and an optional list of attribute pairs.
+
+    Attribute pairs are column_name:sql_type arguments specifying the
+    model's attributes. Timestamps are added by default, so you don't have to
+    specify them by hand as 'created_at:datetime updated_at:datetime'.
+
+    You don't have to think up every attribute up front, but it helps to
+    sketch out a few so you can start working with the resource immediately.
+
+    For example, `scaffold post title:string body:text published:boolean`
+    gives you a model with those three attributes, a controller that handles
+    the create/show/update/destroy, forms to create and edit your posts, and
+    an index that lists them all, as well as a map.resources :posts
+    declaration in config/routes.rb.
+
+Examples:
+    `./script/generate scaffold post` # no attributes, view will be anemic
+    `./script/generate scaffold post title:string body:text published:boolean`
+    `./script/generate scaffold purchase order_id:integer amount:decimal`

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

@@ -1,63 +1,26 @@
-class ScaffoldingSandbox
-  include ActionView::Helpers::ActiveRecordHelper
-
-  attr_accessor :form_action, :singular_name, :suffix, :model_instance
-
-  def sandbox_binding
-    binding
-  end
-  
-  def default_input_block
-    Proc.new { |record, column| "<p><label for=\"#{record}_#{column.name}\">#{column.human_name}</label><br/>\n#{input(record, column.name)}</p>\n" }
-  end
-  
-end
-
-class ActionView::Helpers::InstanceTag
-  def to_input_field_tag(field_type, options={})
-    field_meth = "#{field_type}_field"
-    "<%= #{field_meth} '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+options.inspect} %>"
-  end
-
-  def to_text_area_tag(options = {})
-    "<%= text_area '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
-  end
-
-  def to_date_select_tag(options = {})
-    "<%= date_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
-  end
-
-  def to_datetime_select_tag(options = {})
-    "<%= datetime_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
-  end
-  
-  def to_time_select_tag(options = {})
-    "<%= time_select '#{@object_name}', '#{@method_name}' #{options.empty? ? '' : ', '+ options.inspect} %>"
-  end
-end
-
 class ScaffoldGenerator < Rails::Generator::NamedBase
+  default_options :skip_timestamps => false, :skip_migration => false
+
   attr_reader   :controller_name,
                 :controller_class_path,
                 :controller_file_path,
                 :controller_class_nesting,
                 :controller_class_nesting_depth,
                 :controller_class_name,
+                :controller_underscore_name,
                 :controller_singular_name,
                 :controller_plural_name
-  alias_method  :controller_file_name,  :controller_singular_name
+  alias_method  :controller_file_name,  :controller_underscore_name
   alias_method  :controller_table_name, :controller_plural_name
 
   def initialize(runtime_args, runtime_options = {})
     super
 
-    # Take controller name from the next argument.  Default to the pluralized model name.
-    @controller_name = args.shift
-    @controller_name ||= ActiveRecord::Base.pluralize_table_names ? @name.pluralize : @name
+    @controller_name = @name.pluralize
 
     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)
-
+    @controller_class_name_without_nesting, @controller_underscore_name, @controller_plural_name = inflect_names(base_name)
+    @controller_singular_name=base_name.singularize
     if @controller_class_nesting.empty?
       @controller_class_name = @controller_class_name_without_nesting
     else
@@ -68,126 +31,62 @@ class ScaffoldGenerator < Rails::Generator::NamedBase
   def manifest
     record do |m|
       # Check for class naming collisions.
-      m.class_collisions controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}ControllerTest", "#{controller_class_name}Helper"
+      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_path, "#{class_name}")
 
       # Controller, helper, views, and test directories.
-      m.directory File.join('app/controllers', controller_class_path)
-      m.directory File.join('app/helpers', controller_class_path)
-      m.directory File.join('app/views', controller_class_path, controller_file_name)
-      m.directory File.join('app/views/layouts', controller_class_path)
-      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, :skip_migration => true
-
-      # 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 }
+      m.directory(File.join('app/models', class_path))
+      m.directory(File.join('app/controllers', controller_class_path))
+      m.directory(File.join('app/helpers', controller_class_path))
+      m.directory(File.join('app/views', controller_class_path, controller_file_name))
+      m.directory(File.join('app/views/layouts', controller_class_path))
+      m.directory(File.join('test/functional', controller_class_path))
+      m.directory(File.join('test/unit', class_path))
+
+      for action in scaffold_views
+        m.template(
+          "view_#{action}.html.erb",
+          File.join('app/views', controller_class_path, controller_file_name, "#{action}.html.erb")
+        )
       end
 
-      # Controller class, functional test, helper, and views.
-      m.template 'controller.rb',
-                  File.join('app/controllers',
-                            controller_class_path,
-                            "#{controller_file_name}_controller.rb")
+      # Layout and stylesheet.
+      m.template('layout.html.erb', File.join('app/views/layouts', controller_class_path, "#{controller_file_name}.html.erb"))
+      m.template('style.css', 'public/stylesheets/scaffold.css')
 
-      m.template 'functional_test.rb',
-                  File.join('test/functional',
-                            controller_class_path,
-                            "#{controller_file_name}_controller_test.rb")
+      m.dependency 'model', [name] + @args, :collision => :skip
 
-      m.template 'helper.rb',
-                  File.join('app/helpers',
-                            controller_class_path,
-                            "#{controller_file_name}_helper.rb")
+      m.template(
+        'controller.rb', File.join('app/controllers', controller_class_path, "#{controller_file_name}_controller.rb")
+      )
 
-      # Layout and stylesheet.
-      m.template 'layout.rhtml',
-                  File.join('app/views/layouts',
-                            controller_class_path,
-                            "#{controller_file_name}.rhtml")
-
-      m.template 'style.css',     'public/stylesheets/scaffold.css'
-
-
-      # Unscaffolded views.
-      unscaffolded_actions.each do |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
+      m.template('functional_test.rb', File.join('test/functional', controller_class_path, "#{controller_file_name}_controller_test.rb"))
+      m.template('helper.rb',          File.join('app/helpers',     controller_class_path, "#{controller_file_name}_helper.rb"))
+
+      m.route_resources controller_file_name
     end
   end
 
   protected
     # Override with your own usage banner.
     def banner
-      "Usage: #{$0} scaffold ModelName [ControllerName] [action, ...]"
+      "Usage: #{$0} scaffold ModelName [field:type, field:type]"
     end
 
-    def scaffold_views
-      %w(list show new edit)
-    end
-
-    def scaffold_actions
-      scaffold_views + %w(index create update destroy)
-    end
-    
-    def model_name 
-      class_name.demodulize
+    def add_options!(opt)
+      opt.separator ''
+      opt.separator 'Options:'
+      opt.on("--skip-timestamps",
+             "Don't add timestamps to the migration file for this model") { |v| options[:skip_timestamps] = v }
+      opt.on("--skip-migration",
+             "Don't generate a migration file for this model") { |v| options[:skip_migration] = v }
     end
 
-    def unscaffolded_actions
-      args - scaffold_actions
-    end
-
-    def suffix
-      "_#{singular_name}" if options[:suffix]
+    def scaffold_views
+      %w[ index show new edit ]
     end
 
-    def create_sandbox
-      sandbox = ScaffoldingSandbox.new
-      sandbox.singular_name = singular_name
-      begin
-        sandbox.model_instance = model_instance
-        sandbox.instance_variable_set("@#{singular_name}", sandbox.model_instance)
-      rescue ActiveRecord::StatementInvalid => e
-        logger.error "Before updating scaffolding from new DB schema, try creating a table for your model (#{class_name}) named #{class_name.tableize}."
-        raise SystemExit
-      end
-      sandbox.suffix = suffix
-      sandbox
-    end
-    
-    def model_instance
-      base = class_nesting.split('::').inject(Object) do |base, nested|
-        break base.const_get(nested) if base.const_defined?(nested)
-        base.const_set(nested, Module.new)
-      end
-      unless base.const_defined?(@class_name_without_nesting)
-        base.const_set(@class_name_without_nesting, Class.new(ActiveRecord::Base))
-      end
-      class_name.constantize.new
+    def model_name
+      class_name.demodulize
     end
 end