apotomo 1.0.1 → 1.0.2

data/CHANGES.textile

@@ -0,0 +1,8 @@
+h2. 1.0.2
+
+h3. Changes
+  * removals from ViewHelper: #trigger_event, #form_to_event and friends as they use deprecated Rails helpers.
+  
+h3. Bugfixes
+  * Widget#fire now accepts payload data for the fired event.
+  * triggered states now receive the event object if they expect one argument.

data/Gemfile

@@ -1,9 +1,12 @@
 source "http://rubygems.org"
 
-gem "rails", "~> 3.0.0"
-gem "cells", "~> 3.4"
-gem "onfire"
-gem "hooks", "~> 0.1.3"
+gem "rails",  "~> 3.0"
+#gem "rails", :path => "/home/nick/projects/rayls"
+
+gem "cells",  "~> 3.4"
+gem "onfire", "~> 0.1.1"
+gem "hooks",  "~> 0.1.3"
+
 
 
 gem "jeweler"

data/README.rdoc

@@ -22,7 +22,7 @@ Easy as hell.
 
 === Rails 3
 
-  gem install apotomo --pre
+  gem install apotomo
 
 === Rails 2.3
 

data/Rakefile

@@ -34,7 +34,7 @@ Jeweler::Tasks.new do |spec|
   spec.test_files   = FileList["test/**/*"] - FileList["test/dummy/tmp", "test/dummy/tmp/**/*", "test/dummy/log/*"]
   
   spec.add_dependency 'cells', '~> 3.4.2'
-  spec.add_dependency 'rails', '>= 3.0.0'
+  spec.add_dependency 'rails', '~> 3.0.0'
   spec.add_dependency 'onfire', '>= 0.1.0'
   spec.add_dependency 'hooks', '~> 0.1.3'
 end

data/lib/apotomo/event_methods.rb

@@ -2,19 +2,19 @@ require 'apotomo/event_handler'
 
 module Apotomo
   # Introduces event-processing functions into the StatefulWidget.
-  
   module EventMethods
+    extend ActiveSupport::Concern
+    
+    included do
+      after_initialize :add_class_event_handlers
+    end
+    
     attr_writer :page_updates
-    # Replacement for the EventProcessor singleton queue.
+    
     def page_updates
       @page_updates ||= []
     end
     
-    def self.included(base)
-      base.extend(ClassMethods)
-      base.after_initialize :add_class_event_handlers
-    end
-    
     def add_class_event_handlers(*)
       self.class.responds_to_event_options.each { |options| respond_to_event(*options) }
     end
@@ -34,66 +34,55 @@ module Apotomo
     # state, which implies an update of the invoked widget.
     #
     # You may configure the event handler with the following <tt>options</tt>:
-    #  :with  => (required) the state to invoke on the target widget
+    #  :with  => (optional) the state to invoke on the target widget, defaults to +type+.
     #  :on    => (optional) the targeted widget's id, defaults to <tt>self.name</tt>
     #  :from  => (optional) the source id of the widget that triggered the event, defaults to any widget
     #
     # Example:
     #   
-    #   trap = cell(:input_field, :smell_like_cheese, 'mouse_trap')
+    #   trap = widget(:trap, :charged, 'mouse_trap')
     #   trap.respond_to_event :mouseOver, :with => :catch_mouse
     #
-    # This would instruct <tt>trap</tt> to catch a <tt>:mouseOver</tt> event from any widget (including itself) and
+    # This would instruct +trap+ to catch a <tt>:mouseOver</tt> event from any widget (including itself) and
     # to invoke the state <tt>:catch_mouse</tt> on itself as trigger.
     #
     #   
-    #   hunter = cell(:form, :hunt_for_mice, 'my_form')
-    #     hunter << cell(:input_field, :smell_like_cheese,  'mouse_trap')
-    #     hunter << cell(:text_area,   :stick_like_honey,   'bear_trap')
+    #   hunter = widget(:form, :hunt_for_mice, 'my_form')
+    #     hunter << widget(:input_field, :smell_like_cheese,  'mouse_trap')
+    #     hunter << widget(:text_area,   :stick_like_honey,   'bear_trap')
     #   hunter.respond_to_event :captured, :from => 'mouse_trap', :with => :refill_cheese, :on => 'mouse_trap'
     #
     # As both the bear- and the mouse trap can trigger a <tt>:captured</tt> event the later <tt>respond_to_event</tt>
     # would invoke <tt>:refill_cheese</tt> on the <tt>mouse_trap</tt> widget as soon as this and only this widget fired.
     # It is important to understand the <tt>:from</tt> parameter as it filters the event source - it wouldn't make
-    # sense to refill the mouse trap if the bear trap snapped, would it?
-    
-    def respond_to_event(type, options)
-      options[:once] = true if options[:once].nil?
+    # sense to refill the mouse trap if the bear trap snapped, would it? 
+    def respond_to_event(type, options={})
+      options.reverse_merge!( :once => true,
+                              :with => type,
+                              :on   => self.name )
       
-      handler_opts              = {}
-      handler_opts[:widget_id]  = options[:on] || self.name
-      handler_opts[:state]      = options[:with]
-      
-      handler = InvokeEventHandler.new(handler_opts)
+      handler = InvokeEventHandler.new(:widget_id => options[:on], :state => options[:with])
       
       return if options[:once] and event_table.all_handlers_for(type, options[:from]).include?(handler)
       
       on(type, :do => handler, :from => options[:from])
     end
     
+    # Fire an event of +type+ and let it bubble up. You may add arbitrary payload data to the event.
+    #
+    # Example:
+    #
+    #   trigger(:dropped, :area => 59)
+    #
+    # which can be queried in a triggered state.
+    #
+    #   def on_drop(event)
+    #     if event.data[:area] == 59 
     def trigger(*args)
       fire(*args)
     end
     
-    # Invokes <tt>state</tt> on the widget <em>and</end> updates itself on the page. This should
-    # never be called from outside but in setters when some internal value changed and must be
-    # displayed instantly.
-    # 
-    # Implements the following pattern (TODO: remove example as soon as invoke! proofed):
-    # 
-    #   def title=(str)
-    #     @title = str
-    #     peek(:update, self.name, :display, self.name)
-    #     trigger(:update)
-    #   end
-    def invoke!(state)
-      ### TODO: encapsulate in PageUpdateQueue:
-      Apotomo::EventProcessor.instance.processed_handlers << [name, invoke(:state)]
-    end
-    
-    
-    
-    protected
+  protected
     # Get all handlers from self for the passed event (overriding Onfire#local_event_handlers).
     def local_event_handlers(event)
       event_table.all_handlers_for(event.type, event.source.name) # we key with widget_id.

data/lib/apotomo/invoke_event_handler.rb

@@ -10,13 +10,7 @@ module Apotomo
     def process_event(event)
       target = event.source.root.find_by_path(widget_id) ### DISCUSS: widget_id or widget_selector?
       
-      #::Rails.logger.debug "EventHandler: invoking #{target.name}##{state}"
-      ### DISCUSS: let target access event?
-      ###   pass additional opts to #invoke?
-      ### DISCUSS: pass block here?
-      target.opts[:event] = event
-      
-      target.invoke(state)
+      target.invoke(state, event)
     end
     
     def to_s; "InvokeEventHandler:#{widget_id}##{state}"; end

data/lib/apotomo/rails/controller_methods.rb

@@ -5,19 +5,17 @@ require 'apotomo/rails/view_methods'
     module Rails
       module ControllerMethods
         include WidgetShortcuts
+        extend ActiveSupport::Concern
         
-        def self.included(base) #:nodoc:
-          base.class_eval do
-            extend WidgetShortcuts
-            extend ClassMethods      
-            
-            class_inheritable_array :has_widgets_blocks
-            self.has_widgets_blocks = []
-            
-            helper ::Apotomo::Rails::ViewMethods
-            
-            after_filter :apotomo_freeze
-          end
+        included do
+          extend WidgetShortcuts
+          
+          class_inheritable_array :has_widgets_blocks
+          self.has_widgets_blocks = []
+          
+          helper ::Apotomo::Rails::ViewMethods
+          
+          after_filter :apotomo_freeze
         end
         
         module ClassMethods
@@ -33,8 +31,6 @@ require 'apotomo/rails/view_methods'
           def has_widgets(&block)
             has_widgets_blocks << block
           end
-          
-          alias_method :uses_widgets, :has_widgets
         end
         
         def bound_use_widgets_blocks
@@ -138,25 +134,6 @@ with(window.parent) { setTimeout(function() { window.eval('#{escaped_script}');
 </script></body></html>", :content_type => 'text/html'
         end
         
-        def respond_to_event(type, options)
-          handler = ProcEventHandler.new
-          handler.proc = options[:with]
-          ### TODO: pass :from => (event source).
-          
-          # attach once, not every request:
-          apotomo_root.evt_table.add_handler_once(handler, :event_type => type)
-        end
-        
-        
-        
-        ### DISCUSS: rename? should say "this controller action wants apotomo's deep linking!"
-        ### DISCUSS: move to deep_link_methods?
-        def respond_to_url_change
-          return if apotomo_root.find_widget('deep_link')  # add only once.
-          apotomo_root << widget("apotomo/deep_link_widget", :setup, 'deep_link')
-        end
-      
-      
       class ProcHash < Array
         def id_for_proc(proc)
           proc.to_s.split('@').last

data/lib/apotomo/rails/view_helper.rb

@@ -7,31 +7,7 @@ module Apotomo
       def js_generator
         Apotomo.js_generator
       end
-      
-      
-      # Generates the JavaScript code to report an event of <tt>type</tt> to Apotomo with AJAX.
-      # As always per default the event source is the currently rendered widget.
-      # Internally this method just uses <tt>remote_function</tt> for JS output.
-      #
-      # Example:
-      # 
-      #   <%= image_tag "cheese.png", :onMouseover => trigger_event(:mouseAlarm) %>
-      #
-      # will trigger the event <tt>:mouseAlarm</tt> when moving the mouse over the cheese image.
-      def trigger_event(type, options={})
-        js_generator.xhr(url_for_event(type, options))
-      end
-      
-      # Creates a form tag that triggers an event via AJAX when submitted.
-      # See StatefulWidget::address_for_event for options.
-      #
-      # The values of form elements are available via StatefulWidget#param.
-      def form_to_event(type, options={}, html_options={}, &block)
-        return multipart_form_to_event(type, options, html_options, &block) if options.delete(:multipart)
-        
-        form_remote_tag({:url => url_for_event(type, options), :html => html_options}, &block)
-      end
-      
+            
       # Creates a form that submits itself via an iFrame and executes the response
       # in the parent window. This is needed to upload files via AJAX.
       #
@@ -53,12 +29,7 @@ module Apotomo
       #   url_for_event(:paginate, :page => 2)
       #   #=> http://apotomo.de/mouse/process_event_request?type=paginate&source=mouse&page=2
       def url_for_event(type, options={})
-        @cell.url_for_event(type, options)
-      end
-      
-      ### TODO: test me.
-      def update_url(fragment)
-        'SWFAddress.setValue("' + fragment + '");'
+        controller.url_for_event(type, options)
       end
       
       ### TODO: test me.
@@ -93,7 +64,7 @@ module Apotomo
       
       # Returns the widget id you passed in a has_widgets block.
       def widget_id
-        @cell.name
+        controller.name
       end
     end  
   end

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/apotomo/widget.rb

@@ -31,8 +31,6 @@ module Apotomo
     attr_accessor :opts
     attr_writer   :visible
 
-    attr_writer   :controller
-    
     include TreeNode
     
     include Onfire
@@ -43,6 +41,8 @@ module Apotomo
     
     helper Apotomo::Rails::ViewHelper
     
+    abstract!
+    undef :display  # We don't want #display to be listed in #internal_methods.
     
     # Runs callbacks for +name+ hook in instance context.  
     def run_widget_hook(name, *args)
@@ -80,8 +80,7 @@ module Apotomo
     
     # Returns the rendered content for the widget by running the state method for <tt>state</tt>.
     # This might lead us to some other state since the state method could call #jump_to_state.
-    def invoke(state=nil, &block)
-      @invoke_block = block ### DISCUSS: store block so we don't have to pass it 10 times?
+    def invoke(state=nil, event=nil)
       logger.debug "\ninvoke on #{name} with #{state.inspect}"
       
       if state.blank?
@@ -91,7 +90,12 @@ module Apotomo
       logger.debug "#{name}: transition: #{last_state} to #{state}"
       logger.debug "                                    ...#{state}"
       
-      render_state(state)
+      #render_state(state)
+      
+      return process(state, event) if method(state).arity == 1
+      
+      opts[:event] = event
+      process(state)
     end
     
     
@@ -236,7 +240,7 @@ module Apotomo
     def address_for_event(type, options={})
       options.reverse_merge!  :source     => name,
                               :type       => type,
-                              :controller => parent_controller.controller_name  # DISCUSS: dependency to parent_controller.  
+                              :controller => parent_controller.controller_path  # DISCUSS: dependency to parent_controller.  
     end
     
     def url_for_event(type, options={})

data/lib/apotomo/widget_shortcuts.rb

@@ -38,6 +38,7 @@ module Apotomo
       container(*args)
     end
     
+    # TODO: deprecate.
     def cell(base_name, states, id, *args)
       widget(base_name.to_s + '_cell', states, id, *args)
     end

data/test/rails/controller_methods_test.rb

@@ -116,7 +116,7 @@ class ControllerMethodsTest < ActionController::TestCase
     
     context "invoking #url_for_event" do
       should "compute an url for any widget" do
-        assert_equal "/barn/render_event_response?source=mouse&volume=9&type=footsteps", @controller.url_for_event(:footsteps, :source => :mouse, :volume => 9)
+        assert_equal "/barn/render_event_response?source=mouse&type=footsteps&volume=9", @controller.url_for_event(:footsteps, :source => :mouse, :volume => 9)
       end
     end
     

data/test/rails/view_helper_test.rb

@@ -1,74 +1,92 @@
 require 'test_helper'
 require 'action_view/test_case'
 
-class ViewHelperTest < ActionView::TestCase
-  include Apotomo::TestCaseMethods::TestController
+class ViewHelperTest < Apotomo::TestCase
+  include ActionDispatch::Assertions::DomAssertions
+  include Apotomo::TestCase::TestController
   
-  tests Apotomo::Rails::ViewHelper
-  
-  context "A widget state view" do
-    setup do
-      @cell = mouse_mock('mum')
+  # TODO: move to Apotomo::TestCase, refactor, test.
+  class MouseWidget < Apotomo::Widget
+  end
+  def in_view(subject, &block)
+    if subject.kind_of?(Apotomo::Widget)
+      subject.opts[:block] = block
+    else
+      subject = subject.new(@controller, 'mum', :display, :block => block)
     end
+     
+    setup_test_states_in(subject) unless subject.respond_to?(:in_view)# add #in_view state to subject cell.
     
+    subject.class.action_methods << "in_view"
+    
+    subject.invoke(:in_view)
+  end
+  def mouse_mock(id='mum', start_state=:eat, opts={}, &block)
+    mouse = MouseWidget.new(parent_controller, id, start_state, opts)
+    mouse.instance_eval &block if block_given?
+    mouse
+  end
+  
+  
+  context "A widget state view" do
     teardown do
       Apotomo.js_framework = :prototype
     end
     
-    
-    should "respond to #multipart_form_to_event" do
-      assert_dom_equal "<iframe id=\"apotomo_iframe\" name=\"apotomo_iframe\" style=\"display: none;\"></iframe><form accept-charset=\"UTF-8\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" enctype=\"multipart/form-data\" method=\"post\" target=\"apotomo_iframe\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div></form>",
-      multipart_form_to_event(:footsteps)
-    end
-    
-    should "render multipart form if :multipart => true" do
-      assert_dom_equal "<iframe id=\"apotomo_iframe\" name=\"apotomo_iframe\" style=\"display: none;\"></iframe><form accept-charset=\"UTF-8\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" enctype=\"multipart/form-data\" method=\"post\" target=\"apotomo_iframe\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div></form>",
-      form_to_event(:footsteps, :multipart => true)
+    should_eventually "respond to #multipart_form_to_event" do
+      assert_dom_equal( "<iframe id=\"apotomo_iframe\" name=\"apotomo_iframe\" style=\"display: none;\"></iframe><form accept-charset=\"UTF-8\" action=\"/barn/render_event_response?apotomo_iframe=true&amp;source=mum&amp;type=footsteps\" enctype=\"multipart/form-data\" method=\"post\" target=\"apotomo_iframe\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div></form>",
+      in_view(MouseWidget) do
+        multipart_form_to_event(:footsteps)
+      end)
     end
     
-    should "respond to #trigger_event" do
-      assert_dom_equal "new Ajax.Request(\"/barn/render_event_response?source=mum&type=footsteps\")",
-      trigger_event(:footsteps)
-    end
-    
-    should "render RightJS if set" do
-      Apotomo.js_framework = :right
-      
-      assert_dom_equal "new Xhr(\"/barn/render_event_response?source=mum&type=footsteps\", {evalScripts:true}).send()", trigger_event(:footsteps)
+    should "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)
     end
     
-    should "respond to #url_for_event" do
-      assert_equal("/barn/render_event_response?source=mum&type=footsteps", url_for_event(:footsteps))
+    should "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)
     end
     
     should "respond to #widget_div" do
-      assert_equal '<div id="mum">squeak!</div>', widget_div { "squeak!" }
+      assert_equal('<div id="mum">squeak!</div>', in_view(MouseWidget) do widget_div { "squeak!" } end)
     end
     
     should "respond to #widget_div with options" do
-      assert_equal '<div class="mouse" id="kid">squeak!</div>', widget_div(:id => 'kid', :class => "mouse") { "squeak!" }
+      assert_equal('<div class="mouse" id="kid">squeak!</div>', in_view(MouseWidget) do
+        widget_div(:id => 'kid', :class => "mouse") { "squeak!" }
+      end)
     end
     
     should "respond to #widget_id" do
-      assert_equal 'mum', widget_id
+      assert_equal('mum', in_view(MouseWidget){ widget_id })
     end
     
     context "#widget_javascript" do
       
       should "usually render a javascript block" do
-        assert_equal "<script type=\"text/javascript\">\n//<![CDATA[\nalert(\"Beer!\")\n//]]>\n</script>", widget_javascript { 'alert("Beer!")' }
+        assert_equal("<script type=\"text/javascript\">\n//<![CDATA[\nalert(&quot;Beer!&quot;)\n//]]>\n</script>", in_view(MouseWidget) do
+          widget_javascript { 'alert("Beer!")' }
+        end)
       end
       
-      should "be quiet if suppress_js is set" do
+      # FIXME: get the test running?
+      should_eventually "be quiet if suppress_js is set" do
         @suppress_js = true ### TODO: use a local, not an instance variable.
-        assert_equal nil, widget_javascript { 'alert("Beer!")' }
-      end
-      
-      should_eventually "capture" do
-      puts "capturing"
-        v = ActionView::Base.new
-        c = v.capture do "capture me!" end
-        puts c.inspect
+        mum = mouse_mock do
+          def in_view
+            render :suppress_js => true
+          end
+        end
+
+        assert_equal(nil, in_view(mum) do
+          widget_javascript { 'alert("Beer!")' }
+        end)
       end
     end
   end

data/test/support/test_case_methods.rb

@@ -71,25 +71,28 @@ module Apotomo
       # Creates a mock controller instance. Currently, each widget needs a parent controller instance due to some
       # sucky dependency in cells.
       def barn_controller!
-        @controller = Class.new(ActionController::Base) do
-          def initialize
-            extend ActionController::UrlWriter
-            self.params = {}
+        @controller = Class.new(ApotomoController) do
+          def initialize(*)
+            super
             self.request = ActionController::TestRequest.new
           end
           
           def self.name; "BarnController"; end
           
           def self.default_url_options; {:controller => :barn}; end
-          include Apotomo::Rails::ControllerMethods
         end.new
-        ### FIXME: @controller.session = {}
       end
       
       def parent_controller
         @controller
       end
       
+      def namespaced_controller
+        controller = Farm::BarnController.new
+        controller.request = ActionController::TestRequest.new
+        controller
+      end
+      
     end
   end
 end

data/test/test_helper.rb

@@ -29,12 +29,29 @@ end
 
 class ApotomoController < ActionController::Base
   include Apotomo::Rails::ControllerMethods
+  include Rails.application.routes.url_helpers
 end
 
+module Farm
+  class BarnController < ApotomoController
+  end
+end
+
+
 class MouseCell < Apotomo::StatefulWidget
   def eating; render; end
+  def squeak; render; end
+  def educate; render; end
+  def snooze; render; end
+  def listen; render; end
+  def answer_squeak; render; end
+  def peek; render; end
+  def alert; end
+  def escape; end
+  def snuggle; end
 end
 
+### TODO: 2brm?
 class RenderingTestCell < Apotomo::StatefulWidget
   attr_reader :brain
   attr_reader :rendered_children
@@ -48,6 +65,6 @@ end
 
 
 # Enable dynamic states so we can do Cell.class_eval { def ... } at runtime.
-class Apotomo::Widget
+Apotomo::Widget.class_eval do
   def action_method?(*); true; end
 end

data/test/unit/event_methods_test.rb

@@ -39,6 +39,38 @@ class EventMethodsTest < Test::Unit::TestCase
       assert_equal ['answer squeak', 'answer squeak'], @mum.list
     end
     
+    should "also accept an event argument only" do
+      @mum.respond_to_event :answer_squeak
+      @mum.fire :answer_squeak
+      assert_equal ['answer squeak'], @mum.list
+    end 
+    
+    should "make pass the event into the triggered state" do
+      @mum.instance_eval do
+        respond_to_event :footsteps
+          
+        def footsteps(evt)
+          list << evt.type
+        end
+      end
+      
+      @mum.trigger :footsteps
+      assert_equal ["escape", :footsteps], @mum.list
+    end
+    
+    should "accept payload data for the event" do
+      @mum.respond_to_event :answer_squeak
+      @mum.instance_eval do
+        def answer_squeak
+          evt = @opts[:event]
+          list << evt.data
+        end
+      end
+      
+      @mum.fire :answer_squeak, :volume => 9
+      assert_equal [{:volume => 9}], @mum.list
+    end
+    
     context "#responds_to_event in class context" do
       setup do
         class AdultMouseCell < MouseCell
@@ -58,7 +90,6 @@ class EventMethodsTest < Test::Unit::TestCase
       end
     end
     
-    
     context "#trigger" do
       should "be an alias for #fire" do
         @kid.trigger :footsteps
@@ -77,7 +108,6 @@ class EventMethodsTest < Test::Unit::TestCase
         @mum.fire :footsteps
         assert_equal ["escape"], @mum.page_updates
       end
-      
     end
     
   end 

data/test/unit/invoke_test.rb

@@ -44,8 +44,6 @@ class InvokeTest < Test::Unit::TestCase
         
         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
         end

data/test/unit/widget_test.rb

@@ -75,6 +75,11 @@ class WidgetTest < ActiveSupport::TestCase
       should "accept arbitrary options" do
         assert_equal({:volume=>"loud", :source=>"mum", :type=>:squeak, :controller=>"barn"}, @mum.address_for_event(:squeak, :volume => 'loud'))
       end
+      
+      should "work with controller namespaces" do
+        @mum = Apotomo::Widget.new(namespaced_controller, 'mum', :squeak)
+        assert_equal({:source=>"mum", :type=>:squeak, :controller=>"farm/barn"}, @mum.address_for_event(:squeak))
+      end
     end
     
     context "implementing visibility" do
@@ -132,5 +137,20 @@ class WidgetTest < ActiveSupport::TestCase
       assert_equal 'shrew', @mum.param(:type)
       assert_equal 'Logitech', @mum.param(:brand)
     end
+    
+    
+    # internal_methods:
+    should "not list internal methods in action_methods" do
+      assert_equal [], Class.new(Apotomo::Widget).action_methods
+    end
+    
+    should "list both local and inherited states in Widget.action_methods" do
+      assert MouseCell.action_methods.collect{ |m| m.to_s }.include?("eating")
+      assert Class.new(MouseCell).action_methods.collect{ |m| m.to_s }.include?("eating")
+    end
+    
+    should "not list #display in internal_methods although it's defined in Object" do
+      assert_not Apotomo::Widget.internal_methods.include?(:display)
+    end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,13 +14,138 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-21 00:00:00 +01:00
+date: 2011-01-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: cells
+  name: rails
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: cells
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 4
+        version: "3.4"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: onfire
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  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 
+        segments: 
+        - 0
+        - 1
+        - 3
+        version: 0.1.3
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
+  type: :runtime
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: capybara
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: cells
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -31,14 +156,14 @@ dependencies:
         - 2
         version: 3.4.2
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         segments: 
         - 3
@@ -46,11 +171,11 @@ dependencies:
         - 0
         version: 3.0.0
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: onfire
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +186,11 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: hooks
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -76,7 +201,7 @@ dependencies:
         - 3
         version: 0.1.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id013
 description: Web component framework for Rails providing page widgets that trigger events and know when and how to update themselves with AJAX.
 email: apotonick@gmail.com
 executables: []
@@ -87,6 +212,7 @@ extra_rdoc_files:
 - README.rdoc
 - TODO
 files: 
+- CHANGES.textile
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -119,78 +245,78 @@ files:
 - lib/generators/apotomo/templates/widget_test.rb
 - lib/generators/apotomo/widget_generator.rb
 - lib/tasks.rake
-- test/fixtures/mouse/feed.html.erb
-- test/fixtures/mouse/eating.html.erb
-- test/fixtures/mouse/make_me_squeak.html.erb
-- test/fixtures/mouse/posing.html.erb
-- test/fixtures/mouse/educate.html.erb
-- test/fixtures/mouse/snuggle.html.erb
-- test/fixtures/mouse/content.html.erb
-- test/fixtures/application_widget_tree.rb
-- test/rails/view_methods_test.rb
-- test/rails/controller_methods_test.rb
-- test/rails/view_helper_test.rb
-- test/rails/widget_generator_test.rb
-- test/rails/rails_integration_test.rb
-- test/test_helper.rb
-- test/support/test_case_methods.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - 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/locales/en.yml
-- test/dummy/config/routes.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/script/rails
-- test/dummy/config.ru
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/Rakefile
+- test/dummy/public/404.html
 - test/dummy/public/422.html
-- test/dummy/public/favicon.ico
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/javascripts/controls.js
+- test/dummy/public/favicon.ico
 - test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/rails.js
+- test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/effects.js
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/public/javascripts/prototype.js
+- test/dummy/public/javascripts/rails.js
+- test/dummy/script/rails
+- test/fixtures/application_widget_tree.rb
+- test/fixtures/mouse/content.html.erb
+- test/fixtures/mouse/eating.html.erb
+- test/fixtures/mouse/educate.html.erb
+- test/fixtures/mouse/feed.html.erb
+- test/fixtures/mouse/make_me_squeak.html.erb
+- test/fixtures/mouse/posing.html.erb
+- test/fixtures/mouse/snuggle.html.erb
+- test/rails/controller_methods_test.rb
+- test/rails/rails_integration_test.rb
+- test/rails/view_helper_test.rb
+- test/rails/view_methods_test.rb
+- test/rails/widget_generator_test.rb
+- test/support/test_case_methods.rb
+- test/test_helper.rb
+- test/unit/apotomo_test.rb
+- test/unit/container_test.rb
 - test/unit/event_handler_test.rb
-- test/unit/widget_shortcuts_test.rb
-- test/unit/stateful_widget_test.rb
-- test/unit/test_addressing.rb
+- test/unit/event_methods_test.rb
+- test/unit/event_test.rb
 - test/unit/invoke_test.rb
-- test/unit/container_test.rb
-- test/unit/test_tab_panel.rb
-- test/unit/test_jump_to_state.rb
-- test/unit/render_test.rb
-- test/unit/test_case_test.rb
-- test/unit/apotomo_test.rb
-- test/unit/request_processor_test.rb
 - test/unit/javascript_generator_test.rb
 - test/unit/onfire_integration_test.rb
 - test/unit/persistence_test.rb
+- test/unit/render_test.rb
+- test/unit/request_processor_test.rb
+- test/unit/stateful_widget_test.rb
+- test/unit/test_addressing.rb
+- test/unit/test_case_test.rb
+- test/unit/test_jump_to_state.rb
+- test/unit/test_tab_panel.rb
 - test/unit/transition_test.rb
-- test/unit/event_test.rb
-- test/unit/event_methods_test.rb
+- test/unit/widget_shortcuts_test.rb
 - test/unit/widget_test.rb
 has_rdoc: true
 homepage: http://apotomo.de
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -217,68 +343,68 @@ signing_key:
 specification_version: 3
 summary: Web components for Rails.
 test_files: 
-- test/fixtures/mouse/feed.html.erb
-- test/fixtures/mouse/eating.html.erb
-- test/fixtures/mouse/make_me_squeak.html.erb
-- test/fixtures/mouse/posing.html.erb
-- test/fixtures/mouse/educate.html.erb
-- test/fixtures/mouse/snuggle.html.erb
-- test/fixtures/mouse/content.html.erb
-- test/fixtures/application_widget_tree.rb
-- test/rails/view_methods_test.rb
-- test/rails/controller_methods_test.rb
-- test/rails/view_helper_test.rb
-- test/rails/widget_generator_test.rb
-- test/rails/rails_integration_test.rb
-- test/test_helper.rb
-- test/support/test_case_methods.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/config.ru
 - 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/locales/en.yml
-- test/dummy/config/routes.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/script/rails
-- test/dummy/config.ru
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/Rakefile
+- test/dummy/public/404.html
 - test/dummy/public/422.html
-- test/dummy/public/favicon.ico
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/javascripts/controls.js
+- test/dummy/public/favicon.ico
 - test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/rails.js
+- test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/effects.js
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/helpers/application_helper.rb
+- test/dummy/public/javascripts/prototype.js
+- test/dummy/public/javascripts/rails.js
+- test/dummy/script/rails
+- test/fixtures/application_widget_tree.rb
+- test/fixtures/mouse/content.html.erb
+- test/fixtures/mouse/eating.html.erb
+- test/fixtures/mouse/educate.html.erb
+- test/fixtures/mouse/feed.html.erb
+- test/fixtures/mouse/make_me_squeak.html.erb
+- test/fixtures/mouse/posing.html.erb
+- test/fixtures/mouse/snuggle.html.erb
+- test/rails/controller_methods_test.rb
+- test/rails/rails_integration_test.rb
+- test/rails/view_helper_test.rb
+- test/rails/view_methods_test.rb
+- test/rails/widget_generator_test.rb
+- test/support/test_case_methods.rb
+- test/test_helper.rb
+- test/unit/apotomo_test.rb
+- test/unit/container_test.rb
 - test/unit/event_handler_test.rb
-- test/unit/widget_shortcuts_test.rb
-- test/unit/stateful_widget_test.rb
-- test/unit/test_addressing.rb
+- test/unit/event_methods_test.rb
+- test/unit/event_test.rb
 - test/unit/invoke_test.rb
-- test/unit/container_test.rb
-- test/unit/test_tab_panel.rb
-- test/unit/test_jump_to_state.rb
-- test/unit/render_test.rb
-- test/unit/test_case_test.rb
-- test/unit/apotomo_test.rb
-- test/unit/request_processor_test.rb
 - test/unit/javascript_generator_test.rb
 - test/unit/onfire_integration_test.rb
 - test/unit/persistence_test.rb
+- test/unit/render_test.rb
+- test/unit/request_processor_test.rb
+- test/unit/stateful_widget_test.rb
+- test/unit/test_addressing.rb
+- test/unit/test_case_test.rb
+- test/unit/test_jump_to_state.rb
+- test/unit/test_tab_panel.rb
 - test/unit/transition_test.rb
-- test/unit/event_test.rb
-- test/unit/event_methods_test.rb
+- test/unit/widget_shortcuts_test.rb
 - test/unit/widget_test.rb