cells 2.3.0 → 3.3.0

data/test/capture_helper_test.rb

@@ -0,0 +1,59 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), *%w[test_helper])
+require File.join(File.dirname(__FILE__), *%w[app cells test_cell])
+
+class CaptureTest < ActionController::TestCase
+  tests CellsTestController
+
+  def setup
+    super
+
+    CellsTestController.class_eval do
+      def test_capture
+        @cell_content = render_cell(:test, :state_invoking_capture)
+
+        # captured_block comes from the cell view:
+        render :inline => '<h3><%= @captured_block %></h3>' << @cell_content
+      end
+
+      def test_content_for
+        @cell_content = render_cell(:test, :state_invoking_content_for)
+
+        # :js comes from the cell views:
+        render :inline => '<pre><%= yield :js %></pre>' << @cell_content
+      end
+    end
+  end
+
+  def test_global_capture
+    TestCell.class_eval do
+      helper ::Cells::Helpers::CaptureHelper
+      def state_invoking_capture
+        render
+      end
+    end
+
+    get :test_capture
+
+    assert_select 'h1', ''
+    assert_select 'h2', 'captured!'
+    assert_select 'h3', 'captured!', 'captured block not visible in controller'
+  end
+
+  def test_global_content_for
+    TestCell.class_eval do
+      helper ::Cells::Helpers::CaptureHelper
+      def state_invoking_content_for
+        render
+      end
+      def state_invoking_content_for_twice
+        render
+      end
+    end
+
+    get :test_content_for
+
+    assert_select 'js',   ''
+    assert_select 'pre',  "\nfirst line\n\nsecond line\n\nthird line\n"
+  end
+end

data/test/cells_test.rb

@@ -1,82 +1,66 @@
-require File.dirname(__FILE__) + '/../../../../test/test_helper'
-require File.dirname(__FILE__) + '/testing_helper'
-
-
-# this would usually happen by rails' autoloading -
-# anyway, we don't test loading but rendering in this file.
-require File.dirname(__FILE__) + '/cells/cells_test_one_cell'
-require File.dirname(__FILE__) + '/cells/cells_test_two_cell'
-require File.dirname(__FILE__) + '/cells/simple_cell'
-require File.dirname(__FILE__) + '/cells/test_cell'
-
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), *%w[app cells cells_test_one_cell])
 
 module Some
-  class Cell < Cell::Base
+  class Cell < ::Cell::Base
   end
 end
 
-class JustOneViewCell < Cell::Base
+class JustOneViewCell < ::Cell::Base
   def some_state
     render
   end
 end
 
-
-
-
-
-class CellContainedInPlugin < Cell::Base
+class CellContainedInPlugin < ::Cell::Base
   def some_view
-  end  
+  end
 end
 
-
-# fixture for various tests -----------------------------------
-# views are located in cells/test/cells/my_test/
-class MyTestCell < Cell::Base
+class MyTestCell < ::Cell::Base
   def direct_output
     "<h9>this state method doesn't render a template but returns a string, which is great!</h9>"
-  
   end
-  
+
   def state_with_link_to
     render
   end
-  
+
   def view_in_local_test_views_dir
     render
   end
-  
+
   def view_with_explicit_english_translation
     render
   end
-  
+
   def view_containing_partial
     render
   end
-  
+
   def view_containing_partial_without_cell_name
     render
   end
-  
+
   def view_containing_nonexistant_partial
     render
   end
-  
+
   def view_containing_broken_partial
     render
   end
-  
+
   def view_with_instance_var
-    @instance_variable_one = "yeah"
-    @instance_variable_two = "wow"
+    @instance_variable_one = 'yeah'
+    @instance_variable_two = 'wow'
     render
   end
-  
+
   def missing_view
     render
   end
-  
+
   def state_with_link_to_function
     render
   end
@@ -84,13 +68,13 @@ end
 
 # fixtures for view inheritance -------------------------------
 # views are located in cells/test/cells/my_mother_cell/
-class MyMotherCell < Cell::Base
+class MyMotherCell < ::Cell::Base
   def hello
-    @message = "hello, kid!"
+    @message = 'hello, kid!'
     render
   end
   def bye
-    @message = "bye, you!"
+    @message = 'bye, you!'
     render
   end
 end
@@ -98,19 +82,18 @@ end
 # views are located in cells/test/cells/my_child_cell/
 class MyChildCell < MyMotherCell
   def hello
-    @message = "hello, mom!"
+    @message = 'hello, mom!'
     render
   end
   # view is inherited and located in cells/test/cells/my_mother_cell/bye.html.erb
   def bye
-    @message = "bye, mom!"
+    @message = 'bye, mom!'
     render
   end
 end
 
-
 module ReallyModule
-  class NestedCell < Cell::Base
+  class NestedCell < ::Cell::Base
     # view: cells/test/cells/really_module/nested_cell/happy_state.html.erb
     def happy_state
       render
@@ -118,228 +101,247 @@ module ReallyModule
   end
 end
 
-
 class CellsTest < ActionController::TestCase
-  include CellsTestMethods
-  
+  tests CellsTestController
 
   ### FIXME:
-  #Cell::View.warn_cache_misses = true
+  # Cell::View.warn_cache_misses = true
   def setup
     super
     MyTestCell.default_template_format = :html
   end
-
+  
+  def test_class_aliasing
+    assert_equal Cell::Base, Cells::Cell::Base
+  end
+  
+  def test_view_paths
+    assert_kind_of ActionView::PathSet, Cell::Base.view_paths, "must be a PathSet for proper template caching/reloading (see issue#2)"
+  end
+  
+  def test_cells_view_paths=
+    swap( Cell::Base, :view_paths => ['you', 'are', 'here'])  do
+      paths = Cell::Base.view_paths
+      assert_kind_of ActionView::PathSet, paths, "must not wipe out the PathSet"
+      assert_equal 3, Cell::Base.view_paths.size
+      assert_equal %w(you are here), Cell::Base.view_paths
+    end
+  end
+  
+  
   def test_controller_render_methods
     get :call_render_cell_with_strings  # render_cell("test", "state")
     assert_response :success
-    assert_tag :tag => "h9"
+    assert_tag :tag => 'h9'
 
     get :call_render_cell_with_syms
     assert_response :success
-    assert_tag :tag => "h9"
+    assert_tag :tag => 'h9'
 
     get :call_render_cell_with_state_view
-    assert_select "#view_with_instance_var"
+    assert_select '#view_with_instance_var'
   end
-  
-  
+
   # test simple rendering cycle -------------------------------------------------
-  
+
   def test_render_state_which_returns_a_string
     cell = MyTestCell.new(@controller)
-    
-    c= cell.render_state(:direct_output)
+    c = cell.render_state(:direct_output)
+
     assert_kind_of String, c
-    assert_selekt c, "h9"
-    
+    assert_selekt c, 'h9'
+
     #assert_raises (NoMethodError) { cell.render_state("non_existing_state") }
   end
-  
+
   def test_render_state_with_view_file
     cell = MyTestCell.new(@controller)
-    
-    c= cell.render_state(:view_with_instance_var)
-    assert_selekt c, "#one", "yeah"
-    assert_selekt c, "#two", "wow"
+    c = cell.render_state(:view_with_instance_var)
+
+    assert_selekt c, '#one', 'yeah'
+    assert_selekt c, '#two', 'wow'
   end
-  
+
   def test_render_state_with_layout
-    
   end
-  
-  
+
   def test_render_state_with_missing_view
     cell = MyTestCell.new(@controller)
     ### TODO: production <-> development/test context.
-    
+
     assert_raises ActionView::MissingTemplate do
       c = cell.render_state(:missing_view)
     end
   end
-  
-  
+
   # test partial rendering ------------------------------------------------------
-  
+
   # ok
   def test_not_existing_partial
-    t = MyTestCell.new(@controller)
+    cell = MyTestCell.new(@controller)
+
     assert_raises ActionView::TemplateError do
-      t.render_state(:view_containing_nonexistant_partial)
+      cell.render_state(:view_containing_nonexistant_partial)
     end
   end
-  
+
   # ok
   def test_broken_partial
-    t = MyTestCell.new(@controller)
+    cell = MyTestCell.new(@controller)
+
     assert_raises ActionView::TemplateError do
-      t.render_state(:view_containing_broken_partial)
+      cell.render_state(:view_containing_broken_partial)
     end
   end
-  
+
   # ok
   def test_render_state_with_partial
     cell = MyTestCell.new(@controller)
     c = cell.render_state(:view_containing_partial)
-    assert_selekt c, "#partialContained>#partial"
+
+    assert_selekt c, '#partialContained > #partial'
   end
-  
+
   def test_render_state_with_partial_without_cell_name
     cell = MyTestCell.new(@controller)
     c = cell.render_state(:view_containing_partial_without_cell_name)
-    assert_selekt c, "#partialContained>#partial"
+
+    assert_selekt c, '#partialContained > #partial'
   end
-  
+
   # test advanced views (prototype_helper, ...) --------------------------------
-  ### TODO: fix CellTestController to allow rendering views with #link_to_function-
+  ### TODO: fix CellsTestController to allow rendering views with #link_to_function-
   def dont_test_view_with_link_to_function
     cell = MyTestCell.new(@controller)
     c = cell.render_state(:state_with_link_to_function)
-    assert_selekt c, "#partialContained>#partial"
+
+    assert_selekt c, '#partialContained > #partial'
   end
-  
+
   # test view inheritance ------------------------------------------------------
-  
+
   def test_possible_paths_for_state
-    t = MyChildCell.new(@controller)
-    p = t.possible_paths_for_state(:bye)
-    assert_equal "my_child/bye", p.first
-    assert_equal "my_mother/bye", p.last
+    cell = MyChildCell.new(@controller)
+    cell_paths = cell.possible_paths_for_state(:bye)
+
+    assert_equal 'my_child/bye', cell_paths.first
+    assert_equal 'my_mother/bye', cell_paths.last
   end
-  
-  
+
   def test_render_state_on_child_where_child_view_exists
     cell = MyChildCell.new(@controller)
     c = cell.render_state(:hello)
-    assert_selekt c, "#childHello", "hello, mom!"
+
+    assert_selekt c, '#childHello', 'hello, mom!'
   end
-  
+
   def test_render_state_on_child_where_view_is_inherited_from_mother
     cell = MyChildCell.new(@controller)
-    puts "  rendering cell!"
+    # puts '  rendering cell!'
     c = cell.render_state(:bye)
-    assert_selekt c, "#motherBye", "bye, mom!"
+
+    assert_selekt c, '#motherBye', 'bye, mom!'
   end
-  
-  
+
   # test Cell::View -------------------------------------------------------------
-  
+
   def test_find_family_view_for_state
-    t = MyChildCell.new(@controller)
-    tpl = t.find_family_view_for_state(:bye, Cell::View.new(["#{RAILS_ROOT}/vendor/plugins/cells/test/cells"], {}, @controller))
-    assert_equal "my_mother/bye.html.erb", tpl.path
+    cell = MyChildCell.new(@controller)
+    cells_path = File.join(File.dirname(__FILE__), 'app', 'cells')
+    cell_template = cell.find_family_view_for_state(:bye, ::Cell::View.new([cells_path], {}, @controller))
+
+    assert_equal 'my_mother/bye.html.erb', cell_template.path
   end
-  
 
   ### API test (unit) -----------------------------------------------------------
   def test_cell_name
-    cell_one = CellsTestOneCell.new(@controller)
+    cell = CellsTestOneCell.new(@controller)
 
-    assert_equal cell_one.cell_name, "cells_test_one"
-    assert_equal CellsTestOneCell.cell_name, "cells_test_one"
+    assert_equal 'cells_test_one', cell.cell_name
+    assert_equal 'cells_test_one', CellsTestOneCell.cell_name
   end
-  
 
   def test_class_from_cell_name
-    assert_equal Cell::Base.class_from_cell_name("cells_test_one"), CellsTestOneCell
+    assert_equal CellsTestOneCell, ::Cell::Base.class_from_cell_name('cells_test_one')
   end
-  
+
   def test_default_template_format
     # test getter
-    u = MyTestCell.new(@controller)
-    assert_equal :html, Cell::Base.default_template_format
-    assert_equal :html, u.class.default_template_format
-    
+    cell = MyTestCell.new(@controller)
+
+    assert_equal :html, ::Cell::Base.default_template_format
+    assert_equal :html, cell.class.default_template_format
+
     # test setter
     MyTestCell.default_template_format = :js
-    assert_equal :html, Cell::Base.default_template_format
-    assert_equal :js, u.class.default_template_format
+
+    assert_equal :html, ::Cell::Base.default_template_format
+    assert_equal :js, cell.class.default_template_format
   end
-  
+
   def test_defaultize_render_options_for
-    u = MyTestCell.new(@controller)
-    assert_equal( {:template_format => :html, :view => :do_it}, 
-      u.defaultize_render_options_for({}, :do_it))
-    assert_equal( {:template_format => :html, :view => :do_it}, 
-      u.defaultize_render_options_for({}, :do_it))
-    assert_equal( {:template_format => :js, :view => :do_it},
-      u.defaultize_render_options_for({:template_format => :js}, :do_it))
-    assert_equal( {:template_format => :html, :layout => :metal, :view => :do_it},
-      u.defaultize_render_options_for({:layout => :metal}, :do_it))
-    assert_equal( {:template_format => :js, :layout => :metal, :view => :do_it}, 
-      u.defaultize_render_options_for({:layout => :metal, :template_format => :js}, :do_it))
+    cell = MyTestCell.new(@controller)
+
+    assert_equal ({:template_format => :html, :view => :do_it}),
+                  cell.defaultize_render_options_for({}, :do_it)
+    assert_equal ({:template_format => :html, :view => :do_it}),
+                  cell.defaultize_render_options_for({}, :do_it)
+    assert_equal ({:template_format => :js, :view => :do_it}),
+                  cell.defaultize_render_options_for({:template_format => :js}, :do_it)
+    assert_equal ({:template_format => :html, :layout => :metal, :view => :do_it}),
+                  cell.defaultize_render_options_for({:layout => :metal}, :do_it)
+    assert_equal ({:template_format => :js, :layout => :metal, :view => :do_it}),
+                  cell.defaultize_render_options_for({:layout => :metal, :template_format => :js}, :do_it)
   end
 
   def test_new_directory_hierarchy
     cell = ReallyModule::NestedCell.new(@controller)
-    view = cell.render_state(:happy_state)
-    @response.body = view
+    c = cell.render_state(:happy_state)
+    @response.body = c
 
-    assert_select "#happyStateView"
+    assert_select '#happyStateView'
   end
 
   # Thanks to Fran Pena who made us aware of this bug and contributed a patch.
   def test_i18n_support
-    orig_locale = I18n.locale
-    I18n.locale = :en
-    
-    t = MyTestCell.new(@controller)
-    c = t.render_state(:view_with_explicit_english_translation)
-    
-    I18n.locale = orig_locale   # cleanup before we mess up!
-    
-    # the view "view_with_explicit_english_translation.en" exists, check if
-    # rails' i18n found it:
-    assert_selekt c, "#defaultTranslation", 0
-    assert_selekt c, "#explicitEnglishTranslation"
+    swap I18n, :locale => :en do
+      cell = MyTestCell.new(@controller)
+      c = cell.render_state(:view_with_explicit_english_translation)
+
+      # the view "view_with_explicit_english_translation.en" exists, check if
+      # rails' i18n found it:
+      assert_selekt c, '#defaultTranslation', 0
+      assert_selekt c, '#explicitEnglishTranslation'
+    end
   end
-  
-  
+
   def test_modified_view_finding_for_testing
-    t = MyTestCell.new(@controller)
-    c = t.render_state(:view_in_local_test_views_dir)
-    assert_selekt c, "#localView"
+    cell = MyTestCell.new(@controller)
+    c = cell.render_state(:view_in_local_test_views_dir)
+
+    assert_selekt c, '#localView'
   end
-  
-  
+
   def test_params_in_a_cell_state
-    @controller.params = {:my_param => "value"}
-    t = TestCell.new(@controller)
-    c = t.render_state(:state_using_params)
-    assert_equal c, "value"
+    @controller.params = {:my_param => 'value'}
+    cell = TestCell.new(@controller)
+    c = cell.render_state(:state_using_params)
+
+    assert_equal 'value', c
   end
   
-  
-  
-  
-  
+  def test_log
+    assert_nothing_raised do
+      TestCell.new(@controller).log("everything is perfect!")
+    end
+  end
+
   ### functional tests: ---------------------------------------------------------
 
   def test_link_to_in_view
     get :render_state_with_link_to
 
     assert_response :success
-    assert_select "a", "bla"
+    assert_select 'a', 'bla'
   end
-
 end