0
@@ -20,13 +20,24 @@ module Merb::Generators
0
       generator.new(destination_root, options.merge(:model => true), name, attributes)
0
     end
0
     
0
-    invoke :model_none, :orm => :none
0
-    invoke :model_activerecord, :orm => :activerecord
0
-    invoke :model_datamapper, :orm => :datamapper
0
-    invoke :model_sequel, :orm => :sequel
0
+    [:none, :activerecord, :sequel, :datamapper].each do |orm|
0
     
0
-    invoke :model_rspec, :testing_framework => :rspec
0
-    invoke :model_test_unit, :testing_framework => :test_unit
0
+      template "model_#{orm}".to_sym, :orm => orm do
0
+        source("#{orm}/app/models/%file_name%.rb")
0
+        destination("app/models/#{file_name}.rb")
0
+      end
0
+    
0
+    end
0
+    
0
+    template :spec, :testing_framework => :rspec do
0
+      source('rspec/spec/models/%file_name%_spec.rb')
0
+      destination('spec/models/' + file_name + '_spec.rb')
0
+    end
0
+    
0
+    template :test_unit, :testing_framework => :test_unit do
0
+      source('test_unit/test/models/%file_name%_test.rb')
0
+      destination('test/models/' + file_name + '_test.rb')
0
+    end
0
     
0
     def class_name
0
       self.name.camel_case
0
@@ -50,90 +61,6 @@ module Merb::Generators
0
     
0
   end
0
   
0
-  class NoneModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'none')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
-  class ActiveRecordModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'activerecord')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
-  class DataMapperModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'datamapper')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
-  class SequelModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'sequel')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
-  class SpecModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'rspec')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
-  class TestUnitModelGenerator < ModelGenerator
0
-    
0
-    def self.source_root
0
-      File.join(super, 'test_unit')
0
-    end
0
-
0
-    first_argument :name, :required => true
0
-    second_argument :attributes, :as => :hash, :default => {}
0
-    
0
-    glob!
0
-    
0
-  end
0
-  
0
   add :model, ModelGenerator
0
-  add_private :model_none, NoneModelGenerator
0
-  add_private :model_datamapper, DataMapperModelGenerator
0
-  add_private :model_activerecord, ActiveRecordModelGenerator
0
-  add_private :model_sequel, SequelModelGenerator
0
-  add_private :model_test_unit, TestUnitModelGenerator
0
-  add_private :model_rspec, SpecModelGenerator
0
   
0
 end
0
\ No newline at end of file