apotomo 1.1.3 → 1.1.4

data/.travis.yml

@@ -0,0 +1,3 @@
+rvm: 1.9.2
+notifications:
+  irc: "irc.freenode.org#cells"

data/CHANGES.textile

@@ -1,8 +1,8 @@
-h2. 1.2
+h2. 1.1.4
 
 h3. Changes
   * New signature: @TestCase#trigger(type, source, options)@. This method no longer messes around with the widget's options hash but simply passes any additional options to @evt#data@. Also, the event @source@ is now the required second argument.
-  
+  * We now got @TestCase#view_assigns@ to access instance variables from the last rendered widget.
 
 h2. 1.1.1
 

data/README.rdoc

@@ -2,6 +2,8 @@
 
 <em>Web Components for Rails.</em>
 
+{<img src="https://secure.travis-ci.org/apotonick/apotomo.png" />}[http://travis-ci.org/apotonick/apotomo]
+
 == Overview
 
 Do you need an <b>interactive user interface</b> for your Rails application? A cool Rich Client Application with dashboards, portlets and AJAX, Drag&Drop and jQuery?

data/apotomo.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "cells",   ">= 3.5.6"
+  s.add_dependency "cells",   ">= 3.6.7"
   s.add_dependency "onfire",  "~> 0.2.0"
   s.add_dependency "hooks",   "~> 0.1.3"
 

data/lib/apotomo/event_handler.rb

@@ -1,6 +1,7 @@
 module Apotomo
   # EventHandlers are "callbacks", not knowing why they exist, but what to do.
   class EventHandler
+    
     def process_event(event)
       # do something, and return content.
       nil

data/lib/apotomo/test_case.rb

@@ -10,10 +10,10 @@ module Apotomo
   #     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
   #
@@ -29,17 +29,36 @@ module Apotomo
   #     end
   #
   # See also in Cell::TestCase.
-  class TestCase < Cell::TestCase
+  class TestCase < Cell::TestCase # TODO: re-arrange modules in Cell::TestCase and include instead of inheritance.
     # Generic test methods to be used in Test::Unit, RSpec, etc.
     module TestMethods
       extend ActiveSupport::Concern
-      
+
       module InstanceMethods
+        include Cell::TestCase::CommonTestMethods
+        
+        attr_reader :view_assigns
+        
+        def setup
+          super # defined in Cell::TestCase::CommonTestMethods.
+          
+          @controller.instance_eval do
+            def controller_path
+              'barn'
+            end
+          end
+          @controller.extend Apotomo::Rails::ControllerMethods
+        end
+        
         # Renders the widget +name+.
         def render_widget(*args)
-          @last_invoke = root.render_widget(*args)
+          @view_assigns = extract_state_ivars_for(root[args.first]) do
+            @last_invoke = root.render_widget(*args)
+          end
+          
+          @last_invoke
         end
-        
+
         # Triggers an event of +type+. You have to pass the +source+ as second options.
         #
         # Example:
@@ -50,7 +69,7 @@ module Apotomo
           source.fire(type, options)
           root.page_updates
         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 has_widgets()"
@@ -58,36 +77,25 @@ module Apotomo
              self.instance_exec(root, &blk)
           end
         end
+        
+        def parent_controller
+          @controller
+        end
       end
-      
+
       module ClassMethods
         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
         end
       end
     end
-    
-    
-    def setup
-      super
-      @controller.instance_eval do 
-        def controller_path
-         'barn'
-        end
-      end
-      @controller.extend Apotomo::Rails::ControllerMethods
-    end
-    
-    def parent_controller
-      @controller
-    end
-    
-    # After a #trigger this assertion compares the actually triggered page updates with the passed. 
+
+    # After a #trigger this assertion compares the actually triggered page updates with the passed.
     #
     # Example:
     #
@@ -95,19 +103,19 @@ module Apotomo
     #   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] 
+          assert_match assertion, updates[i]
         else
           assert_equal assertion, updates[i]
         end
-        
+
         i+=1
       end
     end
-    
+
     include Apotomo::WidgetShortcuts
     include TestMethods
   end

data/lib/apotomo/version.rb

@@ -1,3 +1,3 @@
 module Apotomo
-  VERSION = '1.1.3'
+  VERSION = '1.1.4'
 end

data/lib/generators/templates/widget_test.rb

@@ -2,11 +2,11 @@ require 'test_helper'
 
 class <%= class_name %>WidgetTest < Apotomo::TestCase
   has_widgets do |root|
-    root << widget(:<%= file_name %>, 'me')
+    root << widget(:<%= file_name %>)
   end
   
   test "display" do
-    render_widget 'me'
+    render_widget :<%= file_name %>
     assert_select "h1"
   end
 end

data/test/rails/widget_generator_test.rb

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

data/test/test_helper.rb

@@ -55,6 +55,8 @@ class MouseWidget < Apotomo::Widget
     render
   end
   
+  def display
+  end
 end
 
 # Enable dynamic states so we can do Cell.class_eval { def ... } at runtime.

data/test/unit/test_case_test.rb

@@ -77,6 +77,24 @@ class TestCaseTest < Test::Unit::TestCase
           assert @test.assert_response("{}")
         end
       end
+      
+      context "#view_assigns" do
+        should "be emtpy when nothing was set" do
+          @test.render_widget('mum')
+          assert_equal({}, @test.view_assigns)
+        end
+        
+        should "return the instance variables from the last #render_widget" do
+          @mum = @test.root['mum']
+          @mum.instance_eval do
+            def sleep
+              @duration = "8h"
+            end
+          end
+          @test.render_widget('mum', :sleep)
+          assert_equal({:duration => "8h"}, @test.view_assigns)
+        end
+      end
     end
     
     context "responding to parent_controller" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 1
-  - 3
-  version: 1.1.3
+  - 4
+  version: 1.1.4
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-26 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,9 +27,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 3
-        - 5
         - 6
-        version: 3.5.6
+        - 7
+        version: 3.6.7
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -138,6 +138,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGES.textile
 - Gemfile
 - README.rdoc