stage 0.2.0 → 0.3.1

data/History.txt

@@ -1,3 +1,9 @@
+== 0.3.1 2008-04-26
+  * Removed unnecessary local paramater usage in show.
+
+== 0.3.0 2008-04-26
+  * Rails support now added. Yeah!
+
 == 0.2.0 2008-04-20
   * Seems to have been an error with the last deploy
 

data/Manifest.txt

@@ -19,6 +19,19 @@ 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
+rails_generators/stage/USAGE
+rails_generators/stage/stage_generator.rb
+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
+rails_generators/stage/templates/view_index.html.erb
+rails_generators/stage/templates/view_new.html.erb
+rails_generators/stage/templates/view_show.html.erb
 script/console
 script/destroy
 script/generate
@@ -34,5 +47,9 @@ test/test_stage_generator.rb
 website/index.html
 website/index.txt
 website/javascripts/rounded_corners_lite.inc.js
+website/merb.html
+website/merb.txt
+website/rails.html
+website/rails.txt
 website/stylesheets/screen.css
 website/template.html.erb

data/README.txt

@@ -3,20 +3,20 @@
 
 == DESCRIPTION:
 
-Stage is a code template generator that utilizes helpers as presenters to reduce ruby code used in views. The initial release only works with Merb and DataMapper.  Support for RubyOnRails, ActiveRecord, Sequel and other ORMs will be added as I get the time.  Of course, contributions are welcome if you like the concept.
-
+Stage is a code template generator that utilizes helpers as presenters to reduce ruby code used in views. Of course, contributions are welcome if you like the concept. I would especially like to hear of any code reduction suggestions.
 
 == FEATURES/PROBLEMS:
 
-Currently only supports Merb + DataMapper.
-Need to add a confirm script to the delete link.
+Both: The helper methods could generate more precise form helpers.  Just outputs text fields.
 
-== SYNOPSIS:
+Merb:  Need to add resource to router.rb
 
 
 == REQUIREMENTS:
 
 Merb + DataMapper
+-- or --
+RubyOnRails
 
 == INSTALL:
 

data/lib/stage/version.rb

@@ -1,8 +1,8 @@
 module Stage #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 2
-    TINY  = 0
+    MINOR = 3
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/stage/USAGE

@@ -0,0 +1,5 @@
+Description:
+  
+  
+Usage:
+  

data/rails_generators/stage/stage_generator.rb

@@ -0,0 +1,99 @@
+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
+  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?
+      @controller_class_name = @controller_class_name_without_nesting
+    else
+      @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
+  end
+
+  def manifest
+    record do |m|
+      # Check for class naming collisions.
+      m.class_collisions(controller_class_path, "#{controller_class_name}Controller", "#{controller_class_name}Helper")
+      m.class_collisions(class_path, "#{class_name}")
+
+      # Controller, helper, views
+      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))
+
+      for action in stage_views
+        m.template(
+          "view_#{action}.html.erb",
+          File.join("app","views", controller_class_path, controller_file_name, "#{action}.html.erb")
+        )
+      end
+
+      m.template("form_partial.html.erb", 
+                 File.join("app","views", controller_class_path, controller_file_name, "_form.html.erb"))
+
+      m.template("data_partial.html.erb", File.join("app","views",controller_class_path, controller_file_name, "_data.html.erb"))
+
+			m.template 'model.rb', File.join('app/models', class_path, "#{file_name}.rb")
+
+      m.template("controller.rb", File.join("app","controllers", controller_class_path, "#{controller_file_name}_controller.rb"))
+
+      m.template("helper.rb", File.join("app","helpers",     controller_class_path, "#{controller_file_name}_helper.rb"))
+
+			unless options[:skip_migration]
+        m.migration_template 'migration.rb', 'db/migrate', :assigns => {
+          :migration_name => "Create#{class_name.pluralize.gsub(/::/, '')}"
+        }, :migration_file_name => "create_#{file_path.gsub(/\//, '_').pluralize}"
+      end
+
+      m.route_resources controller_file_name
+    end
+  end
+
+  protected
+    # Override with your own usage banner.
+    def banner
+      "Usage: #{$0} stage ModelName [field:type, field:type]"
+    end
+
+    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 stage_views
+      %w[ index show new edit ]
+    end
+
+    def model_name
+      class_name.demodulize
+    end
+end

data/rails_generators/stage/templates/controller.rb

@@ -0,0 +1,85 @@
+class <%= controller_class_name %>Controller < ApplicationController
+  # GET /<%= table_name %>
+  # GET /<%= table_name %>.xml
+  def index
+    @<%= table_name %> = <%= class_name %>.find(:all)
+
+    respond_to do |format|
+      format.html # index.html.erb
+      format.xml  { render :xml => @<%= table_name %> }
+    end
+  end
+
+  # GET /<%= table_name %>/1
+  # GET /<%= table_name %>/1.xml
+  def show
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+
+    respond_to do |format|
+      format.html # show.html.erb
+      format.xml  { render :xml => @<%= file_name %> }
+    end
+  end
+
+  # GET /<%= table_name %>/new
+  # GET /<%= table_name %>/new.xml
+  def new
+    @<%= file_name %> = <%= class_name %>.new
+
+    respond_to do |format|
+      format.html # new.html.erb
+      format.xml  { render :xml => @<%= file_name %> }
+    end
+  end
+
+  # GET /<%= table_name %>/1/edit
+  def edit
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+  end
+
+  # POST /<%= table_name %>
+  # POST /<%= table_name %>.xml
+  def create
+    @<%= file_name %> = <%= class_name %>.new(params[:<%= file_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 %> }
+      else
+        format.html { render :action => "new" }
+        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # PUT /<%= table_name %>/1
+  # PUT /<%= table_name %>/1.xml
+  def update
+    @<%= file_name %> = <%= class_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 %>) }
+        format.xml  { head :ok }
+      else
+        format.html { render :action => "edit" }
+        format.xml  { render :xml => @<%= file_name %>.errors, :status => :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /<%= table_name %>/1
+  # DELETE /<%= table_name %>/1.xml
+  def destroy
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
+    @<%= file_name %>.destroy
+
+    respond_to do |format|
+      format.html { redirect_to(<%= table_name %>_url) }
+      format.xml  { head :ok }
+    end
+  end
+end

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

@@ -0,0 +1,6 @@
+<% for attribute in attributes -%>
+  <p>
+    <b><%= attribute.column.human_name %></b><br />
+    <%%= <%= singular_name %>_<%= attribute.name %>_value %>
+  </p>
+<% end -%>

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

@@ -0,0 +1,11 @@
+<%%
+  submit_label = "Update"
+  submit_label = "Create" if @<%= singular_name%>.new_record?
+-%>
+
+<%%= error_messages_for :<%= singular_name %> %>
+
+<%% form_for(@<%= singular_name %>) do |f| %>
+  <%%= render :partial => "data" %>
+  <p> <%%= f.submit submit_label %> </p>
+<%% end %>

data/rails_generators/stage/templates/helper.rb

@@ -0,0 +1,12 @@
+module <%= controller_class_name %>Helper
+<% for attribute in attributes -%>
+  def <%= singular_name %>_<%= attribute.name %>_value
+    if @action_name == "show"
+      h @<%= singular_name %>.<%= attribute.name %> 
+    else
+      text_field_tag "<%= singular_name%>[<%= attribute.name %>]",  @<%= singular_name %>.<%= attribute.name %>
+    end
+  end
+
+<% end -%>
+end

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

@@ -0,0 +1,17 @@
+<!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>

data/rails_generators/stage/templates/migration.rb

@@ -0,0 +1,16 @@
+class <%= migration_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+		<% for attribute in attributes -%>
+      t.<%= attribute.type %> :<%= attribute.name %>
+		<% end -%>
+		<% unless options[:skip_timestamps] %>
+      t.timestamps
+		<% end -%>
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end

data/rails_generators/stage/templates/model.rb

@@ -0,0 +1,2 @@
+class <%= class_name %> < ActiveRecord::Base
+end

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

@@ -0,0 +1,6 @@
+<h1>Editing <%= singular_title_name %></h1>
+
+<%%= render :partial => "form" %>
+
+<%%= link_to 'Show', @<%= singular_name %> %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

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

@@ -0,0 +1,24 @@
+<h1>Listing <%= plural_title_name %></h1>
+
+<table>
+  <tr>
+<% for attribute in attributes -%>
+    <th><%= attribute.column.human_name %></th>
+<% end -%>
+  </tr>
+
+<%% for <%= singular_name %> in @<%= plural_name %> %>
+  <tr>
+<% 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>
+  </tr>
+<%% end %>
+</table>
+
+<br />
+
+<%%= link_to 'New <%= singular_title_name %>', new_<%= singular_name %>_path %>

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

@@ -0,0 +1,5 @@
+<h1>New <%= singular_title_name %></h1>
+
+<%%= render :partial => "form" %>
+
+<%%= link_to 'Back', <%= plural_name %>_path %>

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

@@ -0,0 +1,4 @@
+<%%= render :partial => "data" %>
+
+<%%= link_to 'Edit', edit_<%= singular_name %>_path(@<%= singular_name %>) %> |
+<%%= link_to 'Back', <%= plural_name %>_path %>

data/test/test_generator_helper.rb

@@ -1,4 +1,8 @@
-require File.dirname(__FILE__) + '/test_helper'
+begin
+  require File.dirname(__FILE__) + '/test_helper'
+rescue LoadError
+  require 'test/unit'
+end
 require 'fileutils'
 
 # Must set before requiring generator libs.
@@ -10,6 +14,11 @@ if defined?(APP_ROOT)
 else
   APP_ROOT = app_root
 end
+if defined?(RAILS_ROOT)
+  RAILS_ROOT.replace(app_root)
+else
+  RAILS_ROOT = app_root
+end
 
 begin
   require 'rubigen'

data/test/test_stage_generator.rb

@@ -1,16 +1,18 @@
 require File.join(File.dirname(__FILE__), "test_generator_helper.rb")
 
+require 'rails_generator'
+
 class TestStageGenerator < Test::Unit::TestCase
   include RubiGen::GeneratorTestHelper
 
   def setup
     bare_setup
   end
-  
+
   def teardown
     bare_teardown
   end
-  
+
   # Some generator-related assertions:
   #   assert_generated_file(name, &block) # block passed the file contents
   #   assert_directory_exists(name)
@@ -24,20 +26,20 @@ class TestStageGenerator < Test::Unit::TestCase
   #   app_root_files - put this in teardown to show files generated by the test method (e.g. p app_root_files)
   #   bare_setup - place this in setup method to create the APP_ROOT folder for each test
   #   bare_teardown - place this in teardown method to destroy the TMP_ROOT or APP_ROOT folder after each test
-  
+
   def test_generator_without_options
     name = "myapp"
     run_generator('stage', [name], sources)
     assert_generated_file("some_file")
   end
-  
+
   private
   def sources
     [RubiGen::PathSource.new(:test, File.join(File.dirname(__FILE__),"..", generator_path))
     ]
   end
-  
+
   def generator_path
-    "merb_generators"
+    "rails_generators"
   end
 end