mack 0.4.5 → 0.4.6

data/CHANGELOG

@@ -1,3 +1,14 @@
+===0.4.6
+* Mack now uses Erubis, http://www.kuwata-lab.com/erubis/, for it's rendering engine instead of ERB. This makes Mack even faster now! Yippie!
+* Added rake generate:model name=<model_name> (optional: cols=<col_1>:<col_1_type>,<col_2>:<col_2_type>) This will also create a migration for you.
+* Updated rake generate:migration name=<model_name> (optional: cols=<col_1>:<col_1_type>,<col_2>:<col_2_type>) This will create the proper table migration for you.
+* Updated rake generate:scaffold to use the ModelGenerator now.
+* ScaffoldGenerator now create input fields based on the type of columns, if any, passed in.
+* Overall general refactoring of the generator classes.
+* Fixed a bug with request logging not, well, logging.
+* gem: erubis 2.5.0
+* gem: thin 0.8.0
+
 ===0.4.5
 * Removed boot.rb file. It was unnecessary.
 * When a new Mack application is generated the Rakefile that gets generated is stamped with the Mack gem version used to create it. This ties the project to that gem. This can, of course, be upgraded as new Mack gems come out, but it's a good way of tying your app to a specific revision of Mack.
@@ -6,6 +17,7 @@
 * Added: mack_ring_server binary to start a Rinda ring server for use with distributed routing.
 * Sqlite3 is now the default database for Mack applications configured with ORM support.
 * Added a test helper method, rake_task, to aid in the testing of Rake tasks.
+* Added: rake generate:migration name=<migration_name>
 * Added: rake db:migrate
 * Added: rake db:abort_if_pending_migrations
 * Added: rake db:rollback

data/bin/mack

@@ -25,7 +25,7 @@ opts.parse!(ARGV)
 include FileUtils
 
 def mack_version
-  "0.4.5"
+  "0.4.6"
 end
 
 def create_dir(dir)
@@ -56,7 +56,7 @@ erb_files = Dir.glob(File.join(File.dirname(__FILE__), "templates", "**/*.templa
 erb_files.each do |fl|
   if fl.match("database.yml") && !options.orm
   else
-    res = ERB.new(File.open(fl).read).result(binding)
+    res = ERB.new(File.open(fl).read, nil, "->").result(binding)
     n = fl.gsub(File.join(File.dirname(__FILE__), "templates"), app).gsub(".template", "")
     File.open(n, "w") {|f| f.puts res}
     puts "Created: #{n}"

data/lib/generators/base.rb

@@ -32,7 +32,7 @@ module Mack
       # Raise Mack::Errors::RequiredGeneratorParameterMissing if a required parameter
       # is missing.
       def initialize(env = {})
-        @env = env
+        @env = env.to_hash
         self.class.required_params.each do |p|
           raise Mack::Errors::RequiredGeneratorParameterMissing.new(p) unless param(p)
         end
@@ -51,7 +51,7 @@ module Mack
       # Needs to be implemented by the subclass.
       needs_method :generate
       
-      # Takes an input_file runs it through ERB and 
+      # Takes an input_file runs it through Erubis::Eruby and 
       # saves it to the specified output_file. If the output_file exists it will
       # be skipped. If you would like to force the writing of the file, use the
       # :force => true option.
@@ -62,7 +62,7 @@ module Mack
             return
           end
         end
-        File.open(output_file, "w") {|f| f.puts ERB.new(File.open(input_file).read).result(binding)}
+        File.open(output_file, "w") {|f| f.puts ERB.new(File.open(input_file).read, nil, "->").result(binding)}
         puts "Wrote: #{output_file}"
       end
       
@@ -76,6 +76,19 @@ module Mack
         puts "Created: #{output_dir}"
       end
       
+      def columns(name = param(:name))
+        ivar_cache("form_columns") do
+          cs = []
+          cols = (param(:cols) || param(:columns))
+          if cols
+            cols.split(",").each do |x|
+              cs << Mack::Generator::ModelColumn.new(name, x)
+            end
+          end
+          cs
+        end
+      end
+            
     end # Base
   end # Generator
 end # Mack

data/lib/generators/migration_generator/migration_generator.rb

@@ -1,3 +1,60 @@
+# This will generate a migration for your application.
+# 
+# Example without columns:
+#   rake generate:migration name=create_users
+# If using ActiveRecord generates:
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < ActiveRecord::Migration
+#     self.up
+#     end
+# 
+#     self.down
+#     end
+#   end
+# 
+# If using DataMapper generates:
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < DataMapper::Migration
+#     self.up
+#     end
+# 
+#     self.down
+#     end
+#   end
+# 
+# Example with columns:
+#   rake generate:migration name=create_users cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
+# If using ActiveRecord generates:
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < ActiveRecord::Migration
+#     self.up
+#       create_table :users do |t|
+#         t.column :username, :string
+#         t.column :email_address, :string
+#         t.column :created_at, :datetime
+#         t.column :updated_at, :datetime
+#     end
+# 
+#     self.down
+#       drop_table :users
+#     end
+#   end
+# 
+# If using DataMapper generates:
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < DataMapper::Migration
+#     self.up
+#       create_table :users do |t|
+#         t.column :username, :string
+#         t.column :email_address, :string
+#         t.column :created_at, :datetime
+#         t.column :updated_at, :datetime
+#     end
+# 
+#     self.down
+#       drop_table :users
+#     end
+#   end
 class MigrationGenerator < Mack::Generator::Migration::Base
 
   require_param :name
@@ -7,7 +64,9 @@ class MigrationGenerator < Mack::Generator::Migration::Base
     
     template_dir = File.join(File.dirname(__FILE__), "templates")
     
-    template(File.join(template_dir, "migration.rb.template"), File.join(migrations_directory, "#{next_migration_number}_#{param(:name)}.rb"))
+    @table_name = param(:name).underscore.plural.gsub("create_", "")
+    
+    template(File.join(template_dir, "migration.rb.template"), File.join(migrations_directory, "#{next_migration_number}_#{param(:name)}.rb"), :force => param(:force))
     
   end
   

data/lib/generators/migration_generator/templates/migration.rb.template

@@ -1,9 +1,31 @@
 class <%= param(:name).camelcase %> < <%= app_config.orm.camelcase %>::Migration
 
   def self.up
+<%
+    unless columns.empty?
+-%>
+    create_table :<%= @table_name %> do |t|
+<%
+      for column in columns
+-%>
+      t.column :<%= column.column_name %>, :<%= column.column_type %>
+<%
+      end
+-%>
+    end
+<%
+    end
+-%>
   end
 
   def self.down
+<%
+    unless columns.empty?
+-%>
+    drop_table :<%= @table_name %>
+<%
+    end
+-%>
   end
 
 end

data/lib/generators/model_column.rb

@@ -0,0 +1,55 @@
+module Mack
+  module Generator
+    
+    # Used to represent a 'column' from the param cols or columns for generators.
+    class ModelColumn
+      
+      # The name of the column.
+      attr_accessor :column_name
+      # The type of the column. Ie. string, integer, datetime, etc...
+      attr_accessor :column_type
+      # The name of the model associated with the column. Ie. user, post, etc...
+      attr_accessor :model_name
+      
+      # Takes in the model_name (user, post, etc...) and the column (username:string, body:text, etc...)
+      def initialize(model_name, column_unsplit)
+        self.model_name = model_name.singular.underscore
+        cols = column_unsplit.split(":")
+        self.column_name = cols.first.singular.underscore
+        self.column_type = cols.last.singular.underscore
+      end
+      
+      # Examples:
+      #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_name # => "user[username]"
+      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_name # => "post[body]"
+      def form_element_name
+        "#{self.model_name}[#{self.column_name}]"
+      end
+
+      # Examples:
+      #   Mack::Generator::ColumnObject.new("user", "username:string").form_element_id # => "user_username"
+      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_element_id # => "post_body"
+      def form_element_id
+        "#{self.model_name}_#{self.column_name}"
+      end
+
+      # Generates the appropriate HTML form field for the type of column represented.
+      # 
+      # Examples:
+      #   Mack::Generator::ColumnObject.new("user", "username:string").form_field 
+      #     => "<input type="text" name="user[username]" id="user_username" size="30" value="<%= user.username %>" />"
+      #   Mack::Generator::ColumnObject.new("Post", "body:text").form_field
+      #     => "<textarea name="post[body]" id="post_id"><%= post.body %></textarea>"
+      def form_field
+        case self.column_type
+        when "text"
+          %{<textarea name="#{self.form_element_name}" id="#{self.form_element_id}"><%= @#{self.model_name}.#{self.column_name} %></textarea>}
+        else
+          %{<input type="text" name="#{self.form_element_name}" id="#{self.form_element_id}" size="30" value="<%= @#{self.model_name}.#{self.column_name} %>" />}
+        end
+      end
+      
+    end # ModelColumn
+    
+  end # Generator
+end # Mack

data/lib/generators/model_generator/model_generator.rb

@@ -0,0 +1,96 @@
+# This will generate an ORM 'model' for your application based on the specified ORM you're using. 
+# 
+# Example without columns:
+#   rake generate:model name=user
+# If using ActiveRecord generates:
+# app/models/user.rb:
+#   class User < ActiveRecord::Base
+#   end
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < ActiveRecord::Migration
+#     self.up
+#     end
+# 
+#     self.down
+#     end
+#   end
+# 
+# If using DataMapper generates:
+# app/models/user.rb:
+#   class User < DataMapper::Base
+#   end
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < DataMapper::Migration
+#     self.up
+#     end
+# 
+#     self.down
+#     end
+#   end
+# 
+# Example with columns:
+#   rake generate:model name=user cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
+# If using ActiveRecord generates:
+# app/models/user.rb:
+#   class User < ActiveRecord::Base
+#   end
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < ActiveRecord::Migration
+#     self.up
+#       create_table :users do |t|
+#         t.column :username, :string
+#         t.column :email_address, :string
+#         t.column :created_at, :datetime
+#         t.column :updated_at, :datetime
+#     end
+# 
+#     self.down
+#       drop_table :users
+#     end
+#   end
+# 
+# If using DataMapper generates:
+# app/models/user.rb:
+#   class User < DataMapper::Base
+#     property :username, :string
+#     property :email_address, :string
+#     property :created_at, :datetime
+#     property :updated_at, :datetime
+#   end
+# db/migrations/<number>_create_users.rb:
+#   class CreateUsers < DataMapper::Migration
+#     self.up
+#       create_table :users do |t|
+#         t.column :username, :string
+#         t.column :email_address, :string
+#         t.column :created_at, :datetime
+#         t.column :updated_at, :datetime
+#     end
+# 
+#     self.down
+#       drop_table :users
+#     end
+#   end
+class ModelGenerator < Mack::Generator::Base
+  
+  require_param :name
+  
+  def generate
+    directory(File.join(MACK_APP, "models"))
+    
+    @columns = ""
+    cols = (param(:cols) || param(:columns))
+    if cols
+      cols = cols.split("|")
+      cols.each_with_index do |v, i|
+        x = v.split(":")
+        @columns << "property :#{x.first}, :#{x.last}\n  "
+      end
+      @columns.strip!
+    end
+    
+    template(File.join(File.dirname(__FILE__), "templates", "app", "models", "#{app_config.orm}.rb.template"), File.join(MACK_APP, "models", "#{param(:name).singular.underscore}.rb"), :force => param(:force))
+    MigrationGenerator.new(@env.merge({"name" => "create_#{param(:name).plural}"})).generate
+  end
+  
+end

data/lib/generators/model_generator/templates/app/models/active_record.rb.template

@@ -0,0 +1,2 @@
+class <%= param(:name).singular.camelcase %> < ActiveRecord::Base
+end

data/lib/generators/model_generator/templates/app/models/data_mapper.rb.template

@@ -0,0 +1,9 @@
+class <%= param(:name).singular.camelcase %> < DataMapper::Base
+<% 
+for column in columns
+-%>
+  property :<%= column.column_name %>, :<%= column.column_type %>
+<%
+end
+-%>
+end

data/lib/generators/plugin_generator/plugin_generator.rb

@@ -23,9 +23,9 @@ class PluginGenerator < Mack::Generator::Base
     directory(File.join(plugin_dir, "lib", "tasks"))
     
     # create vendor/plugins/<name>/init.rb
-    template(File.join(template_dir, "init.rb.template"), File.join(plugin_dir, "init.rb"))
+    template(File.join(template_dir, "init.rb.template"), File.join(plugin_dir, "init.rb"), :force => param(:force))
     # create vendor/plugins/<name>/lib/<name>.rb
-    template(File.join(template_dir, "lib", "plugin.rb.template"), File.join(plugin_dir, "lib", "#{param(:name).downcase}.rb"))
+    template(File.join(template_dir, "lib", "plugin.rb.template"), File.join(plugin_dir, "lib", "#{param(:name).downcase}.rb"), :force => param(:force))
     
   end
   

data/lib/generators/scaffold_generator/scaffold_generator.rb

@@ -7,8 +7,8 @@ class ScaffoldGenerator < Mack::Generator::Base
   require_param :name
   
   def generate # :nodoc:
-    @name_singular = param(:name).singular
-    @name_plural = param(:name).plural
+    @name_singular = param(:name).singular.underscore
+    @name_plural = param(:name).plural.underscore
     @name_singular_camel = @name_singular.camelcase
     @name_plural_camel = @name_plural.camelcase
     
@@ -43,12 +43,11 @@ class ScaffoldGenerator < Mack::Generator::Base
       directory(app_views_dir)
       
       template(File.join(temp_dir, "generic", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
-      template(File.join(temp_dir, "generic", "app", "models", "model.rb.template"), File.join(app_model_dir, "#{@name_singular}.rb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "index.html.erb.template"), File.join(app_views_dir, "index.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "edit.html.erb.template"), File.join(app_views_dir, "edit.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "new.html.erb.template"), File.join(app_views_dir, "new.html.erb"), :force => param(:force))
       template(File.join(temp_dir, "generic", "app", "views", "show.html.erb.template"), File.join(app_views_dir, "show.html.erb"), :force => param(:force))
-      MigrationGenerator.new("NAME" => "create_#{@name_plural}").run
+      ModelGenerator.new(@env).run
     else
       template(File.join(temp_dir, "no_orm", "app", "controllers", "controller.rb.template"), File.join(app_cont_dir, "#{@name_plural}_controller.rb"), :force => param(:force))
     end

data/lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template

@@ -1,10 +1,17 @@
-<h1>Edit <%= @name_singular %></h1>
+<h1>Edit <%= @name_singular_camel %></h1>
 
 <%%= error_messages_for :<%= @name_singular %> %>
 
 <form action="<%%= <%= @name_singular %>s_update_url(:id => @<%= @name_singular %>.id) %>" class="edit_<%= @name_singular %>" id="edit_<%= @name_singular %>" method="<%= @name_singular %>">
   <input type="hidden" name="_method" value="put">
-
+<% for column in columns -%>
+<% unless column.column_name == "created_at" || column.column_name == "updated_at" -%>
+  <p>
+    <b><%= column.column_name.singular.camelcase %></b><br />
+    <%= column.form_field %>
+  </p>
+<% end -%>
+<% end -%>
   <p>
     <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
   </p>

data/lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template

@@ -1,13 +1,34 @@
-<h1>Listing <%= @name_plural %></h1>
+<h1>Listing <%= @name_plural_camel %></h1>
 
 <table>
   <tr>
+<% 
+unless columns.empty? 
+  columns.each do |col|
+-%>
+    <th><%= col.column_name.camelcase %></th>
+<% 
+  end
+else
+-%>
     <th>&nbsp;</th>
+<% 
+end
+-%>
   </tr>
 
 <%% for <%= @name_singular %> in @<%= @name_plural %> %>
   <tr>
+<%
+unless columns.empty? 
+  columns.each do |col| -%>
+    <td><%%= <%= @name_singular %>.<%= col.column_name %> %></td>
+<%
+  end
+else
+-%>
     <td>&nbsp;</td>
+<% end -%>
     <td><%%= link_to("Show", <%= @name_plural %>_show_url(:id => <%= @name_singular %>.id)) %></td>
     <td><%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => <%= @name_singular %>.id)) %></td>
     <td><%%= link_to("Delete", <%= @name_plural %>_delete_url(:id => <%= @name_singular %>.id), :method => :delete, :confirm => "Are you sure?") %></td>

data/lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template

@@ -1,9 +1,16 @@
-<h1>New <%= @name_singular %></h1>
+<h1>New <%= @name_singular_camel %></h1>
 
 <%%= error_messages_for :<%= @name_singular %> %>
 
 <form action="<%%= <%= @name_singular %>s_create_url %>" class="new_<%= @name_singular %>" id="new_<%= @name_singular %>" method="<%= @name_singular %>">
-
+<% for column in columns -%>
+<% unless column.column_name == "created_at" || column.column_name == "updated_at" -%>
+  <p>
+    <b><%= column.column_name.singular.camelcase %></b><br />
+    <%= column.form_field %>
+  </p>
+<% end -%>
+<% end -%>
   <p>
     <input id="<%= @name_singular %>_submit" name="commit" type="submit" value="Create" />
   </p>

data/lib/generators/scaffold_generator/templates/generic/app/views/show.html.erb.template

@@ -1,7 +1,12 @@
 <p>
-  <%%= @<%= @name_singular %>.inspect %>
+  <h1><%= @name_singular_camel %></h1>
 </p>
-
+<% for column in columns -%>
+<p>
+  <b><%= column.column_name.singular.camelcase %></b><br />
+  <%%= @<%= @name_singular %>.<%= column.column_name %> %>
+</p>
+<% end -%>
 
 <%%= link_to("Edit", <%= @name_plural %>_edit_url(:id => @<%= @name_singular %>.id)) %> |
 <%%= link_to("Back", <%= @name_plural %>_index_url) %>

data/lib/initialization/configuration.rb

@@ -37,6 +37,7 @@ module Mack
     DEFAULTS_TEST = {
       "log::level" => "error",
       "run_remote_tests" => true,
+      "mack::drb_timeout" => 0
     } unless self.const_defined?("DEFAULTS_TEST")
     
     unless self.const_defined?("DEFAULTS")

data/lib/initialization/initializer.rb

@@ -12,6 +12,9 @@ require 'uri'
 require 'drb'
 require 'rinda/ring'
 require 'rinda/tuplespace'
+require 'builder'
+require 'erubis'
+require 'erb'
 
 # Set up Mack constants, if they haven't already been set up.
 unless Object.const_defined?("MACK_ENV")
@@ -29,6 +32,7 @@ Object::MACK_PLUGINS = File.join(MACK_ROOT, "vendor", "plugins") unless Object.c
 
 unless Object.const_defined?("MACK_INITIALIZED")
   puts "Starting application in #{MACK_ENV} mode."
+  puts "Mack root: #{MACK_ROOT}"
   
   Object::MACK_INITIALIZED = true
   

data/lib/initialization/initializers/orm_support.rb

@@ -21,7 +21,7 @@ module DataMapper # :nodoc:
 end
 
 unless app_config.orm.nil?
-  dbs = YAML::load(ERB.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
+  dbs = YAML::load(Erubis::Eruby.new(IO.read(File.join(MACK_CONFIG, "database.yml"))).result)
   case app_config.orm
   when 'active_record'
     require 'activerecord'

data/lib/mack.rb

@@ -69,9 +69,9 @@ module Mack
             exception = e
           end
         end
-        return self.response.finish unless exception
       end
       raise exception if exception
+      self.response.finish
     end
     
     def session

data/lib/rendering/base.rb

@@ -53,6 +53,7 @@ module Mack
           parts[parts.size - 1] = "_" << parts.last if options[:is_partial]
           partial = File.join(options[:dir], parts.join("/") + options[:ext])
         end
+        raise Errno::ENOENT.new(partial) unless File.exists?(partial)
         return Mack::ViewBinder.render(File.open(partial).read, self.view_binder.controller, options)
       end
       

data/lib/sea_level/controller_base.rb

@@ -1,4 +1,4 @@
-require 'erb'
+require 'erubis'
 module Mack
   module Controller # :nodoc:
     # All controllers in a Mack application have to extend this class. I'll be honest, if they don't extend this class
@@ -291,8 +291,9 @@ module Mack
             if @result_of_action_called.is_a?(String)
               @render_options[:text] = @result_of_action_called
               return Mack::ViewBinder.new(self).render(@render_options)
+            else
+              raise e
             end
-            
           end
         end
       end # complete_action_render

data/lib/sea_level/filter.rb

@@ -26,7 +26,7 @@ module Mack
     # 
     # <tt>after_render</tt> filters get run after the rendering of the action has happened. At this point
     # there is an instance variable, <tt>@final_rendered_action</tt>, that is available on which work can be done.
-    # This variable will have any layouts rendered to, any ERB will have been processed, etc... It should be the final
+    # This variable will have any layouts rendered to, any Erubis::Eruby will have been processed, etc... It should be the final
     # String that will get rendered to the screen. This is a great place to do things like write a log, gzip, etc...
     class Filter
   

data/lib/sea_level/view_binder.rb

@@ -1,5 +1,3 @@
-require 'builder'
-# require 'erubis'
 # This class is used to do all the view level bindings.
 # It allows for seperation between the controller and the view levels.
 class Mack::ViewBinder
@@ -70,7 +68,7 @@ class Mack::ViewBinder
   
   class << self
     
-    # Creates a Mack::ViewBinder and then passes the io through ERB
+    # Creates a Mack::ViewBinder and then passes the io through Erubis::Eruby
     # and returns a String. The io can be either an IO object or a String.
     def render(io, controller, options = {})
       vb = Mack::ViewBinder.new(controller, options)
@@ -78,9 +76,8 @@ class Mack::ViewBinder
       if ((controller.params(:format).to_sym == :xml) || options[:format] == :xml) && (options[:action] || options[:xml])
         return eval(io, vb.view_binding)
       else
-        return ERB.new(io).result(vb.view_binding)
+        return Erubis::Eruby.new(io).result(vb.view_binding)
       end
-      # return Erubis::Eruby.new(io).result(vb.view_binding)
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mack
 version: !ruby/object:Gem::Version 
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors: 
 - markbates
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-14 00:00:00 -04:00
+date: 2008-04-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.7.1
+        version: 0.8.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -93,6 +93,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.0.10
     version: 
+- !ruby/object:Gem::Dependency 
+  name: erubis
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.5.0
+    version: 
 description: Mack is a powerful, yet simple, web application framework.  It takes some cues from the likes of Rails and Merb, so it's not entirely unfamiliar. Mack hopes to provide developers a great framework for building, and deploying, portal and distributed applications.
 email: mark@mackframework.com
 executables: 
@@ -115,12 +124,15 @@ files:
 - lib/generators/migration/base.rb
 - lib/generators/migration_generator/migration_generator.rb
 - lib/generators/migration_generator/templates/migration.rb.template
+- lib/generators/model_column.rb
+- lib/generators/model_generator/model_generator.rb
+- lib/generators/model_generator/templates/app/models/active_record.rb.template
+- lib/generators/model_generator/templates/app/models/data_mapper.rb.template
 - lib/generators/plugin_generator/plugin_generator.rb
 - lib/generators/plugin_generator/templates/init.rb.template
 - lib/generators/plugin_generator/templates/lib/plugin.rb.template
 - lib/generators/scaffold_generator/scaffold_generator.rb
 - lib/generators/scaffold_generator/templates/generic/app/controllers/controller.rb.template
-- lib/generators/scaffold_generator/templates/generic/app/models/model.rb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/edit.html.erb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/index.html.erb.template
 - lib/generators/scaffold_generator/templates/generic/app/views/new.html.erb.template

data/lib/generators/scaffold_generator/templates/generic/app/models/model.rb.template

@@ -1,2 +0,0 @@
-class <%= @name_singular_camel %> < <%= app_config.orm.camelcase %>::Base
-end