0
@@ -1,6 +1,6 @@
0
 * 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!
0
-* 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.
0
-* 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.
0
+* 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.
0
+* 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.
0
 * Updated rake generate:scaffold to use the ModelGenerator now.
0
 * ScaffoldGenerator now create input fields based on the type of columns, if any, passed in.
0
 * Overall general refactoring of the generator classes.

0
@@ -25,7 +25,7 @@ opts.parse!(ARGV)
0
 include FileUtils
0
 
0
 def mack_version
0
-  "0.4.5.100"
0
+  "0.4.5.110"
0
 end
0
 
0
 def create_dir(dir)

0
@@ -81,7 +81,7 @@ module Mack
0
           cs = []
0
           cols = (param(:cols) || param(:columns))
0
           if cols
0
-            cols.split("|").each do |x|
0
+            cols.split(",").each do |x|
0
               cs << Mack::Generator::ModelColumn.new(name, x)
0
             end
0
           end

0
@@ -23,7 +23,7 @@
0
 #   end
0
 # 
0
 # Example with columns:
0
-#   rake generate:migration name=create_users cols=username:string|email_address:string|created_at:datetime|updated_at:datetime
0
+#   rake generate:migration name=create_users cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
0
 # If using ActiveRecord generates:
0
 # db/migrations/<number>_create_users.rb:
0
 #   class CreateUsers < ActiveRecord::Migration

0
@@ -29,7 +29,7 @@
0
 #   end
0
 # 
0
 # Example with columns:
0
-#   rake generate:model name=user cols=username:string|email_address:string|created_at:datetime|updated_at:datetime
0
+#   rake generate:model name=user cols=username:string,email_address:string,created_at:datetime,updated_at:datetime
0
 # If using ActiveRecord generates:
0
 # app/models/user.rb:
0
 #   class User < ActiveRecord::Base

0
@@ -10,7 +10,7 @@ class GemHelper # :nodoc:
0
     self.project = "magrathea"
0
     self.package = "mack"
0
     self.gem_name = "mack"
0
-    self.version = "0.4.5.100"
0
+    self.version = "0.4.5.110"
0
   end
0
   
0
   def gem_name_with_version

0
@@ -64,7 +64,7 @@ MIG
0
   def test_generate_active_record_with_columns
0
     use_active_record do
0
       assert app_config.orm = "active_record"
0
-      generate_common({"NAME" => "create_users", "cols" => "username:string|email_address:string|created_at:datetime|updated_at:datetime"})
0
+      generate_common({"NAME" => "create_users", "cols" => "username:string,email_address:string,created_at:datetime,updated_at:datetime"})
0
       mig = <<-MIG
0
 class CreateUsers < ActiveRecord::Migration
0
 
0
@@ -90,7 +90,7 @@ MIG
0
   def test_generate_data_mapper_with_columns
0
     use_data_mapper do
0
       assert app_config.orm = "data_mapper"
0
-      generate_common({"NAME" => "create_users", "cols" => "username:string|email_address:string|created_at:datetime|updated_at:datetime"})
0
+      generate_common({"NAME" => "create_users", "cols" => "username:string,email_address:string,created_at:datetime,updated_at:datetime"})
0
       mig = <<-MIG
0
 class CreateUsers < DataMapper::Migration
0
 

0
@@ -32,7 +32,7 @@ class ModelGeneratorTest < Test::Unit::TestCase
0
   
0
   def test_generate_data_mapper_with_columns
0
     use_data_mapper do 
0
-      ModelGenerator.new("name" => "albums", "cols" => "title:string|artist_id:integer|description:text").generate
0
+      ModelGenerator.new("name" => "albums", "cols" => "title:string,artist_id:integer,description:text").generate
0
       assert File.exists?(model_loc)
0
       assert_equal dm_album_with_columns, File.open(model_loc).read
0
       assert File.exists?(migration_loc)

0
@@ -212,7 +212,7 @@ CONT
0
   private
0
   
0
   def orm_common_with_cols
0
-    sg = ScaffoldGenerator.new("name" => "zoo", "cols" => "name:string|description:text")
0
+    sg = ScaffoldGenerator.new("name" => "zoo", "cols" => "name:string,description:text")
0
     sg.run
0
     File.open(File.join(MACK_CONFIG, "routes.rb")) do |f|
0
       assert_match "r.resource :zoos # Added by rake generate:scaffold name=zoo", f.read