0
@@ -10,7 +10,8 @@ module Waves
0
           include Waves::Layers::Simple
0
           include Waves::Layers::DefaultErrors
0
           include Waves::Layers::MVC
0
-          # include Waves::Layers::ORM::Sequel
0
+          include Waves::Layers::ORM::Sequel
0
+          
0
           
0
         end
0
         

0
@@ -15,7 +15,7 @@ module Waves
0
 
0
           auto_create_module( :Models ) do
0
             include AutoCode
0
-            auto_create_class true
0
+            auto_create_class true, Waves::Layers::ORM::Model
0
             auto_load true, :directories => [:models]
0
           end
0
 
0
@@ -33,17 +33,10 @@ module Waves
0
 
0
           auto_create_module( :Helpers ) do
0
             include AutoCode
0
-            auto_create_module
0
-            auto_load true, :directories => [:helpers]
0
-            auto_eval :Default do
0
-              attr_reader :request, :content
0
-              include Waves::ResponseMixin
0
-              include Waves::Helpers::Common
0
-              include Waves::Helpers::Formatting
0
-              include Waves::Helpers::Model
0
-              include Waves::Helpers::View
0
-              include Waves::Helpers::Form
0
+            auto_create_module do
0
+              include Waves::Helpers::Default
0
             end
0
+            auto_load true, :directories => [:helpers]
0
           end          
0
 
0
         end

0
@@ -66,6 +66,7 @@ require 'helpers/form.rb'
0
 require 'helpers/formatting.rb'
0
 require 'helpers/model.rb'
0
 require 'helpers/view.rb'
0
+require 'helpers/base'
0
 
0
 # waves test support
0
 require 'verify/mapping.rb'

0
@@ -12,22 +12,28 @@ Waves::Console.load( :mode => :development )
0
       DefaultApplication::Configurations::Mapping
0
       DefaultApplication::Configurations::Default.host.should == nil
0
       DefaultApplication::Configurations::Development.host.should == '127.0.0.1'
0
-      DefaultApplication::Helpers::Testing
0
-      DefaultApplication::Models::Default.superclass.should == Waves::Layers::ORM::Model
0
+      DefaultApplication::Models::Default
0
       DefaultApplication::Views::Default
0
       DefaultApplication::Controllers::Default
0
       DefaultApplication::Helpers::Default
0
+      DefaultApplication::Helpers::Testing
0
     end
0
 
0
     it "should auto_load Helpers, Models, Views, and Controllers when their files exist" do
0
+      DefaultApplication::Helpers::Default.instance_methods.should.include "layout"
0
+      DefaultApplication::Helpers::Testing.instance_methods.should.include "layout"
0
       DefaultApplication::Helpers::Testing.should.respond_to :foundation_testing
0
       DefaultApplication::Models::Default.should.respond_to :crayola
0
+      DefaultApplication::Models::Default.should.respond_to :set_dataset
0
       DefaultApplication::Models::Different.should.respond_to :sargent
0
-      # DefaultApplication::Controllers::Default.instance_methods.should.include "attributes"
0
+      DefaultApplication::Models::Different.should.respond_to :set_dataset
0
+      DefaultApplication::Controllers::Default.instance_methods.should.include "attributes"
0
       DefaultApplication::Controllers::Default.instance_methods.should.include "destroy_all"
0
+      DefaultApplication::Controllers::Different.instance_methods.should.include "attributes"
0
       DefaultApplication::Controllers::Different.instance_methods.should.include "destroy_all"
0
-      # DefaultApplication::Views::Default.instance_methods.should.include "renderer"
0
+      DefaultApplication::Views::Default.instance_methods.should.include "renderer"
0
       DefaultApplication::Views::Default.instance_methods.should.include "upside_down"
0
+      DefaultApplication::Views::Different.instance_methods.should.include "renderer"
0
       DefaultApplication::Views::Different.instance_methods.should.include "upside_down"
0
     end
0
 

0
@@ -1,6 +1,6 @@
0
 module DefaultApplication
0
   module Configurations
0
-    class Development < Base
0
+    class Development < Default
0
 
0
       database :host => 'localhost', :adapter => 'sqlite', :database => 'defaultapplication',
0
         :user => 'root', :password => ''

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Controllers
0
 
0
-    class Default
0
+    class Default < Base
0
 
0
       def destroy_all
0
         "I'm sorry Dave, but I can't let you do that."

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Controllers
0
 
0
-    class Different
0
+    class Different < Base
0
 
0
       def destroy_all
0
         "I'm sorry Dave, but I can't let you do that."

0
@@ -1,6 +1,7 @@
0
 module DefaultApplication
0
   module Helpers
0
     module Testing
0
+      include Waves::Helpers::Default
0
       def self.foundation_testing
0
         true
0
       end

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Models
0
     
0
-    class Default < ::Sequel::Model
0
+    class Default < Base
0
       
0
       def self.crayola; true; end
0
       

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Models
0
     
0
-    class Different
0
+    class Different < Base
0
       
0
       def self.sargent; true; end
0
       

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Views
0
 
0
-    class Default
0
+    class Default < Base
0
 
0
       def upside_down
0
         

0
@@ -2,7 +2,7 @@ module DefaultApplication
0
 
0
   module Views
0
 
0
-    class Different
0
+    class Different < Base
0
 
0
       def upside_down
0
         

0
@@ -13,11 +13,11 @@ specification "A developer can register exception handlers" do
0
     r.body.should == '404 Not Found'
0
   end
0
 
0
-  specify "A custom 404 handler should override the minimal" do
0
-    handle(Waves::Dispatchers::NotFoundError) { response.status = 404; response.body = "gone baby gone"}
0
-    r = get('/')
0
-    r.status.should == 404
0
-    r.body.should == "gone baby gone"
0
-  end
0
+  # specify "A custom 404 handler should override the minimal" do
0
+  #   handle(Waves::Dispatchers::NotFoundError) { response.status = 404; response.body = "gone baby gone"}
0
+  #   r = get('/')
0
+  #   r.status.should == 404
0
+  #   r.body.should == "gone baby gone"
0
+  # end
0
 
0
 end