apotomo 0.1.4 → 1.0.0.beta1

data/test/test_helper.rb

@@ -10,36 +10,28 @@ require 'mocha/integration'
 
 
 require 'cells'
-Cell::Base.add_view_path File.expand_path(File.dirname(__FILE__) + "/fixtures")
+Cell::Base.append_view_path File.expand_path(File.dirname(__FILE__) + "/fixtures")
 
-puts Cell::Base.view_paths
+require 'rails/engine'
 
 require 'apotomo'
 require 'apotomo/widget_shortcuts'
 require 'apotomo/rails/controller_methods'
 require 'apotomo/rails/view_methods'
-#require 'apotomo/assertions_helper'
 
 
 
 
 # Load test support files.
-Dir[File.join(File.dirname(__FILE__), *%w[support ** *.rb]).to_s].each { |f| require f }
+require File.join(File.dirname(__FILE__), "support/test_case_methods")
 
 
 Test::Unit::TestCase.class_eval do
   include Apotomo::WidgetShortcuts
   include Apotomo::TestCaseMethods
-  include Apotomo::AssertionsHelper
   
-  def setup
-    @controller = ApotomoController.new
-    @request    = ActionController::TestRequest.new
-    @response   = ActionController::TestResponse.new
-    @controller.request   = @request
-    @controller.response  = @response
-    @controller.params    = {}
-    @controller.session   = @session = {}
+  def assert_not(assertion)
+    assert !assertion
   end
 end
 
@@ -63,16 +55,12 @@ class RenderingTestCell < Apotomo::StatefulWidget
 end
 
 
-
-# We need to setup a fake route for the controller tests.
-ActionController::Routing::Routes.draw do |map|
-  map.connect 'apotomo/:action', :controller => 'apotomo'
-  map.connect 'barn/:action', :controller => 'barn'
+# Enable dynamic states so we can do Cell.class_eval { def ... } at runtime.
+class Apotomo::Widget
+  def action_method?(*); true; end
 end
-require File.join(File.dirname(__FILE__), '..', 'config/routes.rb') ### TODO: let rails engine handle that.
-
-
 
-module ::Rails
-  def logger(*args); end
-end
+ENV['RAILS_ENV'] = 'test'
+require "dummy/config/environment"
+#require File.join(File.dirname(__FILE__), '..', 'config/routes.rb') ### TODO: let rails engine handle that.
+require "rails/test_help" # sets up ActionController::TestCase's @routes

data/test/unit/container_test.rb

@@ -1,10 +1,11 @@
 require 'test_helper'
 
 class ContainerTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "Rendering a container" do
     setup do
       @family = container('family')
-      @family.controller = @controller
     end
     
     should "return an empty view if childless" do

data/test/unit/event_handler_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class EventHandlerTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "an abstract EventHandler" do
     should "push nil to root's ordered page_updates when #call'ed" do
       @mum = mouse_mock('mum')

data/test/unit/event_methods_test.rb

@@ -1,7 +1,8 @@
 require 'test_helper'
  
 class EventMethodsTest < Test::Unit::TestCase
-
+  include Apotomo::TestCaseMethods::TestController
+  
   context "#respond_to_event and #fire" do
     setup do
       mum_and_kid!
@@ -49,11 +50,11 @@ class EventMethodsTest < Test::Unit::TestCase
       end
       
       should "add the handlers at creation time" do
-        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouseCell.new('mum', :show).event_table.all_handlers_for(:peep, 'mum')
+        assert_equal [Apotomo::InvokeEventHandler.new(:widget_id => 'mum', :state => :answer_squeak)], AdultMouseCell.new(parent_controller, 'mum', :show).event_table.all_handlers_for(:peep, 'mum')
       end
       
       should "not inherit handlers for now" do
-        assert_equal [], BabyMouseCell.new('kid', :show).event_table.all_handlers_for(:peep, 'kid')
+        assert_equal [], BabyMouseCell.new(parent_controller, 'kid', :show).event_table.all_handlers_for(:peep, 'kid')
       end
     end
     

data/test/unit/invoke_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class InvokeTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   class LocalMouse < MouseCell
     def snuggle; render; end
     def educate; render :view => :snuggle; end
@@ -8,26 +10,26 @@ class InvokeTest < Test::Unit::TestCase
   
   context "Invoking a single widget" do
     setup do
-      @mum = LocalMouse.new('mum', :snuggle)
+      @mum = LocalMouse.new(parent_controller, 'mum', :snuggle)
     end
     
     context "implicitely" do
       should "always enter the given state" do
         @mum.invoke :snuggle
-        assert_equal :snuggle, @mum.last_state
+        assert_equal 'snuggle', @mum.last_state
         
         @mum.invoke :educate
-        assert_equal :educate, @mum.last_state
+        assert_equal 'educate', @mum.last_state
       end
     end
     
     context "explicitely" do
       should "per default enter the start state" do
         @mum.invoke
-        assert_equal :snuggle, @mum.last_state
+        assert_equal 'snuggle', @mum.last_state
         
         @mum.invoke
-        assert_equal :snuggle, @mum.last_state
+        assert_equal 'snuggle', @mum.last_state
       end
       
       context "with defined transitions" do
@@ -37,17 +39,20 @@ class InvokeTest < Test::Unit::TestCase
           end
           
           @mum.invoke
-          assert_equal :snuggle, @mum.last_state
+          assert_equal 'snuggle', @mum.last_state
         end
         
         should "automatically follow the transitions if defined" do
+          assert_equal 'snuggle', @mum.last_state
+          puts "invoooooooooooooogue"
+          puts @mum.last_state.inspect
           @mum.invoke
-          assert_equal :educate, @mum.last_state
+          assert_equal 'educate', @mum.last_state
         end
         
         should "nevertheless allow undefined implicit invokes" do
           @mum.invoke :snuggle
-          assert_equal :snuggle, @mum.last_state
+          assert_equal 'snuggle', @mum.last_state
         end
       end
     end
@@ -55,10 +60,10 @@ class InvokeTest < Test::Unit::TestCase
   
   context "Invoking a widget family" do
     setup do
-      @mum = LocalMouse.new('mum', :snuggle)
+      @mum = LocalMouse.new(parent_controller, 'mum', :snuggle)
       
       # create an anonym class for @kid so we don't pollute with #transition's.
-      @mum << @kid = mouse_class_mock.new('kid', :snooze)
+      @mum << @kid = mouse_class_mock.new(parent_controller, 'kid', :snooze)
       @kid.instance_eval do
         def snooze; render :nothing => true; end
         def listen; render :nothing => true; end
@@ -68,12 +73,12 @@ class InvokeTest < Test::Unit::TestCase
     context "implicitely" do
       should "per default send kid to its start state" do
         @mum.invoke :snuggle
-        assert_equal :snuggle,  @mum.last_state
-        assert_equal :snooze,   @kid.last_state
+        assert_equal 'snuggle',  @mum.last_state
+        assert_equal 'snooze',   @kid.last_state
         
         @mum.invoke :educate
-        assert_equal :educate,  @mum.last_state
-        assert_equal :snooze,   @kid.last_state
+        assert_equal 'educate',  @mum.last_state
+        assert_equal 'snooze',   @kid.last_state
       end
       
       should "follow the kid's transition if defined" do
@@ -83,8 +88,8 @@ class InvokeTest < Test::Unit::TestCase
         
         @mum.invoke :snuggle
         @mum.invoke :educate
-        assert_equal :educate,  @mum.last_state
-        assert_equal :listen,   @kid.last_state
+        assert_equal 'educate',  @mum.last_state
+        assert_equal 'listen',   @kid.last_state
       end
       
       should "send kid to the given state passed to #render" do
@@ -95,8 +100,8 @@ class InvokeTest < Test::Unit::TestCase
         end
         
         @mum.invoke :snuggle
-        assert_equal :snuggle,  @mum.last_state
-        assert_equal :listen,   @kid.last_state
+        assert_equal 'snuggle',  @mum.last_state
+        assert_equal 'listen',   @kid.last_state
       end
       
       should "send kid to the :invoke state as it overrides #transition" do
@@ -111,12 +116,12 @@ class InvokeTest < Test::Unit::TestCase
         end
         
         @mum.invoke :snuggle
-        assert_equal :snuggle,  @mum.last_state
-        assert_equal :snooze,   @kid.last_state
+        assert_equal 'snuggle',  @mum.last_state
+        assert_equal 'snooze',   @kid.last_state
         
         @mum.invoke :educate
-        assert_equal :educate,  @mum.last_state
-        assert_equal :snooze,   @kid.last_state
+        assert_equal 'educate',  @mum.last_state
+        assert_equal 'snooze',   @kid.last_state
       end
     end
   end

data/test/unit/onfire_integration_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
  
 class OnfireIntegrationTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "including Onfire into the StatefulWidget it" do
     setup do
       @mum = mouse_mock('mum')

data/test/unit/persistence_test.rb

@@ -1,6 +1,7 @@
 require 'test_helper'
 
 class PersistenceTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
   
   class PersistentMouse < Apotomo::StatefulWidget # we need a named class for marshalling.
     attr_reader :who, :what
@@ -14,51 +15,27 @@ class PersistenceTest < Test::Unit::TestCase
     def recap;  render :nothing => true; end
   end
   
+  def stateless(name)
+    Apotomo::Widget.new(parent_controller, name, :eat)
+  end
+  
+  def stateful(name)
+    PersistentMouse.new(parent_controller, name, :educate)
+  end
+  
   context "StatefulWidget" do
   
     context ".stateful_branches_for" do
       should "provide all stateful branch-roots seen from root" do
-        @root = Apotomo::Widget.new('root', :eat)
+        @root = stateless('root')
         @root << mum_and_kid!
-        @root << Apotomo::Widget.new('berry', :eat) << @jerry = mouse_mock('jerry', :eat)
+        @root << stateless('berry') << @jerry = mouse_mock('jerry', :eat)
         
         assert_equal ['mum', 'jerry'], Apotomo::StatefulWidget.stateful_branches_for(@root).collect {|n| n.name}
       end
     end
   end
   
-  context "After #hibernate_widget (request) the widget" do
-    should "still have the same ivars" do
-      @mum = PersistentMouse.new('mum', :educate)
-      @mum.controller = @controller ### FIXME: remove that dependency
-      
-      @mum.invoke(:educate)
-      
-      assert_equal @mum.last_state, :educate
-      assert_equal @mum.who,  "the cat"
-      assert_equal @mum.what, "run away"
-      
-      @mum = hibernate_widget(@mum)
-      @mum.controller = @controller ### FIXME: remove that dependency
-      
-      @mum.invoke(:recap)
-      
-      assert_equal @mum.last_state, :recap
-      assert_equal @mum.who,  "the cat"
-      assert_equal @mum.what, "run away"
-    end
-    
-    should "still have its event_table" do
-      @mum    = PersistentMouse.new('mum', :educate)
-      @event  = Apotomo::Event.new(:squeak, @mum)
-      @mum.respond_to_event :squeak, :with => :educate
-      
-      assert_equal 1, @mum.send(:local_event_handlers, @event).size
-      @mum = hibernate_widget(@mum)
-      assert_equal 1, @mum.send(:local_event_handlers, @event).size
-    end
-  end
-  
   context "freezing and thawing a widget family" do
     setup do
       mum_and_kid!
@@ -67,7 +44,7 @@ class PersistenceTest < Test::Unit::TestCase
     
     context "and calling #flush_storage" do
       should "clear the storage from frozen data" do
-        @root = Apotomo::Widget.new('root', :eat)
+        @root = stateless('root')
         @root << @mum
           
         Apotomo::StatefulWidget.freeze_for(@storage, @root)
@@ -86,7 +63,7 @@ class PersistenceTest < Test::Unit::TestCase
       @mum.freeze_ivars_to(@storage)
       
       assert_equal 1, @storage.size
-      assert_equal 5, @storage['mum'].size
+      assert_equal 6, @storage['mum'].size
     end
     
     should "push family's freezable ivars to the storage when calling #freeze_data_to" do
@@ -94,9 +71,9 @@ class PersistenceTest < Test::Unit::TestCase
       @mum.freeze_data_to(@storage)
       
       assert_equal 3, @storage.size
-      assert_equal 5, @storage['mum'].size
-      assert_equal 5, @storage['mum/kid'].size
-      assert_equal 4, @storage['mum/kid/pet'].size
+      assert_equal 6, @storage['mum'].size
+      assert_equal 6, @storage['mum/kid'].size
+      assert_equal 5, @storage['mum/kid/pet'].size
     end
     
     should "push ivars and structure to the storage when calling #freeze_to" do
@@ -107,10 +84,10 @@ class PersistenceTest < Test::Unit::TestCase
     
     context "that has also stateless widgets" do
       setup do
-        @root = Apotomo::Widget.new('root', :eat)
+        @root = stateless('root')
           @root << mum_and_kid!
-          @root << Apotomo::Widget.new('berry', :eat) << @jerry = mouse_mock('jerry', :eat)
-        @root << Apotomo::Widget.new('tom', :eating)
+          @root << stateless('berry') << @jerry = mouse_mock('jerry', :eat)
+        @root << stateless('tom')
         
         Apotomo::StatefulWidget.freeze_for(@storage, @root)
       end
@@ -120,18 +97,13 @@ class PersistenceTest < Test::Unit::TestCase
       end
       
       should "save stateful branches only" do
-        #@mum.root!
-        #@jerry.root!  # disconnect stateful branches.
-        
-        assert_equal([[@mum, 'root'], [@jerry, 'berry']], @storage[:apotomo_stateful_branches])
-        assert @storage[:apotomo_stateful_branches].first.first.root?, "mum not disconnected from root"
-        assert @storage[:apotomo_stateful_branches].last.first.root?, "jerry not disconnected from berry"
+        assert_equal([[[MouseCell, 'mum', 'root'], [MouseCell, 'kid', 'mum']], [[MouseCell, 'jerry', 'berry']]], @storage[:apotomo_stateful_branches])
       end
       
       should "attach stateful branches to the tree in thaw_for" do
-        @new_root = Apotomo::Widget.new('root', :eat)
-          @new_root << Apotomo::Widget.new('berry', :eat)
-        assert_equal @new_root, Apotomo::StatefulWidget.thaw_for(@storage, @new_root)
+        @new_root = stateless('root')
+          @new_root << stateless('berry')
+        assert_equal @new_root, Apotomo::StatefulWidget.thaw_for(@controller, @storage, @new_root)
         
         assert_equal 5, @new_root.size  # without tom.
       end
@@ -139,27 +111,27 @@ class PersistenceTest < Test::Unit::TestCase
       should "re-establish ivars recursivly when calling #thaw_for" do
         @storage[:apotomo_stateful_branches] = Marshal.load(Marshal.dump(@storage[:apotomo_stateful_branches]))
         
-        @new_root = Apotomo::Widget.new('root', :eat)
-          @new_root << Apotomo::Widget.new('berry', :eat)
-        @new_root = Apotomo::StatefulWidget.thaw_for(@storage, @new_root)
+        @new_root = stateless('root')
+          @new_root << stateless('berry')
+        @new_root = Apotomo::StatefulWidget.thaw_for(@controller, @storage, @new_root)
         
         assert_equal :answer_squeak,  @new_root['mum'].instance_variable_get(:@start_state)
         assert_equal :peek,           @new_root['mum']['kid'].instance_variable_get(:@start_state)
       end
       
       should "raise an exception when thaw_for can't find the branch's parent" do
-        @new_root = Apotomo::Widget.new('dad', :eat)
+        @new_root = stateless('dad')
         
         assert_raises RuntimeError do
-           Apotomo::StatefulWidget.thaw_for(@storage, @new_root)
+           Apotomo::StatefulWidget.thaw_for(@controller, @storage, @new_root)
         end
       end
       
       should "clear the fields in the storage when fetching in #thaw_for" do
-        @new_root = Apotomo::Widget.new('root', :eat)
-          @new_root << Apotomo::Widget.new('berry', :eat)
+        @new_root = stateless('root')
+          @new_root << stateless('berry')
         
-        Apotomo::StatefulWidget.thaw_for(@storage, @new_root)
+        Apotomo::StatefulWidget.thaw_for(@controller, @storage, @new_root)
         
         assert_nil @storage[:apotomo_stateful_branches]
         assert_nil @storage[:apotomo_widget_ivars]
@@ -189,46 +161,35 @@ class PersistenceTest < Test::Unit::TestCase
     
   end
   
-  context "dumping and loading" do
+  context "#dump_tree" do
     setup do
-      @mum = PersistentMouse.new('mum', :eating)
-      @mum << @kid = PersistentMouse.new('kid', :eating)
+      @mum = stateful('mum')
+      @mum << @kid = stateful('kid')
+        @kid << @pet = stateful('pet')
+      @mum << @berry = stateful('berry')
+      
     end
     
-    context "a single stateful widget" do
-      should "provide a serialized widget on #node_dump" do
-        assert_equal "mum|PersistenceTest::PersistentMouse|mum", @mum.dump_node
-        assert_equal "kid|PersistenceTest::PersistentMouse|mum", @kid.dump_node
-      end
-      
-      should "recover the widget skeleton when invoking self.node_load" do
-        @mum, parent = ::Apotomo::StatefulWidget.load_node(@mum.dump_node)
-        assert_kind_of PersistentMouse, @mum
-        assert_equal 'mum', @mum.name
-        assert_equal 1,     @mum.size
-        assert_equal 'mum', parent
-      end
+    should "return a list of widget metadata" do
+      assert_equal [[PersistentMouse, 'mum', nil], [PersistentMouse, 'kid', 'mum'], [PersistentMouse, 'pet', 'kid'], [PersistentMouse, 'berry', 'mum']], @mum.dump_tree
     end
     
-    context "a stateful widget family" do
-      should "provide the serialized tree on _dump" do
-        assert_equal "mum|PersistenceTest::PersistentMouse|mum\nkid|PersistenceTest::PersistentMouse|mum\n", @mum._dump(10)
-      end
-      
-      should "recover the widget tree on _load" do
-        @mum = ::Apotomo::StatefulWidget._load(@mum._dump(10))
-        assert_equal 2, @mum.size
-        assert_equal @mum, @mum['kid'].parent
+    should "return a tree for #load_tree" do
+      cold_widgets = @mum.dump_tree
+      assert_equal ['mum', 'kid', 'pet', 'berry'], Apotomo::StatefulWidget.send(:load_tree, @controller, cold_widgets).collect { |n| n.name }
+    end
+    
+    context "#frozen_widget_in?" do
+      should "return true if a valid widget is passed" do
+        @session = {}
+        assert_not Apotomo::StatefulWidget.frozen_widget_in?(@session)
+        Apotomo::StatefulWidget.freeze_for(@session, @berry)
+        assert Apotomo::StatefulWidget.frozen_widget_in?(@session)
       end
     end
   end
   
-  context "#frozen_widget_in?" do
-    should "return true if a valid widget is passed" do
-      assert_not Apotomo::StatefulWidget.frozen_widget_in?({})
-      assert Apotomo::StatefulWidget.frozen_widget_in?({:apotomo_stateful_branches => [[mouse_mock, 'root']]})
-    end
-  end
+  
   
   context "#symbolized_instance_variables?" do
     should "return instance_variables as symbols" do

data/test/unit/render_test.rb

@@ -1,6 +1,8 @@
 require 'test_helper'
 
 class RenderTest < ActionView::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "Rendering a single widget" do
     setup do
       @mum = mouse_mock
@@ -133,13 +135,13 @@ class RenderTest < ActionView::TestCase
         end
         
         should "render the :view" do
-          assert_equal "<div id=\"mouse\"><snuggle></snuggle></div>", @mum.invoke(:squeak)
+          assert_equal "<div id=\"mouse\"><snuggle></snuggle></div>\n", @mum.invoke(:squeak)
         end
         
         should "render the children" do
           @mum << @kid
           
-          assert_equal "<div id=\"mouse\"><snuggle>squeeeeaaak</snuggle></div>", @mum.invoke(:squeak)
+          assert_equal "<div id=\"mouse\"><snuggle>squeeeeaaak</snuggle></div>\n", @mum.invoke(:squeak)
           assert @kid.rendered?
         end
       end
@@ -204,7 +206,7 @@ class RenderTest < ActionView::TestCase
     end
     
     should "per default render kid's content inside mums div with rendered_children" do
-      assert_equal '<div id="mum"><snuggle><div id="kid">burp!</div></snuggle></div>', @mum.invoke(:snuggle)
+      assert_equal "<div id=\"mum\"><snuggle><div id=\"kid\">burp!</div></snuggle></div>\n", @mum.invoke(:snuggle)
     end
     
     should "skip kids if :render_children=>false but still provide a rendered_children hash" do
@@ -212,7 +214,7 @@ class RenderTest < ActionView::TestCase
         def snuggle; render :render_children => false; end
       end
       
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @mum.invoke(:snuggle)
+      assert_equal "<div id=\"mum\"><snuggle></snuggle></div>\n", @mum.invoke(:snuggle)
     end
      
     should_eventually "provide an ordered rendered_children hash"