cells 3.3.1 → 3.3.2

data/README.textile

@@ -0,0 +1 @@
+Helpers

data/lib/cells/cell/base.rb

@@ -323,19 +323,30 @@ module Cells
       # between both terms. A cell view is both, a view and a kind of partial as it represents only a small
       # part of the page.
       # Just use <tt>:view</tt> and enjoy.
-      def render(opts={})
-        render_view_for(opts, @state_name)  ### FIXME: i don't like the magic access to @state_name here. ugly!
+      def render(opts={}, &block)
+        render_view_for(opts, @state_name, &block)
       end
 
       # Render the view belonging to the given state. Will raise ActionView::MissingTemplate
       # if it can not find one of the requested view template. Note that this behaviour was
       # introduced in cells 2.3 and replaces the former warning message.
-      def render_view_for(opts, state)
+      def render_view_for(opts, state, &block)
         return '' if opts[:nothing]
 
         action_view = setup_action_view
 
         ### TODO: dispatch dynamically:
+        if opts[:erector]
+          require 'erector'
+          #puts self.class.master_helper_module.instance_methods
+          #extend self.class.master_helper_module
+          #return Erector.inline(assigns_for_view, &block).to_s(:helpers => action_view, :parent => action_view)
+          #include_helpers_in_class(action_view.class)
+          action_view.output_buffer=""
+          return Erector.inline(assigns_for_view, &block).to_s(:parent => action_view)
+        end
+        
+        
         if    opts[:text]
         elsif opts[:inline]
         elsif opts[:file]
@@ -453,8 +464,7 @@ module Cells
       
       ### TODO: allow log levels.
       def log(message)
-        return unless @controller.logger
-        @controller.logger.debug(message)
+        @controller.logger and @controller.logger.debug(message)
       end
     end
   end

data/lib/cells/cell/view.rb

@@ -18,11 +18,11 @@ module Cells
       ### so that we can overwrite the helper and cleanly reuse the internal method? using the same
       ### method both internally and externally sucks ass.
       def render(options = {}, local_assigns = {}, &block)
-        ### TODO: delegate dynamically:
         ### TODO: we have to find out if this is a call to the cells #render method, or to the rails
         ###       method (e.g. when rendering a layout). what a shit.
-        if view = options[:view]
-          return cell.render_view_for(options, view)
+        if (options.keys & [:view, :state]).present?  ### TODO: is there something like has_keys?
+          # that's better: simply delegate render back to the cell/controller.
+          return cell.render(options)
         end
 
         # rails compatibility we should get rid of:
@@ -30,7 +30,6 @@ module Cells
           # adds the cell name to the partial name.
           options[:partial] = expand_view_path(partial_path)
         end
-        #throw Exception.new
 
         super(options, local_assigns, &block)
       end

data/lib/cells/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cells
-  VERSION = '3.3.1'.freeze
+  VERSION = '3.3.2'
 end

data/test/app/cells/bassist_cell.rb

@@ -0,0 +1,3 @@
+class BassistCell < Cell::Base
+  
+end

data/test/erector_test.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class ErectorTest < ActionController::TestCase
+  context "#render with :erector" do
+    setup do
+      @cell = cell_mock
+    end
+    
+    should "render the erector widget when called with block" do
+      @cell.instance_eval do
+        def jam
+          @key = "A"
+          render :erector => true do
+            h1 do
+              text "Rock it in "
+              b @key
+            end
+          end
+        end
+      end
+        
+      assert_equal "<h1>Rock it in <b>A</b></h1>", @cell.render_state(:jam)
+    end
+    
+    should "have access to cell helpers" do
+      @cell.instance_eval do
+        #self.class.helper ActionView::Helpers::UrlHelper
+        
+        def jam
+          @key = "A"
+          render :erector => true do
+            #url_for("Rock it", "/rock/it")
+            h1 do  link_to("Rock it in #{@key}", :url => "/rock/it") end
+            #text raw link_to("Rock it")
+            #h "test"
+          end
+        end
+      end
+      
+      #erector_in_cell = Erector::Widget.new
+      class Erector::InlineWidget
+        def link_to(*args)
+          text! "what-ever!"
+        end
+      end
+      
+      assert_equal "<h1><a href=\"Rock it in A\" url=\"/rock/it\">Rock it in A</a></h1>", @cell.render_state(:jam)
+    end
+    
+    should "cry for beer!" do
+      require 'erector'
+      obj = Object.new
+      obj.instance_eval do
+        def beer; "beer!"; end
+      end
+      
+      
+      
+      assert_equal "<p>Cry for beer!</p>", Erector.inline() { p "Cry for #{text beer} #{b 'yo'}" }.to_s(:parent => obj)
+    end
+  end
+end

data/test/render_test.rb

@@ -283,4 +283,20 @@ class RenderTest < ActiveSupport::TestCase
     end
     assert_equal "Metal:A/another_state/a,b", render_cell(:a, :existing_view)
   end
+  
+  context "render :state within a view" do
+    should "return the state content" do
+      assert_equal( "\nDoo\n\nDoo\n\nDoo\n\nDoo\n", 
+        bassist_mock do
+          def jam
+            @chords = %w(d a c g)
+            render
+          end
+          def play
+            render
+          end
+        end.render_state(:jam)
+      )
+    end
+  end
 end

data/test/support/internal_assertions_helper.rb

@@ -60,5 +60,11 @@ module Cells
       cell.instance_eval(&block) if block_given?
       cell
     end
+    
+    def bassist_mock(options={}, &block)
+      cell = BassistCell.new(@controller, options)
+      cell.instance_eval(&block) if block_given?
+      cell
+    end
   end
 end

data/test/test_helper.rb

@@ -74,3 +74,5 @@ ActiveSupport::TestCase.class_eval do
   include Cells::AssertionsHelper
   include Cells::InternalAssertionsHelper
 end
+
+require File.join(File.dirname(__FILE__), *%w[app cells bassist_cell])

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cells
 version: !ruby/object:Gem::Version 
-  version: 3.3.1
+  prerelease: false
+  segments: 
+  - 3
+  - 3
+  - 2
+  version: 3.3.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-27 00:00:00 +01:00
+date: 2010-04-12 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -21,10 +26,12 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
+- README.textile
 files: 
 - CHANGES
 - MIT-LICENSE
 - README.rdoc
+- README.textile
 - Rakefile
 - lib/cell.rb
 - lib/cells.rb
@@ -62,22 +69,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Cells are lightweight controllers for Rails and can be rendered in controllers and views, providing an elegant and fast way for encapsulation and component-orientation.
 test_files: 
+- test/erector_test.rb
 - test/rails_test.rb
 - test/capture_helper_test.rb
 - test/assertions_helper_test.rb
@@ -90,6 +100,7 @@ test_files:
 - test/helper_test.rb
 - test/caching_test.rb
 - test/app/controllers/cells_test_controller.rb
+- test/app/cells/bassist_cell.rb
 - test/app/cells/really_module/nested_cell.rb
 - test/app/cells/cells_test_one_cell.rb
 - test/app/cells/cells_test_two_cell.rb