stage 0.3.2 → 0.4.0

data/History.txt

@@ -1,5 +1,8 @@
+== 0.4.0 2008-05-25
+  *Fixed: Support for namespacing in Rails. 
+
 == 0.3.2 2008-04-27
-  * Added route to config/router.rb when generating resource
+  * Merb: Added route to config/router.rb when generating resource
 
 == 0.3.1 2008-04-26
   * Removed unnecessary local paramater usage in show.

data/Manifest.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

data/config/hoe.rb

@@ -2,7 +2,7 @@ require 'stage/version'
 
 AUTHOR = 'Andrew Stone'  # can also be an array of Authors
 EMAIL = "andy@stonean.com"
-DESCRIPTION = "Code template generator that utilizes helpers as presenters"
+DESCRIPTION = "Code template generator for Rails and Merb that DRYs up view code with partials and utilizes helpers as presenters to reduce ruby code in your view."
 GEM_NAME = 'stage' # what ppl will type to install your gem
 RUBYFORGE_PROJECT = 'stage' # The unix name for your project
 HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"

data/lib/stage/version.rb

@@ -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

data/rails_generators/stage/stage_generator.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(

data/rails_generators/stage/templates/controller.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) }

data/rails_generators/stage/templates/migration.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
 

data/rails_generators/stage/templates/view_edit.html.erb

@@ -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 %> %>

data/rails_generators/stage/templates/view_index.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 %> %>

data/rails_generators/stage/templates/view_new.html.erb

@@ -2,4 +2,4 @@
 
 <%%= render :partial => "form" %>
 
-<%%= link_to 'Back', <%= plural_name %>_path %>
+<%%= link_to 'Back', <%= plural_route_method %> %>

data/rails_generators/stage/templates/view_show.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 %> %>

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.3.2</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

data/website/merb.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.3.2</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

data/website/rails.html

@@ -33,7 +33,7 @@
     <h1>stage</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/stage"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/stage" class="numbers">0.3.2</a>
+      <a href="http://rubyforge.org/projects/stage" class="numbers">0.4.0</a>
     </div>
     <h1>&#x2192; &#8216;stage&#8217;</h1>
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stage
 version: !ruby/object:Gem::Version 
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-27 00:00:00 -04:00
+date: 2008-05-25 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Code template generator that utilizes helpers as presenters
+description: Code template generator for Rails and Merb that DRYs up view code with partials and utilizes helpers as presenters to reduce ruby code in your view.
 email: 
 - andy@stonean.com
 executables: []
@@ -56,7 +56,6 @@ files:
 - 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
@@ -110,7 +109,7 @@ rubyforge_project: stage
 rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: Code template generator that utilizes helpers as presenters
+summary: Code template generator for Rails and Merb that DRYs up view code with partials and utilizes helpers as presenters to reduce ruby code in your view.
 test_files: 
 - test/test_generator_helper.rb
 - test/test_helper.rb

data/rails_generators/stage/templates/layout.html.erb

@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title><%= controller_class_name %>: <%%= controller.action_name %></title>
-  <%%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%%= flash[:notice] %></p>
-
-<%%= yield  %>
-
-</body>
-</html>