apotomo 0.1.1 → 0.1.2

data/lib/apotomo/rails/controller_methods.rb

@@ -21,11 +21,11 @@ require 'apotomo/rails/view_methods'
         end
         
         module ClassMethods
-          def uses_widgets(&block)
+          def has_widgets(&block)
             uses_widgets_blocks << block
           end
           
-          alias_method :has_widgets, :uses_widgets
+          alias_method :uses_widgets, :has_widgets
         end
         
         def bound_use_widgets_blocks
@@ -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(session, options, self.class.uses_widgets_blocks)
+          @apotomo_request_processor = Apotomo::RequestProcessor.new(self, session, options, self.class.uses_widgets_blocks)
           
           flush_bound_use_widgets_blocks if @apotomo_request_processor.widgets_flushed?
           
@@ -80,7 +80,7 @@ require 'apotomo/rails/view_methods'
         
         
         def render_widget(widget, options={}, &block)
-          apotomo_request_processor.render_widget_for(widget, options, self, &block)
+          apotomo_request_processor.render_widget_for(widget, options, &block)
         end
         
         def apotomo_freeze
@@ -88,7 +88,7 @@ require 'apotomo/rails/view_methods'
         end
       
         def render_event_response
-          page_updates = apotomo_request_processor.process_for({:type => params[:type], :source => params[:source]}, self)
+          page_updates = apotomo_request_processor.process_for({:type => params[:type], :source => params[:source]})
           
           return render_iframe_updates(page_updates) if params[:apotomo_iframe]
           

data/lib/apotomo/rails/view_helper.rb

@@ -38,10 +38,6 @@ module Apotomo
         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)
-        ### FIXME: couldn't get obstrusive js working, i don't understand rails helpers.
-        #html_options[:onSubmit] = js_generator.escape(js_generator.xhr(url_for_event(type, options)))
-        #puts html_options.inspect
-        #form_tag(url_for_event(type, options), html_options, &block)
       end
       
       # Creates a form that submits itself via an iFrame and executes the response
@@ -65,8 +61,8 @@ 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 => @cell.name
-        @controller.url_for_event(type, options)
+        options.reverse_merge! :source => widget_id
+        controller.url_for_event(type, options)
       end
       
       ### TODO: test me.
@@ -87,8 +83,26 @@ module Apotomo
         javascript_tag(*args, &block)
       end
       
-      def widget_div(*args, &block)
-        content_tag(:div, :id => @cell.name, :class => :widget, &block)
+      # Wraps your content in a +div+ and sets the id. Feel free to pass additional html options.
+      #
+      # Example:
+      #
+      #   - widget_div do
+      #     %p I'm wrapped
+      #
+      # will render
+      #
+      #   <div id="mouse">
+      #     <p>I'm wrapped</p>
+      #   </div>
+      def widget_div(options={}, &block)
+        options.reverse_merge!(:id => widget_id) 
+        content_tag(:div, options, &block)
+      end
+      
+      # Returns the widget id you passed in a has_widgets block.
+      def widget_id
+        @cell.name
       end
     end  
   end

data/lib/apotomo/request_processor.rb

@@ -4,12 +4,14 @@ module Apotomo
     
     attr_reader :session, :root
     
-    def initialize(session, options={}, uses_widgets_blocks=[])
+    def initialize(controller, session, options={}, uses_widgets_blocks=[])
       @session              = session
       @widgets_flushed      = false
       
       @root = widget('apotomo/widget', 'root')
-      uses_widgets_blocks.each { |blk| blk.call(@root) } # add stateless widgets.
+      @root.controller = controller
+      
+      attach_stateless_blocks_for(uses_widgets_blocks, @root, controller)
       
       if options[:flush_widgets].blank? and ::Apotomo::StatefulWidget.frozen_widget_in?(session)  
         @root = ::Apotomo::StatefulWidget.thaw_for(session, @root)
@@ -22,6 +24,16 @@ module Apotomo
       #handle_version!(options[:version])
     end
     
+    def attach_stateless_blocks_for(blocks, root, controller)
+      blocks.each do |blk|
+        if blk.arity == 1
+          blk.call(root) and next # fixes misbehaviour in ruby 1.8.
+        end
+        
+        blk.call(root, controller)  
+      end
+    end
+    
     
     def flushed_root
       StatefulWidget.flush_storage(session)
@@ -41,10 +53,7 @@ module Apotomo
     def widgets_flushed?;  @widgets_flushed; end
     
     # Fires the request event in the widget tree and collects the rendered page updates.
-    def process_for(request_params, controller)
-      ### TODO: move controller dependency to rails/merb/sinatra layer only!
-      self.root.controller = controller
-      
+    def process_for(request_params)
       source = self.root.find_widget(request_params[:source]) or raise "Source #{request_params[:source].inspect} non-existent."
       
       source.fire(request_params[:type].to_sym)
@@ -64,7 +73,7 @@ module Apotomo
     
     # Renders the widget named <tt>widget_id</tt>, passing optional <tt>opts</tt> and a block to it.
     # Use this in your #render_widget wrapper.
-    def render_widget_for(widget_id, opts, controller, &block)
+    def render_widget_for(widget_id, opts, &block)
       if widget_id.kind_of?(::Apotomo::Widget)
         widget = widget_id
       else
@@ -76,9 +85,6 @@ module Apotomo
       ### TODO: pass options in invoke.
       widget.opts = opts unless opts.empty?
       
-      ### TODO: move controller dependency to rails/merb/sinatra layer only!
-      widget.root.controller = controller
-      
       widget.invoke(&block)
     end
     

data/lib/apotomo/tree_node.rb

@@ -8,7 +8,7 @@ module TreeNode
   attr_writer :content, :parent
   
   def self.included(base)
-    base.initialize_hooks << :initialize_tree_node_for
+    base.after_initialize :initialize_tree_node_for
   end
   
   # Constructor which expects the name of the node

data/lib/apotomo/version.rb

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

data/lib/apotomo/widget.rb

@@ -24,21 +24,6 @@ module Apotomo
     attr_accessor :opts
     attr_writer   :visible
     
-    include TreeNode
-    
-    
-    include Onfire
-    include EventMethods
-    
-    include Transition
-    include Caching
-    
-    include DeepLinkMethods
-    include WidgetShortcuts
-    
-    helper Apotomo::Rails::ViewHelper
-    
-    
     attr_writer   :controller
     attr_accessor :version
     
@@ -55,12 +40,41 @@ module Apotomo
       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
-    self.initialize_hooks << :add_has_widgets_blocks
+    
+    include TreeNode
+    
+    include Onfire
+    include EventMethods
+    
+    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) }
     end
+    after_initialize :add_has_widgets_blocks
     
     
     # Constructor which needs a unique id for the widget and one or multiple start states.

data/lib/apotomo/widget_shortcuts.rb

@@ -7,8 +7,12 @@ module Apotomo
     # Example:
     #   widget(:form, 'uploads', :build_form) do |form|
     #     form << widget(:upload_field)
+    # 
+    # You can also use namespaces.
+    #
+    #   widget('jquery/tabs', 'panel')
     def widget(class_name, id, state=:display, *args)
-      object = class_name.to_s.classify.constantize.new(id, state, *args)
+      object = constant_for(class_name).new(id, state, *args)
       yield object if block_given?
       object
     end
@@ -32,5 +36,10 @@ module Apotomo
     def tab(id, *args)
       widget('apotomo/tab_widget', :display, id, *args)
     end
+    
+    private
+      def constant_for(class_name)
+        class_name.to_s.camelize.constantize
+      end
   end
 end

data/test/rails/view_helper_test.rb

@@ -52,7 +52,15 @@ class ViewHelperTest < ActionView::TestCase
     end
     
     should "respond to #widget_div" do
-      assert_equal '<div class="widget" id="mum">squeak!</div>', widget_div { "squeak!" }
+      assert_equal '<div id="mum">squeak!</div>', widget_div { "squeak!" }
+    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!" }
+    end
+    
+    should "respond to #widget_id" do
+      assert_equal 'mum', widget_id
     end
     
     context "#widget_javascript" do
@@ -74,4 +82,18 @@ class ViewHelperTest < ActionView::TestCase
       end
     end
   end
+  
+  context "A widget including ViewHelper" do
+    setup do
+      barn_controller!
+      @mum = mouse_mock
+      @mum.class_eval do
+        include Apotomo::Rails::ViewHelper
+      end
+    end
+    
+    should "respond to url_for_event" do
+      @mum.url_for_event(:bla)
+    end
+  end
 end

data/test/test_helper.rb

@@ -1,4 +1,5 @@
 # wycats says...
+require 'rubygems'
 require 'bundler'
 Bundler.setup
 

data/test/unit/request_processor_test.rb

@@ -3,17 +3,35 @@ require File.join(File.dirname(__FILE__), *%w[.. test_helper])
 class RequestProcessorTest < Test::Unit::TestCase
   context "#root" do
     should "allow external modification of the tree" do
-      @processor = Apotomo::RequestProcessor.new({})
+      @processor = Apotomo::RequestProcessor.new(nil, {})
       root = @processor.root
       root << mouse_mock
       assert_equal 2, @processor.root.size
     end
   end
+  
+  context "#attach_stateless_blocks_for" do
+    setup do
+      @processor  = Apotomo::RequestProcessor.new("controller", {})
+      @root       = @processor.root
+      @controller = "yo"
+    end
+    
+    should "allow has_widgets blocks with root parameter, only" do
+      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root| root.add mouse_mock }], @root, @controller)
+      assert_equal 'mouse', @processor.root['mouse'].name
+    end
+    
+    should "allow has_widgets blocks with both root and controller parameter" do
+      @processor.send(:attach_stateless_blocks_for, [Proc.new{ |root,controller| root.add mouse_mock }], @root, @controller)
+      assert_equal 'mouse', @processor.root['mouse'].name
+    end
+  end
     
   context "option processing at construction time" do
     context "with empty session and options" do
       setup do
-        @processor = Apotomo::RequestProcessor.new({})
+        @processor = Apotomo::RequestProcessor.new(nil, {})
       end
       
       should "mark the tree as flushed" do
@@ -29,12 +47,18 @@ class RequestProcessorTest < Test::Unit::TestCase
       end
     end
     
+    context "with controller" do
+      should "attach the passed controller to root" do
+        assert_equal "controller", Apotomo::RequestProcessor.new("controller", {}, {}, []).root.controller
+      end
+    end
+    
     context "with session" do
       setup do
         mum_and_kid!
         @mum.version = 1
         @session = {:apotomo_stateful_branches => [[@mum, 'root']]}
-        @processor = Apotomo::RequestProcessor.new(@session)
+        @processor = Apotomo::RequestProcessor.new(nil, @session)
       end
       
       should "provide a widget family for #root" do
@@ -45,7 +69,7 @@ class RequestProcessorTest < Test::Unit::TestCase
       
       context "having a flush flag set" do
         setup do
-          @processor = Apotomo::RequestProcessor.new(@session, :flush_widgets => true)
+          @processor = Apotomo::RequestProcessor.new(nil, @session, :flush_widgets => true)
         end
         
         should "provide a single root for #root when :flush_widgets is set" do
@@ -58,13 +82,12 @@ class RequestProcessorTest < Test::Unit::TestCase
           assert_nil @session[:apotomo_widget_ivars]
         end
         
-        should ""
       end
       
       context "and with stateless widgets" do
         setup do
           @session = {:apotomo_stateful_branches => [[@mum, 'grandma']]}
-          @processor = Apotomo::RequestProcessor.new(@session, {}, [Proc.new { |root| root << Apotomo::Widget.new('grandma', :eating) }])
+          @processor = Apotomo::RequestProcessor.new(nil, @session, {}, [Proc.new { |root| root << Apotomo::Widget.new('grandma', :eating) }])
         end
         
         should "first attach passed stateless, then stateful widgets to root" do
@@ -80,7 +103,7 @@ class RequestProcessorTest < Test::Unit::TestCase
       ### FIXME: what about that automatic @controller everywhere?
       mum_and_kid!
       @mum.controller = nil # check if controller gets connected.
-      @processor = Apotomo::RequestProcessor.new({:apotomo_stateful_branches => [[@mum, 'root']]}, :js_framework => :prototype)
+      @processor = Apotomo::RequestProcessor.new(nil, {:apotomo_stateful_branches => [[@mum, 'root']]}, :js_framework => :prototype)
       
       
       
@@ -99,14 +122,14 @@ class RequestProcessorTest < Test::Unit::TestCase
     end
       
     should "return 2 page_updates when @kid squeaks" do
-      res = @processor.process_for({:type => :squeak, :source => 'kid'}, @controller)
+      res = @processor.process_for({:type => :squeak, :source => 'kid'})
       
       assert_equal ["alert!", "squeak"], res
     end
     
     should "raise an exception when :source is unknown" do
       assert_raises RuntimeError do
-        @processor.process_for({:type => :squeak, :source => 'tom'}, @controller)
+        @processor.process_for({:type => :squeak, :source => 'tom'})
       end
     end
   end
@@ -115,12 +138,12 @@ class RequestProcessorTest < Test::Unit::TestCase
   
   context "#freeze!" do
     should "serialize stateful branches to @session" do
-      @processor = Apotomo::RequestProcessor.new({})
+      @processor = Apotomo::RequestProcessor.new(nil, {})
       @processor.root << mum_and_kid!
       assert_equal 3, @processor.root.size
       @processor.freeze!
       
-      @processor = Apotomo::RequestProcessor.new(@processor.session)
+      @processor = Apotomo::RequestProcessor.new(nil, @processor.session)
       assert_equal 3, @processor.root.size
     end
   end
@@ -132,27 +155,27 @@ class RequestProcessorTest < Test::Unit::TestCase
       end
       @mum.controller = nil
       
-      @processor = Apotomo::RequestProcessor.new({:apotomo_stateful_branches => [[@mum, 'root']]})
+      @processor = Apotomo::RequestProcessor.new(nil, {:apotomo_stateful_branches => [[@mum, 'root']]})
     end
     
     should "render the widget when passing an existing widget id" do
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for('mum', {}, @controller)
+      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for('mum', {})
     end
     
     should "render the widget when passing an existing widget instance" do
-      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for(@mum, {}, @controller)
+      assert_equal '<div id="mum"><snuggle></snuggle></div>', @processor.render_widget_for(@mum, {})
     end
     
     should "raise an exception when a non-existent widget id id passed" do
       assert_raises RuntimeError do
-        @processor.render_widget_for('mummy', {}, @controller)
+        @processor.render_widget_for('mummy', {})
       end
     end
   end
   
   context "invoking #address_for" do
     setup do
-      @processor = Apotomo::RequestProcessor.new({})
+      @processor = Apotomo::RequestProcessor.new(nil, {})
     end
     
     should "accept an event :type" do

data/test/unit/stateful_widget_test.rb

@@ -23,85 +23,6 @@ class StatefulWidgetTest < Test::Unit::TestCase
       @mum.version = 1
       assert_equal 1, @mum.version
     end
-    
-    context "responding to #address_for_event" do
-      should "accept an event :type" do
-        assert_equal({:type => :squeak, :source => 'mum'}, @mum.address_for_event(:type => :squeak))
-      end
-      
-      should "accept a :source" do
-        assert_equal({:type => :squeak, :source => 'kid'}, @mum.address_for_event(:type => :squeak, :source => 'kid'))
-      end
-      
-      should "accept arbitrary options" do
-        assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @mum.address_for_event(:type => :squeak, :volume => 'loud'))
-      end
-      
-      should "complain if no type given" do
-        assert_raises RuntimeError do
-          @mum.address_for_event(:source => 'mum')
-        end
-      end
-    end
-    
-    context "implementing visibility" do
-      should "per default respond to #visible?" do
-        assert @mum.visible?
-      end
-      
-      should "expose a setter therefore" do
-        @mum.visible = false
-        assert_not @mum.visible?
-      end
-      
-      context "in a widget family" do
-        setup do
-          @mum << @jerry = mouse_mock('jerry')
-          @mum << @berry = mouse_mock('berry')
-        end
-        
-        should "per default return all #visible_children" do
-          assert_equal [@jerry, @berry], @mum.visible_children
-          assert_equal [], @jerry.visible_children
-        end
-        
-        should "hide berry in #visible_children if he's invisible" do
-          @berry.visible = false
-          assert_equal [@jerry], @mum.visible_children
-        end
-      end
-    end
-    
-    should "respond to #find_widget" do
-      mum_and_kid!
-      assert_not @mum.find_widget('pet')
-      assert @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
-    end
   end
   
   context "mum having a family" do

data/test/unit/widget_shortcuts_test.rb

@@ -1,8 +1,20 @@
 require File.join(File.dirname(__FILE__), *%w[.. test_helper])
 
 class MumWidget < MouseCell; end
+class MouseTabs;end
 
 class WidgetShortcutsTest < Test::Unit::TestCase
+  context "#constant_for" do
+    
+    should "constantize symbols" do
+      assert_equal MumWidget, constant_for(:mum_widget)
+    end
+    
+    should "not try to singularize the widget class" do
+      assert_equal MouseTabs, constant_for(:mouse_tabs)
+    end
+  end
+  
   context "#cell" do
     should "create a MouseCell instance for backward-compatibility" do
       assert_kind_of MouseCell, cell(:mouse, :eating, 'mum')

data/test/unit/widget_test.rb

@@ -21,4 +21,100 @@ class WidgetTest < ActiveSupport::TestCase
       assert_equal [], @kid.children
     end
   end
+  
+  context "A stateless widget" do
+    setup do
+      @mum = Apotomo::Widget.new('mum', :squeak)
+    end
+    
+    context "responding to #address_for_event" do
+        should "accept an event :type" do
+          assert_equal({:type => :squeak, :source => 'mum'}, @mum.address_for_event(:type => :squeak))
+        end
+        
+        should "accept a :source" do
+          assert_equal({:type => :squeak, :source => 'kid'}, @mum.address_for_event(:type => :squeak, :source => 'kid'))
+        end
+        
+        should "accept arbitrary options" do
+          assert_equal({:type => :squeak, :volume => 'loud', :source => 'mum'}, @mum.address_for_event(:type => :squeak, :volume => 'loud'))
+        end
+        
+        should "complain if no type given" do
+          assert_raises RuntimeError do
+            @mum.address_for_event(:source => 'mum')
+          end
+        end
+      end
+      
+      context "implementing visibility" do
+        should "per default respond to #visible?" do
+          assert @mum.visible?
+        end
+        
+        should "expose a setter therefore" do
+          @mum.visible = false
+          assert_not @mum.visible?
+        end
+        
+        context "in a widget family" do
+          setup do
+            @mum << @jerry = mouse_mock('jerry')
+            @mum << @berry = mouse_mock('berry')
+          end
+          
+          should "per default return all #visible_children" do
+            assert_equal [@jerry, @berry], @mum.visible_children
+            assert_equal [], @jerry.visible_children
+          end
+          
+          should "hide berry in #visible_children if he's invisible" do
+            @berry.visible = false
+            assert_equal [@jerry], @mum.visible_children
+          end
+        end
+      end
+      
+      should "respond to #find_widget" do
+        mum_and_kid!
+        assert_not @mum.find_widget('pet')
+        assert @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
+      end
+    end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apotomo
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,11 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-24 00:00:00 +02:00
+date: 2010-09-16 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cells
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +32,10 @@ dependencies:
         - 3
         version: "3.3"
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: activesupport
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +48,10 @@ dependencies:
         - 0
         version: 2.3.0
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: onfire
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,7 +64,6 @@ dependencies:
         - 0
         version: 0.1.0
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 description: A generic widget framework for Rails. Event-driven. Clean. Fast. Free optional statefulness included.
 email: apotonick@gmail.com
@@ -121,34 +121,34 @@ files:
 - lib/apotomo/widget_shortcuts.rb
 - rails/init.rb
 - test/fixtures/application_widget_tree.rb
-- test/test_helper.rb
-- test/support/test_case_methods.rb
-- test/support/assertions_helper.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/rails/rails_integration_test.rb
+- test/test_helper.rb
+- test/support/assertions_helper.rb
+- test/support/test_case_methods.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/unit/invoke_test.rb
-- test/unit/request_processor_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/apotomo_test.rb
+- test/unit/request_processor_test.rb
+- test/unit/test_caching.rb
 - test/unit/javascript_generator_test.rb
-- test/unit/stateful_widget_test.rb
-- test/unit/event_methods_test.rb
+- test/unit/onfire_integration_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_caching.rb
-- test/unit/test_widget_shortcuts.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: []
@@ -185,31 +185,31 @@ specification_version: 3
 summary: Event-driven Widgets for Rails with optional Statefulness.
 test_files: 
 - test/fixtures/application_widget_tree.rb
-- test/test_helper.rb
-- test/support/test_case_methods.rb
-- test/support/assertions_helper.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/rails/rails_integration_test.rb
+- test/test_helper.rb
+- test/support/assertions_helper.rb
+- test/support/test_case_methods.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/unit/invoke_test.rb
-- test/unit/request_processor_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/apotomo_test.rb
+- test/unit/request_processor_test.rb
+- test/unit/test_caching.rb
 - test/unit/javascript_generator_test.rb
-- test/unit/stateful_widget_test.rb
-- test/unit/event_methods_test.rb
+- test/unit/onfire_integration_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_caching.rb
-- test/unit/test_widget_shortcuts.rb
-- test/unit/test_tab_panel.rb
-- test/unit/test_addressing.rb
-- test/unit/container_test.rb
-- test/unit/test_jump_to_state.rb