apotomo 1.0.0.beta2 → 1.0.0

data/Gemfile

@@ -3,7 +3,7 @@ source "http://rubygems.org"
 gem "rails", "~> 3.0.0"
 gem "cells", "~> 3.4"
 gem "onfire"
-gem "hooks", "~> 0.1.2"
+gem "hooks", "~> 0.1.3"
 
 
 gem "jeweler"
@@ -12,3 +12,4 @@ gem "jeweler"
 gem "shoulda"
 gem "mocha"
 gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'	# needed in router_test, whatever.
+gem "capybara"

data/README.rdoc

@@ -22,7 +22,7 @@ Easy as hell.
 
 === Rails 3
 
-  gem install apotomo
+  gem install apotomo --pre
 
 === Rails 2.3
 
@@ -42,12 +42,12 @@ Let's wrap that comments block in a widget.
 
 Go and generate a widget stub.
 
-  $ rails generate apotomo:widget CommentsWidget display process --haml
+  $ rails generate apotomo:widget CommentsWidget display write --haml
     create  app/cells/
     create  app/cells/comments_widget
     create  app/cells/comments_widget.rb
     create  app/cells/comments_widget/display.html.haml
-    create  app/cells/comments_widget/process.html.haml
+    create  app/cells/comments_widget/write.html.haml
     create  test/widgets/comments_widget_test.rb
 
 Nothing special.
@@ -60,10 +60,10 @@ You now tell your controller about the new widget.
     include Apotomo::Rails::ControllerMethods
     
     has_widgets do |root|
-      root << widget('comments_widget', 'post-comments', :display, :post => post)
+      root << widget('comments_widget', 'post-comments', :post => @post)
     end
 
-The widget is named <tt>post-comments</tt> and jumps to the <tt>:display</tt> state per default. Assuming your controller has a method +post+ we pass the current post into the widget.
+The widget is named <tt>post-comments</tt>. We pass the current post into the widget - the block is executed in controller instance context, that's were <tt>@post</tt> comes from. Handy, isn't it?
 
 == Render the widget
 
@@ -82,18 +82,18 @@ Rendering usually happens in your controller view, <tt>views/posts/show.haml</tt
 A widget is like a cell which is like a mini-controller.
 
   class CommentsWidget < Apotomo::Widget
-    responds_to_event :submit, :with => :process
+    responds_to_event :submit, :with => :write
     
     def display
       @comments = param(:post).comments # the parameter from outside.
       render
     end
 
-The +display+ state collects comments to show and renders its view.
+Having +display+ as the default state when rendering, this method collects comments to show and renders its view.
 
-And look at line 2 - if encountering a <tt>:submit</tt> event we invoke +process+, which is simply another state. How cool is that? 
+And look at line 2 - if encountering a <tt>:submit</tt> event we invoke +write+, which is simply another state. How cool is that? 
 
-    def process
+    def write
       @comment = Comment.new(:post => param(:post))
       @comment.update_attributes param(:comment)  # like params[].
       
@@ -160,7 +160,7 @@ Look, +replace+ basically generates
 
 If that's not what you want, do
 
-  def process
+  def write
     if param(:comment)[:text].explicit?
       render :text => 'alert("Hey, you wanted to submit a pervert comment!");'
     end
@@ -168,6 +168,25 @@ If that's not what you want, do
 
 Apotomo doesn't depend on _any_ JS framework - you choose!
 
+== Testing
+
+Apotomo comes with its own test case and assertions to <b>build rock-solid web components</b>.
+
+  class CommentsWidgetTest < Apotomo::TestCase
+    has_widgets do |root|
+      root << widget(:comments_widget, 'me', :post => @pervert_post)
+    end
+    
+    def test_render
+      render_widget 'me'
+      assert_select "li#me"
+      
+      trigger :submit, :comment => {:text => "Sex on the beach"}
+      assert_response 'alert("Hey, you wanted to submit a pervert comment!");'
+    end
+  end
+
+You can render your widgets, spec the markup, trigger events and assert the event responses, so far. If you need more, let us know!
 
 == More features
 
@@ -175,8 +194,7 @@ There's even more, too much for a simple README.
 
 [Statefulness]      Deriving your widget from +StatefulWidget+ gives you free statefulness.
 [Composability]     Widgets can range from small standalone components to nested widget trees like complex dashboards.
-[Bubbling events]   Events bubble up from their triggering source to root and thus can be observed, providing a way to implement loosely coupled, distributable components.
-[Testing]           Apotomo comes with testing assertions to build rock-solid web components.
+[Bubbling events]   Events bubble up from their triggering source to root and thus can be observed, providing a way to implement loosely coupled, distributable components.           
 [Team-friendly]     Widgets encourage encapsulation and help having different developers working on different components without getting out of bounds.
 
 

data/Rakefile

@@ -25,7 +25,7 @@ Jeweler::Tasks.new do |spec|
   spec.name         = "apotomo"
   spec.version      = ::Apotomo::VERSION
   spec.summary      = %{Web components for Rails.}
-  spec.description  = "Web components for Rails. Event-driven. Clean. Fast. Free optional statefulness included."
+  spec.description  = "Web component framework for Rails providing page widgets that trigger events and know when and how to update themselves with AJAX."
   spec.homepage     = "http://apotomo.de"
   spec.authors      = ["Nick Sutterer"]
   spec.email        = "apotonick@gmail.com"
@@ -36,7 +36,7 @@ Jeweler::Tasks.new do |spec|
   spec.add_dependency 'cells', '~> 3.4.2'
   spec.add_dependency 'rails', '>= 3.0.0'
   spec.add_dependency 'onfire', '>= 0.1.0'
-  spec.add_dependency 'hooks', '~> 0.1.2'
+  spec.add_dependency 'hooks', '~> 0.1.3'
 end
 
 Jeweler::GemcutterTasks.new

data/config/routes.rb

@@ -1,3 +1,3 @@
-Rails.application.routes.draw do |map|
+Rails.application.routes.draw do
   match ":controller/render_event_response", :to => "#render_event_response", :as => "apotomo_event"
 end

data/lib/apotomo/rails/view_helper.rb

@@ -53,8 +53,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={})
-        options.reverse_merge! :source => widget_id
-        @cell.url_for_event(type, options) # FIXME: don't access @parent_controller but @cell.
+        @cell.url_for_event(type, options)
       end
       
       ### TODO: test me.

data/lib/apotomo/request_processor.rb

@@ -17,8 +17,6 @@ module Apotomo
         
         flushed_root  ### FIXME: set internal mode to flushed 
       end
-      
-      #handle_version!(options[:version])
     end
     
     def attach_stateless_blocks_for(blocks, root, controller)
@@ -30,16 +28,7 @@ module Apotomo
       @widgets_flushed = true
       #widget('apotomo/widget', 'root')
     end
-    
-    ### DISCUSS: do we need the version feature, or should we push that into user code?
-    def handle_version!(version)
-      return if version.blank?
-      return if root.version == version
-      
-      @root = flushed_root
-      @root.version = version
-    end
-    
+        
     def widgets_flushed?;  @widgets_flushed; end
     
     # Fires the request event in the widget tree and collects the rendered page updates.

data/lib/apotomo/stateful_widget.rb

@@ -4,5 +4,26 @@ require 'apotomo/persistence'
 module Apotomo
   class StatefulWidget < Widget
     include Persistence
+    
+    attr_accessor :version
+    
+    def initialize(*)
+      super
+      @version = 0
+    end
+    
+    
+    # Defines the instance vars that should <em>not</em> survive between requests, 
+    # which means they're not frozen in Apotomo::StatefulWidget#freeze.
+    def ivars_to_forget
+      unfreezable_ivars
+    end
+    
+    def unfreezable_ivars
+      [:@childrenHash, :@children, :@parent, :@parent_controller, :@_request, :@_config, :@cell, :@invoke_block, :@rendered_children, :@page_updates, :@opts, :@params,
+      :@suppress_javascript ### FIXME: implement with ActiveHelper and :locals.
+      
+      ]
+    end
   end
-end
+end

data/lib/apotomo/test_case.rb

@@ -0,0 +1,105 @@
+require 'cell/test_case'
+
+module Apotomo
+  # Testing is fun. Test your widgets!
+  #
+  # This class helps you testing widgets where it can. It is similar as in a controller.
+  # A declarative test would look like
+  #
+  #   class BlogWidgetTest < Apotomo::TestCase
+  #     has_widgets do |root|
+  #       root << widget(:comments_widget, 'post-comments')
+  #     end
+  #     
+  #     it "should be rendered nicely" do
+  #       render_widget 'post-comments'
+  #       
+  #       assert_select "div#post-comments", "Comments for this post"
+  #     end
+  #
+  #     it "should redraw on :update" do
+  #       trigger :update
+  #       assert_response "$(\"post-comments\").update ..."
+  #     end
+  #
+  # For unit testing, you can grab an instance of your tested widget.
+  #
+  #     it "should be visible" do
+  #       assert root['post-comments'].visible?
+  #     end
+  #
+  # See also in Cell::TestCase.
+  class TestCase < Cell::TestCase
+    class << self
+      def has_widgets_blocks; @has_widgets; end
+      
+      # Setup a widget tree as you're used to it from your controller. Executed in test context.
+      def has_widgets(&block)
+        @has_widgets = block  # DISCUSS: use ControllerMethods?
+      end
+    end
+    
+    def setup
+      super
+      @controller.instance_eval do 
+        def controller_name
+         'barn'
+        end
+      end
+      @controller.extend Apotomo::Rails::ControllerMethods
+    end
+    
+    
+    # Returns the widget tree from TestCase.has_widgets.
+    def root
+      blk = self.class.has_widgets_blocks or raise "Please setup a widget tree using TestCase.has_widgets"
+      @root ||= widget("apotomo/widget", "root").tap do |root|
+         self.instance_exec(root, &blk)
+      end
+    end
+    
+    def parent_controller
+      @controller
+    end
+    
+    # Renders the widget +name+.
+    def render_widget(name, options={})
+      @last_invoke = root.find_widget(name).tap { |w| w.opts = options }.invoke # DISCUSS: use ControllerMethods?
+    end
+    
+    # Triggers an event of +type+. You have to pass <tt>:source</tt> as options.
+    #
+    # Example:
+    #
+    #   trigger :submit, :source => "post-comments"
+    def trigger(type, options)
+      source = root.find_widget(options.delete(:source))
+      source.instance_variable_set :@params, options  # TODO: this is just a try-out (what about children?). 
+      source.fire(type)
+      root.page_updates # DISCUSS: use ControllerMethods?
+    end
+    
+    # After a #trigger this assertion compares the actually triggered page updates with the passed. 
+    #
+    # Example:
+    #
+    #   trigger :submit, :source => "post-comments"
+    #   assert_response "alert(\":submit clicked!\")", /\$\("post-comments"\).update/
+    def assert_response(*content)
+      updates = root.page_updates
+      
+      i = 0
+      content.each do |assertion|
+        if assertion.kind_of? Regexp
+          assert_match assertion, updates[i] 
+        else
+          assert_equal assertion, updates[i]
+        end
+        
+        i+=1
+      end
+    end
+    
+    include Apotomo::WidgetShortcuts
+  end
+end

data/lib/apotomo/version.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module Apotomo
-  VERSION = '1.0.0.beta2'
+  VERSION = '1.0.0'
 end

data/lib/apotomo/widget.rb

@@ -6,7 +6,6 @@ require 'apotomo/tree_node'
 require 'apotomo/event'
 require 'apotomo/event_methods'
 require 'apotomo/transition'
-require 'apotomo/caching'
 require 'apotomo/widget_shortcuts'
 require 'apotomo/rails/view_helper'
 
@@ -31,9 +30,8 @@ module Apotomo
     
     attr_accessor :opts
     attr_writer   :visible
-    
+
     attr_writer   :controller
-    attr_accessor :version
     
     include TreeNode
     
@@ -41,7 +39,6 @@ module Apotomo
     include EventMethods
     
     include Transition
-    include Caching
     include WidgetShortcuts
     
     helper Apotomo::Rails::ViewHelper
@@ -66,13 +63,11 @@ module Apotomo
       @start_state  = start_state
 
       @visible      = true
-      @version      = 0 ### DISCUSS: neeed in stateLESS?
-      
       @cell         = self  ### DISCUSS: needed?
       
       @params       = parent_controller.params.dup.merge(opts)
       
-      run_hook(:after_initialize, id, start_state, opts)
+      run_hook :after_initialize, self
     end
     
     def last_state
@@ -82,29 +77,6 @@ module Apotomo
     def visible?
       @visible
     end
-
-    # Defines the instance vars that should <em>not</em> survive between requests, 
-    # which means they're not frozen in Apotomo::StatefulWidget#freeze.
-    def ivars_to_forget
-      unfreezable_ivars
-    end
-    
-    def unfreezable_ivars
-      [:@childrenHash, :@children, :@parent, :@parent_controller, :@_request, :@_config, :@cell, :@invoke_block, :@rendered_children, :@page_updates, :@opts, :@params,
-      :@suppress_javascript ### FIXME: implement with ActiveHelper and :locals.
-      
-      ]
-    end
-
-    # Defines the instance vars which should <em>not</em> be copied to the view.
-    # Called in Cell::Base.
-    def ivars_to_ignore
-      []
-    end
-    
-    ### FIXME:
-    def logger; self; end
-    def debug(*args); puts args; end
     
     # 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.
@@ -256,36 +228,19 @@ module Apotomo
     end
     
     
-    # Returns the address hash to the event controller and the targeted widget.
-    #
-    # Reserved options for <tt>way</tt>:
-    #   :source   explicitly specifies an event source.
-    #             The default is to take the current widget as source.
-    #   :type     specifies the event type.
-    #
-    # Any other option will be directly passed into the address hash and is 
-    # available via StatefulWidget#param in the widget.
-    #
-    # Can be passed to #url_for.
-    # 
-    # Example:
-    #   address_for_event :type => :squeak, :volume => 9
-    # will result in an address that triggers a <tt>:click</tt> event from the current
-    # widget and also provides the parameter <tt>:item_id</tt>.
-    def address_for_event(options)
-      raise "please specify the event :type" unless options[:type]
-      
-      options[:source] ||= self.name
-      options
-    end
-    
     # Returns the widget named <tt>widget_id</tt> as long as it is below self or self itself.
     def find_widget(widget_id)
       find {|node| node.name.to_s == widget_id.to_s}
     end
     
-    def url_for_event(*args)
-      parent_controller.url_for_event(*args)
+    def address_for_event(type, options={})
+      options.reverse_merge!  :source     => name,
+                              :type       => type,
+                              :controller => parent_controller.controller_name  # DISCUSS: dependency to parent_controller.  
+    end
+    
+    def url_for_event(type, options={})
+      apotomo_event_path address_for_event(type, options) 
     end
     
     alias_method :widget_id, :name

data/lib/apotomo.rb

@@ -20,6 +20,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
+require "rails/railtie"
+require 'rails/engine'
+ 
 module Apotomo
   class << self
     def js_framework=(js_framework)
@@ -43,13 +46,24 @@ module Apotomo
   
   class Engine < Rails::Engine
   end
+  
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "tasks.rake"
+    end
+  end 
 end
 
-require 'apotomo/javascript_generator'
-Apotomo.js_framework = :jquery ### DISCUSS: move to rails.rb
 
 require 'apotomo/widget'
 require 'apotomo/stateful_widget'
 require 'apotomo/container_widget'
 require 'apotomo/widget_shortcuts'
 require 'apotomo/rails/controller_methods'
+
+
+require 'apotomo/javascript_generator'
+Apotomo.js_framework = :jquery ### DISCUSS: move to rails.rb
+
+### FIXME: only load in test env.
+require 'apotomo/test_case' #if defined?("Rails") and Rails.env == "test"

data/lib/generators/apotomo/templates/widget_test.rb

@@ -1,11 +1,12 @@
 require 'test_helper'
 
 class <%= class_name %>Test < Apotomo::TestCase
-<% for state in @states -%>
-  test "<%= state %>" do
-    invoke :<%= state %>
-    assert_select "p"
+  has_widgets do |root|
+    root << widget(:<%= file_name %>, 'me')
   end
   
-<% end %>
+  test "display" do
+    render_widget 'me'
+    assert_select "h1"
+  end
 end

data/lib/tasks.rake

@@ -0,0 +1,6 @@
+namespace "test" do
+  TestTaskWithoutDescription.new(:widgets => "test:prepare") do |t|
+    t.libs << "test"
+    t.pattern = 'test/widgets/**/*_test.rb'
+  end
+end

data/test/rails/widget_generator_test.rb

@@ -20,6 +20,7 @@ class WidgetGeneratorTest < Rails::Generators::TestCase
         assert_file "app/cells/mouse_widget/squeak.html.erb", %r(app/cells/mouse_widget/squeak\.html\.erb)
 
         assert_file "test/widgets/mouse_widget_test.rb", %r(class MouseWidgetTest < Apotomo::TestCase)
+        assert_file "test/widgets/mouse_widget_test.rb", %r(widget\(:mouse_widget, 'me'\))
       end
       
       should "create haml assets with --haml" do

data/test/test_helper.rb

@@ -3,24 +3,16 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-#require 'rubygems'
 require 'shoulda'
-require 'mocha'
-require 'mocha/integration'
-
-
 require 'cells'
-Cell::Base.append_view_path File.expand_path(File.dirname(__FILE__) + "/fixtures")
-
-require 'rails/engine'
-
 require 'apotomo'
-require 'apotomo/widget_shortcuts'
-require 'apotomo/rails/controller_methods'
-require 'apotomo/rails/view_methods'
 
+ENV['RAILS_ENV'] = 'test'
+require "dummy/config/environment"
+require "rails/test_help" # sets up ActionController::TestCase's @routes
 
 
+Cell::Base.append_view_path File.expand_path(File.dirname(__FILE__) + "/fixtures")
 
 # Load test support files.
 require File.join(File.dirname(__FILE__), "support/test_case_methods")
@@ -59,8 +51,3 @@ end
 class Apotomo::Widget
   def action_method?(*); true; end
 end
-
-ENV['RAILS_ENV'] = 'test'
-require "dummy/config/environment"
-#require File.join(File.dirname(__FILE__), '..', 'config/routes.rb') ### TODO: let rails engine handle that.
-require "rails/test_help" # sets up ActionController::TestCase's @routes

data/test/unit/request_processor_test.rb

@@ -59,10 +59,6 @@ class RequestProcessorTest < ActiveSupport::TestCase
       should "provide a single root-node for #root" do
         assert_equal 1, @processor.root.size
       end
-      
-      should "initialize version to 0" do
-        assert_equal 0, @processor.root.version
-      end
     end
     
     context "with controller" do

data/test/unit/test_case_test.rb

@@ -0,0 +1,95 @@
+require 'test_helper'
+require 'apotomo/test_case'
+
+class TestCaseTest < Test::Unit::TestCase
+  
+  class CommentsWidgetTest < Apotomo::TestCase
+  end
+  
+  class CommentsWidget < Apotomo::Widget
+  end
+  
+  context "TestCase" do
+    
+    context "responding to #root" do
+      class MouseWidgetTest < Apotomo::TestCase
+      end
+  
+      setup do
+        @klass = MouseWidgetTest
+        @test = @klass.new(:widget).tap{ |t| t.setup }
+        @klass.has_widgets { |r| r << widget("mouse_cell", 'mum', :eating) }
+      end
+      
+      should "respond to #root" do  
+        assert_equal ['root', 'mum'], @test.root.collect { |w| w.name }
+      end
+      
+      should "raise an error if no has_widgets block given" do
+        exc = assert_raises RuntimeError do
+          @test = Class.new(Apotomo::TestCase).new(:widget).tap{ |t| t.setup }
+          @test.root
+        end
+        
+        assert_equal "Please setup a widget tree using TestCase.has_widgets", exc.message
+      end
+      
+      should "memorize root" do
+        @test.root.visible=false
+        assert_equal false, @test.root.visible?
+      end
+      
+      should "respond to #render_widget" do
+        assert_equal "<div id=\"mum\">burp!</div>", @test.render_widget('mum')
+        assert_equal "<div id=\"mum\">burp!</div>", @test.last_invoke
+      end
+      
+      should "respond to #assert_select" do
+        @test.render_widget('mum')
+        
+        assert_nothing_raised { @test.assert_select("div#mum", "burp!") } 
+        
+        exc = assert_raises( MiniTest::Assertion){  @test.assert_select("div#mummy", "burp!"); }
+        assert_equal 'Expected at least 1 element matching "div#mummy", found 0.', exc.message 
+      end
+      
+      context "using events" do
+        setup do
+          @mum = @test.root['mum']
+          @mum.respond_to_event :footsteps, :with => :squeak
+          @mum.instance_eval do
+            def squeak; render :text => "squeak!"; end
+          end
+        end
+        
+        should "respond to #trigger" do
+          assert_equal ["squeak!"], @test.trigger(:footsteps, :source => 'mum')
+        end
+        
+        should "provide options from #trigger to the widget" do
+          @test.trigger(:footsteps, :source => 'mum', :direction => :kitchen)
+          assert_equal :kitchen, @mum.param(:direction)
+        end
+        
+        should "respond to #assert_response" do
+          @test.trigger(:footsteps, :source => 'mum')
+          assert @test.assert_response("squeak!")
+        end
+      end
+    end
+    
+    context "responding to parent_controller" do
+      setup do
+        @test = Apotomo::TestCase.new(:widget).tap{ |t| t.setup }
+      end
+      
+      should "provide a test controller" do
+        assert_kind_of ActionController::Base, @test.parent_controller
+      end
+      
+      should "respond to #controller_name" do
+        assert_equal "barn", @test.parent_controller.controller_name
+      end
+    end
+  end
+end

data/test/unit/widget_test.rb

@@ -65,21 +65,15 @@ class WidgetTest < ActiveSupport::TestCase
     
     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))
+        assert_equal({:source=>"mum", :type=>:squeak, :controller=>"barn"}, @mum.address_for_event(:squeak))
       end
       
       should "accept a :source" do
-        assert_equal({:type => :squeak, :source => 'kid'}, @mum.address_for_event(:type => :squeak, :source => 'kid'))
+        assert_equal({:source=>"kid", :type=>:squeak, :controller=>"barn"}, @mum.address_for_event(: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
+        assert_equal({:volume=>"loud", :source=>"mum", :type=>:squeak, :controller=>"barn"}, @mum.address_for_event(:squeak, :volume => 'loud'))
       end
     end
     

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: apotomo
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 1
   - 0
   - 0
-  - beta2
-  version: 1.0.0.beta2
+  version: 1.0.0
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-16 00:00:00 +02:00
+date: 2010-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,11 +73,11 @@ dependencies:
         segments: 
         - 0
         - 1
-        - 2
-        version: 0.1.2
+        - 3
+        version: 0.1.3
   type: :runtime
   version_requirements: *id004
-description: Web components for Rails. Event-driven. Clean. Fast. Free optional statefulness included.
+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: []
 
@@ -94,9 +93,7 @@ files:
 - TODO
 - config/routes.rb
 - lib/apotomo.rb
-- lib/apotomo/caching.rb
 - lib/apotomo/container_widget.rb
-- lib/apotomo/deep_link_methods.rb
 - lib/apotomo/event.rb
 - lib/apotomo/event_handler.rb
 - lib/apotomo/event_methods.rb
@@ -109,6 +106,7 @@ files:
 - lib/apotomo/rails/view_methods.rb
 - lib/apotomo/request_processor.rb
 - lib/apotomo/stateful_widget.rb
+- lib/apotomo/test_case.rb
 - lib/apotomo/transition.rb
 - lib/apotomo/tree_node.rb
 - lib/apotomo/version.rb
@@ -120,72 +118,72 @@ files:
 - lib/generators/apotomo/templates/widget.rb
 - lib/generators/apotomo/templates/widget_test.rb
 - lib/generators/apotomo/widget_generator.rb
-- test/fixtures/mouse/feed.html.erb
-- test/fixtures/mouse/eating.html.erb
+- lib/tasks.rake
 - test/fixtures/mouse/make_me_squeak.html.erb
-- test/fixtures/mouse/posing.html.erb
+- test/fixtures/mouse/content.html.erb
 - test/fixtures/mouse/educate.html.erb
+- test/fixtures/mouse/feed.html.erb
 - test/fixtures/mouse/snuggle.html.erb
-- test/fixtures/mouse/content.html.erb
+- test/fixtures/mouse/eating.html.erb
+- test/fixtures/mouse/posing.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/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/environment.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/db/test.sqlite3
 - test/dummy/Rakefile
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/public/404.html
+- test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/controls.js
+- test/dummy/public/javascripts/effects.js
+- test/dummy/public/javascripts/dragdrop.js
 - test/dummy/public/javascripts/application.js
 - test/dummy/public/javascripts/rails.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/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_addressing.rb
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/config.ru
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/application.rb
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/script/rails
+- test/support/test_case_methods.rb
+- test/rails/rails_integration_test.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/unit/onfire_integration_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/request_processor_test.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/test_caching.rb
 - test/unit/javascript_generator_test.rb
-- test/unit/onfire_integration_test.rb
+- test/unit/stateful_widget_test.rb
+- test/unit/event_methods_test.rb
 - test/unit/persistence_test.rb
+- test/unit/event_handler_test.rb
 - test/unit/transition_test.rb
 - test/unit/event_test.rb
-- test/unit/event_methods_test.rb
 - test/unit/widget_test.rb
+- test/unit/widget_shortcuts_test.rb
+- test/unit/test_tab_panel.rb
+- test/unit/test_addressing.rb
+- test/unit/container_test.rb
+- test/unit/test_jump_to_state.rb
 has_rdoc: true
 homepage: http://apotomo.de
 licenses: []
@@ -206,13 +204,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
@@ -221,69 +217,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/content.html.erb
 - test/fixtures/mouse/educate.html.erb
+- test/fixtures/mouse/feed.html.erb
 - test/fixtures/mouse/snuggle.html.erb
-- test/fixtures/mouse/content.html.erb
+- test/fixtures/mouse/eating.html.erb
+- test/fixtures/mouse/posing.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/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/environment.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/db/test.sqlite3
 - test/dummy/Rakefile
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
 - test/dummy/public/404.html
+- test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/controls.js
+- test/dummy/public/javascripts/effects.js
+- test/dummy/public/javascripts/dragdrop.js
 - test/dummy/public/javascripts/application.js
 - test/dummy/public/javascripts/rails.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/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_addressing.rb
+- test/dummy/public/422.html
+- test/dummy/public/favicon.ico
+- test/dummy/public/500.html
+- test/dummy/config.ru
+- test/dummy/config/environments/test.rb
+- test/dummy/config/environments/production.rb
+- test/dummy/config/environments/development.rb
+- test/dummy/config/database.yml
+- test/dummy/config/boot.rb
+- test/dummy/config/locales/en.yml
+- test/dummy/config/environment.rb
+- test/dummy/config/initializers/secret_token.rb
+- test/dummy/config/initializers/backtrace_silencers.rb
+- test/dummy/config/initializers/session_store.rb
+- test/dummy/config/initializers/mime_types.rb
+- test/dummy/config/initializers/inflections.rb
+- test/dummy/config/application.rb
+- test/dummy/config/routes.rb
+- test/dummy/db/test.sqlite3
+- test/dummy/script/rails
+- test/support/test_case_methods.rb
+- test/rails/rails_integration_test.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/unit/onfire_integration_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/request_processor_test.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/test_caching.rb
 - test/unit/javascript_generator_test.rb
-- test/unit/onfire_integration_test.rb
+- test/unit/stateful_widget_test.rb
+- test/unit/event_methods_test.rb
 - test/unit/persistence_test.rb
+- test/unit/event_handler_test.rb
 - test/unit/transition_test.rb
 - test/unit/event_test.rb
-- test/unit/event_methods_test.rb
 - test/unit/widget_test.rb
+- test/unit/widget_shortcuts_test.rb
+- test/unit/test_tab_panel.rb
+- test/unit/test_addressing.rb
+- test/unit/container_test.rb
+- test/unit/test_jump_to_state.rb

data/lib/apotomo/caching.rb

@@ -1,37 +0,0 @@
-# Introduces caching of rendered state views into the StatefulWidget.
-module Apotomo::Caching
-    
-  def self.included(base) #:nodoc:
-    base.class_eval do
-      extend ClassMethods
-    end
-  end
-
-
-  module ClassMethods
-    # If <tt>version_proc</tt> is omitted, Apotomo provides some basic caching 
-    # mechanism: the state view rendered for <tt>state</tt> will be cached as long
-    # as you (or e.g. an EventHandler) calls #dirty!. It will then be re-rendered
-    # and cached again.
-    # You may override that to provide fine-grained caching, with multiple cache versions
-    # for the same state.
-    def cache(state, version_proc=:cache_version)
-      super(state, version_proc)
-    end
-  end
-  
-  def cache_version
-    @version ||= 0
-    {:v => @version}
-  end
-  
-  def increment_version
-    @version += 1
-  end
-  
-  # Instruct caching to re-render all cached state views.
-  def dirty!
-    increment_version
-  end
-  
-end

data/lib/apotomo/deep_link_methods.rb

@@ -1,90 +0,0 @@
-module Apotomo
-  module DeepLinkMethods
-    def self.included(base)
-      base.initialize_hooks << :initialize_deep_link_for
-    end
-    
-    
-    # Called in StatefulWidget's constructor.
-    def initialize_deep_link_for(id, start_states, opts)
-      #add_deep_link if opts[:is_url_listener] ### DISCUSS: remove #add_de
-    end
-    
-    def responds_to_url_change?
-      evt_table.all_handlers_for(:urlChange, name).size > 0
-    end
-    
-    
-    ### DISCUSS: private? rename to compute_url_fragment_for ?
-    # Computes the fragment part of the widget's url by querying all widgets up to root.
-    # Widgets managing a certain state will usually insert state recovery information
-    # via local_fragment.
-    def url_fragment_for(local_portion=nil, portions=[])
-      local_portion = local_fragment if responds_to_url_change? and local_portion.nil?
-      
-      portions.unshift(local_portion) # prepend portions as we move up.
-      
-      return portions.compact.join("/") if root?
-      
-      parent.url_fragment_for(nil, portions)
-    end
-    
-    
-    # Called when widget :is_url_listener. Adds the local url fragment portion to the url.
-    def local_fragment
-      #"#{local_fragment_key}=#{state_name}"
-    end
-    
-    # Key found in the url fragment, pointing to the local fragment.
-    #def local_fragment_key
-    #  name
-    #end
-    
-    
-    # Called by DeepLinkWidget#process to query if we're involved in an URL change.
-    # Do return false if you're not interested in the change.
-    #
-    # This especially means:
-    #  * the fragment doesn't include you or is empty
-    #   fragment[name].blank?
-    #  * your portion in the fragment didn't change
-    #   tab=first/content=html vs. tab=first/content=markdown
-    #   fragment[:tab] != @active_tab
-    def responds_to_url_change_for?(fragment)
-    end
-    
-    
-    
-    class UrlFragment
-      attr_reader :fragment
-      
-      def initialize(fragment)
-        @fragment = fragment || ""
-      end
-      
-      def to_s
-        fragment.to_s
-      end
-      
-      def blank?
-        fragment.blank?
-      end
-      
-      ### TODO: make path separator configurable.
-      def [](key)
-        if path_portion = fragment.split("/").find {|i| i.include?(key.to_s)}
-          return path_portion.sub("#{key}=", "")
-        end
-        
-        nil
-      end
-    end
-    
-    # Query object for the url fragment. Use this to retrieve state information from the
-    # deep link.
-    def url_fragment
-      UrlFragment.new(param(:deep_link))
-    end
-    
-  end
-end

data/test/unit/test_caching.rb

@@ -1,53 +0,0 @@
-require 'test_helper'
-
-class ApotomoCachingTest < Test::Unit::TestCase
-  include Apotomo::UnitTestCase
-  
-  def setup
-    super
-    @controller.session= {}
-    @cc = CachingCell.new('caching_cell', :start)
-    @cc.controller = @controller
-  end
-  
-  
-  def test_caching_with_instance_version_proc
-    unless ActionController::Base.cache_configured?
-      throw Exception.new "cache_configured? returned false. You may enable caching in your config/environments/test.rb to make this test pass."
-      return
-    end
-    c1 = @cc.invoke
-    c2 = @cc.invoke
-    assert_equal c1, c2
-    
-    @cc.dirty!
-    
-    c3 = @cc.invoke
-    assert c2 != c3
-  end
-  
-end
-
-
-class CachingCell < Apotomo::StatefulWidget
-  
-  cache :cached_state
-  
-  transition :in => :cached_state
-  
-  
-  def start
-    jump_to_state :cached_state
-  end
-  
-  def cached_state
-    @counter ||= 0
-    @counter += 1
-    "#{@counter}"
-    
-  end
-  
-  def not_cached_state
-    "i'm really static"
-  end
-end

data/test/unit/test_widget_shortcuts.rb

@@ -1,44 +0,0 @@
-require 'test_helper'
-
-# fixture:
-module My
-  class TestCell < Apotomo::StatefulWidget
-    def a_state
-      "a_state"
-    end
-  end
-  
-  class TestWidget < Apotomo::StatefulWidget
-    def a_state
-      "a_state"
-    end
-  end
-end
-
-class MyTestWidgetTree < Apotomo::WidgetTree  
-  def draw(root)
-    root << widget('apotomo/stateful_widget', :widget_content, 'widget_one')
-    root << cell(:my_test, :a_state, 'my_test_cell')
-    root << switch('my_switch') << widget('apotomo/stateful_widget', :widget_content, :child_widget)
-    root << section('my_section')
-    root << widget('apotomo/stateful_widget', :widget_content, :widget_three)
-    #root  ### FIXME! find a way to return nothing by default.
-  end
-end
-
-
-class WidgetShortcutsTest < Test::Unit::TestCase
-  include Apotomo::UnitTestCase
-  
-  
-  def test_cell
-    assert_kind_of My::TestCell, cell("my/test", :a_state, 'my_test_cell')
-  end
-  
-  def test_widget
-    w = widget("my/test_widget", :a_state, 'my_test_cell')
-    assert_kind_of My::TestWidget, w
-    assert_equal "my_test_cell", w.name
-  end
-  
-end