cells 3.6.6 → 3.6.7

data/.gitignore

@@ -5,3 +5,4 @@ pkg
 Gemfile.lock
 test/dummy/log/*.log
 test/dummy/tmp/
+/.rvmrc

data/.travis.yml

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

data/CHANGES.textile

@@ -1,3 +1,8 @@
+h2. 3.6.7
+
+h3. Changes
+  * Added @view_assigns@ to TestCase. 
+  
 h2. 3.6.6
 
 h3. Changes

data/README.rdoc

@@ -2,6 +2,8 @@
 
 <em>View Components for Rails.</em>
 
+{<img src="https://secure.travis-ci.org/apotonick/cells.png" />}[http://travis-ci.org/apotonick/cells]
+
 == Overview
 
 Say you're writing a Rails online shop - the shopping cart is reappearing again and again in every view. You're thinking about a clean solution for that part. A mixture of controller code, before-filters, partials and helpers?

data/lib/cell.rb

@@ -14,8 +14,8 @@ module Cell
     end
     
     def render_cell_for(controller, name, state, *args)
-      cell = create_cell_for(controller, name, *args)  # DISCUSS: we always save options.
-      yield cell if block_given?
+      cell = create_cell_for(controller, name, *args) # DISCUSS: pass args here?
+      yield cell if block_given?  # DISCUSS: call block before or after render?
       
       cell.render_state_with_args(state, *args)
     end

data/lib/cell/test_case.rb

@@ -58,8 +58,8 @@ module Cell
         super(HTML::Document.new(last_invoke).root, *args, &block)
       end
     end
-
-    module TestMethods
+    
+    module CommonTestMethods
       def setup
         @controller = Class.new(ActionController::Base).new
         @request    = ::ActionController::TestRequest.new
@@ -68,15 +68,40 @@ module Cell
         @controller.response = @response
         @controller.params = {}
       end
+      
+      # Runs the block while computing the instance variables diff from before and after. 
+      def extract_state_ivars_for(cell)
+        before  = cell.instance_variables
+        yield 
+        after   = cell.instance_variables
+        
+        Hash[(after - before).collect do |var|
+          next if var =~ /^@_/
+          [var[1, var.length].to_sym, cell.instance_variable_get(var)]
+        end]
+      end
+    end
+    
 
+    module TestMethods
+      include CommonTestMethods
+      
+      attr_reader :last_invoke, :subject_cell, :view_assigns
+      
       # Use this for functional tests of your application cells.
       #
       # Example:
       #   should "spit out a h1 title" do
       #     html = render_cell(:news, :latest)
-      #     assert_selekt html, "h1", "The latest and greatest!"
-      def render_cell(*args)
-        @controller.render_cell(*args)
+      #     assert_select html, "h1", "The latest and greatest!"
+      def render_cell(name, state, *args)
+        # DISCUSS: should we allow passing a block here, just as in controllers?
+        @subject_cell = ::Cell::Base.create_cell_for(@controller, name, *args)
+        @view_assigns = extract_state_ivars_for(@subject_cell) do
+          @last_invoke = @subject_cell.render_state_with_args(state, *args)
+        end
+        
+        @last_invoke
       end
 
       # Builds an instance of <tt>name</tt>Cell for unit testing.
@@ -89,8 +114,8 @@ module Cell
         cell.instance_eval &block if block_given?
         cell
       end
-      
-      # Execute the passed +block+ in a real view context of +cell_class+. 
+
+      # Execute the passed +block+ in a real view context of +cell_class+.
       # Usually you'd test helpers here.
       #
       # Example:
@@ -101,7 +126,7 @@ module Cell
         setup_test_states_in(subject) # add #in_view to subject cell.
         subject.render_state(:in_view)
       end
-      
+
     protected
       def setup_test_states_in(cell)
         cell.instance_eval do
@@ -119,9 +144,7 @@ module Cell
 
     extend ActionController::TestCase::Behavior::ClassMethods
     class_attribute :_controller_class
-    
-    
-    attr_reader :last_invoke
+
 
     def invoke(state, *args)
       @last_invoke = self.class.controller_class.new(@controller, *args).render_state_with_args(state, *args)

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.6.6'
+  VERSION = '3.6.7'
 end

data/test/test_case_test.rb

@@ -11,7 +11,6 @@ class TestCaseTest < Cell::TestCase
       end
     end
     
-    
     should "respond to #render_cell" do
       assert_equal "Doo", render_cell(:bassist, :play)
     end
@@ -32,6 +31,31 @@ class TestCaseTest < Cell::TestCase
       assert_equal({:topic => :peace}, cell(:bassist, :topic => :peace).options)
     end
     
+    context "#subject_cell" do
+      should "return the last rendered cell" do
+        render_cell(:bassist, :play)
+        assert_kind_of BassistCell, subject_cell
+      end
+    end
+    
+    
+    context "#view_assigns" do
+      should "be emtpy when nothing was set" do
+        render_cell(:bassist, :play)
+        assert_equal({}, view_assigns)
+      end
+      
+      should "return the instance variables from the last #render_cell" do
+        BassistCell.class_eval do
+          def sleep
+            @duration = "8h"
+          end
+        end
+        render_cell(:bassist, :sleep)
+        assert_equal({:duration => "8h"}, view_assigns)
+      end
+    end
+    
     context "in declarative tests" do
       should "respond to TestCase.tests" do
         self.class.tests BassistCell

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 6
-  - 6
-  version: 3.6.6
+  - 7
+  version: 3.6.7
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 +02:00
+date: 2011-09-28 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -121,6 +121,7 @@ extra_rdoc_files: []
 
 files: 
 - .gitignore
+- .travis.yml
 - CHANGES.textile
 - Gemfile
 - README.rdoc