cells 3.3.2 → 3.3.3

data/lib/cells.rb

@@ -52,7 +52,7 @@ module Cells
 
   # Cells setup/configuration helper for initializer.
   #
-  # == Usage/Exmaples:
+  # == Usage/Examples:
   #
   #   Cells.setup do |config|
   #     config.cell_view_paths << Rails.root.join('lib', 'cells')

data/lib/cells/cell.rb

@@ -5,6 +5,7 @@ module Cells
     autoload :Base, 'cells/cell/base'
     autoload :View, 'cells/cell/view'
     autoload :Caching, 'cells/cell/caching'
+    autoload :ActiveHelper, 'cells/cell/active_helper'
   end
 end
 

data/lib/cells/cell/active_helper.rb

@@ -0,0 +1,32 @@
+module Cells::Cell::ActiveHelper
+  
+  def self.included(base)
+    base.extend ClassMethods
+    
+    base.class_inheritable_array :active_helpers
+    base.active_helpers = []
+  end
+  
+  module ClassMethods    
+    # The passed helpers will be imported in the view and thus be available in
+    # your template.
+    #
+    # Example:
+    #   class BassistCell < Cell::Base
+    #     active_helper SlappingHelper
+    #
+    # The helper file usually resides in +app/active_helpers/+, baby.
+    def active_helper(*classes)
+      active_helpers.push(*classes).uniq!
+    end
+  end
+  
+  def import_active_helpers_into(view)
+    return if self.class.active_helpers.blank?
+    
+    # We simply assume if somebody's using #active_helper, it is already
+    # required.
+    view.extend ::ActiveHelper
+    view.use *self.class.active_helpers
+  end
+end

data/lib/cells/cell/base.rb

@@ -140,6 +140,7 @@ module Cells
     class Base
       include ::ActionController::Helpers
       include ::ActionController::RequestForgeryProtection
+      include ActiveHelper
       
       class_inheritable_array :view_paths, :instance_writer => false
       write_inheritable_attribute(:view_paths, ActionView::PathSet.new) # Force use of a PathSet in this attribute, self.view_paths = ActionView::PathSet.new would still yield in an array
@@ -323,30 +324,19 @@ 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={}, &block)
-        render_view_for(opts, @state_name, &block)
+      def render(opts={})
+        render_view_for(opts, @state_name)  ### FIXME: i don't like the magic access to @state_name here. ugly!
       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, &block)
+      def render_view_for(opts, state)
         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]
@@ -378,6 +368,8 @@ module Cells
       def prepare_action_view_for(action_view, opts)
         # make helpers available:
         include_helpers_in_class(action_view.class)
+        
+        import_active_helpers_into(action_view) # in Cells::Cell::ActiveHelper.
 
         action_view.assigns         = assigns_for_view  # make instance vars available.
         action_view.template_format = opts[:template_format]
@@ -464,7 +456,8 @@ module Cells
       
       ### TODO: allow log levels.
       def log(message)
-        @controller.logger and @controller.logger.debug(message)
+        return unless @controller.logger
+        @controller.logger.debug(message)
       end
     end
   end

data/lib/cells/cell/caching.rb

@@ -3,7 +3,7 @@
 # To improve performance rendered state views can be cached using Rails' caching
 # mechanism.
 # If this it configured (e.g. using our fast friend memcached) all you have to do is to
-# tell Cells which state you want to cache. You can further attach a proc to expire the
+# tell Cells which state to cache. You can further attach a proc to expire the
 # cached view.
 #
 # As always I stole a lot of code, this time from Lance Ivy <cainlevy@gmail.com> and

data/lib/cells/version.rb

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

data/test/active_helper_test.rb

@@ -0,0 +1,59 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+### DISCUSS: how can we limit that test to systems where ActiveHelper's around?
+
+class ActiveHelperTest < ActiveSupport::TestCase
+  context "The Cell::Base class" do
+    setup do
+      require 'active_helper'
+      class FingeringHelper < ActiveHelper::Base
+        provides :finger
+      end
+      
+      class SlappingHelper < ActiveHelper::Base
+        provides :slap
+      end
+    end
+    
+    should "respond to active_helper" do
+      assert_respond_to Cell::Base, :active_helper
+    end
+    
+    should "store helper constants from active_helper" do
+      @cell = Class.new(BassistCell)
+      @cell.active_helper SlappingHelper
+      assert_equal [SlappingHelper], @cell.active_helpers
+    end
+    
+    should "inherit helper constants from active_helper" do
+      @base_cell = Class.new(BassistCell)
+      @base_cell.active_helper SlappingHelper
+      @cell = Class.new(@base_cell)
+      @cell.active_helper FingeringHelper
+      assert_equal [SlappingHelper, FingeringHelper], @cell.active_helpers
+    end
+    
+    
+    context "An Cell::View::Base instance" do
+      should_eventually "respond to use" do
+        # we didn't extend the view at this point.
+        @view = bassist_mock.setup_action_view
+        assert_respond_to @view, :use
+      end
+      
+    end
+    
+    context "The view rendered by the cell" do
+      should "respond to used helper methods" do
+        @cell = bassist_mock
+        @cell.class.active_helper SlappingHelper
+        
+        @view = @cell.setup_action_view
+        @cell.prepare_action_view_for(@view, {})
+        
+        assert_respond_to @view, :slap # from the SlappingHelper
+      end
+    end
+  end
+  
+end

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cells
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 3
-  - 2
-  version: 3.3.2
+  version: 3.3.3
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-12 00:00:00 +02:00
+date: 2010-04-17 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -26,17 +21,16 @@ extensions: []
 
 extra_rdoc_files: 
 - README.rdoc
-- README.textile
 files: 
 - CHANGES
 - MIT-LICENSE
 - README.rdoc
-- README.textile
 - Rakefile
 - lib/cell.rb
 - lib/cells.rb
 - lib/cells/assertions_helper.rb
 - lib/cells/cell.rb
+- lib/cells/cell/active_helper.rb
 - lib/cells/cell/base.rb
 - lib/cells/cell/caching.rb
 - lib/cells/cell/view.rb
@@ -69,26 +63,24 @@ 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.6
+rubygems_version: 1.3.5
 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/active_helper_test.rb
 - test/capture_helper_test.rb
 - test/assertions_helper_test.rb
 - test/cell_generator_test.rb

data/README.textile

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

data/test/erector_test.rb

@@ -1,63 +0,0 @@
-# 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