cells 3.3.0 → 3.3.1

data/Rakefile

@@ -62,7 +62,7 @@ begin
     spec.authors      = ["Nick Sutterer"]
     spec.email        = "apotonick@gmail.com"
 
-    spec.files = FileList["[A-Z]*", File.join(*%w[{generators,lib,rails} ** *]).to_s]
+    spec.files = FileList["[A-Z]*", File.join(*%w[{lib,rails,rails_generators} ** *]).to_s]
 
     # spec.add_dependency 'activesupport', '>= 2.3.0' # Dependencies and minimum versions?
   end

data/lib/cells/assertions_helper.rb

@@ -0,0 +1,49 @@
+# encoding: utf-8
+require 'action_controller/test_case'
+
+module Cells
+  module AssertionsHelper
+    # Sets up a mock controller for usage in render_cell.
+    def setup
+      @controller = Class.new(ActionController::Base).new
+      @request    = ::ActionController::TestRequest.new
+      @response   = ::ActionController::TestResponse.new
+      @controller.request = @request
+      @controller.response = @response
+      @controller.params = {}
+    end
+    
+    # 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)
+    end
+    
+    # Invokes assert_select for the passed <tt>content</tt> string.
+    #
+    # Example:
+    #   html = "<h1>The latest and greatest!</h1>"
+    #   assert_selekt html, "h1", "The latest and greatest!"
+    #
+    # would be true.
+    def assert_selekt(content, *args)
+      assert_select(HTML::Document.new(content).root, *args)
+    end
+    
+    # Builds an instance of <tt>name</tt>Cell for unit testing.
+    # Passes the optional block to <tt>cell.instance_eval</tt>.
+    #
+    # Example:
+    #   assert_equal "Banks kill planet!" cell(:news, :topic => :terror).latest_headline
+    def cell(name, opts={}, &block)
+      cell = Cell::Base.create_cell_for(@controller, name, opts)
+      cell.instance_eval &block if block_given?
+      cell
+    end
+  end
+end
+

data/lib/cells/version.rb

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

data/{generators → rails_generators}/cell/cell_generator.rb

@@ -17,16 +17,19 @@ class CellGenerator < ControllerGenerator
       # Directories
       m.directory File.join('app/cells', class_path)
       m.directory File.join('app/cells', class_path, file_name)
-
+      m.directory File.join('test/cells')
+      
       # Cell
       m.template 'cell.rb', File.join('app/cells', class_path, "#{file_name}_cell.rb")
 
       # View template for each action.
       actions.each do |action|
         path = File.join('app/cells', class_path, file_name, "#{action}.html.#{template_type}")
-        m.template "view.html.#{template_type}", path,
-          :assigns => { :action => action, :path => path }
+        m.template "view.html.#{template_type}", path, :assigns => { :action => action, :path => path }
       end
+      
+      # Functional test for the widget.
+      m.template 'cell_test.rb', File.join('test/cells/', "#{file_name}_cell_test.rb"), :assigns => {:states => actions}
     end
   end
 

data/rails_generators/cell/templates/cell_test.rb

@@ -0,0 +1,13 @@
+require 'test_helper'
+
+class <%= class_name %>CellTest < ActionController::TestCase
+  include Cells::AssertionsHelper
+  
+  <% for state in states -%>
+  test "<%= state %>" do
+    html = render_cell(:<%= file_name %>, :<%= state %>)
+    #assert_selekt html, "div"
+  end
+  
+  <% end %>
+end

data/test/assertions_helper_test.rb

@@ -0,0 +1,43 @@
+# encoding: utf-8
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+class AssertionsHelperTest < ActionController::TestCase
+  context "A TestCase" do
+    setup do
+      TestCell.class_eval do
+        def beep; render; end
+      end
+    end
+    
+    context "calling #cell_mock" do
+      should "return a cell instance" do
+        assert_kind_of Cell::Base, cell_mock
+      end
+      
+      should "accept a block" do
+        assert_respond_to cell_mock { def beep; end}, :beep
+      end
+    end
+    
+    should "respond to #render_cell" do
+      assert_equal "<h1>beep!</h1>", render_cell(:test, :beep)
+    end
+    
+    should "respond to #assert_selekt" do
+      assert_selekt render_cell(:test, :beep), "h1", "beep!"
+    end
+    
+    should "respond to #cell" do
+      assert_kind_of TestCell, cell(:test)
+      assert_not cell(:test).respond_to? :opts
+    end
+    
+    should "respond to #cell with a block" do
+      assert_respond_to cell(:test) { def opts; @opts; end }, :opts
+    end
+    
+    should "respond to #cell with options and block" do
+      assert_equal({:topic => :peace}, cell(:test, :topic => :peace) { def opts; @opts; end }.opts)
+    end
+  end
+end

data/test/cell_generator_test.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), *%w[test_helper])
+require 'rails_generator'
+require 'rails_generator/scripts/generate'
+
+# for some reasons the "autoloading" in Rails::Generator::Lookup doesn't work:
+Rails::Generator::Base.append_sources Rails::Generator::PathSource.new(:cells, File.join(File.dirname(__FILE__)+'/../rails_generators'))
+
+class CellGeneratorTest < Test::Unit::TestCase
+  context "Running script/generate cell" do
+    setup do
+      FileUtils.mkdir_p(fake_rails_root)
+      @original_files = file_list
+    end
+    
+    teardown do
+      FileUtils.rm_r(fake_rails_root) 
+    end
+    
+    context "Blog post latest" do
+      should "create the standard assets" do
+        Rails::Generator::Scripts::Generate.new.run(%w(cell Blog post latest), :destination => fake_rails_root)
+        files = (file_list - @original_files)
+        assert files.include?(fake_rails_root+"/app/cells/blog_cell.rb")
+        assert files.include?(fake_rails_root+"/app/cells/blog/post.html.erb")
+        assert files.include?(fake_rails_root+"/app/cells/blog/latest.html.erb")
+        assert files.include?(fake_rails_root+"/test/cells/blog_cell_test.rb")
+      end
+      
+      should "create haml assets with --haml" do
+        Rails::Generator::Scripts::Generate.new.run(%w(cell Blog post latest --haml), :destination => fake_rails_root)
+        files = (file_list - @original_files)
+        assert files.include?(fake_rails_root+"/app/cells/blog_cell.rb")
+        assert files.include?(fake_rails_root+"/app/cells/blog/post.html.haml")
+        assert files.include?(fake_rails_root+"/app/cells/blog/latest.html.haml")
+        assert files.include?(fake_rails_root+"/test/cells/blog_cell_test.rb")
+      end
+    end
+  end
+  
+  private
+  def fake_rails_root
+    File.join(File.dirname(__FILE__), 'rails_root')  
+  end
+  
+  def file_list
+    Dir.glob(File.join(fake_rails_root, "**/*"))
+  end 
+end

data/test/support/{assertions_helper.rb → internal_assertions_helper.rb}

@@ -1,11 +1,10 @@
 # encoding: utf-8
-require 'action_controller/test_case'
- 
-# Assertion helpers extracted from Devise by José Valim.
-#
 module Cells
-  module AssertionsHelper
+  # Assertion helpers extracted from Devise by José Valim.
+  #
+  module InternalAssertionsHelper
     def setup
+      ### TODO: clean up CellsTestController.
       @controller = ::CellsTestController.new
       @request    = ::ActionController::TestRequest.new
       @response   = ::ActionController::TestResponse.new
@@ -13,11 +12,7 @@ module Cells
       @controller.response = @response
       @controller.params = {}
     end
-
-    def assert_selekt(content, *args)
-      assert_select(HTML::Document.new(content).root, *args)
-    end
-
+      
     def assert_not(assertion)
       assert !assertion
     end
@@ -56,5 +51,14 @@ module Cells
         object.send :"#{key}=", value
       end
     end
+    
+    # Provides a TestCell instance. The <tt>block</tt> is passed to instance_eval and should be used
+    # to extend the mock on the fly.
+    ### DISCUSS: make an anonymous subclass of TestCell?
+    def cell_mock(options={}, &block)
+      cell = TestCell.new(@controller, options)
+      cell.instance_eval(&block) if block_given?
+      cell
+    end
   end
-end
+end

data/test/test_helper.rb

@@ -29,6 +29,13 @@ rescue
   require 'action_view'
 end
 
+begin
+  require 'shoulda'
+rescue
+  gem 'shoulda'
+  require 'shoulda'
+end
+
 require 'active_support/test_case'
 
 # Require app's test_helper.rb if such exists.
@@ -61,7 +68,9 @@ end
 
 # Load test support files.
 Dir[File.join(File.dirname(__FILE__), *%w[support ** *.rb]).to_s].each { |f| require f }
+require File.join(File.dirname(__FILE__), *%w[.. lib cells assertions_helper])
 
 ActiveSupport::TestCase.class_eval do
   include Cells::AssertionsHelper
+  include Cells::InternalAssertionsHelper
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cells
 version: !ruby/object:Gem::Version 
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 +01:00
+date: 2010-03-27 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -26,16 +26,9 @@ files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- generators/cell/USAGE
-- generators/cell/cell_generator.rb
-- generators/cell/templates/cell.rb
-- generators/cell/templates/view.html.erb
-- generators/cell/templates/view.html.haml
-- generators/cells_install/USAGE
-- generators/cells_install/cells_install_generator.rb
-- generators/cells_install/templates/initializer.rb
 - lib/cell.rb
 - lib/cells.rb
+- lib/cells/assertions_helper.rb
 - lib/cells/cell.rb
 - lib/cells/cell/base.rb
 - lib/cells/cell/caching.rb
@@ -47,6 +40,15 @@ files:
 - lib/cells/rails/action_view.rb
 - lib/cells/version.rb
 - rails/init.rb
+- rails_generators/cell/USAGE
+- rails_generators/cell/cell_generator.rb
+- rails_generators/cell/templates/cell.rb
+- rails_generators/cell/templates/cell_test.rb
+- rails_generators/cell/templates/view.html.erb
+- rails_generators/cell/templates/view.html.haml
+- rails_generators/cells_install/USAGE
+- rails_generators/cells_install/cells_install_generator.rb
+- rails_generators/cells_install/templates/initializer.rb
 has_rdoc: true
 homepage: http://cells.rubyforge.org
 licenses: []
@@ -76,20 +78,22 @@ 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/caching_test.rb
-- test/cells_test.rb
-- test/test_helper.rb
-- test/capture_helper_test.rb
 - test/rails_test.rb
-- test/helper_test.rb
+- test/capture_helper_test.rb
+- test/assertions_helper_test.rb
+- test/cell_generator_test.rb
+- test/test_helper.rb
+- test/support/internal_assertions_helper.rb
 - test/bugs_test.rb
 - test/render_test.rb
-- test/support/assertions_helper.rb
-- test/app/helpers/application_helper.rb
-- test/app/helpers/helper_using_cell_helper.rb
-- test/app/cells/cells_test_two_cell.rb
-- test/app/cells/test_cell.rb
-- test/app/cells/cells_test_one_cell.rb
+- test/cells_test.rb
+- test/helper_test.rb
+- test/caching_test.rb
+- test/app/controllers/cells_test_controller.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
 - test/app/cells/simple_cell.rb
-- test/app/controllers/cells_test_controller.rb
+- test/app/cells/test_cell.rb
+- test/app/helpers/application_helper.rb
+- test/app/helpers/helper_using_cell_helper.rb