apotomo 0.1.2 → 0.1.3

data/Gemfile

@@ -3,8 +3,9 @@ source "http://rubygems.org"
 gem "rails", "~> 2.3.8"
 gem "cells", "3.3.4"
 gem "onfire"
+gem "hooks", "~> 0.1"
 gem "jeweler"
 
 # for test env:
 gem "shoulda"
-gem "mocha"
+gem "mocha"

data/Gemfile.lock

@@ -14,6 +14,8 @@ GEM
     cells (3.3.4)
     gemcutter (0.6.1)
     git (1.2.5)
+    hooks (0.1)
+      activesupport (>= 2.3.0)
     jeweler (1.4.0)
       gemcutter (>= 0.1.0)
       git (>= 1.2.5)
@@ -40,6 +42,7 @@ PLATFORMS
 
 DEPENDENCIES
   cells (= 3.3.4)
+  hooks (~> 0.1)
   jeweler
   mocha
   onfire

data/Rakefile

@@ -5,59 +5,21 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+$:.unshift File.dirname(__FILE__)+"/lib" # add current dir to LOAD_PATHS
+
 desc 'Default: run unit tests.'
 task :default => :test
 
 desc 'Test the Apotomo plugin.'
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
+  t.libs << 'test'
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
 end
 
-namespace 'rdoc' do
-	desc 'Generate documentation for Apotomo.'
-	Rake::RDocTask.new(:build) do |rdoc|
-		rdoc.rdoc_dir = 'rdoc'
-		rdoc.title    = 'Apotomo API'
-		rdoc.options << '--line-numbers' << '--inline-source' << '-m README'
-		
-		rdoc.rdoc_files.include('lib/**/*.rb')
-		rdoc.rdoc_files.include('app/**/*.rb')
-		rdoc.rdoc_files.include('test/*.rb')
-		rdoc.rdoc_files.include('README')
-	end
-	
-	desc 'Upload the rdocs to apotomo.rubyforge.org.'
-	task :upload do
-		sh %{ scp -r rdoc nix@rubyforge.org:/var/www/gforge-projects/apotomo/ }
-	end
-end
 
-# Gem managment tasks.
-#
-# == Bump gem version (any):
-#
-#   rake version:bump:major
-#   rake version:bump:minor
-#   rake version:bump:patch
-#
-# == Generate gemspec, build & install locally:
-#
-#   rake gemspec
-#   rake build
-#   sudo rake install
-#
-# == Git tag & push to origin/master
-#
-#   rake release
-#
-# == Release to Gemcutter.org:
-#
-#   rake gemcutter:release
-#
 require 'jeweler'
-require 'lib/apotomo/version'
+require 'apotomo/version'
 
 Jeweler::Tasks.new do |spec|
   spec.name         = "apotomo"
@@ -73,6 +35,7 @@ Jeweler::Tasks.new do |spec|
   spec.add_dependency 'cells', '~> 3.3'
   spec.add_dependency 'activesupport', '>= 2.3.0'
   spec.add_dependency 'onfire', '>= 0.1.0'
+  spec.add_dependency 'hooks', '~> 0.1'
 end
 
-Jeweler::GemcutterTasks.new
+Jeweler::GemcutterTasks.new

data/lib/apotomo/event_methods.rb

@@ -12,7 +12,7 @@ module Apotomo
     
     def self.included(base)
       base.extend(ClassMethods)
-      base.initialize_hooks << :add_class_event_handlers
+      base.after_initialize :add_class_event_handlers
     end
     
     def add_class_event_handlers(*)

data/lib/apotomo/rails/controller_methods.rb

@@ -11,8 +11,8 @@ require 'apotomo/rails/view_methods'
             extend WidgetShortcuts
             extend ClassMethods      
             
-            class_inheritable_array :uses_widgets_blocks
-            self.uses_widgets_blocks = []
+            class_inheritable_array :has_widgets_blocks
+            self.has_widgets_blocks = []
             
             helper ::Apotomo::Rails::ViewMethods
             
@@ -22,7 +22,7 @@ require 'apotomo/rails/view_methods'
         
         module ClassMethods
           def has_widgets(&block)
-            uses_widgets_blocks << block
+            has_widgets_blocks << block
           end
           
           alias_method :uses_widgets, :has_widgets
@@ -45,7 +45,7 @@ require 'apotomo/rails/view_methods'
                       :js_framework   => Apotomo.js_framework || :prototype,
           }  ### TODO: process rails options (flush_tree, version)
           
-          @apotomo_request_processor = Apotomo::RequestProcessor.new(self, session, options, self.class.uses_widgets_blocks)
+          @apotomo_request_processor = Apotomo::RequestProcessor.new(self, session, options, self.class.has_widgets_blocks)
           
           flush_bound_use_widgets_blocks if @apotomo_request_processor.widgets_flushed?
           

data/lib/apotomo/request_processor.rb

@@ -4,14 +4,14 @@ module Apotomo
     
     attr_reader :session, :root
     
-    def initialize(controller, session, options={}, uses_widgets_blocks=[])
+    def initialize(controller, session, options={}, has_widgets_blocks=[])
       @session              = session
       @widgets_flushed      = false
       
       @root = widget('apotomo/widget', 'root')
       @root.controller = controller
       
-      attach_stateless_blocks_for(uses_widgets_blocks, @root, controller)
+      attach_stateless_blocks_for(has_widgets_blocks, @root, controller)
       
       if options[:flush_widgets].blank? and ::Apotomo::StatefulWidget.frozen_widget_in?(session)  
         @root = ::Apotomo::StatefulWidget.thaw_for(session, @root)

data/lib/apotomo/test_methods.rb

@@ -0,0 +1,8 @@
+module Apotomo
+  module TestMethods
+    def render_widget(*args)
+      @controller.render_widget(*args)
+    end
+    
+  end
+end

data/lib/apotomo/tree_node.rb

@@ -8,14 +8,10 @@ module TreeNode
   attr_writer :content, :parent
   
   def self.included(base)
-    base.after_initialize :initialize_tree_node_for
+    base.after_initialize :initialize_tree_node
   end
   
-  # Constructor which expects the name of the node
-  #
-  # name of the node is expected to be unique across the
-  # tree.
-  def initialize_tree_node_for(name, *args)
+  def initialize_tree_node(*)
     self.setAsRoot!
 
     @childrenHash = Hash.new
@@ -49,7 +45,9 @@ module TreeNode
       @childrenHash[child.name]  = child
       @children << child
       child.parent = self
-      return child
+      
+      child.run_hook :after_add, child, self
+    child
   end
 
   # Removes the specified child node from the receiver node.

data/lib/apotomo/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Apotomo
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/lib/apotomo/widget.rb

@@ -1,25 +1,33 @@
+require 'cells'
 require 'onfire'
-require 'apotomo/tree_node'
-
+require 'hooks'
 
+require 'apotomo/tree_node'
 require 'apotomo/event'
 require 'apotomo/event_methods'
 require 'apotomo/transition'
 require 'apotomo/caching'
-require 'apotomo/deep_link_methods'
 require 'apotomo/widget_shortcuts'
 require 'apotomo/rails/view_helper'
 
-### TODO: use load_hooks when switching to rails 3.
-# wycats@gmail.com: ActiveSupport.run_load_hooks(:name)
-# (21:01:17) wycats@gmail.com: ActiveSupport.on_load(:name) { … }
-#require 'active_support/lazy_load_hooks'
-
 module Apotomo
   class Widget < Cell::Base
+    include Hooks
     
-    class_inheritable_array :initialize_hooks, :instance_writer => false
-    self.initialize_hooks = []
+    # Use this for setup code you're calling in every state. Almost like a +before_filter+ except that it's
+    # invoked after the initialization in #has_widgets.
+    #
+    # Example:
+    #
+    #   class MouseWidget < Apotomo::Widget
+    #     after_initialize :setup_cheese
+    #     
+    #     # we need @cheese in every state:
+    #     def setup_cheese(*)
+    #       @cheese = Cheese.find @opts[:cheese_id]
+    define_hook :after_initialize
+    define_hook :has_widgets
+    define_hook :after_add
     
     attr_accessor :opts
     attr_writer   :visible
@@ -27,34 +35,8 @@ module Apotomo
     attr_writer   :controller
     attr_accessor :version
     
-    ### DISCUSS: extract to has_widgets_methods for both Widget and Controller?
-    #class_inheritable_array :has_widgets_blocks
-    
     class << self
       include WidgetShortcuts
-      
-      def has_widgets_blocks
-        @has_widgets_blocks ||= []
-      end
-      
-      def has_widgets(&block)
-        has_widgets_blocks << block
-      end
-      
-      # Use this for setup code you're calling in every state. Almost like a +before_filter+ except that it's
-      # invoked after the initialization in #has_widgets.
-      #
-      # Example:
-      #
-      #   class MouseWidget < Apotomo::Widget
-      #     after_initialize :setup_cheese
-      #     
-      #     # we need @cheese in every state:
-      #     def setup_cheese(*)
-      #       @cheese = Cheese.find @opts[:cheese_id]
-      def after_initialize(method)
-        self.initialize_hooks << method
-      end
     end
     
     include TreeNode
@@ -64,15 +46,15 @@ module Apotomo
     
     include Transition
     include Caching
-    
-    include DeepLinkMethods
     include WidgetShortcuts
     
     helper Apotomo::Rails::ViewHelper
     
     
+    
+    
     def add_has_widgets_blocks(*)
-      self.class.has_widgets_blocks.each { |block| block.call(self) }
+      run_hook :has_widgets, self
     end
     after_initialize :add_has_widgets_blocks
     
@@ -89,11 +71,7 @@ module Apotomo
       
       @cell         = self
       
-      process_initialize_hooks(id, start_state, opts)
-    end
-    
-    def process_initialize_hooks(*args)
-      self.class.initialize_hooks.each { |method| send(method, *args) }
+      run_hook(:after_initialize, id, start_state, opts)
     end
     
     def last_state
@@ -211,15 +189,32 @@ module Apotomo
     
     alias_method :emit, :render
     
-    
+    # Wraps the rendered content in a replace statement targeted at your +Apotomo.js_framework+ setting.
+    # Use +:selector+ to change the selector.
+    #
+    # Example:
+    #
+    # Assuming you set 
+    #   Apotomo.js_framework = :jquery
+    #
+    # and call replace in a state
+    #
+    #   replace :view => :squeak, :selector => "div#mouse"
+    #   #=> "$(\"div#mouse\").replaceWith(\"<div id=\\\"mum\\\">squeak!<\\/div>\")"
     def replace(options={})
       content = render(options)
-      Apotomo.js_generator.replace(self.name, content) 
+      Apotomo.js_generator.replace(options[:selector] || self.name, content)
     end
     
+    # Same as replace except that the content is wrapped in an update statement.
+    #
+    # Example for +:jquery+:
+    #
+    #   update :view => :squeak
+    #   #=> "$(\"mum\").html(\"<div id=\\\"mum\\\">squeak!<\\/div>\")"
     def update(options={})
       content = render(options)
-      Apotomo.js_generator.update(self.name, content)
+      Apotomo.js_generator.update(options[:selector] || self.name, content)
     end
 
     # Force the FSM to go into <tt>state</tt>, regardless whether it's a valid 
@@ -299,5 +294,7 @@ module Apotomo
     def controller
       root? ? @controller : root.controller
     end
+    
+    alias_method :widget_id, :name
   end
-end
+end

data/lib/apotomo.rb

@@ -19,11 +19,6 @@
 #  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
-#  
-
-
-require 'cells'
-require 'onfire'
 
 module Apotomo
   class << self
@@ -47,13 +42,10 @@ module Apotomo
   end
 end
 
-### FIXME: move to rails.rb
-
 require 'apotomo/javascript_generator'
 Apotomo.js_framework = :prototype ### DISCUSS: move to rails.rb
 
-### DISCUSS: move to 'apotomo/widgets'?
 require 'apotomo/widget'
 require 'apotomo/stateful_widget'
 require 'apotomo/container_widget'
-require 'apotomo/widget_shortcuts'
+require 'apotomo/widget_shortcuts'

data/test/rails/controller_methods_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
  
 class ControllerMethodsTest < ActionController::TestCase
   context "A Rails controller" do
@@ -24,9 +24,9 @@ class ControllerMethodsTest < ActionController::TestCase
       end
     end
     
-    context "invoking #uses_widgets" do
+    context "invoking #has_widgets" do
       setup do
-        @controller.class.uses_widgets do |root|
+        @controller.class.has_widgets do |root|
           root << mouse_mock('mum')
         end
       end
@@ -40,8 +40,8 @@ class ControllerMethodsTest < ActionController::TestCase
         assert @controller.apotomo_root['mum']
       end
       
-      should "allow multiple calls to uses_widgets" do
-        @controller.class.uses_widgets do |root|
+      should "allow multiple calls to has_widgets" do
+        @controller.class.has_widgets do |root|
           root << mouse_mock('kid')
         end
         
@@ -49,10 +49,10 @@ class ControllerMethodsTest < ActionController::TestCase
         assert @controller.apotomo_root['kid']
       end
       
-      should "inherit uses_widgets blocks to sub-controllers" do
+      should "inherit has_widgets blocks to sub-controllers" do
         berry = mouse_mock('berry')
         @sub_controller = Class.new(@controller.class) do
-          uses_widgets { |root| root << berry }
+          has_widgets { |root| root << berry }
         end.new
         @sub_controller.params  = {}
         @sub_controller.session = {}
@@ -203,4 +203,4 @@ class ControllerMethodsTest < ActionController::TestCase
     end
   end
   
-end
+end

data/test/rails/rails_integration_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w(.. test_helper))
+require 'test_helper'
 
 class RailsIntegrationTest < ActionController::TestCase
   def simulate_request!
@@ -96,4 +96,4 @@ class RailsIntegrationTest < ActionController::TestCase
       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
     end
   end
-end
+end

data/test/rails/view_helper_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
-
+require 'test_helper'
 require 'action_view/test_case'
 
 class ViewHelperTest < ActionView::TestCase
@@ -96,4 +95,4 @@ class ViewHelperTest < ActionView::TestCase
       @mum.url_for_event(:bla)
     end
   end
-end
+end

data/test/rails/view_methods_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
  
 class ViewMethodsTest < ActionController::TestCase
   context "A Rails controller view" do
@@ -37,4 +37,4 @@ class ViewMethodsTest < ActionController::TestCase
       assert_equal "/apotomo/render_event_response?source=mum&type=footsteps", @response.body
     end
   end
-end
+end

data/test/rails/widget_generator_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w(.. test_helper))
+require 'test_helper'
 require 'rails_generator'
 require 'rails_generator/scripts/generate'
 
@@ -44,4 +44,4 @@ class WidgetGeneratorTest < Test::Unit::TestCase
   def file_list
     Dir.glob(File.join(fake_rails_root, "**/*"))
   end 
-end
+end

data/test/unit/apotomo_test.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
+require 'test_helper'
 
 class ApotomoTest < Test::Unit::TestCase
   context "The main module" do    
@@ -17,4 +17,4 @@ class ApotomoTest < Test::Unit::TestCase
       assert_respond_to Apotomo.js_generator, :prototype
     end
   end
-end
+end

data/test/unit/container_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class ContainerTest < Test::Unit::TestCase
   context "Rendering a container" do
@@ -17,4 +17,4 @@ class ContainerTest < Test::Unit::TestCase
       assert_equal "<div id=\"family\"><div id=\"mum\">burp!</div>\n<div id=\"kid\">burp!</div></div>", @family.invoke
     end
   end
-end
+end

data/test/unit/event_handler_test.rb

@@ -1,5 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
-
+require 'test_helper'
 
 class EventHandlerTest < Test::Unit::TestCase
   context "an abstract EventHandler" do

data/test/unit/event_methods_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w(.. test_helper))
+require 'test_helper'
  
 class EventMethodsTest < Test::Unit::TestCase
 
@@ -80,4 +80,4 @@ class EventMethodsTest < Test::Unit::TestCase
     end
     
   end 
-end
+end

data/test/unit/event_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
  
 class EventTest < Test::Unit::TestCase
   context "An Event" do
@@ -27,4 +27,4 @@ class EventTest < Test::Unit::TestCase
       assert_not Apotomo::Event.new(:footsteps, 'mum').stopped?
     end
   end
-end
+end

data/test/unit/invoke_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class InvokeTest < Test::Unit::TestCase
   class LocalMouse < MouseCell
@@ -120,4 +120,4 @@ class InvokeTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/javascript_generator_test.rb

@@ -1,5 +1,4 @@
-require File.dirname(__FILE__) + '/../test_helper'
-
+require 'test_helper'
 
 class JavascriptGeneratorTest < Test::Unit::TestCase
   context "The JavascriptGenerator" do
@@ -87,4 +86,4 @@ class JavascriptGeneratorTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/onfire_integration_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
  
 class OnfireIntegrationTest < Test::Unit::TestCase
   context "including Onfire into the StatefulWidget it" do
@@ -16,4 +16,4 @@ class OnfireIntegrationTest < Test::Unit::TestCase
       assert_equal @mum, @kid.parent
     end
   end
-end
+end

data/test/unit/persistence_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class PersistenceTest < Test::Unit::TestCase
   
@@ -237,4 +237,4 @@ class PersistenceTest < Test::Unit::TestCase
       assert_not @mum.symbolized_instance_variables.find { |ivar| ivar.kind_of? String }
     end
   end
-end
+end

data/test/unit/render_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class RenderTest < ActionView::TestCase
   context "Rendering a single widget" do
@@ -158,6 +158,15 @@ class RenderTest < ActionView::TestCase
         end
         assert_equal "$(\"mouse\").update(\"squeak!\")", @mum.invoke(:squeak)
       end
+      
+      should "accept :selector" do
+        @mum.instance_eval do
+          def squeak
+            update :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
+          end
+        end
+        assert_equal "$(\"div#mouse\").update(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+      end
     end
     
     context "with #replace" do
@@ -173,6 +182,15 @@ class RenderTest < ActionView::TestCase
         end
         assert_equal "$(\"mouse\").replace(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
       end
+      
+      should "accept :selector" do
+        @mum.instance_eval do
+          def squeak
+            replace :text => '<div id="mum">squeak!</div>', :selector => "div#mouse"
+          end
+        end
+        assert_equal "$(\"div#mouse\").replace(\"<div id=\\\"mum\\\">squeak!<\\/div>\")", @mum.invoke(:squeak)
+      end
     end
   end
   
@@ -200,4 +218,4 @@ class RenderTest < ActionView::TestCase
     should_eventually "provide an ordered rendered_children hash"
   end
   
-end
+end

data/test/unit/request_processor_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class RequestProcessorTest < Test::Unit::TestCase
   context "#root" do
@@ -198,4 +198,4 @@ class RequestProcessorTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/stateful_widget_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class StatefulWidgetTest < Test::Unit::TestCase
   context "The StatefulWidget" do
@@ -53,4 +53,4 @@ class StatefulWidgetTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

data/test/unit/test_addressing.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
+require 'test_helper'
 
 class AddressingTest < Test::Unit::TestCase
   include Apotomo::UnitTestCase

data/test/unit/test_caching.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
+require 'test_helper'
 
 class ApotomoCachingTest < Test::Unit::TestCase
   include Apotomo::UnitTestCase

data/test/unit/test_jump_to_state.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
+require 'test_helper'
 
 ### DISCUSS: move some tests from PersistenceTest to this test file.
 

data/test/unit/test_methods_test.rb

@@ -0,0 +1,11 @@
+require 'test_helper'
+require 'apotomo/test_methods'
+
+class TestMethodsTest < Test::Unit::TestCase
+  include Apotomo::TestMethods
+  context "A Unit test with included module" do    
+    should "provide #render_widget" do
+      assert_respond_to self, :render_widget
+    end
+  end
+end

data/test/unit/test_tab_panel.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
+require 'test_helper'
 
 class TabPanelTest < Test::Unit::TestCase
   include Apotomo::UnitTestCase

data/test/unit/test_widget_shortcuts.rb

@@ -1,5 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + "/../test_helper")
-
+require 'test_helper'
 
 # fixture:
 module My

data/test/unit/transition_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class TransitionTest < Test::Unit::TestCase
   context "Calling #next_state_for" do
@@ -30,4 +30,4 @@ class TransitionTest < Test::Unit::TestCase
       assert_equal :snore, @mum.send(:next_state_for, :snuggle)
     end
   end
-end
+end

data/test/unit/widget_shortcuts_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), *%w[.. test_helper])
+require 'test_helper'
 
 class MumWidget < MouseCell; end
 class MouseTabs;end
@@ -77,4 +77,4 @@ class WidgetShortcutsTest < Test::Unit::TestCase
       assert_kind_of ::Apotomo::ContainerWidget, section('family')
     end
   end
-end
+end

data/test/unit/widget_test.rb

@@ -1,7 +1,7 @@
-require File.join(File.dirname(__FILE__), '..', 'test_helper')
+require 'test_helper'
 
 class WidgetTest < ActiveSupport::TestCase
-  context "#has_widgets in class context" do
+  context "Widget.has_widgets" do
     setup do
       @mum = Class.new(MouseCell) do
         has_widgets do |me|
@@ -17,8 +17,35 @@ class WidgetTest < ActiveSupport::TestCase
       assert_kind_of Apotomo::StatefulWidget, @mum['baby']
     end
     
-    should "not inherit trees for now" do
-      assert_equal [], @kid.children
+    should "inherit trees for now" do
+      assert_equal 1, @mum.children.size
+      assert_kind_of Apotomo::StatefulWidget, @mum['baby']
+    end
+  end
+  
+  context "Widget.after_add" do
+    setup do
+      @mum = Class.new(MouseCell) do
+        after_add do |me, parent|
+          parent << widget('mouse_cell', 'kid', :squeak)
+        end
+      end.new('mum', :squeak)
+      
+      @root = mouse_mock('root')
+    end
+    
+    should "be invoked after mum is added" do
+      assert_equal [], @root.children
+      @root << @mum
+      
+      assert_equal ['mum', 'kid'], @root.children.collect { |w| w.name }
+    end
+    
+    should "inherit callbacks for now" do
+      @berry = Class.new(@mum.class).new('berry', :squeak)
+      @root << @berry
+      
+      assert_equal ['berry', 'kid'], @root.children.collect { |w| w.name }
     end
   end
   
@@ -78,43 +105,15 @@ class WidgetTest < ActiveSupport::TestCase
       should "respond to #find_widget" do
         mum_and_kid!
         assert_not @mum.find_widget('pet')
-        assert @kid, @mum.find_widget('kid')
+        assert_equal @kid, @mum.find_widget('kid')
       end
       
       should "respond to the WidgetShortcuts methods, like #widget" do
         assert_respond_to @mum, :widget
       end
       
-      context "with initialize_hooks" do
-        should "expose its class_inheritable_array with #initialize_hooks" do
-          @mum = mouse_class_mock.new('mum', :eating)
-          @mum.class.instance_eval { self.initialize_hooks << :initialize_mouse }
-          assert ::Apotomo::StatefulWidget.initialize_hooks.size + 1 == @mum.class.initialize_hooks.size
-        end
-        
-        should "execute the initialize_hooks in the correct order in #process_initialize_hooks" do
-          @mum = mouse_class_mock.new('mum', :eating)
-          @mum.class.instance_eval do
-            define_method(:executed) { |*args| @executed ||= [] }
-            define_method(:setup) { |*args| executed << :setup }
-            define_method(:configure) { |*args| executed << :configure }
-            initialize_hooks << :setup
-            initialize_hooks << :configure
-          end
-          
-          assert_equal [:setup, :configure], @mum.class.new('zombie', nil).executed
-        end
-        
-        should "provide after_initialize" do
-          @mum = mouse_class_mock.new('mum', :eat)
-          @mum.class.instance_eval do
-            after_initialize :first
-            after_initialize :second
-          end
-          
-          assert_equal @mum.class.initialize_hooks[-1], :second
-          assert_equal @mum.class.initialize_hooks[-2], :first
-        end
+      should "alias #widget_id to #name" do
+        assert_equal @mum.name, @mum.widget_id
       end
     end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apotomo
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-16 00:00:00 +02:00
+date: 2010-10-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,6 +65,21 @@ dependencies:
         version: 0.1.0
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: hooks
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 0
+        - 1
+        version: "0.1"
+  type: :runtime
+  version_requirements: *id004
 description: A generic widget framework for Rails. Event-driven. Clean. Fast. Free optional statefulness included.
 email: apotonick@gmail.com
 executables: []
@@ -82,15 +97,6 @@ files:
 - README.rdoc
 - Rakefile
 - TODO
-- app/cells/apotomo/child_switch_widget/switch.html.erb
-- app/cells/apotomo/child_switch_widget/switch.rhtml
-- app/cells/apotomo/deep_link_widget.rb
-- app/cells/apotomo/deep_link_widget/setup.html.erb
-- app/cells/apotomo/java_script_widget.rb
-- app/cells/apotomo/tab_panel_widget.rb
-- app/cells/apotomo/tab_panel_widget/display.html.erb
-- app/cells/apotomo/tab_widget.rb
-- app/cells/apotomo/tab_widget/display.html.erb
 - config/routes.rb
 - generators/widget/USAGE
 - generators/widget/templates/functional_test.rb
@@ -114,6 +120,7 @@ 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
@@ -133,6 +140,7 @@ files:
 - 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
@@ -197,6 +205,7 @@ test_files:
 - 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/app/cells/apotomo/child_switch_widget/switch.html.erb

@@ -1 +0,0 @@
-<%= @content.to_s %>

data/app/cells/apotomo/child_switch_widget/switch.rhtml

@@ -1 +0,0 @@
-<%= @content.to_s %>

data/app/cells/apotomo/deep_link_widget/setup.html.erb

@@ -1,20 +0,0 @@
-<%= javascript_tag "
-   	SWFAddress.onInternalChange = function() {
-   		//alert('internalChange');
-   		#{remote_function :url => address_to_event(:type=>:internalChange),  :with => '\'deep_link=\'+SWFAddress.getPath()'}
-   	}
-   	
-   	SWFAddress.onExternalChange = function() {
-   		//alert(SWFAddress.getPath()+SWFAddress.getQueryString());
-   		#{remote_function :url => address_to_event(:type=>:internalChange),  :with => '\'deep_link=\'+SWFAddress.getPath()'}
-   	}
-   	
-   	
-    	SWFAddress.onChange = function() {
-   		}
-   		
-   		SWFAddress.onInit = function() {
-   		#{remote_function :url => address_to_event(:type=>:internalChange),  :with => '\'deep_link=\'+SWFAddress.getPath()'}
-   			//alert('init');
-   		}
-   		" %>

data/app/cells/apotomo/deep_link_widget.rb

@@ -1,27 +0,0 @@
-class Apotomo::DeepLinkWidget < Apotomo::StatefulWidget
-  
-  transition :from => :setup, :to => :process
-  transition :in   => :process
-  
-  def setup
-    root.respond_to_event :externalChange, :on => 'deep_link', :with => :process
-    root.respond_to_event :internalChange, :on => 'deep_link', :with => :process
-    
-    render
-  end
-  
-  def process
-    # find out what changed in the deep link
-      # find the update root (### DISCUSS: this might be more than one root, as in A--B)
-    #path = param(:deep_link)  # path is #tab=users/icon=3
-    
-    update_root = root.find {|w| w.responds_to_url_change? and w.responds_to_url_change_for?(url_fragment)}  ### DISCUSS: we just look for one root here.
-    
-    if update_root
-      controller.logger.debug "deep_link#process: `#{update_root.name}` responds to :urlChange"
-      update_root.trigger(:urlChange)
-    end
-    
-    render :nothing => true
-  end
-end

data/app/cells/apotomo/java_script_widget.rb

@@ -1,12 +0,0 @@
-module Apotomo
-  
-  ### TODO: if a state doesn't return anything, the view-finding is invoked, which
-  ###   is nonsense in a JS widget. current work-around: return render :js => ""
-  
-  class JavaScriptWidget < StatefulWidget
-    def frame_content(content)
-      content
-    end
-  end
-  
-end

data/app/cells/apotomo/tab_panel_widget/display.html.erb

@@ -1,57 +0,0 @@
-<style type="text/css">
-  .TabPanel ul {
-    display: block;
-    list-style: none;
-    padding: 0;
-    margin: 0 0 -1px 0;
-    height: 100%;
-    font-size: 14px;
-    border-left: 1px solid #888888;
-
-  }
-
-  .TabPanel ul li {
-    float: left;
-    margin: 0;
-    padding: 5px;
-    background-color: #dbdbdb;
-    color: #888888;
-    border-top: 1px solid #888888;
-    border-right: 1px solid #888888;
-    border-bottom: 1px solid #888888;
-  }
-
-  .TabPanel ul li.active {
-    border-bottom: 1px solid #ffffff;
-    background-color: #ffffff;
-    color: #000000;
-
-  }
-
-  .TabPanel ul li a, .TabPanel ul li a:visited {
-    color: #888888
-  }
-</style>
-
-
-<div class="TabPanel">
-  <ul>
-    <% tabs.each do |tab|
-  	  tab_class = ""   
-	  tab_class = "active" if tab.name == @current_child_id
-    %>
-    <li class="<%= tab_class %>">
-      <%- if @cell.responds_to_url_change? %>
-      	<%= link_to_function tab.title, update_url(@cell.url_fragment_for_tab(tab)) %>
-      <%- else %>
-		<%= link_to_event tab.title, {:type => :switchChild, @cell.param_name => tab.name} %>
-      <% end %>
-    </li>
-    <% end -%>
-    
-    <div style="clear: both;" />
-  </ul>
-</div>
-<div style="clear: both;"></div>
-
-<%= rendered_children.first %>

data/app/cells/apotomo/tab_panel_widget.rb

@@ -1,87 +0,0 @@
-module Apotomo
-  class TabPanelWidget < StatefulWidget
-    transition :from => :display, :to => :switch
-    transition                    :in => :switch
-    
-    attr_accessor :current_child_id
-    
-    
-    # Called in StatefulWidget's constructor.
-    def initialize_deep_link_for(id, start_states, opts)
-      return unless opts[:is_url_listener]
-      
-      respond_to_event :urlChange, :from => self.name, :with => :switch
-    end
-    
-    
-    
-    def display
-      respond_to_event(:switchChild, :with => :switch)
-      
-      
-      @current_child_id  = find_current_child.name
-      
-      render :locals => {:tabs => children}
-    end
-    
-    
-    def switch
-      @current_child_id  = find_current_child.name
-      
-      render :view => :display, :locals => {:tabs => children}
-    end
-    
-    
-    def children_to_render
-      [children.find{ |c| c.name == @current_child_id } ]
-    end
-    
-    ### DISCUSS: use #find_param instead of #param to provide a cleaner parameter retrieval?
-    def find_current_child
-      if responds_to_url_change?
-        child_id  = url_fragment[param_name]
-      else
-        child_id  = param(param_name)
-      end
-      
-      find_child(child_id) || find_child(@current_child_id) || default_child
-    end
-    
-    def default_child;  children.first;   end
-    
-    
-    def find_child(id)
-      children.find { |c| c.name.to_s == id }
-    end
-    
-    def param_name; name; end
-    
-    
-    # Called by deep_link_widget#process to query if we're involved in an URL change.
-    def responds_to_url_change_for?(fragment)
-      # don't respond to an empty/invalid/ fragment as we don't get any information from it:
-      return if fragment[param_name].blank?
-      
-      fragment[param_name] != @current_child_id
-    end
-    
-    def local_fragment
-      "#{param_name}=#{current_child_id}"
-    end
-    
-    
-    # Used in view to create the tab link in deep-linking mode.
-    def url_fragment_for_tab(tab)
-      url_fragment_for("#{param_name}=#{tab.name}")
-    end
-    
-    
-    def address(way={}, target=self, state=nil)
-      way.merge!( local_address(target, way, state) )
-
-      return way if isRoot?
-
-      return parent.address(way, target)
-    end
-  end
-end

data/app/cells/apotomo/tab_widget/display.html.erb

@@ -1 +0,0 @@
-<%= rendered_children.collect{|e| e.last}.join("") %>

data/app/cells/apotomo/tab_widget.rb

@@ -1,18 +0,0 @@
-module Apotomo
-  class TabWidget < StatefulWidget
-    
-    attr_accessor :title
-    
-    def initialize(*args)
-      super(*args)
-      
-      @title = @opts[:title] || self.name.to_s
-    end
-    
-    
-    def display
-      render
-    end
-    
-  end
-end