Merge branch '0.8-stable': Redirect or render inside widget behaviours [#431]

Author: bfcapell

lib/ubiquo_design/ubiquo_widgets.rb

@@ -95,6 +95,18 @@ def run_behaviour widget
       ::Widget.behaviours[widget.key][:proc].bind(self).call(widget)
     end
 
+    def widget_performed?
+      performed?
+    end
+
+    def widget_redirected?
+      @performed_redirect
+    end
+
+    def widget_rendered?
+      @performed_render
+    end
+
     # Renders the widget as a string
     #
     # The +widget+ is the instance to be rendered
@@ -104,8 +116,20 @@ def render_widget widget
         require_dependency "widgets/#{widget_name}_widget"
         raise WidgetNotFound.new("Widget #{widget_name} not found") unless available_widgets.include?(widget_name)
       end
-      run_behaviour(widget)
-      render_to_string :file => File.join("widgets", widget_name.to_s, "show.html.erb")
+
+      output = run_behaviour(widget)
+      if widget_redirected?
+        # Not render any other widget
+        false
+      elsif widget_rendered?
+        # Erase render results: @performed_render and @performed_redirect
+        # This is used in ActionView::Base::render_to_string
+        erase_render_results
+        reset_variables_added_to_assigns
+        output #return the output rendered by the behaviour
+      else
+        render_to_string :file => File.join("widgets", widget_name.to_s, "show.html.erb")
+      end
     end
 
   end

test/functional/ubiquo_widgets_test.rb

@@ -0,0 +1,44 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class GenericDetailWidgetTest < ActionController::TestCase
+  tests PagesController
+  
+  test "should render" do
+    widget, page = create_widget(:generic_detail)
+    
+    old_proc_behaviour = ::Widget.behaviours[widget.key][:proc]
+    ::Widget.behaviours[widget.key][:proc] = Proc.new do 
+      render :text => "<div id=\"widget-test-container\">Foo</div>"
+    end
+    
+    get :show, :url => [page.url_name, widget.id]
+    assert_equal @controller.widget_rendered?, true
+    assert_select "#widget-test-container", "Foo"
+    
+    ::Widget.behaviours[widget.key][:proc] = old_proc_behaviour
+  end
+  
+  test "should redirect" do
+    widget, page = create_widget(:generic_detail)
+    page.add_widget(page.blocks.first.block_type, Free.new(:name => 'free2', :content => 'test_content'))
+
+    PagesController.any_instance.expects(:widget_redirected?).returns(true)
+    PagesController.any_instance.expects(:run_behaviour).once
+    PagesController.any_instance.expects(:render).returns("foo")
+
+    get :show, :url => [page.url_name, widget.id]
+  end
+  
+  private
+
+  def widget_attributes
+    {
+      :model => 'GenericDetail'
+    }
+  end
+
+  def create_widget(type, options = {})
+    insert_widget_in_page(type, widget_attributes.merge(options))
+  end
+
+end