apotomo 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 017a9d6267b6b8cf91a80513607f24cd2f0edcd0
-  data.tar.gz: 2cfe2319182b4536f6c20d5dddf7cbb02224a5e0
+  metadata.gz: 869673532c8cc2f950193bfa92152e84f1a72b29
+  data.tar.gz: 97d85b797409ec903b0ff2c62c50d3fd975384cc
 SHA512:
-  metadata.gz: c39ad60a4f9fc2a4d93b3a928b3ff46ce583443aa25b3a3ade4663221bd639717c3b26d35b4f3b27dfd1456503ca039e70740bb0a2d97b998103eea2789944b4
-  data.tar.gz: e0b7f965287f2d42ba136dfec5816c90b7514904dbb111bd4dc6654a8cd57a50e9a6214a357b077fbf2075ae415853b3635c37f5dc243c64aa109ceec70aff6d
+  metadata.gz: d4771336d38c9b568ed1a945c073026df36becaaa44b6f312aead1c2ea2fcd304141142aaf21a7bf75587ade5b8eaf722c0f6757224147ef937e696297058fde
+  data.tar.gz: 7046dc17fc8996102ced3bc8243421496bfa7a535d5a5d700f68bbb444549ac8cf5651a9665e7f62c5581bbce4aeb576b5a0f1d0383d85802d75176fadda0e0b

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 1.2.6
+
+* Upgrade to newest hooks and uber, fixing `uninitialized constant Hooks::InheritableAttribute ` (fixes #144).
+
 h2. 1.2.5
 
 * Introduce @#widget_tag@ helper allowing you to wrap widget content in an arbitrary tag. Extends @#widget_div@.

data/README.md

@@ -192,6 +192,8 @@ 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!
 
+**Using rspec?** please check out [rspec-apotomo].
+
 ## Bubbling events
 
 Note: Let's write this paragraph!
@@ -209,3 +211,5 @@ If you wanna be cool, subscribe to our [feed](http://feeds.feedburner.com/Apotom
 Copyright (c) 2007-2013 Nick Sutterer <apotonick@gmail.com>
 
 Released under the MIT License.
+
+  [rspec-apotomo]: https://github.com/apotonick/rspec-apotomo "apotonick/rspec-apotomo"

data/apotomo.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "cells",   ">= 3.6.7"
   s.add_dependency "onfire",  "~> 0.2.0"
-  s.add_dependency "hooks",   "~> 0.3.0"
+  s.add_dependency "hooks",   "~> 0.4.0" # brings us uber.
 
   s.add_development_dependency "rake"
   s.add_development_dependency "slim"

data/config/routes.rb

@@ -1,3 +1,3 @@
 Rails.application.routes.draw do
-  match ":controller/render_event_response", :to => "#render_event_response", :as => "apotomo_event", :via => [:get, :post]
+  match ":controller/render_event_response", :to => "#render_event_response", :as => "apotomo_event", :via =>  [:get, :post, :put, :patch, :delete]
 end

data/lib/apotomo/rails/controller_methods.rb

@@ -1,4 +1,5 @@
 require 'apotomo/request_processor'
+require 'uber/inheritable_attr'
 
 module Apotomo
   module Rails
@@ -9,28 +10,28 @@ module Apotomo
         has_widgets(*args, &block)
       end
     end
-    
-    
+
+
     module ActionViewMethods
       delegate :render_widget, :url_for_event, :to => :controller
     end
-    
+
     module ControllerMethods
       include WidgetShortcuts
       extend ActiveSupport::Concern
-      
+
       included do
-        extend Hooks::InheritableAttribute
+        extend Uber::InheritableAttr
         extend WidgetShortcuts
-        
+
         inheritable_attr :has_widgets_blocks
         self.has_widgets_blocks = []
-        
+
         helper ActionViewMethods
       end
-      
+
       module ClassMethods
-        # Yields the root widget to setup your widgets for a controller. The block is executed in 
+        # Yields the root widget to setup your widgets for a controller. The block is executed in
         # controller _instance_ context, so you may use instance methods and variables of the
         # controller.
         #
@@ -43,32 +44,32 @@ module Apotomo
           has_widgets_blocks << block
         end
       end
-      
+
       def apotomo_request_processor
         return @apotomo_request_processor if @apotomo_request_processor
-        
+
         # happens once per request:
         options = {:js_framework   => Apotomo.js_framework}
-        
+
         @apotomo_request_processor = Apotomo::RequestProcessor.new(self, options, self.class.has_widgets_blocks)
       end
-      
+
       def apotomo_root
         apotomo_request_processor.root
       end
-      
+
       def render_widget(*args, &block)
         apotomo_request_processor.render_widget_for(*args, &block)
       end
-      
+
       def render_event_response
         page_updates = apotomo_request_processor.process_for(params)
-        
+
         return render_iframe_updates(page_updates) if params[:apotomo_iframe]
-        
+
         render :text => page_updates.join("\n"), :content_type => Mime::JS
       end
-      
+
       # Returns the url to trigger a +type+ event from +:source+, which is a non-optional parameter.
       # Additional +options+ will be appended to the query string.
       #
@@ -79,16 +80,16 @@ module Apotomo
       #   #=> http://apotomo.de/mouse/process_event_request?type=paginate&source=mouse&page=2
       def url_for_event(type, options)
         options.reverse_merge!(:type => type)
-        
+
         apotomo_event_path(apotomo_request_processor.address_for(options))
       end
-      
+
     protected
       # Renders the page updates through an iframe. Copied from responds_to_parent,
       # see http://github.com/markcatley/responds_to_parent .
       def render_iframe_updates(page_updates)
         escaped_script = Apotomo::JavascriptGenerator.escape(page_updates.join("\n"))
-        
+
         render :text => "<html><body><script type='text/javascript' charset='utf-8'>
 var loc = document.location;
 with(window.parent) { setTimeout(function() { window.eval('#{escaped_script}'); window.loc && loc.replace('about:blank'); }, 1) }

data/lib/apotomo/request_processor.rb

@@ -41,7 +41,7 @@ module Apotomo
     
     # Computes the address hash for a +:source+ widget and an event +:type+.
     # Additional parameters will be merged.
-    def address_for(options)
+    def address_for(options) # DISCUSS: remove/make private/rename?
       raise "You forgot to provide :source or :type" unless options.has_key?(:source) and options.has_key?(:type)
       options
     end

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.2.5'
+  VERSION = '1.2.6'
 end

data/lib/apotomo/widget/tree_node.rb

@@ -3,19 +3,23 @@ module Apotomo
     include Enumerable
     include Apotomo::WidgetShortcuts::DSL
 
+    # DISCUSS: do we need it? we have []!
+    # DISCUSS: #children receives a block, but #childrenHash doesn't
     attr_reader :childrenHash
     attr_accessor :parent
   
-    def setup_tree_node(parent)
+    def setup_tree_node(parent) # DISCUSS: make private?
       @parent       = nil
       @childrenHash = {}
-      @children     = []
+      @children     = [] # TODO: order of widgets in this variable isn't tested anywhere!!!
       
+      # DISCUSS: and what if not a Widget?
       parent.add_widget(self) if parent.kind_of? Widget # TODO: as long as cells needs parent_controller.
     end
 
     # Print the string representation of this node.
     def to_s
+      # DISCUSS: why self.widget_id but parent.name ?
       "Node ID: #{widget_id} Parent: " + (root?  ? "ROOT" : "#{parent.name}") +
         " Children: #{children.length}" + " Total Nodes: #{size}"
     end
@@ -37,6 +41,7 @@ module Apotomo
     def remove!(child)
       @childrenHash.delete(child.name)
       @children.delete(child)
+      # DISCUSS: why `unless child == nil`? if child is nil, an exception has been raised two locs above!
       child.root! unless child == nil
       child
     end
@@ -105,6 +110,8 @@ module Apotomo
     # Provides a comparision operation for the nodes. Comparision
     # is based on the natural character-set ordering for the
     # node names.
+    # DUISCUSS: useful?
+    # DUISCUSS: <, >, etc., operators doesn't work because of Comparable isn't included
     def <=>(other)
       return +1 if other == nil
       self.name <=> other.name

data/test/apotomo_test.rb

@@ -7,25 +7,23 @@ class ApotomoTest < MiniTest::Spec
         Apotomo.js_framework = :jquery
       end
 
-      it "respond to #js_framework" do
+      it "respond to #js_framework and return javascript framework's name" do
         assert_equal :jquery, Apotomo.js_framework
       end
 
-      it "respond to #js_generator" do
+      it "respond to #js_generator and return an correct instance" do
         assert_kind_of Apotomo::JavascriptGenerator, Apotomo.js_generator
-      end
-
-      it "include correct javascript framework module" do
-        assert Apotomo.js_generator.is_a?(Apotomo::JavascriptGenerator::Jquery)
-        assert_respond_to Apotomo.js_generator, :jquery
+        assert_kind_of Apotomo::JavascriptGenerator::Jquery, Apotomo.js_generator
       end
     end
 
     it "respond to #setup" do
-      Apotomo.setup { |config| config.js_framework = :jquery }
+      Apotomo.setup do |config|
+        config.js_framework = :jquery
+      end
+
       # TODO: Apotomo expect #js_framework
       assert_respond_to Apotomo.js_generator, :jquery
     end
   end
 end
-

data/test/event_handler_test.rb

@@ -15,25 +15,23 @@ class EventHandlerTest < MiniTest::Spec
       assert_equal nil, h.process_event(e)
     end
 
-    describe "#call" do 
-      it "push #process_events' results ordered to root's #page_updates" do
-        [@mum, @mum[:kid], @mum].each_with_index do |source, i|
-          e = Apotomo::Event.new(:squeak, source)
-          h = Apotomo::EventHandler.new
-          h.stub :process_event, "tick#{i}" do
-            h.call(e)
-          end
+    it "respond to #call and push #process_events' results ordered to root's #page_updates" do
+      [@mum, @mum[:kid], @mum].each_with_index do |source, i|
+        e = Apotomo::Event.new(:squeak, source)
+        h = Apotomo::EventHandler.new
+        h.stub :process_event, "tick#{i}" do
+          h.call(e)
         end
-
-        assert_equal 3, @mum.page_updates.size
-        assert_equal "tick0", @mum.page_updates[0]
-        assert_equal "tick1", @mum.page_updates[1]
-        assert_equal "tick2", @mum.page_updates[2]
-        assert_equal 0, @mum[:kid].page_updates.size
       end
 
-      #TODO: handler expect #process_event
+      assert_equal 3, @mum.page_updates.size
+      assert_equal "tick0", @mum.page_updates[0]
+      assert_equal "tick1", @mum.page_updates[1]
+      assert_equal "tick2", @mum.page_updates[2]
+      assert_equal 0, @mum[:kid].page_updates.size
     end
+
+    #TODO: handler expect #process_event
   end
 
 end

data/test/event_methods_test.rb

@@ -7,7 +7,6 @@ class EventMethodsTest < MiniTest::Spec
     Apotomo::InvokeEventHandler.new(:widget_id => id, :state => state)
   end
 
-
   describe "#respond_to_event and #fire" do
     before do
       mum_and_kid!
@@ -15,18 +14,20 @@ class EventMethodsTest < MiniTest::Spec
 
     it "alert @mum first, then make her squeak when @kid squeaks" do
       @kid.fire :squeak
+
       assert_equal ['be alerted', 'answer squeak'], @mum.list
     end
 
     it "make @mum just squeak back when jerry squeaks" do
       @mum << mouse_mock(:jerry)
       @mum[:jerry].fire :squeak
+
       assert_equal ['answer squeak'], @mum.list
     end
 
-
     it "make @mum run away while @kid keeps watching" do
       @kid.fire :footsteps
+
       assert_equal ['peek', 'escape'], @mum.list
     end
 
@@ -34,6 +35,7 @@ class EventMethodsTest < MiniTest::Spec
       @mum.respond_to_event :peep, :with => :answer_squeak
       @mum.respond_to_event :peep, :with => :answer_squeak
       @mum.fire :peep
+
       assert_equal ['answer squeak'], @mum.list
     end
 
@@ -41,12 +43,14 @@ class EventMethodsTest < MiniTest::Spec
       @mum.respond_to_event :peep, :with => :answer_squeak
       @mum.respond_to_event :peep, :with => :answer_squeak, :once => false
       @mum.fire :peep
+
       assert_equal ['answer squeak', 'answer squeak'], @mum.list
     end
 
     it "also accept an event argument only" do
       @mum.respond_to_event :answer_squeak
       @mum.fire :answer_squeak
+
       assert_equal ['answer squeak'], @mum.list
     end
 
@@ -60,6 +64,7 @@ class EventMethodsTest < MiniTest::Spec
       end
 
       @mum.trigger :footsteps, "near"
+
       assert_kind_of Apotomo::Event, @mum.list.last
     end
 
@@ -72,6 +77,7 @@ class EventMethodsTest < MiniTest::Spec
       end
 
       @mum.fire :answer_squeak, :volume => 9
+
       assert_equal [{:volume => 9}], @mum.list
     end
 
@@ -103,6 +109,7 @@ class EventMethodsTest < MiniTest::Spec
       class AdultMouse < Apotomo::Widget
         responds_to_event :peep, :with => :answer_squeak
       end
+
       class BabyMouse < AdultMouse
         responds_to_event :peep
         responds_to_event :footsteps, :with => :squeak
@@ -123,7 +130,6 @@ class EventMethodsTest < MiniTest::Spec
 
       it "not share responds_to_event options between different instances" do
         assert_equal [handler('mum', :answer_squeak)], @mum.event_table.all_handlers_for(:peep, 'mum')
-
         assert_equal [handler('dad', :answer_squeak)], AdultMouse.new(parent_controller, 'dad', :show).event_table.all_handlers_for(:peep, 'dad')
       end
     end
@@ -131,11 +137,11 @@ class EventMethodsTest < MiniTest::Spec
     describe "#trigger" do
       it "be an alias for #fire" do
         @kid.trigger :footsteps
+
         assert_equal ['peek', 'escape'], @mum.list
       end
     end
 
-
     describe "page_updates" do
       it "expose a simple Array for now" do
         assert_kind_of Array, @mum.page_updates
@@ -144,9 +150,9 @@ class EventMethodsTest < MiniTest::Spec
 
       it "be queued in root#page_updates after #fire" do
         @mum.fire :footsteps
+
         assert_equal ["escape"], @mum.page_updates
       end
     end
-
   end
 end

data/test/event_test.rb

@@ -3,25 +3,35 @@ require 'test_helper'
 class EventTest < MiniTest::Spec
   include Apotomo::TestCaseMethods::TestController
 
-  describe "An Event" do
+  describe "Event" do
+    it "is a kind of Onfire::Event" do
+      @event = Apotomo::Event.new(:footsteps, 'mum')
+
+      assert_kind_of Onfire::Event, @event
+    end
+
     it "respond to #type and #source" do
       @event = Apotomo::Event.new(:footsteps, 'mum')
-      assert_equal :footsteps,  @event.type
-      assert_equal 'mum',       @event.source
+
+      assert_equal :footsteps, @event.type
+      assert_equal 'mum', @event.source
     end
 
     it "accept an additional data object and respond to #data" do
       @event = Apotomo::Event.new(:footsteps, 'mum', {:volume => :loud})
+
       assert_equal({:volume => :loud}, @event.data)
     end
 
     it "delegate #[] to data" do
       @event = Apotomo::Event.new(:footsteps, 'mum', {:volume => :loud})
+
       assert_equal :loud, @event[:volume]
     end
 
     it "respond to #to_s" do
       @event = Apotomo::Event.new(:footsteps, mouse('mum'))
+
       assert_equal "<Event :footsteps source=mum>", @event.to_s
     end
   end

data/test/invoke_event_handler_test.rb

@@ -5,14 +5,16 @@ class EventHandlerTest < MiniTest::Spec
 
   describe "InvokeEventHandler" do
     describe "constructor" do
-      it "accept no arguments" do
+      it "accept no arguments and create clean instance" do
         h = Apotomo::InvokeEventHandler.new
+
         assert_nil h.widget_id
         assert_nil h.state
       end
 
-      it "accept options" do
+      it "accept options and set them" do
         h = Apotomo::InvokeEventHandler.new(:widget_id => :widget, :state => :state)
+
         assert_equal :widget, h.widget_id
         assert_equal :state,  h.state
       end
@@ -50,6 +52,7 @@ class EventHandlerTest < MiniTest::Spec
       h = Apotomo::InvokeEventHandler.new
       h.widget_id = :widget_id
       h.state     = :my_state
+
       assert_equal "InvokeEventHandler:widget_id#my_state", h.to_s
     end
   end

data/test/javascript_generator_test.rb

@@ -64,11 +64,11 @@ class JavascriptGeneratorTest < MiniTest::Spec
       it "respond to #update_id" do
         assert_equal "jQuery(\"#drinks\").html(\"EMPTY!\");", @gen.update_id("drinks", 'EMPTY!')
       end
+    end
 
-      # TODO: Prototype mode
+    # TODO: Prototype mode
 
-      # TODO: Right mode
+    # TODO: Right mode
 
-    end
   end
 end

data/test/rails/rails_integration_test.rb

@@ -46,75 +46,77 @@ class RailsIntegrationTest < ActionController::TestCase
   end
 
 
-  describe "ActionController" do
-    setup do
-      @controller.class.has_widgets do |root|
-        MumWidget.new(root, 'mum')
-      end
+  def setup
+    super
 
-      @controller.instance_eval do
-        def mum
-          render :text => render_widget('mum', params[:state])
-        end
-      end
+    @controller.class.has_widgets do |root|
+      MumWidget.new(root, 'mum')
     end
 
-    test "provide the rails view helpers in state views" do
-      get 'mum', :state => :make_me_squeak
-      assert_select "a", "mum"
+    @controller.instance_eval do
+      def mum
+        render :text => render_widget('mum', params[:state])
+      end
     end
+  end
 
-    # describe "nested widgets" do
-      test "render" do
-        get 'mum', :state => :child
-        assert_equal "/barn/render_event_response?source=kid&amp;type=click\n", @response.body
-      end
+  test "provide the rails view helpers in state views" do
+    get 'mum', :state => :make_me_squeak
+    assert_select "a", "mum"
+  end
 
-      test "process events" do
-        get 'render_event_response', :source => 'root', :type => :squeak
-        assert_equal "squeak!", @response.body
-      end
-    # end
+  test "render" do
+    get 'mum', :state => :child
+    puts "-"
+    assert_equal "/barn/render_event_response?source=kid&amp;type=click\n", @response.body
+  end
 
-    test "pass the event with all params data as state-args" do
-      get 'render_event_response', :source => "mum", :type => "squeak", :pitch => "high"
-      assert_equal "{\"source\"=>\"mum\", \"type\"=>\"squeak\", \"pitch\"=>\"high\", \"controller\"=>\"barn\", \"action\"=>\"render_event_response\"}\nsqueak!", @response.body
-    end
+  test "process events" do
+    get 'render_event_response', :source => 'root', :type => :squeak
+    assert_equal "squeak!", @response.body
+  end
 
-    test "render updates to the parent window for an iframe request" do
-      get 'render_event_response', :source => 'mum', :type => :sniff, :apotomo_iframe => true
+  test "#page_updates is populated with event responses" do
+    get 'render_event_response', :source => 'root', :type => :squeak
 
-      assert_response :success
-      assert_equal 'text/html', @response.content_type
-      assert_equal "<html><body><script type='text/javascript' charset='utf-8'>\nvar loc = document.location;\nwith(window.parent) { setTimeout(function() { window.eval('<b>sniff sniff<\\/b>'); window.loc && loc.replace('about:blank'); }, 1) }\n</script></body></html>", @response.body
-    # end
+    assert_equal ["squeak!"], @controller.apotomo_root.page_updates
+  end
 
+  test "pass the event with all params data as state-args" do
+    get 'render_event_response', :source => "mum", :type => "squeak", :pitch => "high"
+    assert_equal "{\"source\"=>\"mum\", \"type\"=>\"squeak\", \"pitch\"=>\"high\", \"controller\"=>\"barn\", \"action\"=>\"render_event_response\"}\nsqueak!", @response.body
+  end
+
+  test "render updates to the parent window for an iframe request" do
+    get 'render_event_response', :source => 'mum', :type => :sniff, :apotomo_iframe => true
+
+    assert_response :success
+    assert_equal 'text/html', @response.content_type
+    assert_equal "<html><body><script type='text/javascript' charset='utf-8'>\nvar loc = document.location;\nwith(window.parent) { setTimeout(function() { window.eval('<b>sniff sniff<\\/b>'); window.loc && loc.replace('about:blank'); }, 1) }\n</script></body></html>", @response.body
+  end
 
-    # describe "ActionView" do
-      before do
-        @controller.instance_eval do
-          def mum
-            render :inline => "<%= render_widget 'mum', :eat %>"
-          end
-        end
-      end
 
-      test "respond to #render_widget" do
-        get :mum
-        assert_select "#mum", "burp!"
+  # describe "ActionView" do
+  test "respond to #render_widget" do
+    @controller.instance_eval do
+      def mum
+        render :inline => "<%= render_widget 'mum', :eat %>"
       end
+    end
 
-      test "respond to #url_for_event" do
-        @controller.instance_eval do
-          def mum
-            render :inline => "<%= url_for_event :footsteps, :source => 'mum' %>"
-          end
-        end
+    get :mum
+    assert_select "#mum", "burp!"
+  end
 
-        get :mum
-        assert_equal "/barn/render_event_response?source=mum&amp;type=footsteps", @response.body
+  test "respond to #url_for_event" do
+    @controller.instance_eval do
+      def mum
+        render :inline => "<%= url_for_event :footsteps, :source => 'mum' %>"
       end
     end
+
+    get :mum
+    assert_equal "/barn/render_event_response?source=mum&amp;type=footsteps", @response.body
   end
 end