cells 3.5.2 → 3.5.4

data/CHANGES.textile

@@ -1,3 +1,14 @@
+h2. 3.5.3
+  
+h3. Bugfixes
+  * state-args work even if your state method receives optional arguments or default values, like @def show(user, age=18)@.
+
+h3. Changes
+
+  * Cell::Base.view_paths is now setup in an initializer. If you do scary stuff with view_paths this might lead to scary problems.
+  * Cells::DEFAULT_VIEW_PATHS is now Cell::Base::DEFAULT_VIEW_PATHS. Note that Cells will set its view_paths to DEFAULT_VIEW_PATHS at initialization time. If you want to alter the view_paths, use Base.append_view_path and friends in a separate initializer.
+
+
 h2. 3.5.2
   
 h3. Bugfixes

data/lib/cell.rb

@@ -1,9 +1,19 @@
 module Cell
-  autoload :Caching,      'cell/caching'
+  autoload :Caching, 'cell/caching'
 
   extend ActiveSupport::Concern
-
+  
+  DEFAULT_VIEW_PATHS = [
+    File.join('app', 'cells'),
+    File.join('app', 'cells', 'layouts')
+  ]
+    
   module ClassMethods
+    # Called in Railtie at initialization time.
+    def setup_view_paths!
+      self.view_paths = self::DEFAULT_VIEW_PATHS
+    end
+    
     def render_cell_for(controller, name, state, *args)
       cell = create_cell_for(controller, name, *args)  # DISCUSS: we always save options.
       yield cell if block_given?
@@ -73,9 +83,8 @@ module Cell
       superclass.find_class_view_for_state(state) << view_for_state(state)
     end
 
-    # The cell name, underscored with +_cell+ removed.
-    def cell_name
-      name.underscore.sub(/_cell$/, '')
+    def cell_name # TODO: remove in 3.6.
+      controller_path
     end
 
     # The cell class constant for +cell_name+.
@@ -91,7 +100,7 @@ module Cell
     end
     
     def state_accepts_args?(state)
-      method(state).arity > 0
+      method(state).arity != 0
     end
   end
 end

data/lib/cell/rails.rb

@@ -60,7 +60,6 @@ module Cell
       @opts    = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :options)
     end
     
-    
     def self.view_context_class
       controller = self
 

data/lib/cells.rb

@@ -60,17 +60,12 @@
 # this is pretty DRY and object-oriented, isn't it?
 
 require 'cell/rails'
+require 'cells/railtie'
 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.
-  DEFAULT_VIEW_PATHS = [
-    File.join('app', 'cells'),
-    File.join('app', 'cells', 'layouts')
-  ]
-
   # Setup your special needs for Cells here. Use this to add new view paths.
   #
   # Example:
@@ -85,20 +80,3 @@ module Cells
 end
 
 Cell::Base = Cell::Rails
-
-Cell::Base.view_paths = Cells::DEFAULT_VIEW_PATHS if Cell::Base.view_paths.blank?
-
-
-require "rails/railtie"
-
-class Cells::Railtie < Rails::Railtie
-  initializer "cells.attach_router" do |app|
-    Cell::Rails.class_eval do
-      include app.routes.url_helpers
-    end
-  end
-  
-  rake_tasks do
-    load "cells/cells.rake"
-  end
-end

data/lib/cells/railtie.rb

@@ -0,0 +1,19 @@
+require "rails/railtie"
+
+module Cells
+  class Railtie < Rails::Railtie
+    initializer "cells.attach_router" do |app|
+      Cell::Rails.class_eval do
+        include app.routes.url_helpers
+      end
+    end
+    
+    initializer "cells.setup_view_paths" do |app|
+      Cell::Base.setup_view_paths!
+    end
+    
+    rake_tasks do
+      load "cells/cells.rake"
+    end
+  end
+end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.5.2'
+  VERSION = '3.5.4'
 end

data/test/cell_module_test.rb

@@ -170,6 +170,12 @@ class CellModuleTest < ActiveSupport::TestCase
           def listen(what, where) end 
         end.state_accepts_args?(:listen))
       end
+      
+      should "be true for multiple arg with defaults" do
+        assert(cell(:bassist) do 
+          def listen(what, where="") end 
+        end.state_accepts_args?(:listen))
+      end
     end
   end
 end

data/test/rails/cells_test.rb

@@ -34,9 +34,30 @@ class RailsCellsTest < ActiveSupport::TestCase
       end
       assert_equal "D", cell(:bassist).render_state(:listen, :note => "D")
     end
+    
+    should "accept state-args with default parameters" do
+      BassistCell.class_eval do
+        def listen(first, second="D")
+          render :text => first+second
+        end
+      end
+      assert_equal "AD", cell(:bassist).render_state(:listen, "A")
+    end
   end
   
+  
   context "A rails cell" do
+    should "respond to DEFAULT_VIEW_PATHS" do
+      assert_equal ["app/cells", "app/cells/layouts"], Cell::Base::DEFAULT_VIEW_PATHS
+    end
+    
+    should "respond to .setup_view_paths!" do
+      swap( Cell::Base, :view_paths => [])  do
+        Cell::Base.setup_view_paths!
+        assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS), Cell::Base.view_paths
+      end
+    end
+    
     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)"
     end

data/test/rails/integration_test.rb

@@ -11,7 +11,7 @@ class RailsIntegrationTest < ActionController::TestCase
     
     should "respond to #render_cell with arbitrary options" do
       BassistCell.class_eval do
-        def enjoy(what, where)
+        def enjoy(what, where="the bar")
           render :text => "I like #{what} in #{where}."
         end
       end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 5
-  - 2
-  version: 3.5.2
+  - 4
+  version: 3.5.4
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-11 00:00:00 +01:00
+date: 2011-02-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -76,16 +76,14 @@ files:
 - about.yml
 - cells.gemspec
 - lib/cell.rb
-- lib/cell/active_helper.rb
 - lib/cell/caching.rb
 - lib/cell/rails.rb
 - lib/cell/test_case.rb
 - lib/cells.rb
 - lib/cells/cells.rake
-- lib/cells/helpers.rb
-- lib/cells/helpers/capture_helper.rb
 - lib/cells/rails.rb
 - lib/cells/rails_compat.rb
+- lib/cells/railtie.rb
 - lib/cells/version.rb
 - lib/generators/USAGE
 - lib/generators/cells/base.rb

data/lib/cell/active_helper.rb

@@ -1,32 +0,0 @@
-module 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/helpers.rb

@@ -1,7 +0,0 @@
-# encoding: utf-8
-
-module Cells
-  module Helpers
-    autoload :CaptureHelper, 'cells/helpers/capture_helper'
-  end
-end

data/lib/cells/helpers/capture_helper.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-# Sorry for the interface violations, but it looks as if there are
-# no interfaces in rails at all.
-module Cells
-  module Helpers
-    module CaptureHelper
-      # Executes #capture on the global ActionView and sets <tt>name</tt> as the
-      # instance variable name.
-      #
-      # Example:
-      #
-      #  <p>
-      #  <% global_capture :greeting do
-      #    <h1>Hi, Nick!</h1>
-      #  <% end %>
-      #
-      # The captured markup can be accessed in your global action view or in your layout.
-      #
-      #  <%= @greeting %>
-      def global_capture(name, &block)
-        global_view = controller.parent_controller.view_context
-        content     = capture(&block)
-        global_view.send(:instance_variable_set, :"@#{name}", content)
-      end
-
-
-      # Executes #content_for on the global ActionView.
-      #
-      # Example:
-      #
-      #  <p>
-      #  <% global_content_for :greetings do
-      #    <h1>Hi, Michal!</h1>
-      #  <% end %>
-      #
-      # As in global_capture, the markup can be accessed in your global action view or in your layout.
-      #
-      #  <%= yield :greetings %>
-      def global_content_for(name, content = nil, &block)
-        # OMG. that SUCKS.
-        global_view = controller.parent_controller.view_context
-        ivar        = :"@content_for_#{name}"
-        content     = capture(&block) if block_given?
-        old_content = global_view.send(:'instance_variable_get', ivar)
-        global_view.send(:'instance_variable_set', ivar, "#{old_content}#{content}")
-        nil
-      end
-    end
-  end
-end