cells 3.5.0.beta1 → 3.5.0.beta2

data/CHANGES.textile

@@ -1,9 +1,16 @@
 h2. 3.5.0
 
 h3. Changes
-  * Deprecated @opts, use #options now. This should be the prefered way of parameter exchange with the outer world.
-  * #params is now delegated to @parent_controller. 
-
+  * Deprecated @opts, use #options now.
+  * Added state-args. State methods can now receive the options as method arguments. This should be the prefered way of parameter exchange with the outer world.
+  * #params, #request, and #config is now delegated to @parent_controller. 
+  * The generator now is invoked as @rails g cell ...@
+    * The `--haml` option is no longer available.
+    * The `-t` option now is compatible with the rest of rails generators, now it is used as alias for `--test-framework`. Use the `-e` option	as an alias of `--template-engine`
+    Thanks to Jorge Calás Lozano <calas@qvitta.net> for patching this in the most reasonable manner i could imagine.
+  * Privatized @#find_family_view_for_state@, @#render_view_for@, and all *ize methods in Cell::Rails.
+  * New signature: @#render_view_for(state, *args)@
+  
 h2. 3.4.4
 
 h3. Changes

data/README.rdoc

@@ -29,7 +29,7 @@ Rails 2.3:
 
 Creating a cell is nothing more than
 
-  $ rails generate cells:cell ShoppingCart display
+  $ rails generate cell ShoppingCart display
     create  app/cells/
     create  app/cells/shopping_cart
     create  app/cells/shopping_cart_cell.rb
@@ -52,8 +52,8 @@ Feels like rendering a controller action. As additional encapsulation we pass th
 Time to improve our cell code. Let's start with <tt>app/cells/shopping_cart_cell.rb</tt>:
 
   class ShoppingCartCell < Cell::Rails 
-    def display 
-      user    = options[:user]        # #options exposes options passed to #render_cell.
+    def display(args)
+      user    = args[:user]
       @items  = user.items_in_cart
       
       render  # renders display.html.erb
@@ -93,13 +93,12 @@ The distinction between partials and views is making things more complex, so why
   %p
     = render :view => 'items'
 
-
 == View Inheritance
 
 This is where OOP comes back to your view.
 
 * <b>Inherit code</b> into your cells by deriving more abstract cells.
-* <b>Inherit views</b> from ancesting cells.
+* <b>Inherit views</b> from parent cells.
 
 === Builders
 
@@ -180,7 +179,6 @@ In order to copy the cells rake tasks to your app, run
 Cells can do more.
 
 <b>No Limits</b>::  Have as many cells in your page as you need - no limitation to your +render_cell+ calls.
-<b>View Inheritance</b>::  Inherit view files dynamically from parent cells.
 <b>Cell Nesting</b>:: Have complex cell hierarchies as you can call +render_cell+ within cells, too. 
 
 Go for it, you'll love it!
@@ -188,7 +186,7 @@ Go for it, you'll love it!
 
 == LICENSE
 
-Copyright (c) 2007-2010, Nick Sutterer
+Copyright (c) 2007-2011, Nick Sutterer
 
 Copyright (c) 2007-2008, Solide ICT by Peter Bex and Bob Leers
 

data/lib/cell.rb

@@ -1,13 +1,15 @@
 module Cell
   autoload :Caching,      'cell/caching'
-  
+
   extend ActiveSupport::Concern
-    
+
   module ClassMethods
     def render_cell_for(controller, name, state, opts={})
-      cell = create_cell_for(controller, name, opts)
+      cell = create_cell_for(controller, name, opts)  # DISCUSS: we always save options.
       yield cell if block_given?
-      cell.render_state(state)
+      
+      return cell.render_state(state, opts) if cell.method(state).arity == 1
+      cell.render_state(state)  # backward-compat.
     end
     
     # Creates a cell instance. Note that this method calls builders which were attached to the
@@ -57,7 +59,7 @@ module Cell
     def builders
       @builders ||= []
     end
-    
+
     # Return the default view path for +state+. Override this if you cell has a differing naming style.
     def view_for_state(state)
       "#{cell_name}/#{state}"
@@ -75,13 +77,13 @@ module Cell
     def cell_name
       name.underscore.sub(/_cell$/, '')
     end
-    
+
     # The cell class constant for +cell_name+.
     def class_from_cell_name(cell_name)
       "#{cell_name}_cell".classify.constantize
     end
   end
-    
+
   module InstanceMethods
     # Computes all possible paths for +state+ by traversing up the inheritance chain.
     def possible_paths_for_state(state)

data/lib/cell/active_helper.rb

@@ -1,13 +1,13 @@
 module Cell::ActiveHelper
-  
+
   def self.included(base)
     base.extend ClassMethods
-    
+
     base.class_inheritable_array :active_helpers
     base.active_helpers = []
   end
-  
-  module ClassMethods    
+
+  module ClassMethods
     # The passed helpers will be imported in the view and thus be available in
     # your template.
     #
@@ -20,10 +20,10 @@ module Cell::ActiveHelper
       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

data/lib/cell/caching.rb

@@ -4,7 +4,7 @@ require 'active_support/cache'
 module Cell
   module Caching
     extend ActiveSupport::Concern
-    
+
     module ClassMethods
       # Activate caching for the state <tt>state</tt>. If no other options are passed
       # the view will be cached forever.
@@ -85,20 +85,20 @@ module Cell
       def expire_cache_key(key, opts=nil)
         cache_store.delete(key, opts)
       end
-      
+
       def cache_configured?
         ::ActionController::Base.cache_configured?
       end
     end
 
-    def render_state(state)
-      return super(state) unless state_cached?(state)
+    def render_state(state, *args)
+      return super(state, *args) unless state_cached?(state)
 
       key     = cache_key(state, call_version_proc_for_state(state))
       options = self.class.cache_options[state]
-      
+
       self.class.cache_store.fetch(key, options) do
-        super(state)
+        super(state, *args)
       end
     end
 

data/lib/cell/rails.rb

@@ -1,4 +1,5 @@
 require 'abstract_controller'
+require 'cell'
 
 module Cell
   class Rails < AbstractController::Base
@@ -6,37 +7,36 @@ module Cell
     include AbstractController
     include Rendering, Layouts, Helpers, Callbacks, Translation, Logger
     include ActionController::RequestForgeryProtection
-    
-    
+
+
     class View < ActionView::Base
       def render(options = {}, locals = {}, &block)
         if options[:state] or options[:view]
           return @_controller.render(options, &block)
         end
-        
+
         super
       end
     end
-    
-    
+
+
     class MissingTemplate < ActionView::ActionViewError
       def initialize(message, possible_paths)
         super(message + " and possible paths #{possible_paths}")
       end
     end
-    
-    
+
+
     module Rendering
       # Invoke the state method for +state+ which usually renders something nice.
-      def render_state(state)
-        process(state)
+      def render_state(state, *args)
+        process(state, *args)
       end
     end
-    
-    
+
+
     module Metal
-      attr_internal :request
-      delegate :session, :params, :to => :parent_controller
+      delegate :session, :params, :request, :config, :to => :parent_controller
     end 
     
     
@@ -48,27 +48,26 @@ module Cell
     attr_accessor :options
     
     abstract!
-    
-    
+
+
     def initialize(parent_controller, options={})
       @parent_controller  = parent_controller
-      @_request           = parent_controller.request # DISCUSS: delegate?
-      @_config            = parent_controller.config.dup  # FIXME: delegate!
       @options            = options
       @opts               = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :options)
     end
-    
+
     def self.view_context_class
       controller = self
-      
+
       View.class_eval do
         include controller._helpers
         include controller._routes.url_helpers
       end
-      
+
+
       @view_context_class ||= View
     end
-    
+
     def self.controller_path
       @controller_path ||= name.sub(/Cell$/, '').underscore unless anonymous?
     end
@@ -84,7 +83,7 @@ module Cell
     # +:inline+:: Renders an inline template as state view. See ActionView::Base#render for details.
     # +:file+::   Specifies the name of the file template to render.
     # +:nothing+:: Doesn't invoke the rendering process.
-    # +:state+::  Instantly invokes another rendering cycle for the passed state and returns.
+    # +:state+::  Instantly invokes another rendering cycle for the passed state and returns. You may pass arbitrary state-args to the called state.  
     #
     # Example:
     #  class MusicianCell < ::Cell::Base
@@ -118,15 +117,32 @@ module Cell
     # of the page.
     #
     # Just use <tt>:view</tt> and enjoy.
-    def render(opts={})
-      render_view_for(opts, self.action_name)
+    #
+    # === Using states instead of helpers
+    #
+    # Sometimes it's useful to not only render a view but also invoke the associated state. This is 
+    # especially helpful when replacing helpers. Do that with <tt>render :state</tt>.
+    #
+    #   def show_cheap_item(item)
+    #     render if item.price <= 1
+    #   end
+    #
+    # A view could use this state in place of an odd helper.
+    #
+    #   - @items.each do |item|
+    #     = render({:state => :show_cheap_item}, item)
+    #
+    # This calls the state method which in turn will render its view - if the item isn't too expensive.
+    def render(*args)
+      render_view_for(self.action_name, *args)
     end
 
+  private
     # Climbs up the inheritance chain, looking for a view for the current +state+.
     def find_family_view_for_state(state)
       exception       = nil
       possible_paths  = possible_paths_for_state(state)
-      
+
       possible_paths.each do |template_path|
         begin
           template = find_template(template_path)
@@ -134,19 +150,21 @@ module Cell
         rescue ::ActionView::MissingTemplate => exception
         end
       end
-      
+
       raise MissingTemplate.new(exception.message, possible_paths)
     end
-    
+
     # Renders the view belonging to the given state. Will raise ActionView::MissingTemplate
     # if it can't find a view.
-    def render_view_for(opts, state)
-      return "" if opts[:nothing]
+    def render_view_for(state, *args)
+      opts = args.first.is_a?(::Hash) ? args.shift : {}
       
+      return "" if opts[:nothing]
+
       rails_options = [:text, :inline, :file]
       if (opts.keys & rails_options).present?
       elsif opts[:state]
-        opts[:text] = render_state(opts[:state])
+        opts[:text] = render_state(opts[:state], *args)
       else
         opts            = defaultize_render_options_for(opts, state)
         template        = find_family_view_for_state(opts[:view])
@@ -161,7 +179,7 @@ module Cell
     def defaultize_render_options_for(opts, state)
       opts.reverse_merge!(:view => state)
     end
-    
+
     def sanitize_render_options(opts)
       opts.except!(:view, :state)
     end

data/lib/cell/test_case.rb

@@ -1,7 +1,7 @@
 module Cell
   # Test your cells.
   #
-  # This class is roughly equal to ActionController::TestCase, exposing the same semantics. It will try 
+  # This class is roughly equal to ActionController::TestCase, exposing the same semantics. It will try
   # to infer the tested cell name from the test name if you use declarative testing. You can also set it
   # with TestCase.tests.
   #
@@ -12,7 +12,7 @@ module Cell
   #
   #     it "should be rendered nicely" do
   #       invoke :order_button, :items => @fixture_items
-  #       
+  #
   #       assert_select "button", "Order now!"
   #     end
   #
@@ -35,8 +35,8 @@ module Cell
   #
   # +invoke+::  Renders the passed +state+ with your tested cell. You may pass options like in #render_cell.
   # +render_cell+:: As in your views. Will return the rendered view.
-  # +assert_selector+:: Like #assert_select except that the last argument is the html markup you wanna test.     
-  # +cell+:: Gives you a cell instance for unit testing and stuff. 
+  # +assert_selector+:: Like #assert_select except that the last argument is the html markup you wanna test.
+  # +cell+:: Gives you a cell instance for unit testing and stuff.
   class TestCase < ActiveSupport::TestCase
     module AssertSelect
       # Invokes assert_select for the last argument, the +content+ string.
@@ -48,7 +48,7 @@ module Cell
       def assert_selector(*args, &block)
         rails_assert_select(HTML::Document.new(args.pop).root, *args, &block)
       end
-      
+
       # Invokes assert_select on the markup set by the last #invoke.
       #
       # Example:
@@ -58,7 +58,7 @@ module Cell
         super(HTML::Document.new(last_invoke).root, *args, &block)
       end
     end
-    
+
     module TestMethods
       def setup
         @controller = Class.new(ActionController::Base).new
@@ -68,7 +68,7 @@ module Cell
         @controller.response = @response
         @controller.params = {}
       end
-      
+
       # Use this for functional tests of your application cells.
       #
       # Example:
@@ -78,7 +78,7 @@ module Cell
       def render_cell(*args)
         @controller.render_cell(*args)
       end
-      
+
       # Builds an instance of <tt>name</tt>Cell for unit testing.
       # Passes the optional block to <tt>cell.instance_eval</tt>.
       #
@@ -111,18 +111,18 @@ module Cell
         end
       end
     end
-    
+
     include TestMethods
     include ActionDispatch::Assertions::SelectorAssertions  # imports "their" #assert_select.
     alias_method :rails_assert_select, :assert_select # i hate that.
     include AssertSelect
-    
+
     extend ActionController::TestCase::Behavior::ClassMethods
     class_attribute :_controller_class
     
     
     attr_reader :last_invoke
-    
+
     def invoke(state, *args)
       @last_invoke = self.class.controller_class.new(@controller, *args).render_state(state)
     end

data/lib/cells.rb

@@ -58,12 +58,11 @@
 # Beside your new class you'd provide a star-sprangled button view in +xmas_cart/order_button.haml+.
 # When rendering the +cart+ state, the states as well as the "missing" views are inherited from ancesting cells,
 # this is pretty DRY and object-oriented, isn't it?
-require 'action_controller'
 
-require 'cell'
-require 'cells/rails'
 require 'cell/rails'
-require 'cell/test_case' if Object.const_defined?("Rails") and Rails.env == "test"
+require 'cells/rails'
+require 'cell/test_case' if Rails.env == "test"
+require 'cells/rails_compat'  # fixes a bug in Rails <3.0.4. # TODO: remove me as soon as we support 3.1, only.
 
 module Cells
   # Default view paths for Cells.

data/lib/cells/helpers.rb

@@ -4,4 +4,4 @@ module Cells
   module Helpers
     autoload :CaptureHelper, 'cells/helpers/capture_helper'
   end
-end
+end

data/lib/cells/rails.rb

@@ -41,8 +41,7 @@ module Cells
         ::Cell::Base.expire_cache_key(key, opts)
       end
     end
-    
-    
+
     module ActionView
       # See Cells::Rails::ActionController#render_cell.
       def render_cell(name, state, opts = {}, &block)
@@ -53,7 +52,6 @@ module Cells
   end
 end
 
-
 # Add extended ActionController behaviour.
 ActionController::Base.class_eval do
   include ::Cells::Rails::ActionController

data/lib/cells/rails_compat.rb

@@ -0,0 +1,12 @@
+# TODO: remove me when Cells supports 3.1, only.
+if Rails::VERSION::MINOR == 0 and Rails::VERSION::TINY <= 3
+  module AbstractController
+    module Callbacks
+      def process_action(method_name, *args)  # Fixed in 3.0.4.
+        run_callbacks(:process_action, method_name) do
+          super
+        end
+      end
+    end
+  end
+end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.5.0.beta1'
+  VERSION = '3.5.0.beta2'
 end

data/lib/generators/USAGE

@@ -0,0 +1,30 @@
+Description:
+  Stubs out a new cell and its views. Pass the cell name, either
+  CamelCased or under_scored, and a list of views as arguments.
+
+  This generates a cell class in app/cells and view templates in
+  app/cells/cell_name/ directory.
+
+Examples:
+
+  rails g cell ShoppingCart index
+
+  This will create these cell assets:
+    Cell:
+      app/cells/shopping_cart_cell.rb
+    Views:
+      app/cells/shopping_cart/index.html.erb
+    Test:
+      test/cells/shopping_cart_cell_test.rb
+
+
+  rails g cell main_menu display sort -e haml -t rspec
+
+  This will create these cell assets:
+    Cell:
+      app/cells/main_menu_cell.rb
+    Views:
+      app/cells/main_menu/display.html.haml
+      app/cells/main_menu/sort.html.haml
+    Spec:
+      spec/cells/main_menu_cell_spec.rb

data/lib/generators/cells/base.rb

@@ -0,0 +1,14 @@
+require 'rails/generators'
+require 'rails/generators/named_base'
+
+module Cells
+  module Generators
+    class Base < ::Rails::Generators::NamedBase
+      class_option :template_engine
+      class_option :test_framework
+
+      argument :actions, :type => :array, :default => [], :banner => "action action"
+      check_class_collision :suffix => "Cell"
+    end
+  end
+end

data/lib/generators/cells/cell_generator.rb

@@ -1,45 +1,22 @@
-require 'rails/generators'
-require 'rails/generators/named_base'
+require 'generators/cells/base'
 
 module Cells
   module Generators
-    class CellGenerator < ::Rails::Generators::NamedBase
-      argument :actions, :type => :array, :default => [], :banner => "action action"
-      check_class_collision :suffix => "Cell"
-      
-      source_root File.expand_path(File.join(File.dirname(__FILE__), 'templates'))
-      
-      class_option :view_engine, :type => :string, :aliases => "-t", :desc => "Template engine for the views. Available options are 'erb' and 'haml'.", :default => "erb"
-      class_option :haml, :type => :boolean, :default => false
-      
-      
+    class CellGenerator < ::Cells::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
       def create_cell_file
         template 'cell.rb', File.join('app/cells', class_path, "#{file_name}_cell.rb")
       end
-      
-      def create_views
-        if options[:view_engine].to_s == "haml" or options[:haml]
-          create_views_for(:haml)
-        else
-          create_views_for(:erb)
-        end
-      end
-      
-      def create_test
-        @states = actions
-        template 'cell_test.rb', File.join('test/cells/', "#{file_name}_cell_test.rb")
-      end
-      
-    protected
-      
-      def create_views_for(engine)
-        for state in actions do
-          @state  = state
-          @path   = File.join('app/cells', file_name, "#{state}.html.#{engine}")
-          
-          template "view.#{engine}", @path
-        end
+
+      hook_for(:template_engine)
+      hook_for(:test_framework)
+
+      def say_deprecated
+        say "====> This generator is now DEPRECATED. <====", :red
+        say "Please use:"
+        say "  rails g cell #{class_name} #{actions.join(' ')}"
       end
-    end    
+    end
   end
-end
+end

data/lib/generators/erb/cell_generator.rb

@@ -0,0 +1,17 @@
+require 'generators/cells/base'
+
+module Erb
+  module Generators
+    class CellGenerator < ::Cells::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
+      def create_views
+        for state in actions do
+          @state = state
+          @path = File.join('app/cells', file_name, "#{state}.html.erb")
+          template "view.erb", @path
+        end
+      end
+    end
+  end
+end

data/lib/generators/haml/cell_generator.rb

@@ -0,0 +1,20 @@
+require 'generators/cells/base'
+
+module Haml
+  module Generators
+    class CellGenerator < ::Cells::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
+      def create_views
+        for state in actions do
+          @state  = state
+          @path   = File.join('app/cells', file_name, "#{state}.html.haml")
+
+          template "view.haml", @path
+        end
+      end
+    end
+  end
+end
+
+

data/lib/generators/rails/cell_generator.rb

@@ -0,0 +1,16 @@
+require 'generators/cells/base'
+
+module Rails
+  module Generators
+    class CellGenerator < ::Cells::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
+      def create_cell_file
+        template 'cell.rb', File.join('app/cells', class_path, "#{file_name}_cell.rb")
+      end
+
+      hook_for(:template_engine)
+      hook_for(:test_framework)
+    end
+  end
+end

data/lib/generators/{cells/templates → templates}/view.erb

@@ -4,4 +4,4 @@
 
 <p>
   Find me in <%= @path %>
-</p>
+</p>

data/lib/generators/test_unit/cell_generator.rb

@@ -0,0 +1,14 @@
+require 'generators/cells/base'
+
+module TestUnit
+  module Generators
+    class CellGenerator < ::Cells::Generators::Base
+      source_root File.expand_path('../../templates', __FILE__)
+
+      def create_test
+        @states = actions
+        template 'cell_test.rb', File.join('test/cells/', "#{file_name}_cell_test.rb")
+      end
+    end
+  end
+end

data/test/cell_generator_test.rb

@@ -1,18 +1,17 @@
 require 'test_helper'
-
 require 'generators/cells/cell_generator'
 
 class CellGeneratorTest < Rails::Generators::TestCase
   destination File.join(Rails.root, "tmp")
   setup :prepare_destination
   tests ::Cells::Generators::CellGenerator
-   
+
   context "Running script/generate cell" do
     context "Blog post latest" do
+
       should "create the standard assets" do
-        
         run_generator %w(Blog post latest)
-        
+
         assert_file "app/cells/blog_cell.rb", /class BlogCell < Cell::Rails/
         assert_file "app/cells/blog_cell.rb", /def post/
         assert_file "app/cells/blog_cell.rb", /def latest/
@@ -20,12 +19,15 @@ class CellGeneratorTest < Rails::Generators::TestCase
         assert_file "app/cells/blog/post.html.erb", %r(<p>)
         assert_file "app/cells/blog/latest.html.erb", %r(app/cells/blog/latest\.html\.erb)
 
-        assert_file "test/cells/blog_cell_test.rb", %r(class BlogCellTest < Cell::TestCase)
+
+        assert_no_file "app/cells/blog/post.html.haml"
+        assert_no_file "app/cells/blog/post.html.haml"
+        assert_no_file "app/cells/blog/latest.html.haml"
       end
-      
-      should "create haml assets with --haml" do
-        run_generator %w(Blog post latest --haml)
-        
+
+      should "create haml assets with -e haml" do
+        run_generator %w(Blog post latest -e haml)
+
         assert_file "app/cells/blog_cell.rb", /class BlogCell < Cell::Rails/
         assert_file "app/cells/blog_cell.rb", /def post/
         assert_file "app/cells/blog_cell.rb", /def latest/
@@ -33,21 +35,24 @@ class CellGeneratorTest < Rails::Generators::TestCase
         assert_file "app/cells/blog/post.html.haml", %r(%p)
         assert_file "app/cells/blog/latest.html.haml", %r(app/cells/blog/latest\.html\.haml)
 
-        assert_file "test/cells/blog_cell_test.rb"
+
+        assert_no_file "app/cells/blog/post.html.erb"
+        assert_no_file "app/cells/blog/post.html.erb"
+        assert_no_file "app/cells/blog/latest.html.erb"
       end
-      
-      should "create haml assets with -t haml" do
-        run_generator %w(Blog post latest -t haml)
-        
-        assert_file "app/cells/blog_cell.rb", /class BlogCell < Cell::Rails/
-        assert_file "app/cells/blog_cell.rb", /def post/
-        assert_file "app/cells/blog_cell.rb", /def latest/
-        assert_file "app/cells/blog/post.html.haml", %r(app/cells/blog/post\.html\.haml)
-        assert_file "app/cells/blog/post.html.haml", %r(%p)
-        assert_file "app/cells/blog/latest.html.haml", %r(app/cells/blog/latest\.html\.haml)
+
+      should "create test_unit assets with -t test_unit" do
+        run_generator %w(Blog post latest -t test_unit)
 
         assert_file "test/cells/blog_cell_test.rb"
       end
+
+      should "create test_unit assets with -t rspec" do
+        run_generator %w(Blog post latest -t rspec)
+
+        assert_no_file "test/cells/blog_cell_test.rb"
+      end
+
     end
   end
 end

data/test/cell_module_test.rb

@@ -16,6 +16,7 @@ class CellModuleTest < ActiveSupport::TestCase
   
   context "Cell::Base" do
     
+    # FUNCTIONAL:
     context "render_cell_for" do
       should "render the actual cell" do
         assert_equal "Doo", Cell::Base.render_cell_for(@controller, :bassist, :play)
@@ -32,7 +33,23 @@ class CellModuleTest < ActiveSupport::TestCase
         assert flag
       end
       
+      should "make options available in #options if not receiving state-args" do
+        BassistCell.class_eval do
+          def listen
+            render :text => options[:note]
+          end
+        end
+        assert_equal "C-minor", Cell::Base.render_cell_for(@controller, :bassist, :listen, :note => "C-minor")
+      end
       
+      should "pass options as state-args and still set #options otherwise" do
+        BassistCell.class_eval do
+          def listen(args)
+            render :text => args[:note] + options[:note].to_s
+          end
+        end
+        assert_equal "C-minorC-minor", Cell::Base.render_cell_for(@controller, :bassist, :listen, :note => "C-minor")
+      end
     end
     
     context "create_cell_for" do

data/test/rails/cells_test.rb

@@ -16,6 +16,26 @@ class RailsCellsTest < ActiveSupport::TestCase
     end
   end
   
+  context "#render_state" do
+    should "work without args" do
+      BassistCell.class_eval do
+        def listen
+          render :text => options[:note]
+        end
+      end
+      assert_equal "D", cell(:bassist, :note => "D").render_state(:listen)
+    end
+    
+    should "accept state-args" do
+      BassistCell.class_eval do
+        def listen(args)
+          render :text => args[:note]
+        end
+      end
+      assert_equal "D", cell(:bassist).render_state(:listen, :note => "D")
+    end
+  end
+  
   context "A rails cell" do
     should "respond to view_paths" do
       assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must be a PathSet for proper template caching/reloading (see issue#2)"
@@ -52,13 +72,13 @@ class RailsCellsTest < ActiveSupport::TestCase
     
     context "invoking defaultize_render_options_for" do
       should "set default values" do
-        options = cell(:bassist).defaultize_render_options_for({}, :play)
+        options = cell(:bassist).send(:defaultize_render_options_for, {}, :play)
         
         assert_equal :play, options[:view]
       end
       
       should "allow overriding defaults" do
-        assert cell(:bassist).defaultize_render_options_for({:view => :slap}, :play)[:view] == :slap
+        assert cell(:bassist).send(:defaultize_render_options_for, {:view => :slap}, :play)[:view] == :slap
       end
     end
     
@@ -72,11 +92,11 @@ class RailsCellsTest < ActiveSupport::TestCase
       end
       
       should "return play.html.erb" do
-        assert_equal "bassist/play", cell(:bassist).find_family_view_for_state(:play).virtual_path
+        assert_equal "bassist/play", cell(:bassist).send(:find_family_view_for_state, :play).virtual_path
       end
       
       should "find inherited play.html.erb" do
-        assert_equal "bassist/play", cell(:bad_guitarist).find_family_view_for_state(:play).virtual_path
+        assert_equal "bassist/play", cell(:bad_guitarist).send(:find_family_view_for_state, :play).virtual_path
       end
       
       should_eventually "find the EN-version if i18n instructs" do

data/test/rails/render_test.rb

@@ -49,6 +49,24 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "Snooore", render_cell(:bassist, :sleep)
     end
     
+    should "accept the :state option with state-args" do
+      BassistCell.class_eval do
+        def listen(band, song)
+          render :text => "Listening to #{band}: #{song}"
+        end
+        def groove; render({:state => :listen}, "Thin Lizzy", "Southbound"); end
+      end
+      assert_equal "Listening to Thin Lizzy: Southbound", render_cell(:bassist, :groove)
+      
+      BassistCell.class_eval do
+        def listen(args)
+          render :text => "Listening to #{args[:band]}"
+        end
+        def groove; render({:state => :listen}, :band => "Belvedere"); end
+      end
+      assert_equal "Listening to Belvedere", render_cell(:bassist, :groove)
+    end
+    
     should "accept the :state option" do
       BassistCell.class_eval do
         def play; render; end

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 3
   - 5
   - 0
-  - beta1
-  version: 3.5.0.beta1
+  - beta2
+  version: 3.5.0.beta2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-02-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,13 +85,19 @@ files:
 - lib/cells/helpers.rb
 - lib/cells/helpers/capture_helper.rb
 - lib/cells/rails.rb
+- lib/cells/rails_compat.rb
 - lib/cells/version.rb
-- lib/generators/cells/USAGE
+- lib/generators/USAGE
+- lib/generators/cells/base.rb
 - lib/generators/cells/cell_generator.rb
-- lib/generators/cells/templates/cell.rb
-- lib/generators/cells/templates/cell_test.rb
-- lib/generators/cells/templates/view.erb
-- lib/generators/cells/templates/view.haml
+- lib/generators/erb/cell_generator.rb
+- lib/generators/haml/cell_generator.rb
+- lib/generators/rails/cell_generator.rb
+- lib/generators/templates/cell.rb
+- lib/generators/templates/cell_test.rb
+- lib/generators/templates/view.erb
+- lib/generators/templates/view.haml
+- lib/generators/test_unit/cell_generator.rb
 - test/active_helper_test.rb
 - test/app/cells/bad_guitarist/_dii.html.erb
 - test/app/cells/bad_guitarist_cell.rb

data/lib/generators/cells/USAGE

@@ -1,18 +0,0 @@
-Description:
-  Stubs out a new cell and its views. Pass the cell name, either
-  CamelCased or under_scored, and a list of views as arguments.
-  
-  This generates a cell class in app/cells and view templates in
-  app/cells/cell_name.
-  
-Examples:
-  
-  rails g cells:cell ShoppingCart index --haml
-  
-  This will create these cell assets:
-    Cell:
-      app/cells/shopping_cart_cell.rb
-    Views:
-      app/cells/shopping_cart/index.html.haml
-    Test:
-      test/cells/shopping_cart_cell_test