apotomo 0.1.4 → 1.0.0.beta1

data/test/unit/request_processor_test.rb

@@ -1,9 +1,29 @@
 require 'test_helper'
 
-class RequestProcessorTest < Test::Unit::TestCase
+class RequestProcessorTest < ActiveSupport::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
+  def root_mum_and_kid!
+    
+        mum_and_kid!
+        
+        @root = Apotomo::Widget.new(parent_controller, 'root', :display)
+        @root << @mum
+        
+        
+        @session = {}
+        #freeze!
+  end
+  
+  # Call SW.freeze_for on @session, "freezing" stateful widgets below @root there.
+  def freeze!
+    Apotomo::StatefulWidget.freeze_for(@session, @root)
+  end
+  
+  
   context "#root" do
     should "allow external modification of the tree" do
-      @processor = Apotomo::RequestProcessor.new(nil, {})
+      @processor = Apotomo::RequestProcessor.new(parent_controller, {})
       root = @processor.root
       root << mouse_mock
       assert_equal 2, @processor.root.size
@@ -12,18 +32,23 @@ class RequestProcessorTest < Test::Unit::TestCase
   
   context "#attach_stateless_blocks_for" do
     setup do
-      @processor  = Apotomo::RequestProcessor.new("controller", {})
+      @processor  = Apotomo::RequestProcessor.new(parent_controller, {})
       @root       = @processor.root
-      @controller = "yo"
+      assert_equal @root.size, 1
     end
     
     should "allow has_widgets blocks with root parameter, only" do
-      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root| root.add mouse_mock }], @root, @controller)
+      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root|
+        root.add widget('mouse_cell', 'mouse') 
+      }], @root, parent_controller)
+      
       assert_equal 'mouse', @processor.root['mouse'].name
     end
     
     should "allow has_widgets blocks with both root and controller parameter" do
-      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root,controller| root.add mouse_mock }], @root, @controller)
+      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root,controller| 
+        root.add widget('mouse_cell', 'mouse') 
+      }], @root, parent_controller)
       assert_equal 'mouse', @processor.root['mouse'].name
     end
   end
@@ -31,7 +56,7 @@ class RequestProcessorTest < Test::Unit::TestCase
   context "option processing at construction time" do
     context "with empty session and options" do
       setup do
-        @processor = Apotomo::RequestProcessor.new(nil, {})
+        @processor = Apotomo::RequestProcessor.new(parent_controller, {})
       end
       
       should "mark the tree as flushed" do
@@ -48,17 +73,18 @@ class RequestProcessorTest < Test::Unit::TestCase
     end
     
     context "with controller" do
-      should "attach the passed controller to root" do
-        assert_equal "controller", Apotomo::RequestProcessor.new("controller", {}, {}, []).root.controller
+      should "attach the passed parent_controller to root" do
+        assert_equal parent_controller, Apotomo::RequestProcessor.new(parent_controller, {}, {}, []).root.parent_controller
       end
     end
     
     context "with session" do
       setup do
-        mum_and_kid!
+        root_mum_and_kid!
         @mum.version = 1
-        @session = {:apotomo_stateful_branches => [[@mum, 'root']]}
-        @processor = Apotomo::RequestProcessor.new(nil, @session)
+        freeze!
+        
+        @processor = Apotomo::RequestProcessor.new(parent_controller, @session)
       end
       
       should "provide a widget family for #root" do
@@ -69,7 +95,7 @@ class RequestProcessorTest < Test::Unit::TestCase
       
       context "having a flush flag set" do
         setup do
-          @processor = Apotomo::RequestProcessor.new(nil, @session, :flush_widgets => true)
+          @processor = Apotomo::RequestProcessor.new(parent_controller, @session, :flush_widgets => true)
         end
         
         should "provide a single root for #root when :flush_widgets is set" do
@@ -86,8 +112,9 @@ class RequestProcessorTest < Test::Unit::TestCase
       
       context "and with stateless widgets" do
         setup do
-          @session = {:apotomo_stateful_branches => [[@mum, 'grandma']]}
-          @processor = Apotomo::RequestProcessor.new(nil, @session, {}, [Proc.new { |root| root << Apotomo::Widget.new('grandma', :eating) }])
+          root_mum_and_kid!
+          freeze!
+          @processor = Apotomo::RequestProcessor.new(parent_controller, @session, {}, [Proc.new { |root| root << Apotomo::Widget.new(parent_controller, 'grandma', :eating) }])
         end
         
         should "first attach passed stateless, then stateful widgets to root" do
@@ -100,31 +127,26 @@ class RequestProcessorTest < Test::Unit::TestCase
   
   context "#process_for" do
     setup do
-      ### FIXME: what about that automatic @controller everywhere?
-      mum_and_kid!
-      @mum.controller = nil # check if controller gets connected.
-      @processor = Apotomo::RequestProcessor.new(nil, {:apotomo_stateful_branches => [[@mum, 'root']]}, :js_framework => :prototype)
-      
-      
-      
-      
-      
-      @kid.respond_to_event :doorSlam, :with => :eating, :on => 'mum'
-          @kid.respond_to_event :doorSlam, :with => :squeak
-          @mum.respond_to_event :doorSlam, :with => :squeak
-          
-          @mum.instance_eval do
-            def squeak; render :js => 'squeak();'; end
-          end
-          @kid.instance_eval do
-            def squeak; render :text => 'squeak!', :update => :true; end
-          end
+      class KidCell < 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,controller| 
+        root << mum = MouseCell.new(parent_controller, 'mum', :squeak) << KidCell.new(parent_controller, 'kid', :squeak)
+      }]
+    
+      @processor = Apotomo::RequestProcessor.new(parent_controller, {}, {:js_framework => :prototype}, procs)
     end
-      
-    should "return 2 page_updates when @kid squeaks" do
-      res = @processor.process_for({:type => :squeak, :source => 'kid'})
-      
-      assert_equal ["alert!", "squeak"], res
+    
+    should "return an empty array if nothing was triggered" do
+      assert_equal [], @processor.process_for({:type => :mouseClick, :source => 'kid'})
+    end
+    
+    should "return 2 page updates when @kid squeaks" do
+      assert_equal ["away from here!", "squeak!"], @processor.process_for({:type => :doorSlam, :source => 'kid'})
     end
     
     should "raise an exception when :source is unknown" do
@@ -138,32 +160,32 @@ class RequestProcessorTest < Test::Unit::TestCase
   
   context "#freeze!" do
     should "serialize stateful branches to @session" do
-      @processor = Apotomo::RequestProcessor.new(nil, {})
+      @processor = Apotomo::RequestProcessor.new(parent_controller, {})
       @processor.root << mum_and_kid!
       assert_equal 3, @processor.root.size
       @processor.freeze!
       
-      @processor = Apotomo::RequestProcessor.new(nil, @processor.session)
+      @processor = Apotomo::RequestProcessor.new(parent_controller, @processor.session)
       assert_equal 3, @processor.root.size
     end
   end
   
   context "#render_widget_for" do
     setup do
-      @mum = mouse_mock('mum', :snuggle) do
-        def snuggle; render; end
+      class MouseCell < Apotomo::Widget
+        def squeak; render :text => "squeak!"; end
       end
-      @mum.controller = nil
       
-      @processor = Apotomo::RequestProcessor.new(nil, {:apotomo_stateful_branches => [[@mum, 'root']]})
+      @processor = Apotomo::RequestProcessor.new(parent_controller, {}, {}, 
+        [Proc.new { |root| root << MouseCell.new(parent_controller, 'mum', :squeak) }])
     end
     
     should "render the widget when passing an existing widget id" do
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for('mum', {})
+      assert_equal 'squeak!', @processor.render_widget_for('mum', {})
     end
     
     should "render the widget when passing an existing widget instance" do
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for(@mum, {})
+      assert_equal 'squeak!', @processor.render_widget_for(@processor.root['mum'], {})
     end
     
     should "raise an exception when a non-existent widget id id passed" do
@@ -175,7 +197,7 @@ class RequestProcessorTest < Test::Unit::TestCase
   
   context "invoking #address_for" do
     setup do
-      @processor = Apotomo::RequestProcessor.new(nil, {})
+      @processor = Apotomo::RequestProcessor.new(parent_controller, {})
     end
     
     should "accept an event :type" do

data/test/unit/stateful_widget_test.rb

@@ -1,9 +1,11 @@
 require 'test_helper'
 
 class StatefulWidgetTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "The StatefulWidget" do
     setup do
-      @mum = Apotomo::StatefulWidget.new('mum', :squeak)
+      @mum = Apotomo::StatefulWidget.new(parent_controller, 'mum', :squeak)
     end
     
     should "accept an id as first option" do

data/test/unit/transition_test.rb

@@ -19,6 +19,7 @@ class TransitionTest < Test::Unit::TestCase
       end
       
       assert_equal :sleep, @mum.send(:next_state_for, :snuggle)
+      assert_equal :sleep, @mum.send(:next_state_for, "snuggle")
     end
     
     should "return the state that was defined last" do

data/test/unit/widget_shortcuts_test.rb

@@ -4,8 +4,9 @@ class MumWidget < MouseCell; end
 class MouseTabs;end
 
 class WidgetShortcutsTest < Test::Unit::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
   context "#constant_for" do
-    
     should "constantize symbols" do
       assert_equal MumWidget, constant_for(:mum_widget)
     end
@@ -21,7 +22,7 @@ class WidgetShortcutsTest < Test::Unit::TestCase
     end
   end
   
-  context "#widget" do
+  context "#widget" do   
     context "with all arguments" do
       setup do
         @mum = widget(:mum_widget, 'mum', :eating)

data/test/unit/widget_test.rb

@@ -1,15 +1,24 @@
 require 'test_helper'
 
 class WidgetTest < ActiveSupport::TestCase
+  include Apotomo::TestCaseMethods::TestController
+  
+  context "The constructor" do
+    should "accept the parent_controller as first arg" do
+      assert_kind_of ActionController::Base, @controller
+      @mum = Apotomo::Widget.new(@controller, 'mum', :squeak)
+    end
+  end
+  
   context "Widget.has_widgets" do
     setup do
       @mum = Class.new(MouseCell) do
         has_widgets do |me|
           me << widget('mouse_cell', 'baby', :squeak)
         end
-      end.new('mum', :squeak)
+      end.new(@controller, 'mum', :squeak)
       
-      @kid = Class.new(@mum.class).new('mum', :squeak)
+      @kid = Class.new(@mum.class).new(@controller, 'mum', :squeak)
     end
     
     should "setup the widget family at creation time" do
@@ -29,7 +38,7 @@ class WidgetTest < ActiveSupport::TestCase
         after_add do |me, parent|
           parent << widget('mouse_cell', 'kid', :squeak)
         end
-      end.new('mum', :squeak)
+      end.new(@controller, 'mum', :squeak)
       
       @root = mouse_mock('root')
     end
@@ -42,7 +51,7 @@ class WidgetTest < ActiveSupport::TestCase
     end
     
     should "inherit callbacks for now" do
-      @berry = Class.new(@mum.class).new('berry', :squeak)
+      @berry = Class.new(@mum.class).new(@controller, 'berry', :squeak)
       @root << @berry
       
       assert_equal ['berry', 'kid'], @root.children.collect { |w| w.name }
@@ -51,69 +60,73 @@ class WidgetTest < ActiveSupport::TestCase
   
   context "A stateless widget" do
     setup do
-      @mum = Apotomo::Widget.new('mum', :squeak)
+      @mum = Apotomo::Widget.new(@controller, 'mum', :squeak)
     end
     
     context "responding to #address_for_event" do
-        should "accept an event :type" do
-          assert_equal({:type => :squeak, :source => 'mum'}, @mum.address_for_event(:type => :squeak))
-        end
-        
-        should "accept a :source" do
-          assert_equal({:type => :squeak, :source => 'kid'}, @mum.address_for_event(:type => :squeak, :source => 'kid'))
-        end
-        
-        should "accept arbitrary options" do
-          assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @mum.address_for_event(:type => :squeak, :volume => 'loud'))
-        end
-        
-        should "complain if no type given" do
-          assert_raises RuntimeError do
-            @mum.address_for_event(:source => 'mum')
-          end
-        end
+      should "accept an event :type" do
+        assert_equal({:type => :squeak, :source => 'mum'}, @mum.address_for_event(:type => :squeak))
       end
       
-      context "implementing visibility" do
-        should "per default respond to #visible?" do
-          assert @mum.visible?
-        end
-        
-        should "expose a setter therefore" do
-          @mum.visible = false
-          assert_not @mum.visible?
-        end
-        
-        context "in a widget family" do
-          setup do
-            @mum << @jerry = mouse_mock('jerry')
-            @mum << @berry = mouse_mock('berry')
-          end
-          
-          should "per default return all #visible_children" do
-            assert_equal [@jerry, @berry], @mum.visible_children
-            assert_equal [], @jerry.visible_children
-          end
-          
-          should "hide berry in #visible_children if he's invisible" do
-            @berry.visible = false
-            assert_equal [@jerry], @mum.visible_children
-          end
-        end
+      should "accept a :source" do
+        assert_equal({:type => :squeak, :source => 'kid'}, @mum.address_for_event(:type => :squeak, :source => 'kid'))
+      end
+      
+      should "accept arbitrary options" do
+        assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @mum.address_for_event(:type => :squeak, :volume => 'loud'))
       end
       
-      should "respond to #find_widget" do
-        mum_and_kid!
-        assert_not @mum.find_widget('pet')
-        assert_equal @kid, @mum.find_widget('kid')
+      should "complain if no type given" do
+        assert_raises RuntimeError do
+          @mum.address_for_event(:source => 'mum')
+        end
+      end
+    end
+    
+    context "implementing visibility" do
+      should "per default respond to #visible?" do
+        assert @mum.visible?
       end
       
-      should "respond to the WidgetShortcuts methods, like #widget" do
-        assert_respond_to @mum, :widget
+      should "expose a setter therefore" do
+        @mum.visible = false
+        assert_not @mum.visible?
       end
       
-      should "alias #widget_id to #name" do
-        assert_equal @mum.name, @mum.widget_id
+      context "in a widget family" do
+        setup do
+          @mum << @jerry = mouse_mock('jerry')
+          @mum << @berry = mouse_mock('berry')
+        end
+        
+        should "per default return all #visible_children" do
+          assert_equal [@jerry, @berry], @mum.visible_children
+          assert_equal [], @jerry.visible_children
+        end
+        
+        should "hide berry in #visible_children if he's invisible" do
+          @berry.visible = false
+          assert_equal [@jerry], @mum.visible_children
+        end
       end
     end
+    
+    should "respond to #find_widget" do
+      mum_and_kid!
+      assert_not @mum.find_widget('pet')
+      assert_equal @kid, @mum.find_widget('kid')
+    end
+    
+    should "respond to the WidgetShortcuts methods, like #widget" do
+      assert_respond_to @mum, :widget
+    end
+    
+    should "respond to #parent_controller" do
+      assert_equal @controller, @mum.parent_controller
+    end
+    
+    should "alias #widget_id to #name" do
+      assert_equal @mum.name, @mum.widget_id
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apotomo
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
+  prerelease: true
   segments: 
-  - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 0
+  - 0
+  - beta1
+  version: 1.0.0.beta1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-12 00:00:00 +02:00
+date: 2010-10-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,27 +26,26 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 3
-        - 3
-        version: "3.3"
+        - 4
+        - 2
+        version: 3.4.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rails
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 2
         - 3
         - 0
-        version: 2.3.0
+        - 0
+        version: 3.0.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -57,7 +56,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 1
@@ -73,7 +71,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
         segments: 
         - 0
         - 1
@@ -81,7 +78,7 @@ dependencies:
         version: 0.1.2
   type: :runtime
   version_requirements: *id004
-description: A generic widget framework for Rails. Event-driven. Clean. Fast. Free optional statefulness included.
+description: Web components for Rails. Event-driven. Clean. Fast. Free optional statefulness included.
 email: apotonick@gmail.com
 executables: []
 
@@ -98,14 +95,7 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
-- app/.jeweler_doesnt_like_empty_directories
 - config/routes.rb
-- generators/widget/USAGE
-- generators/widget/templates/functional_test.rb
-- generators/widget/templates/view.html.erb
-- generators/widget/templates/view.html.haml
-- generators/widget/templates/widget.rb
-- generators/widget/widget_generator.rb
 - lib/apotomo.rb
 - lib/apotomo/caching.rb
 - lib/apotomo/container_widget.rb
@@ -122,12 +112,17 @@ files:
 - lib/apotomo/rails/view_methods.rb
 - lib/apotomo/request_processor.rb
 - lib/apotomo/stateful_widget.rb
-- lib/apotomo/test_methods.rb
 - lib/apotomo/transition.rb
 - lib/apotomo/tree_node.rb
 - lib/apotomo/version.rb
 - lib/apotomo/widget.rb
 - lib/apotomo/widget_shortcuts.rb
+- lib/generators/apotomo/USAGE
+- lib/generators/apotomo/templates/view.erb
+- lib/generators/apotomo/templates/view.haml
+- lib/generators/apotomo/templates/widget.rb
+- lib/generators/apotomo/templates/widget_test.rb
+- lib/generators/apotomo/widget_generator.rb
 - rails/init.rb
 - test/fixtures/application_widget_tree.rb
 - test/rails/view_methods_test.rb
@@ -136,13 +131,27 @@ files:
 - test/rails/widget_generator_test.rb
 - test/rails/rails_integration_test.rb
 - test/test_helper.rb
-- test/support/assertions_helper.rb
 - test/support/test_case_methods.rb
+- test/dummy/config/application.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/tmp/test/widgets/mouse_widget_test.rb
+- test/dummy/tmp/app/cells/mouse_widget.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/unit/test_widget_shortcuts.rb
 - test/unit/event_handler_test.rb
 - test/unit/widget_shortcuts_test.rb
 - test/unit/stateful_widget_test.rb
-- test/unit/test_methods_test.rb
 - test/unit/test_addressing.rb
 - test/unit/invoke_test.rb
 - test/unit/container_test.rb
@@ -173,26 +182,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Event-driven Widgets for Rails with optional Statefulness.
+summary: Web components for Rails.
 test_files: 
 - test/fixtures/application_widget_tree.rb
 - test/rails/view_methods_test.rb
@@ -201,13 +210,27 @@ test_files:
 - test/rails/widget_generator_test.rb
 - test/rails/rails_integration_test.rb
 - test/test_helper.rb
-- test/support/assertions_helper.rb
 - test/support/test_case_methods.rb
+- test/dummy/config/application.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/routes.rb
+- test/dummy/config/boot.rb
+- test/dummy/config/environment.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/tmp/test/widgets/mouse_widget_test.rb
+- test/dummy/tmp/app/cells/mouse_widget.rb
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
 - test/unit/test_widget_shortcuts.rb
 - test/unit/event_handler_test.rb
 - test/unit/widget_shortcuts_test.rb
 - test/unit/stateful_widget_test.rb
-- test/unit/test_methods_test.rb
 - test/unit/test_addressing.rb
 - test/unit/invoke_test.rb
 - test/unit/container_test.rb

data/generators/widget/templates/functional_test.rb

@@ -1,8 +0,0 @@
-require "test_helper"
-
-class <%= class_name %>Test < Test::Unit::TestCase
-  test "a first test" do
-    html = widget(:<%= file_name %>, :<%= states.first %>, 'my_<%= file_name %>').invoke
-    assert_selekt html, "p"
-  end
-end

data/generators/widget/templates/view.html.erb

@@ -1,2 +0,0 @@
-<h1><%= class_name %>#<%= action %></h1>
-<p>Find me in <%= path %></p>

data/generators/widget/templates/view.html.haml

@@ -1,3 +0,0 @@
-%h1 "<%= class_name %>#<%= action %>"
-%p
-  Find me in <%= path %>