0
@@ -16,11 +16,13 @@ module Waves
0
 
0
         app.instance_eval do
0
 
0
-          auto_create_module( :Models ) { include AutoCode }
0
-          
0
-          auto_eval( :Models ) do
0
+          auto_create_module( :Models ) do
0
+            include AutoCode
0
             auto_create_class :Default
0
             auto_load :Default, :directories => [:models]
0
+          end
0
+          
0
+          auto_eval( :Models ) do
0
             auto_create_class true, app::Models::Default
0
             auto_load true, :directories => [ :models ]
0
           end

0
@@ -28,12 +28,18 @@ module Waves
0
           
0
           app.instance_eval do
0
             
0
-            auto_eval :Models do
0
+            auto_create_module( :Models ) do
0
               include AutoCode
0
               auto_create_class :Default, ::Sequel::Model
0
               auto_load :Default, :directories => [ :models ]
0
+            end
0
+            
0
+            auto_eval :Models do
0
               auto_create_class true, app::Models::Default
0
               auto_load true, :directories => [ :models ]
0
+              # set the Sequel dataset based on the model class name
0
+              # note that this is not done for app::Models::Default, as it isn't 
0
+              # supposed to represent a table
0
               auto_eval true do
0
                 default = superclass.basename.snake_case.pluralize.intern
0
                 if @dataset && @dataset.opts[:from] != [ default ]

0
@@ -23,10 +23,11 @@ describe "An application module which includes the Sequel ORM layer" do
0
     
0
   it "auto_creates models that inherit from Sequel::Model" do
0
     TA::Models::Default.superclass.should == Sequel::Model
0
+    TA::Models::Thingy.superclass.should == TA::Models::Default
0
   end
0
   
0
   it "sets the dataset to use the snake_case of the class name as the table name" do
0
-    TA::Models::Default.dataset.send(:to_table_reference).should =~ /SELECT.+FROM.+defaults+/
0
+    TA::Models::Thingy.dataset.send(:to_table_reference).should =~ /SELECT.+FROM.+thingies+/
0
   end
0
   
0
   it "provides an accessor for database" do