apotomo 1.2.5 → 1.2.6

data/test/rails/view_helper_test.rb

@@ -11,19 +11,13 @@ class ViewHelperTest < Apotomo::TestCase
     setup_test_states_in(subject)
     subject.invoke(:in_view, block)
   end
-  def mouse_mock(id='mum', opts={}, &block)
-    mouse = MouseWidget.new(parent_controller, id, opts)
-    mouse.instance_eval &block if block_given?
-    mouse
-  end
-
 
-  # describe "A widget state view" do
-    ### DISCUSS: what is this for?
-    teardown do
-      Apotomo.js_framework = :prototype
-    end
+  ### DISCUSS: what is this for?
+  teardown do
+    Apotomo.js_framework = :prototype
+  end
 
+  # describe "Rails::ViewHelper" do
     ### DISCUSS: needed?
     ### FIXME: could somebody get that working?
     test "respond to #multipart_form_to_event" do
@@ -36,25 +30,27 @@ class ViewHelperTest < Apotomo::TestCase
     end
 
     test "respond to #url_for_event" do
-      assert_equal("/barn/render_event_response?source=mum&amp;type=footsteps", in_view(MouseWidget) do
-        url_for_event(:footsteps)
-      end)
+      assert_equal "/barn/render_event_response?source=mum&amp;type=footsteps", in_view(MouseWidget) { url_for_event(:footsteps) }
     end
 
     test "respond to #url_for_event with a namespaced controller" do
       @controller = namespaced_controller
-      assert_equal("/farm/barn/render_event_response?source=mum&amp;type=footsteps", in_view(MouseWidget) do
-        url_for_event(:footsteps)
-      end)
+      assert_equal "/farm/barn/render_event_response?source=mum&amp;type=footsteps", in_view(MouseWidget) { url_for_event(:footsteps) }
     end
 
     test "respond to #widget_tag" do
-      assert_equal('<span id="mum">squeak!</span>', in_view(MouseWidget) do widget_tag(:span) { "squeak!" } end)
+      assert_equal('<span id="mum">squeak!</span>', in_view(MouseWidget) do
+        widget_tag(:span) do
+          "squeak!"
+        end
+      end)
     end
 
     test "respond to #widget_tag with options" do
       assert_equal('<span class="mouse" id="kid">squeak!</span>', in_view(MouseWidget) do
-        widget_tag(:span, :id => 'kid', :class => "mouse") { "squeak!" }
+        widget_tag(:span, :id => 'kid', :class => "mouse") do
+          "squeak!"
+        end
       end)
     end
 
@@ -63,14 +59,16 @@ class ViewHelperTest < Apotomo::TestCase
     end
 
     test "respond to #widget_id" do
-      assert_equal('mum', in_view(MouseWidget){ widget_id })
+      assert_equal 'mum', in_view(MouseWidget) { widget_id }
     end
 
     test "respond to #render_widget" do
       mum = mouse
       MouseWidget.new(mum, :kid)
 
-      assert_equal("<div id=\"kid\">burp!</div>\n", in_view(mum){ render_widget 'kid', :eat })
+      assert_equal("<div id=\"kid\">burp!</div>\n", in_view(mum) do
+        render_widget('kid', :eat)
+      end)
     end
 
     test "respond to #children" do
@@ -78,8 +76,15 @@ class ViewHelperTest < Apotomo::TestCase
       MouseWidget.new(mum, :kid)
 
       assert_equal("<div id=\"kid\">burp!</div>\n", in_view(mum) do
-        children.inject("") { |html, child| html += render_widget(child, :eat) }.html_safe
+        children.collect do |child|
+          render_widget(child, :eat)
+        end.join.html_safe
       end)
     end
+
+    # TODO: test #js_generator
+
+    # TODO: test instance variables access
+
   # end
 end

data/test/request_processor_test.rb

@@ -3,131 +3,139 @@ require 'test_helper'
 class RequestProcessorTest < MiniTest::Spec
   include Apotomo::TestCaseMethods::TestController
 
-  def root_mum_and_kid!
-    mum_and_kid!
-
-    @root = Apotomo::Widget.new(parent_controller, 'root', :display)
-    @root << @mum
-  end
-
-
   describe "RequestProcessor" do
     before do
       @processor = Apotomo::RequestProcessor.new(parent_controller)
-      root = @processor.root
-      root << mouse_mock
-    end
-
-    it "allow external modification of the tree" do
-      root = @processor.root
-      assert_equal 2, @processor.root.size
-    end
-
-    it "delegate #render_widget_for to #root" do
-      assert_equal 'squeak!', @processor.render_widget_for('mouse', :squeak)
-    end
-  end
-
-  describe "#attach_stateless_blocks_for" do
-    before do
-      @processor  = Apotomo::RequestProcessor.new(parent_controller)
-      @root       = @processor.root
-      assert_equal @root.size, 1
+      @processor.root << mouse_mock
     end
 
-    it "allow has_widgets blocks with root parameter" do
-      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root|
-        root << widget(:mouse, 'mouse')
-      }], @root, parent_controller)
+    describe "constructor, #parent_controller, #root" do
+      it "provide #parent_controller and a single root-node for #root" do
+        assert_kind_of Apotomo::Widget, @processor.root
+        assert_equal 2, @processor.root.size # because we added a child
+        assert_equal :root, @processor.root.name
 
-      assert_equal 'mouse', @processor.root['mouse'].name
-    end
-  end
-
-  describe "option processing at construction time" do
-    describe "with empty options" do
-      before do
-        @processor = Apotomo::RequestProcessor.new(parent_controller)
+        assert_equal parent_controller, @processor.root.parent_controller
       end
 
-      it "provide a single root-node for #root" do
-        assert_equal 1, @processor.root.size
-      end
-    end
-
-    describe "with controller" do
-      it "attach the passed parent_controller to root" do
-        assert_equal parent_controller, Apotomo::RequestProcessor.new(parent_controller, {}, []).root.parent_controller
-      end
-    end
-  end
+      # TODO: test options argument
 
+      # TODO: test has_widgets_blocks argument
 
-  describe "#process_for" do
-    before do
-      class KidWidget < Apotomo::Widget
-        responds_to_event :doorSlam, :with => :flight
-        responds_to_event :doorSlam, :with => :squeak
-        def flight; render :text => "away from here!"; end
-        def squeak; render :text => "squeak!"; end
-      end
-
-      procs = [Proc.new{ |root|
-        root << widget(:mouse, 'mum')
-          KidWidget.new(root['mum'], 'kid')
-      }]
-
-      @processor = Apotomo::RequestProcessor.new(parent_controller, {:js_framework => :prototype}, procs)
+      # TODO: test if after_initialize hook has been run
     end
 
-    it "return an empty array if nothing was triggered" do
-      assert_equal [], @processor.process_for({:type => :mouseClick, :source => 'kid'})
+    it "allow external modification of the tree" do # DISCUSS: needed?
+      assert_equal 2, @processor.root.size
     end
 
-    it "return 2 page updates when @kid squeaks" do
-      assert_equal ["away from here!", "squeak!"], @processor.process_for({:type => :doorSlam, :source => 'kid'})
+    it "delegate #render_widget_for to #root" do
+      # TODO: @processor.root should expect #render_widget_for
+      assert_equal 'squeak!', @processor.render_widget_for('mouse', :squeak)
     end
 
-    it "append the params hash to the triggered event" do
-      KidWidget.class_eval do
-        def squeak(evt); render :text => evt.data.inspect; end
-      end
+    describe "#attach_stateless_blocks_for" do
+      it "allow has_widgets blocks with root parameter" do
+        @processor.send(:attach_stateless_blocks_for, [
+          Proc.new{ |root|
+            root << widget(:mouse, 'mouse_sister')
+          },
+          Proc.new{ |root|
+            root << widget(:mouse, 'mouse_brother')
+          }], @processor.root, parent_controller)
 
-      assert_equal ["away from here!", "{:type=>:doorSlam, :source=>\"kid\"}"], @processor.process_for({:type => :doorSlam, :source => 'kid'})
-    end
+        # TODO: test if blocks are yielded
+        # TODO: test what blocks gets
 
-    it "raise an exception when :source is unknown" do
-      assert_raises Apotomo::RequestProcessor::InvalidSourceWidget do
-        @processor.process_for({:type => :squeak, :source => 'tom'})
+        assert_kind_of MouseWidget, @processor.root['mouse_sister']
+        assert_equal 'mouse_sister', @processor.root['mouse_sister'].name
+        assert_kind_of MouseWidget, @processor.root['mouse_brother']
+        assert_equal 'mouse_brother', @processor.root['mouse_brother'].name
       end
     end
-  end
-
-
-
 
-  describe "invoking #address_for" do
-    before do
-      @processor = Apotomo::RequestProcessor.new(parent_controller)
-    end
+    describe "#process_for" do
+      before do
+        class KidWidget < Apotomo::Widget
+          responds_to_event :doorSlam, :with => :flight
+          responds_to_event :doorSlam, :with => :squeak
 
-    it "accept an event :type" do
-      assert_equal({:type => :squeak, :source => 'mum'}, @processor.address_for(:type => :squeak, :source => 'mum'))
-    end
+          def flight
+            render :text => "away from here!"
+          end
 
-    it "accept arbitrary options" do
-      assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @processor.address_for(:type => :squeak, :volume => 'loud', :source => 'mum'))
-    end
+          def squeak
+            render :text => "squeak!"
+          end
+        end
+  
+        procs = [Proc.new{ |root|
+          root << widget(:mouse, 'mum')
+            KidWidget.new(root['mum'], 'kid')
+        }]
+  
+        @processor = Apotomo::RequestProcessor.new(parent_controller, {:js_framework => :prototype}, procs)
+      end
+  
+      it "return an empty array if nothing was triggered" do
+        assert_equal [], @processor.process_for(:type => :mouseClick, :source => 'kid')
+      end
+  
+      it "return ordered results if something was triggered" do
+        assert_equal ["away from here!", "squeak!"], @processor.process_for(:type => :doorSlam, :source => 'kid')
+      end
+  
+      # TODO: test a situation: root.page_updates is not empty before #process_for call
+
+      # TODO: widget instance should expect #fire
+
+      # TODO: make this test without #inspect
+      # TODO: widget instance should expect responder method (replace this test with)
+      it "append the params hash to the triggered event" do
+        KidWidget.class_eval do
+          def squeak(evt)
+            render :text => evt.data.inspect
+          end
+        end
+  
+        assert_equal ["away from here!", %Q({:type=>:doorSlam, :param=>:value, :source=>"kid"})], @processor.process_for(:type => :doorSlam, :param => :value, :source => 'kid')
+      end
+  
+      # TODO: test if after_fire hook has been run
 
-    it "complain if no type given" do
-      assert_raises RuntimeError do
-        @processor.address_for(:source => 'mum')
+      it "raise an exception when :source is unknown" do
+        e = assert_raises Apotomo::RequestProcessor::InvalidSourceWidget do
+          @processor.process_for(:type => :squeak, :source => 'tom')
+        end
+        assert_match "Source \"tom\" non-existent", e.message
       end
     end
-
-    it "complain if no source given" do
-      assert_raises RuntimeError do
-        @processor.address_for(:type => :footsteps)
+  
+    describe "#address_for" do
+      before do
+        @processor = Apotomo::RequestProcessor.new(parent_controller)
+      end
+  
+      it "accept an event :type and :source" do
+        assert_equal({:type => :squeak, :source => 'mum'}, @processor.address_for(:type => :squeak, :source => 'mum'))
+      end
+  
+      it "accept arbitrary options" do
+        assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @processor.address_for(:type => :squeak, :volume => 'loud', :source => 'mum'))
+      end
+  
+      it "complain if no :type given" do
+        e = assert_raises RuntimeError do
+          @processor.address_for(:source => 'mum')
+        end
+        assert_equal "You forgot to provide :source or :type", e.message
+      end
+  
+      it "complain if no :source given" do
+        e = assert_raises RuntimeError do
+          @processor.address_for(:type => :footsteps)
+        end
+        assert_equal "You forgot to provide :source or :type", e.message
       end
     end
   end
@@ -137,18 +145,22 @@ class RequestProcessorHooksTest < MiniTest::Spec
   include Apotomo::TestCaseMethods::TestController
   include Apotomo::TestCaseMethods
 
-  describe "Hooks in RequestProcessor" do
+  describe "RequestProcessor' hooks" do
     before do
       @kid = mouse_mock(:kid)
       @class = Class.new(Apotomo::RequestProcessor)
       @class.instance_eval do
-        def kid=(kid); @kid=kid end
-        def kid; @kid end
+        def kid=(kid); @kid = kid; end
+        def kid; @kid; end
       end
       @class.kid = @kid
     end
 
     describe ":after_initialize hook" do
+      # TODO: test when hooks are called
+      # TODO: test if block is yielded
+      # TODO: test what blocks gets
+
       it "be called after the has_widgets blocks invokation" do
         @class.after_initialize do |r|
           r.root[:mum] << self.class.kid # requires that :mum is there, yet.
@@ -170,7 +182,7 @@ class RequestProcessorHooksTest < MiniTest::Spec
         # DISCUSS: maybe add a trigger test here?
         @r = @class.new(parent_controller, {},
           [Proc.new { |root| root << widget(:mouse, :mum) }])
-        @r.process_for(:source => "root", :type => :noop) # calls ~after_fire.
+        @r.process_for(:source => "root", :type => :noop) # calls after_fire hook
 
         assert @r.root[:mum][:kid]
       end

data/test/test_case_methods.rb

@@ -10,13 +10,8 @@ module Apotomo
       end
     end
     
-    
-    # Provides a ready-to-use mouse widget instance.
     def mouse_mock(id='mouse', opts={}, &block)
-      #mouse = MouseWidget.new(parent_controller, id, opts)
-      #mouse.instance_eval &block if block_given?
       widget(:mouse, id, opts)
-      #mouse
     end
     
     def mouse_class_mock(&block)
@@ -29,17 +24,14 @@ module Apotomo
       @mum = mouse('mum')
         @kid = MouseWidget.new(@mum, 'kid')
       
-      
       @mum.respond_to_event :squeak, :with => :answer_squeak
       @mum.respond_to_event :squeak, :from => 'kid', :with => :alert
       @mum.respond_to_event :footsteps, :with => :escape
       
       @kid.respond_to_event :footsteps, :with => :peek
       
-      
       @mum.instance_eval do
         def list; @list ||= []; end
-        
         def answer_squeak;  self.list << 'answer squeak'; render :text => "squeak", :render_children => false; end
         def alert;          self.list << 'be alerted';    render :text => "alert!", :render_children => false; end
         def escape;         self.list << 'escape';        render :text => "escape", :render_children => false; end
@@ -52,16 +44,23 @@ module Apotomo
       @mum
     end
     
+    def root_mum_and_kid!
+      mum_and_kid!
+
+      @root = Apotomo::Widget.new(parent_controller, 'root', :display)
+      @root << @mum
+    end
+
     def barn_controller!
       @controller = Class.new(ActionController::Base) do
-        def self.default_url_options; {:controller => :barn}; end
+        def self.default_url_options
+          { :controller => :barn }
+        end
       end.new
-      @controller.extend ActionController::UrlWriter
-      @controller.params  = {}
+      @controller.extend(ActionController::UrlWriter)
+      @controller.params = {}
     end
-    
-
-    
+        
     module TestController
       def setup
         barn_controller!
@@ -76,9 +75,13 @@ module Apotomo
             self.request = ActionController::TestRequest.new
           end
           
-          def self.name; "BarnController"; end
+          def self.name
+            "BarnController"
+          end
           
-          def self.default_url_options; {:controller => :barn}; end
+          def self.default_url_options
+            { :controller => :barn }
+          end
         end.new
       end
       
@@ -90,8 +93,7 @@ module Apotomo
         controller = Farm::BarnController.new
         controller.request = ActionController::TestRequest.new
         controller
-      end
-      
+      end   
     end
   end
 end

data/test/test_case_test.rb

@@ -1,41 +1,41 @@
 require 'test_helper'
 require 'apotomo/test_case'
 
-class TestCaseTest < MiniTest::Spec
+class CommentsWidget < Apotomo::Widget
+end
 
-  class CommentsWidgetTest < Apotomo::TestCase
-  end
+class CommentsWidgetTest < Apotomo::TestCase
+end
 
-  class CommentsWidget < Apotomo::Widget
-  end
+class MouseWidgetTest < Apotomo::TestCase
+end
 
+class TestCaseTest < MiniTest::Spec
   describe "TestCase" do
-
     describe "responding to #root" do
-      class MouseWidgetTest < Apotomo::TestCase
-      end
-
       before do
         @klass = MouseWidgetTest
-        @test = @klass.new(:widget).tap{ |t| t.setup }
-        @klass.has_widgets { |r| r << widget(:mouse, 'mum', :eating) }
+        @test = @klass.new(:widget).tap { |t| t.setup }
+        @klass.has_widgets do |root|
+          root << widget(:mouse, 'mum', :eating)
+        end
       end
 
       it "respond to #root" do
-        assert_equal ['root', 'mum'], @test.root.collect { |w| w.name }
+        assert_equal ['root', 'mum'], @test.root.collect(&:name)
       end
 
       it "raise an error if no has_widgets block given" do
         exc = assert_raises RuntimeError do
-          @test = Class.new(Apotomo::TestCase).new(:widget).tap{ |t| t.setup }
+          @test = Class.new(Apotomo::TestCase).new(:widget).tap { |t| t.setup }
           @test.root
         end
-
         assert_equal "Please setup a widget tree using has_widgets()", exc.message
       end
 
+      # TODO: needed? why root but not self?
       it "memorize root" do
-        @test.root.visible=false
+        @test.root.visible = false
         assert_equal false, @test.root.visible?
       end
 
@@ -48,9 +48,10 @@ class TestCaseTest < MiniTest::Spec
         @test.render_widget('mum', :eat)
 
         @test.assert_select("div#mum", "burp!")
-
-        exc = assert_raises( MiniTest::Assertion){  @test.assert_select("div#mummy", "burp!"); }
-        assert_match /Expected at least 1 element matching "div#mummy", found 0/, exc.message
+        exc = assert_raises MiniTest::Assertion do
+          @test.assert_select("div#mummy", "burp!")
+        end
+        assert_match "Expected at least 1 element matching \"div#mummy\", found 0", exc.message
       end
 
       describe "using events" do
@@ -59,7 +60,7 @@ class TestCaseTest < MiniTest::Spec
           @mum.respond_to_event :footsteps, :with => :squeak
           @mum.instance_eval do
             def squeak(evt)
-              render :text => evt.data  # this usually leads to "{}".
+              render :text => evt.data
             end
           end
         end
@@ -74,6 +75,7 @@ class TestCaseTest < MiniTest::Spec
 
         it "respond to #assert_response" do
           @test.trigger(:footsteps, 'mum')
+
           assert @test.assert_response("{}")
         end
       end
@@ -81,6 +83,7 @@ class TestCaseTest < MiniTest::Spec
       describe "#view_assigns" do
         it "be emtpy when nothing was set" do
           @test.render_widget('mum')
+
           assert_equal({}, @test.view_assigns)
         end
 
@@ -92,23 +95,17 @@ class TestCaseTest < MiniTest::Spec
             end
           end
           @test.render_widget('mum', :sleep)
+
           assert_equal({:duration => "8h"}, @test.view_assigns)
         end
       end
     end
 
-    describe "responding to parent_controller" do
-      before do
-        @test = Apotomo::TestCase.new(:widget).tap{ |t| t.setup }
-      end
+    it "respond to #parent_controller and return a controller with correct #controller_path" do
+      @test = Apotomo::TestCase.new(:widget).tap { |t| t.setup }
 
-      it "provide a test controller" do
-        assert_kind_of ActionController::Base, @test.parent_controller
-      end
-
-      it "respond to #controller_path" do
-        assert_equal "barn", @test.parent_controller.controller_path
-      end
+      assert_kind_of ActionController::Base, @test.parent_controller
+      assert_equal "barn", @test.parent_controller.controller_path
     end
   end
 end

data/test/test_helper.rb

@@ -9,9 +9,7 @@ require 'apotomo'
 
 Apotomo::Widget.append_view_path(File.expand_path(File.dirname(__FILE__) + "/widgets"))
 
-# Load test support files.
-require "test_case_methods"
-
+require "test_case_methods" # Load test support files.
 
 MiniTest::Spec.class_eval do
   include Apotomo::WidgetShortcuts
@@ -48,9 +46,11 @@ class MouseWidget < Apotomo::Widget
   def squeak
     render :text => "squeak!"
   end
+
   def eating
     render
   end
+
   def eat
     render
   end