@@ -1,3 +1,25 @@ +class GeneratedAttribute < Rails::Generator::GeneratedAttribute + def column_name + reference? ? "#{name}_id" : name + end + + def field_type + @field_type ||= case type + when :references, :belong_to then :collection_select + else + super + end + end + + def field_parameters + if reference? + ":#{column_name}, #{name.camelize}.all, :id, :to_s" + else + ":#{column_name}" + end + end +end + class NiftyScaffoldGenerator < Rails::Generator::Base attr_accessor :name, :attributes, :controller_actions @@ -13,7 +35,7 @@ class NiftyScaffoldGenerator < Rails::Generator::Base if arg == '!' options[:invert] = true elsif arg.include? ':' - @attributes << Rails::Generator::GeneratedAttribute.new(*arg.split(":")) + @attributes << GeneratedAttribute.new(*arg.split(":")) else @controller_actions << arg @controller_actions << 'create' if arg == 'new' @@ -81,6 +103,16 @@ class NiftyScaffoldGenerator < Rails::Generator::Base end m.route_resources plural_name + references.each do |ref| + look_for = "map.resources :#{ref.name.pluralize}" + m.gsub_file "config/routes.rb", + /#{look_for}(?:, :has_many => \[\s*(.*)\])?$/, + "#{look_for}, :has_many => [ :#{plural_name}, \\1]" + + m.gsub_file "app/models/#{ref.name}.rb", + /#:Relationships$/, + "\\&\n has_many :#{plural_name}" + end if rspec? m.directory "spec/controllers" @@ -124,6 +156,10 @@ class NiftyScaffoldGenerator < Rails::Generator::Base def plural_class_name plural_name.camelize end + + def references + @references ||= attributes.select { |a| a.reference? } + end def controller_methods(dir_name) controller_actions.map do |action| rails_generators/nifty_scaffold/nifty_scaffold_generator.rb @@ -1,5 +1,5 @@ def index - @<%= plural_name %> = <%= class_name %>.scoped({}) + @<%= plural_name %> = filter_model(<%= references.map {|r| ":#{r.column_name}" }.join ', ' %>) respond_to do |format| format.html # index.html.erb rails_generators/nifty_scaffold/templates/actions/index.rb @@ -1,5 +1,5 @@ def new - @<%= singular_name %> = <%= class_name %>.new + @<%= singular_name %> = <%= class_name %>.new(<%= references.map {|r| ":#{r.column_name} => params[:#{r.column_name}]" }.join ', ' %>) respond_to do |format| format.html # new.html.erb rails_generators/nifty_scaffold/templates/actions/new.rb @@ -1,3 +1,14 @@ class <%= plural_class_name %>Controller < ApplicationController <%= controller_methods :actions %> + +private + def filter_model *keys + result_set = <%= class_name %>.scoped({}) + keys.each do |key| + if (value = params[key]).present? + result_set = result_set.scoped( :conditions => { key => params[key] } ) + end + end + result_set + end end rails_generators/nifty_scaffold/templates/controller.rb @@ -1,3 +1,12 @@ class <%= class_name %> < ActiveRecord::Base - attr_accessible <%= attributes.map { |a| ":#{a.name}" }.join(", ") %> + attr_accessible <%= attributes.map { |a| ":#{a.column_name}" }.join(", ") %> + + #:Relationships + <%- references.each do |a|-%> + belongs_to :<%= a.name %> + <%- end -%> + + def to_s + "<%= class_name %> ##{id}" + end end rails_generators/nifty_scaffold/templates/model.rb @@ -3,7 +3,7 @@ <%- for attribute in attributes -%> <p> <%%= f.label :<%= attribute.name %> %><br /> - <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> + <%%= f.<%= attribute.field_type %> <%= attribute.field_parameters %> %> </p> <%- end -%> <p><%%= f.submit "Submit" %></p> rails_generators/nifty_scaffold/templates/views/erb/_form.html.erb @@ -9,7 +9,11 @@ <%% for <%= singular_name %> in @<%= plural_name %> %> <tr> <%- for attribute in attributes -%> + <%- if attribute.reference? -%> + <td><%%=link_to <%= singular_name %>.<%= attribute.name %>, <%= singular_name %>.<%= attribute.name %> %></td> + <%- else -%> <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td> + <%- end -%> <%- end -%> <%- if action? :show -%> <td><%%= link_to "Show", <%= singular_name %> %></td> rails_generators/nifty_scaffold/templates/views/erb/index.html.erb @@ -3,7 +3,11 @@ <%- for attribute in attributes -%> <p> <strong><%= attribute.column.human_name.titleize %>:</strong> + <%- if attribute.reference? -%> + <%%=link_to @<%= singular_name %>.<%= attribute.name %>, @<%= singular_name %>.<%= attribute.name %> %> + <%- else -%> <%%=h @<%= singular_name %>.<%= attribute.name %> %> + <%- end -%> </p> <%- end -%> rails_generators/nifty_scaffold/templates/views/erb/show.html.erb 3fbe581b39f75f90a484205407152e347aceebb8 Jesus Lopez jesus@jesusla.com http://github.com/jlopez/nifty-generators/commit/fa7a3575d5cb0fa5b294da6371b8fd9685f53b7f fa7a3575d5cb0fa5b294da6371b8fd9685f53b7f 2009-10-28T13:34:53-07:00 2009-10-28T11:14:58-07:00 Improve support of :references attribute type Will add belongs_to to generated model Will add has_many to referenced model Will add needed filters to generated controller (so parent/<id>/child works) Will display links to parent model in views Will use select_fields to edit parent affiliation 04df0416f4382592e9f71d75ca1cb5a3f6074126 Jesus Lopez jesus@jesusla.com