@@ -1,2 +1,3 @@ doc/** pkg/** +nbproject/** .gitignore @@ -1,3 +1,6 @@ +== 0.4.0 2008-05-25 + *Fixed: Support for namespacing in Rails. + == 0.3.2 2008-04-27 * Merb: Added route to config/router.rb when generating resource History.txt @@ -25,7 +25,6 @@ rails_generators/stage/templates/controller.rb rails_generators/stage/templates/data_partial.html.erb rails_generators/stage/templates/form_partial.html.erb rails_generators/stage/templates/helper.rb -rails_generators/stage/templates/layout.html.erb rails_generators/stage/templates/migration.rb rails_generators/stage/templates/model.rb rails_generators/stage/templates/view_edit.html.erb Manifest.txt @@ -1,8 +1,8 @@ module Stage #:nodoc: module VERSION #:nodoc: MAJOR = 0 - MINOR = 3 - TINY = 2 + MINOR = 4 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end lib/stage/version.rb @@ -1,36 +1,33 @@ class StageGenerator < Rails::Generator::NamedBase default_options :skip_timestamps => false, :skip_migration => false, :skip_fixture => true - 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, - :singular_title_name, - :plural_title_name + attr_reader :controller_class_path, + :controller_class_name, + :controller_underscore_name, + :controller_plural_name, + :singular_title_name, + :plural_title_name, + :singular_route_method, + :plural_route_method + alias_method :controller_file_name, :controller_underscore_name alias_method :controller_table_name, :controller_plural_name def initialize(runtime_args, runtime_options = {}) super - - @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_underscore_name, @controller_plural_name = inflect_names(base_name) - @controller_singular_name= base_name.singularize - if @controller_class_nesting.empty? + base_name, @controller_class_path, controller_file_path, controller_class_nesting, controller_class_nesting_depth = extract_modules(@name.pluralize) + @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 - @controller_class_name = "#{@controller_class_nesting}::#{@controller_class_name_without_nesting}" + @controller_class_name = "#{controller_class_nesting}::#{@controller_class_name_without_nesting}" end - @singular_title_name = @controller_singular_name.humanize - @plural_title_name = @controller_plural_name.humanize + @singular_title_name = controller_singular_name.humanize + @plural_title_name = controller_plural_name.humanize + @singular_route_method = "#{@name.gsub("::", "_")}_path" + @plural_route_method = "#{@name.gsub("::", "_").pluralize}_path" end def manifest @@ -44,7 +41,6 @@ class StageGenerator < Rails::Generator::NamedBase 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)) for action in stage_views m.template( rails_generators/stage/stage_generator.rb @@ -2,54 +2,54 @@ class <%= controller_class_name %>Controller < ApplicationController # GET /<%= table_name %> # GET /<%= table_name %>.xml def index - @<%= table_name %> = <%= class_name %>.find(:all) + @<%= plural_name %> = <%= singular_title_name %>.find(:all) respond_to do |format| format.html # index.html.erb - format.xml { render :xml => @<%= table_name %> } + format.xml { render :xml => @<%= plural_name %> } end end # GET /<%= table_name %>/1 # GET /<%= table_name %>/1.xml def show - @<%= file_name %> = <%= class_name %>.find(params[:id]) + @<%= singular_name %> = <%= singular_title_name %>.find(params[:id]) respond_to do |format| format.html # show.html.erb - format.xml { render :xml => @<%= file_name %> } + format.xml { render :xml => @<%= singular_name %> } end end # GET /<%= table_name %>/new # GET /<%= table_name %>/new.xml def new - @<%= file_name %> = <%= class_name %>.new + @<%= singular_name %> = <%= singular_title_name %>.new respond_to do |format| format.html # new.html.erb - format.xml { render :xml => @<%= file_name %> } + format.xml { render :xml => @<%= singular_name %> } end end # GET /<%= table_name %>/1/edit def edit - @<%= file_name %> = <%= class_name %>.find(params[:id]) + @<%= singular_name %> = <%= singular_title_name %>.find(params[:id]) end # POST /<%= table_name %> # POST /<%= table_name %>.xml def create - @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>]) + @<%= singular_name %> = <%= singular_title_name %>.new(params[:<%= singular_name %>]) respond_to do |format| - if @<%= file_name %>.save - flash[:notice] = '<%= class_name %> was successfully created.' - format.html { redirect_to(@<%= file_name %>) } - format.xml { render :xml => @<%= file_name %>, :status => :created, :location => @<%= file_name %> } + if @<%= singular_name %>.save + flash[:notice] = '<%= singular_title_name %> was successfully created.' + format.html { redirect_to(@<%= singular_name %>) } + format.xml { render :xml => @<%= singular_name %>, :status => :created, :location => @<%= singular_name %> } else format.html { render :action => "new" } - format.xml { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity } + format.xml { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity } end end end @@ -57,16 +57,16 @@ class <%= controller_class_name %>Controller < ApplicationController # PUT /<%= table_name %>/1 # PUT /<%= table_name %>/1.xml def update - @<%= file_name %> = <%= class_name %>.find(params[:id]) + @<%= singular_name %> = <%= singular_title_name %>.find(params[:id]) respond_to do |format| - if @<%= file_name %>.update_attributes(params[:<%= file_name %>]) - flash[:notice] = '<%= class_name %> was successfully updated.' - format.html { redirect_to(@<%= file_name %>) } + if @<%= singular_name %>.update_attributes(params[:<%= singular_name %>]) + flash[:notice] = '<%= singular_title_name %> was successfully updated.' + format.html { redirect_to(@<%= singular_name %>) } format.xml { head :ok } else format.html { render :action => "edit" } - format.xml { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity } + format.xml { render :xml => @<%= singular_name %>.errors, :status => :unprocessable_entity } end end end @@ -74,8 +74,8 @@ class <%= controller_class_name %>Controller < ApplicationController # DELETE /<%= table_name %>/1 # DELETE /<%= table_name %>/1.xml def destroy - @<%= file_name %> = <%= class_name %>.find(params[:id]) - @<%= file_name %>.destroy + @<%= singular_name %> = <%= singular_title_name %>.find(params[:id]) + @<%= singular_name %>.destroy respond_to do |format| format.html { redirect_to(<%= table_name %>_url) } rails_generators/stage/templates/controller.rb @@ -1,12 +1,12 @@ class <%= migration_name %> < ActiveRecord::Migration def self.up create_table :<%= table_name %> do |t| - <% for attribute in attributes -%> +<% for attribute in attributes -%> t.<%= attribute.type %> :<%= attribute.name %> - <% end -%> - <% unless options[:skip_timestamps] %> +<% end -%> +<% unless options[:skip_timestamps] %> t.timestamps - <% end -%> +<% end -%> end end rails_generators/stage/templates/migration.rb @@ -2,5 +2,5 @@ <%%= render :partial => "form" %> -<%%= link_to 'Show', @<%= singular_name %> %> | -<%%= link_to 'Back', <%= plural_name %>_path %> +<%%= link_to 'Show', <%= "#{singular_route_method}(@#{singular_name})" %> %> | +<%%= link_to 'Back', <%= plural_route_method %> %> rails_generators/stage/templates/view_edit.html.erb @@ -12,13 +12,13 @@ <% for attribute in attributes -%> <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td> <% end -%> - <td><%%= link_to 'Show', <%= singular_name %> %></td> - <td><%%= link_to 'Edit', edit_<%= singular_name %>_path(<%= singular_name %>) %></td> - <td><%%= link_to 'Destroy', <%= singular_name %>, :confirm => 'Are you sure?', :method => :delete %></td> + <td><%%= link_to 'Show', <%= "#{singular_route_method}(#{singular_name})" %> %></td> + <td><%%= link_to 'Edit', <%= "edit_#{singular_route_method}(#{singular_name})" %> %></td> + <td><%%= link_to 'Destroy', <%= "#{singular_route_method}(#{singular_name})" %>, :confirm => 'Are you sure?', :method => :delete %></td> </tr> <%% end %> </table> <br /> -<%%= link_to 'New <%= singular_title_name %>', new_<%= singular_name %>_path %> +<%%= link_to 'New <%= singular_title_name %>', new_<%= singular_route_method %> %> rails_generators/stage/templates/view_index.html.erb @@ -2,4 +2,4 @@ <%%= render :partial => "form" %> -<%%= link_to 'Back', <%= plural_name %>_path %> +<%%= link_to 'Back', <%= plural_route_method %> %> rails_generators/stage/templates/view_new.html.erb @@ -1,4 +1,4 @@ <%%= render :partial => "data" %> -<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> | -<%%= link_to 'Back', <%= plural_name %>_path %> +<%%= link_to 'Edit', <%= "edit_#{singular_route_method}(@#{singular_name})" %> %> | +<%%= link_to 'Back', <%= plural_route_method %> %> rails_generators/stage/templates/view_show.html.erb rails_generators/stage/templates/layout.html.erb 42751b1d27647c513d82e8dc9c3b69c8b8d48b85 Andrew Stone andy@stonean.com http://github.com/stonean/stage/commit/9de365bb82bdb18aae2d59b70873d07b35647cc9 9de365bb82bdb18aae2d59b70873d07b35647cc9 2008-05-25T20:02:52-07:00 2008-05-25T20:02:52-07:00 fix for namespacing resources. rails only e8c4675c2563625fb98df6a2432ace83f7b250b0 Andrew Stone andy@stonean.com