README.txt @@ -1,4 +1,4 @@ -Copyright (c) 2008 FIXME full name +Copyright (c) 2008 Andrew Stone Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the License.txt @@ -1,7 +1,6 @@ History.txt License.txt Manifest.txt -README README.txt Rakefile config/hoe.rb @@ -9,6 +8,17 @@ config/requirements.rb lib/stage.rb lib/stage/version.rb log/debug.log +merb_generators/stage/USAGE +merb_generators/stage/stage_generator.rb +merb_generators/stage/templates/app/controllers/%controller_file_name%.rb +merb_generators/stage/templates/app/helpers/%controller_file_name%_helper.rb +merb_generators/stage/templates/app/models/%resource_name%.rb +merb_generators/stage/templates/app/views/%controller_file_name%/_data.html.erb +merb_generators/stage/templates/app/views/%controller_file_name%/_form.html.erb +merb_generators/stage/templates/app/views/%controller_file_name%/edit.html.erb +merb_generators/stage/templates/app/views/%controller_file_name%/index.html.erb +merb_generators/stage/templates/app/views/%controller_file_name%/new.html.erb +merb_generators/stage/templates/app/views/%controller_file_name%/show.html.erb script/console script/destroy script/generate @@ -17,8 +27,10 @@ setup.rb tasks/deployment.rake tasks/environment.rake tasks/website.rake +test/test_generator_helper.rb test/test_helper.rb test/test_stage.rb +test/test_stage_generator.rb website/index.html website/index.txt website/javascripts/rounded_corners_lite.inc.js Manifest.txt @@ -1,8 +1,8 @@ module Stage #:nodoc: module VERSION #:nodoc: MAJOR = 0 - MINOR = 0 - TINY = 1 + MINOR = 1 + TINY = 0 STRING = [MAJOR, MINOR, TINY].join('.') end lib/stage/version.rb @@ -1,28 +1,30 @@ -class StageGenerator < RubiGen::Base +class StageGenerator < Merb::GeneratorBase - attr_reader :provided_args, - :controller_class_name, + attr_reader :controller_class_name, :controller_file_name, :controller_base_path, :controller_modules, :full_controller_const, :attributes, - :resource_name + :resource_name, + :resource_class_name, + :resource_title_name, + :resource_plural_name def initialize(runtime_args, runtime_options = {}) @base = File.dirname(__FILE__) super - @provided_args = runtime_args - name = args.shift + name = runtime_args.shift @controller_file_name = name.snake_case.gsub("::", "/") unless @controller_file_name == File.basename(@controller_file_name) @controller_base_path = controller_file_name.split("/")[0..-2].join("/") end @controller_modules = @controller_file_name.to_const_string.split("::")[0..-2] - @controller_class_name = @controller_file_name.to_const_string.split("::").last - @resource_name = @controller_class_name.downcase - @resource_title_name = @controller_class_name.snake_case + @controller_class_name = @controller_file_name.to_const_string.split("::").last.pluralize + @resource_name = name.downcase + @resource_class_name = @resource_name.to_const_string + @resource_title_name = name.capitalize.snake_case @resource_plural_name = @resource_name.pluralize @full_controller_const = ((@controller_modules.dup || []) << @controller_class_name).join("::") @@ -41,16 +43,11 @@ class StageGenerator < RubiGen::Base :controller_class_name => controller_class_name, :controller_file_name => controller_file_name, :controller_base_path => controller_base_path, - :full_controller_const => full_controller_const } + :full_controller_const => full_controller_const, + :resource_name => resource_name} copy_dirs copy_files - - model_args = provided_args.dup - #Singularize model name - model_args[0] = model_args.first.snake_case.gsub("::", "/").split("/").last.singularize - #Need to use whatever ORM is chosen - m.dependency "model", model_args, options.dup end end @@ -59,15 +56,14 @@ class StageGenerator < RubiGen::Base def banner <<-EOS Stages a resources. This includes the following: - Model: A model class - Migration: if required (ORM Dependent) - Model Test or Spec stub - Resource Controller and views - Controller Test or Spec stubs + DataMapper Model + Resource Controller + Resource Views + Resource Helpers (contains presentation code utilized by View) Example - ./script/generate resource post title:string content:text created_at:datetime + merb-gen stage post title:string content:text created_at:datetime USAGE: #{$0} #{spec.name} name" EOS merb_generators/stage/stage_generator.rb @@ -5,14 +5,62 @@ <% end -%> <% counter = counter == 0 ? 0 : (counter + 1) -%> <%= " " * counter %>class <%= controller_class_name %> < Application +<%= " " * counter %> before :find_<%= resource_name %>, :only => [:show, :edit, :update, :delete] <%= " " * counter %> def index +<%= " " * counter %> @<%= resource_plural_name %> = <%= resource_class_name %>.all +<%= " " * counter %> display @<%= resource_plural_name %> +<%= " " * counter %> end + +<%= " " * counter %> def show +<%= " " * counter %> display @<%= resource_name %> +<%= " " * counter %> end + +<%= " " * counter %> def new +<%= " " * counter %> only_provides :html +<%= " " * counter %> @<%= resource_name %> = <%= resource_class_name %>.new <%= " " * counter %> render <%= " " * counter %> end +<%= " " * counter %> def edit +<%= " " * counter %> only_provides :html +<%= " " * counter %> render +<%= " " * counter %> end + +<%= " " * counter %> def create +<%= " " * counter %> @<%= resource_name %> = <%= resource_class_name %>.new(params[:<%= resource_name %>]) +<%= " " * counter %> if @<%= resource_name %>.save +<%= " " * counter %> redirect url(:<%= resource_name %>, @<%= resource_name %>) +<%= " " * counter %> else +<%= " " * counter %> render :new +<%= " " * counter %> end +<%= " " * counter %> end + +<%= " " * counter %> def update +<%= " " * counter %> if @<%= resource_name %>.update_attributes(params[:<%= resource_name %>]) +<%= " " * counter %> redirect url(:<%= resource_name %>, @<%= resource_name %>) +<%= " " * counter %> else +<%= " " * counter %> raise BadRequest +<%= " " * counter %> end +<%= " " * counter %> end + +<%= " " * counter %> def destroy +<%= " " * counter %> if @<%= resource_name %>.destroy! +<%= " " * counter %> redirect url(:<%= resource_name %>) +<%= " " * counter %> else +<%= " " * counter %> raise BadRequest +<%= " " * counter %> end +<%= " " * counter %> end + +<%= " " * counter %> private +<%= " " * counter %> def find_<%= resource_name %> +<%= " " * counter %> @<%= resource_name %> = <%= resource_class_name %>.first(params[:id]) +<%= " " * counter %> raise NotFound unless @<%= resource_name %> +<%= " " * counter %> end + <%= " " * counter %>end <% counter = counter == 0 ? 0 : (counter - 1) -%> <% controller_modules.reverse.each_with_index do |mod, i| -%> <%= " " * counter %>end # <%= mod %> <% counter = counter - 1 -%> -<% end -%> \ No newline at end of file +<% end -%> merb_generators/stage/templates/app/controllers/%controller_file_name%.rb @@ -6,11 +6,20 @@ module Merb <% end -%> <% counter = counter == 0 ? 0 : (counter + 1) -%> <%= " " * counter %>module <%= controller_class_name %>Helper +<% attributes.each do |attr| -%> + def <%= resource_name %>_<%= attr.first %>_value(f = nil) + if @action_name == "show" + @<%= resource_name %>.<%= attr.first %> + else + text_field :<%= attr.first %> + end + end +<% end -%> <%= " " * counter %>end <% counter = counter == 0 ? 0 : (counter - 1) -%> <% controller_modules.reverse.each_with_index do |mod, i| -%> <%= " " * counter %>end # <%= mod %> <% counter = counter - 1 -%> <% end -%> -end \ No newline at end of file +end merb_generators/stage/templates/app/helpers/%controller_file_name%_helper.rb @@ -1,9 +1,7 @@ <% attributes.each do |attr| -%> <p> - <b><%= attr.first.capitalize %></b>:<br /> - <%%= <%= resource_name %>_<%= attr.first %>_value %> + <b><%= attr.first.capitalize %></b><br /> + <%%= <%= resource_name %>_<%= attr.first %>_value %> </p> <% end -%> - - merb_generators/stage/templates/app/views/%controller_file_name%/_data.html.erb @@ -2,21 +2,21 @@ <table> <tr> - <% attributes.each do |attr| -%> - <th><%= attr.first.capitalize %></th> - <% end -%> +<% attributes.each do |attr| -%> + <th><%= attr.first.capitalize %></th> +<% end -%> </tr> - <%% for <%= resource_name %> in @<%= resource_plural_name %> %> +<%% for <%= resource_name %> in @<%= resource_plural_name %> %> <tr> - <% attributes.each do |attr| -%> - <td><%%= <%= resource_name %>.<%= attribute.first %> %></td> - <% end -%> +<% attributes.each do |attr| -%> + <td><%%= <%= resource_name %>.<%= attr.first %> %></td> +<% end -%> <td><%%= link_to 'Show', url(:<%= resource_name %>, <%= resource_name %>) %></td> <td><%%= link_to 'Edit', url(:edit_<%= resource_name %>, @<%= resource_name %>) %></td> <td><%%= link_to 'Destroy', url(:delete_<%= resource_name %>, @<%= resource_name %>), :confirm => 'Are you sure?', :method => :delete %></td> </tr> - <%% end %> +<%% end %> </table> <br /> merb_generators/stage/templates/app/views/%controller_file_name%/index.html.erb README e3402cfdcbefe0f3e32fb1a4d1621c8ebb4fcccb Andrew Stone andy@stonean.com http://github.com/stonean/stage/commit/42fdc02085bc15360d8a7aa864992dcf43db82ab 42fdc02085bc15360d8a7aa864992dcf43db82ab 2008-04-18T06:39:30-07:00 2008-04-18T06:39:30-07:00 first working version fd6ba2ab602d77dd57606658f5cb5453011de7e0 Andrew Stone andy@stonean.com