0
@@ -2,9 +2,9 @@ module <%= @name %>
0
 
0
   module Configurations
0
 
0
-    class Development
0
+    class Development < Base
0
 
0
-      database :host => 'localhost', :adapter => 'sqlite', :database => '<%= @name.downcase %>'
0
+      database :adapter => 'sqlite', :database => '<%= @name.downcase %>'
0
 
0
       reloadable [ <%= @name %> ]
0
 

0
@@ -2,7 +2,7 @@ module <%= @name %>
0
 
0
   module Configurations
0
 
0
-    class Production < Default
0
+    class Production < Base
0
 
0
       database :host => 'localhost', :adapter => 'mysql', :database => '<%= @name.downcase %>',
0
         :user => 'root', :password => ''

0
@@ -15,28 +15,26 @@ module Waves
0
 
0
           auto_create_module( :Models ) do
0
             include AutoCode
0
-            auto_create_class true, Waves::Layers::ORM::Model
0
             auto_load true, :directories => [:models]
0
+            auto_create_class true, Waves::Layers::ORM::Model
0
           end
0
 
0
           auto_create_module( :Views ) do
0
             include AutoCode
0
-            auto_create_class true, Waves::Views::Base
0
             auto_load true, :directories => [:views]
0
+            auto_create_class true, Waves::Views::Base
0
           end
0
 
0
           auto_create_module( :Controllers ) do
0
             include AutoCode
0
-            auto_create_class true, Waves::Controllers::Base
0
             auto_load true, :directories => [:controllers]
0
+            auto_create_class true, Waves::Controllers::Base
0
           end
0
 
0
           auto_create_module( :Helpers ) do
0
             include AutoCode
0
-            auto_create_module do
0
-              include Waves::Helpers::Default
0
-            end
0
             auto_load true, :directories => [:helpers]
0
+            auto_create_module { include Waves::Helpers::Default }
0
           end          
0
 
0
         end

0
@@ -15,8 +15,8 @@ module Waves
0
           app.instance_eval do
0
             
0
             auto_eval :Models do
0
-              auto_create_class true, Waves::Layers::ORM::Model do
0
-                set_dataset app.database[ basename.snake_case.plural.intern]
0
+              auto_eval true do
0
+                set_dataset Waves.application.database[ basename.snake_case.pluralize.intern ]
0
               end
0
               auto_load true, :directories => [:models]
0
             end

0
@@ -3,7 +3,6 @@ module Waves
0
     module ORM
0
       
0
       class Model < ::Sequel::Model
0
-        
0
         before_save do
0
            set(:updated_on => Time.now) if columns.include? :updated_on
0
         end

0
@@ -12,9 +12,10 @@ module Waves
0
           
0
           auto_create_module( :Configurations ) do
0
             include AutoCode
0
-            auto_create_class true, Waves::Configurations::Default
0
-            auto_create_module( :Mapping ) { extend Waves::Mapping }
0
+            auto_load :Mapping, :directories => [:configurations]
0
             auto_load true, :directories => [:configurations]
0
+            auto_create_module( :Mapping ) { extend Waves::Mapping }
0
+            auto_create_class true, Waves::Configurations::Default
0
           end
0
 
0
           include Waves::Layers::SimpleErrors