apotomo 0.1.4 → 1.0.0.beta1

data/test/dummy/config/environments/development.rb

@@ -0,0 +1,26 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # In the development environment your application's code is reloaded on
+  # every request.  This slows down response time but is perfect for development
+  # since you don't have to restart the webserver when you make code changes.
+  config.cache_classes = false
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_view.debug_rjs             = true
+  config.action_controller.perform_caching = false
+
+  # Don't care if the mailer can't send
+  config.action_mailer.raise_delivery_errors = false
+
+  # Print deprecation notices to the Rails logger
+  config.active_support.deprecation = :log
+
+  # Only use best-standards-support built into browsers
+  config.action_dispatch.best_standards_support = :builtin
+end
+

data/test/dummy/config/environments/production.rb

@@ -0,0 +1,49 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The production environment is meant for finished, "live" apps.
+  # Code is not reloaded between requests
+  config.cache_classes = true
+
+  # Full error reports are disabled and caching is turned on
+  config.consider_all_requests_local       = false
+  config.action_controller.perform_caching = true
+
+  # Specifies the header that your server uses for sending files
+  config.action_dispatch.x_sendfile_header = "X-Sendfile"
+
+  # For nginx:
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
+
+  # If you have no front-end server that supports something like X-Sendfile,
+  # just comment this out and Rails will serve the files
+
+  # See everything in the log (default is :info)
+  # config.log_level = :debug
+
+  # Use a different logger for distributed setups
+  # config.logger = SyslogLogger.new
+
+  # Use a different cache store in production
+  # config.cache_store = :mem_cache_store
+
+  # Disable Rails's static asset server
+  # In production, Apache or nginx will already do this
+  config.serve_static_assets = false
+
+  # Enable serving of images, stylesheets, and javascripts from an asset server
+  # config.action_controller.asset_host = "http://assets.example.com"
+
+  # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
+
+  # Enable threaded mode
+  # config.threadsafe!
+
+  # Enable locale fallbacks for I18n (makes lookups for any locale fall back to
+  # the I18n.default_locale when a translation can not be found)
+  config.i18n.fallbacks = true
+
+  # Send deprecation notices to registered listeners
+  config.active_support.deprecation = :notify
+end

data/test/dummy/config/environments/test.rb

@@ -0,0 +1,35 @@
+Dummy::Application.configure do
+  # Settings specified here will take precedence over those in config/environment.rb
+
+  # The test environment is used exclusively to run your application's
+  # test suite.  You never need to work with it otherwise.  Remember that
+  # your test database is "scratch space" for the test suite and is wiped
+  # and recreated between test runs.  Don't rely on the data there!
+  config.cache_classes = true
+
+  # Log error messages when you accidentally call methods on nil.
+  config.whiny_nils = true
+
+  # Show full error reports and disable caching
+  config.consider_all_requests_local       = true
+  config.action_controller.perform_caching = false
+
+  # Raise exceptions instead of rendering exception templates
+  config.action_dispatch.show_exceptions = false
+
+  # Disable request forgery protection in test environment
+  config.action_controller.allow_forgery_protection    = false
+
+  # Tell Action Mailer not to deliver emails to the real world.
+  # The :test delivery method accumulates sent emails in the
+  # ActionMailer::Base.deliveries array.
+  config.action_mailer.delivery_method = :test
+
+  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  # like if you have constraints or database-specific column types
+  # config.active_record.schema_format = :sql
+
+  # Print deprecation notices to the stderr
+  config.active_support.deprecation = :stderr
+end

data/test/dummy/config/initializers/backtrace_silencers.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
+# Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
+
+# You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
+# Rails.backtrace_cleaner.remove_silencers!

data/test/dummy/config/initializers/inflections.rb

@@ -0,0 +1,10 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new inflection rules using the following format
+# (all these examples are active by default):
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.plural /^(ox)$/i, '\1en'
+#   inflect.singular /^(ox)en/i, '\1'
+#   inflect.irregular 'person', 'people'
+#   inflect.uncountable %w( fish sheep )
+# end

data/test/dummy/config/initializers/mime_types.rb

@@ -0,0 +1,5 @@
+# Be sure to restart your server when you modify this file.
+
+# Add new mime types for use in respond_to blocks:
+# Mime::Type.register "text/richtext", :rtf
+# Mime::Type.register_alias "text/html", :iphone

data/test/dummy/config/initializers/secret_token.rb

@@ -0,0 +1,7 @@
+# Be sure to restart your server when you modify this file.
+
+# Your secret key for verifying the integrity of signed cookies.
+# If you change this key, all old signed cookies will become invalid!
+# Make sure the secret is at least 30 characters and all random,
+# no regular words or you'll be exposed to dictionary attacks.
+Dummy::Application.config.secret_token = '50777595d4b6041cfca51636cf4e262508f96cc081757729e7123d04a5abdf9e3554e4f519b71106e41c5146a9b07b5affd2e410af1130db3a7f4538b70e2429'

data/test/dummy/config/initializers/session_store.rb

@@ -0,0 +1,8 @@
+# Be sure to restart your server when you modify this file.
+
+Dummy::Application.config.session_store :cookie_store, :key => '_dummy_session'
+
+# Use the database for sessions instead of the cookie-based default,
+# which shouldn't be used to store highly confidential information
+# (create the session table with "rake db:sessions:create")
+# Dummy::Application.config.session_store :active_record_store

data/test/dummy/config/routes.rb

@@ -0,0 +1,59 @@
+Dummy::Application.routes.draw do
+  # The priority is based upon order of creation:
+  # first created -> highest priority.
+
+  # Sample of regular route:
+  #   match 'products/:id' => 'catalog#view'
+  # Keep in mind you can assign values other than :controller and :action
+
+  # Sample of named route:
+  #   match 'products/:id/purchase' => 'catalog#purchase', :as => :purchase
+  # This route can be invoked with purchase_url(:id => product.id)
+
+  # Sample resource route (maps HTTP verbs to controller actions automatically):
+  #   resources :products
+
+  # Sample resource route with options:
+  #   resources :products do
+  #     member do
+  #       get 'short'
+  #       post 'toggle'
+  #     end
+  #
+  #     collection do
+  #       get 'sold'
+  #     end
+  #   end
+
+  # Sample resource route with sub-resources:
+  #   resources :products do
+  #     resources :comments, :sales
+  #     resource :seller
+  #   end
+
+  # Sample resource route with more complex sub-resources
+  #   resources :products do
+  #     resources :comments
+  #     resources :sales do
+  #       get 'recent', :on => :collection
+  #     end
+  #   end
+
+  # Sample resource route within a namespace:
+  #   namespace :admin do
+  #     # Directs /admin/products/* to Admin::ProductsController
+  #     # (app/controllers/admin/products_controller.rb)
+  #     resources :products
+  #   end
+
+  # You can have the root of your site routed with "root"
+  # just remember to delete public/index.html.
+  # root :to => "welcome#index"
+
+  # See how all your routes lay out with "rake routes"
+
+  # This is a legacy wild controller route that's not recommended for RESTful applications.
+  # Note: This route will make all actions in every controller accessible via GET requests.
+  match "barn/widget", :to => "barn#widget"
+  match ':controller(/:action(/:id(.:format)))'
+end

data/test/dummy/tmp/app/cells/mouse_widget.rb

@@ -0,0 +1,11 @@
+class MouseWidget < Apotomo::Widget
+
+  def squeak
+    render
+  end
+
+  def snuggle
+    render
+  end
+
+end

data/test/dummy/tmp/test/widgets/mouse_widget_test.rb

@@ -0,0 +1,15 @@
+require 'test_helper'
+
+class MouseWidgetTest < Apotomo::TestCase
+  test "squeak" do
+    invoke :squeak
+    assert_select "p"
+  end
+  
+  test "snuggle" do
+    invoke :snuggle
+    assert_select "p"
+  end
+  
+
+end

data/test/rails/controller_methods_test.rb

@@ -1,11 +1,9 @@
 require 'test_helper'
  
 class ControllerMethodsTest < ActionController::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "A Rails controller" do
-    setup do
-      barn_controller!
-    end
-    
     context "responding to #apotomo_root" do
       should "initially return a root widget" do
         assert_equal 1, @controller.apotomo_root.size
@@ -27,7 +25,7 @@ class ControllerMethodsTest < ActionController::TestCase
     context "invoking #has_widgets" do
       setup do
         @controller.class.has_widgets do |root|
-          root << mouse_mock('mum')
+          root << widget(:mouse_cell, 'mum')
         end
       end
       
@@ -42,7 +40,7 @@ class ControllerMethodsTest < ActionController::TestCase
       
       should "allow multiple calls to has_widgets" do
         @controller.class.has_widgets do |root|
-          root << mouse_mock('kid')
+          root << widget(:mouse_cell, 'kid')
         end
         
         assert @controller.apotomo_root['mum']
@@ -50,12 +48,11 @@ class ControllerMethodsTest < ActionController::TestCase
       end
       
       should "inherit has_widgets blocks to sub-controllers" do
-        berry = mouse_mock('berry')
+        berry = widget(:mouse_cell, 'berry')
         @sub_controller = Class.new(@controller.class) do
           has_widgets { |root| root << berry }
         end.new
         @sub_controller.params  = {}
-        @sub_controller.session = {}
         
         assert @sub_controller.apotomo_root['mum']
         assert @sub_controller.apotomo_root['berry']
@@ -63,7 +60,7 @@ class ControllerMethodsTest < ActionController::TestCase
       
       should "be aliased to has_widgets" do
         @controller.class.has_widgets do |root|
-          root << mouse_mock('kid')
+          root << widget(:mouse_cell, 'kid')
         end
         
         assert @controller.apotomo_root['mum']
@@ -79,7 +76,7 @@ class ControllerMethodsTest < ActionController::TestCase
       
       should "extend the widget family and remember the block with one #use_widgets call" do
         @controller.use_widgets do |root|
-          root << mouse_mock
+          root << widget(:mouse_cell, 'mum')
         end
         
         assert_equal 1, @controller.bound_use_widgets_blocks.size
@@ -87,7 +84,7 @@ class ControllerMethodsTest < ActionController::TestCase
       end
       
       should "add blocks only once" do
-        block = Proc.new {|root| root << mouse_mock}
+        block = Proc.new {|root| root << widget(:mouse_cell, 'mum')}
         
         @controller.use_widgets &block
         @controller.use_widgets &block
@@ -102,7 +99,7 @@ class ControllerMethodsTest < ActionController::TestCase
           root << @mum
         end
         @controller.use_widgets do |root|
-          root << mouse_mock('pet')
+          root << widget(:mouse_cell, 'pet')
         end
         
         assert_equal 2, @controller.bound_use_widgets_blocks.size
@@ -112,7 +109,7 @@ class ControllerMethodsTest < ActionController::TestCase
     
     context "invoking #url_for_event" do
       should "compute an url for any widget" do
-        assert_equal "/barn/render_event_response?source=mouse&type=footsteps&volume=9", @controller.url_for_event(:footsteps, :source => :mouse, :volume => 9)
+        assert_equal "/barn/render_event_response?source=mouse&volume=9&type=footsteps", @controller.url_for_event(:footsteps, :source => :mouse, :volume => 9)
       end
     end
     
@@ -131,7 +128,7 @@ class ControllerMethodsTest < ActionController::TestCase
     
     should "render the widget" do
       @controller.apotomo_root << @mum
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @controller.render_widget('mum')
+      assert_equal "<div id=\"mum\"><snuggle></snuggle></div>\n", @controller.render_widget('mum')
     end
   end
   

data/test/rails/rails_integration_test.rb

@@ -3,18 +3,20 @@ require 'test_helper'
 class RailsIntegrationTest < ActionController::TestCase
   def simulate_request!
     @controller.instance_eval { @apotomo_request_processor = nil }
-    @controller.session = Marshal.load(Marshal.dump(@controller.session))
+    
+    ### FIXME: @controller.session = Marshal.load(Marshal.dump(@controller.session))
   end
   
+  include Apotomo::TestCaseMethods::TestController
+  
   context "A Rails controller" do
     setup do
-      @controller = ApotomoController.new
-      @controller.session = {}
-      @controller.params  = {}
-      
-      #@mum = mouse_mock('mum', 'snuggle') { def snuggle; render; end }
-      @mum = MouseCell.new('mum', :snuggle)
-      @mum.instance_eval{ def snuggle; render; end }
+      @mum = MouseCell.new(parent_controller, 'mum', :snuggle)
+      @mum.class.class_eval do
+        responds_to_event :squeak, :with => :snuggle
+        
+        def snuggle; render; end
+      end
       
       @controller.instance_variable_set(:@mum, @mum)
       @controller.instance_eval do
@@ -61,7 +63,7 @@ class RailsIntegrationTest < ActionController::TestCase
       end
       
       get 'widget'
-      assert_select "a", "Squeak!"
+      assert_select "a", "mum"
     end
     
     should "contain a freshly flushed tree when ?flush_widgets=1 is set" do
@@ -85,7 +87,6 @@ class RailsIntegrationTest < ActionController::TestCase
     should "render updates to the parent window for an iframe request" do
       get 'widget'
       assert_response :success
-      @controller.apotomo_root['mum'].respond_to_event :squeak, :with => :snuggle
       
       simulate_request!
       
@@ -93,7 +94,7 @@ class RailsIntegrationTest < ActionController::TestCase
       
       assert_response :success
       assert_equal 'text/html', @response.content_type
-      assert_equal "<html><body><script type='text/javascript' charset='utf-8'>\nvar loc = document.location;\nwith(window.parent) { setTimeout(function() { window.eval('<div id=\\\"mum\\\"><snuggle><\\/snuggle><\\/div>'); window.loc && loc.replace('about:blank'); }, 1) }\n</script></body></html>", @response.body
+      assert_equal "<html><body><script type='text/javascript' charset='utf-8'>\nvar loc = document.location;\nwith(window.parent) { setTimeout(function() { window.eval('<div id=\\\"mum\\\"><snuggle><\\/snuggle><\\/div>\\n'); window.loc && loc.replace('about:blank'); }, 1) }\n</script></body></html>", @response.body
     end
   end
 end

data/test/rails/view_helper_test.rb

@@ -2,12 +2,12 @@ require 'test_helper'
 require 'action_view/test_case'
 
 class ViewHelperTest < ActionView::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   tests Apotomo::Rails::ViewHelper
   
   context "A widget state view" do
     setup do
-      barn_controller!
-      
       @cell = mouse_mock('mum')
     end
     
@@ -15,23 +15,14 @@ class ViewHelperTest < ActionView::TestCase
       Apotomo.js_framework = :prototype
     end
     
-    should "respond to #link_to_event" do
-      assert_dom_equal "<a href=\"#\" onclick=\"new Ajax.Request('/barn/render_event_response?source=mum&amp;type=footsteps', {asynchronous:true, evalScripts:true}); return false;\">Walk!</a>",
-      link_to_event("Walk!", :footsteps)
-    end
-    
-    should "respond to #form_to_event" do
-      assert_dom_equal "<form onsubmit=\"new Ajax.Request('/barn/render_event_response?source=mum&amp;type=footsteps', {asynchronous:true, evalScripts:true, parameters:Form.serialize(this)}); return false;\" method=\"post\" action=\"/barn/render_event_response?source=mum&amp;type=footsteps\">",
-      form_to_event(:footsteps)
-    end
     
     should "respond to #multipart_form_to_event" do
-      assert_dom_equal "<iframe name=\"apotomo_iframe\" id=\"apotomo_iframe\" style=\"display: none;\"></iframe><form enctype=\"multipart/form-data\" method=\"post\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" target=\"apotomo_iframe\">",
+      assert_dom_equal "<iframe id=\"apotomo_iframe\" name=\"apotomo_iframe\" style=\"display: none;\"></iframe><form accept-charset=\"UTF-8\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" enctype=\"multipart/form-data\" method=\"post\" target=\"apotomo_iframe\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div></form>",
       multipart_form_to_event(:footsteps)
     end
     
     should "render multipart form if :multipart => true" do
-      assert_dom_equal "<iframe name=\"apotomo_iframe\" id=\"apotomo_iframe\" style=\"display: none;\"></iframe><form enctype=\"multipart/form-data\" method=\"post\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" target=\"apotomo_iframe\">",
+      assert_dom_equal "<iframe id=\"apotomo_iframe\" name=\"apotomo_iframe\" style=\"display: none;\"></iframe><form accept-charset=\"UTF-8\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" enctype=\"multipart/form-data\" method=\"post\" target=\"apotomo_iframe\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div></form>",
       form_to_event(:footsteps, :multipart => true)
     end
     
@@ -81,18 +72,4 @@ class ViewHelperTest < ActionView::TestCase
       end
     end
   end
-  
-  context "A widget including ViewHelper" do
-    setup do
-      barn_controller!
-      @mum = mouse_mock
-      @mum.class_eval do
-        include Apotomo::Rails::ViewHelper
-      end
-    end
-    
-    should "respond to url_for_event" do
-      @mum.url_for_event(:bla)
-    end
-  end
 end

data/test/rails/view_methods_test.rb

@@ -1,12 +1,10 @@
 require 'test_helper'
- 
+
 class ViewMethodsTest < ActionController::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "A Rails controller view" do
     setup do
-      @controller = ApotomoController.new
-      @controller.extend Apotomo::Rails::ControllerMethods
-      @controller.session = {}
-      
       @controller.instance_variable_set(:@mum, mouse_mock('mum', 'snuggle') {def snuggle; render; end})
       @controller.instance_eval do
         def widget
@@ -34,7 +32,7 @@ class ViewMethodsTest < ActionController::TestCase
       end
       
       get :widget
-      assert_equal "/apotomo/render_event_response?source=mum&type=footsteps", @response.body
+      assert_equal "/barn/render_event_response?source=mum&amp;type=footsteps", @response.body
     end
   end
 end

data/test/rails/widget_generator_test.rb

@@ -1,47 +1,50 @@
 require 'test_helper'
-require 'rails_generator'
-require 'rails_generator/scripts/generate'
+require 'generators/apotomo/widget_generator'
 
-Rails::Generator::Base.append_sources Rails::Generator::PathSource.new(:apotomo, File.join(File.dirname(__FILE__)+'/../../generators'))
-
-class WidgetGeneratorTest < Test::Unit::TestCase
-  context "Running script/generate widget" do
-    setup do
-      FileUtils.mkdir_p(fake_rails_root)
-      @original_files = file_list
-    end
-    
-    teardown do
-      FileUtils.rm_r(fake_rails_root) 
-    end
-    
-    context "MouseWidget squeak snuggle" do
+class WidgetGeneratorTest < Rails::Generators::TestCase
+  destination File.join(Rails.root, "tmp")
+  setup :prepare_destination
+  tests ::Apotomo::Generators::WidgetGenerator
+   
+  context "Running rails g apotomo::widget" do
+    context "Mouse squeak snuggle" do
       should "create the standard assets" do
-        Rails::Generator::Scripts::Generate.new.run(%w(widget MouseWidget squeak snuggle), :destination => fake_rails_root)
-        files = (file_list - @original_files)
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget.rb")
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget/squeak.html.erb")
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget/snuggle.html.erb")
-        assert files.include?(fake_rails_root+"/test/widgets/mouse_widget_test.rb")
+        
+        run_generator %w(MouseWidget squeak snuggle)
+        
+        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
+        assert_file "app/cells/mouse_widget.rb", /def snuggle/
+        assert_file "app/cells/mouse_widget.rb", /def squeak/
+        assert_file "app/cells/mouse_widget/snuggle.html.erb", %r(app/cells/mouse_widget/snuggle\.html\.erb)
+        assert_file "app/cells/mouse_widget/snuggle.html.erb", %r(<p>)
+        assert_file "app/cells/mouse_widget/squeak.html.erb", %r(app/cells/mouse_widget/squeak\.html\.erb)
+
+        assert_file "test/widgets/mouse_widget_test.rb", %r(class MouseWidgetTest < Apotomo::TestCase)
       end
       
       should "create haml assets with --haml" do
-        Rails::Generator::Scripts::Generate.new.run(%w(widget MouseWidget squeak snuggle --haml), :destination => fake_rails_root)
-        files = (file_list - @original_files)
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget.rb")
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget/squeak.html.haml")
-        assert files.include?(fake_rails_root+"/app/cells/mouse_widget/snuggle.html.haml")
-        assert files.include?(fake_rails_root+"/test/widgets/mouse_widget_test.rb")
+        run_generator %w(MouseWidget squeak snuggle --haml)
+        
+        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
+        assert_file "app/cells/mouse_widget.rb", /def snuggle/
+        assert_file "app/cells/mouse_widget.rb", /def squeak/
+        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(app/cells/mouse_widget/snuggle\.html\.haml)
+        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(%p)
+        assert_file "app/cells/mouse_widget/squeak.html.haml", %r(app/cells/mouse_widget/squeak\.html\.haml)
+        assert_file "test/widgets/mouse_widget_test.rb"
+      end
+      
+      should "create haml assets with -t haml" do
+        run_generator %w(MouseWidget snuggle squeak -t haml)
+        
+        assert_file "app/cells/mouse_widget.rb", /class MouseWidget < Apotomo::Widget/
+        assert_file "app/cells/mouse_widget.rb", /def snuggle/
+        assert_file "app/cells/mouse_widget.rb", /def squeak/
+        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(app/cells/mouse_widget/snuggle\.html\.haml)
+        assert_file "app/cells/mouse_widget/snuggle.html.haml", %r(%p)
+        assert_file "app/cells/mouse_widget/squeak.html.haml", %r(app/cells/mouse_widget/squeak\.html\.haml)
+        assert_file "test/widgets/mouse_widget_test.rb"
       end
     end
   end
-  
-  private
-  def fake_rails_root
-    File.join(File.dirname(__FILE__), 'rails_root')  
-  end
-  
-  def file_list
-    Dir.glob(File.join(fake_rails_root, "**/*"))
-  end 
 end

data/test/support/test_case_methods.rb

@@ -2,10 +2,8 @@ module Apotomo
   module TestCaseMethods
     # Provides a ready-to-use mouse widget instance.
     def mouse_mock(id='mouse', start_state=:eating, opts={}, &block)
-      #mouse = mouse_class_mock.new(id, start_state, opts)
-      mouse = MouseCell.new(id, start_state, opts)
+      mouse = MouseCell.new(parent_controller, id, start_state, opts)
       mouse.instance_eval &block if block_given?
-      mouse.controller = @controller
       mouse
     end
     
@@ -48,15 +46,15 @@ module Apotomo
       @controller.class.instance_eval { include Apotomo::Rails::ControllerMethods }
       @controller.extend ActionController::UrlWriter
       @controller.params  = {}
-      @controller.session = {}
+      ### FIXME: @controller.session = {}
     end
     
     def hibernate_widget(widget, session = {})
-      widget.freeze_to(session)
+      Apotomo::StatefulWidget.freeze_for(session, widget)
       
       session = Marshal.load(Marshal.dump(session))
       
-      Apotomo::StatefulWidget.thaw_from(session)
+      Apotomo::StatefulWidget.thaw_for(@controller, session, )
     end
     
     def hibernate(widget, session = {})
@@ -64,5 +62,34 @@ module Apotomo
       session = Marshal.load(Marshal.dump(session))
       Apotomo::StatefulWidget.thaw_for(session, widget('apotomo/widget', 'root'))
     end
+    
+    module TestController
+      def setup
+        barn_controller!
+      end
+      
+      # Creates a mock controller instance. Currently, each widget needs a parent controller instance due to some
+      # sucky dependency in cells.
+      def barn_controller!
+        @controller = Class.new(ActionController::Base) do
+          def initialize
+            extend ActionController::UrlWriter
+            self.params = {}
+            self.request = ActionController::TestRequest.new
+          end
+          
+          def self.name; "BarnController"; end
+          
+          def self.default_url_options; {:controller => :barn}; end
+          include Apotomo::Rails::ControllerMethods
+        end.new
+        ### FIXME: @controller.session = {}
+      end
+      
+      def parent_controller
+        @controller
+      end
+      
+    end
   end
-end
+end