cells 3.6.2 → 3.6.3

data/CHANGES.textile

@@ -1,3 +1,13 @@
+h2. 3.6.3
+
+h3. Bugfixes
+  * [Rails 3.0] Helpers are now properly included (only once). Thanks to [paneq] for a fix.
+  * `#url_options` in the Metal module is now delegated to `parent_controller` which propagates global URL setting like relative URLs to your cells.
+
+h3. Changes
+  * `cells/test_case` is no longer required as it should be loaded automatically.
+
+
 h2. 3.6.2
 
 h3. Bugfixes

data/README.rdoc

@@ -22,19 +22,19 @@ Rails 3.x:
 
 Rails 2.3:
 
-  gem install cells -v 3.3.5
+  gem install cells -v 3.3.8
 
 
 == Generate
 
 Creating a cell is nothing more than
 
-  $ rails generate cell ShoppingCart display -e haml
+  $ rails generate cell cart display -e haml
     create  app/cells/
-    create  app/cells/shopping_cart
-    create  app/cells/shopping_cart_cell.rb
-    create  app/cells/shopping_cart/display.html.haml
-    create  test/cells/shopping_cart_test.rb
+    create  app/cells/cart
+    create  app/cells/cart_cell.rb
+    create  app/cells/cart/display.html.haml
+    create  test/cells/cart_test.rb
 
 That looks very familiar.
 
@@ -43,15 +43,15 @@ That looks very familiar.
 Now, render your cart. Why not put it in <tt>layouts/application.html.erb</tt> for now?
 
   <div id="header">
-    <%= render_cell :shopping_cart, :display, :user => @current_user %>
+    <%= render_cell :cart, :display, :user => @current_user %>
 
 Feels like rendering a controller action. For good encapsulation we pass the current +user+ from outside into the cell - a dependency injection.
 
 == Code
 
-Time to improve our cell code. Let's start with <tt>app/cells/shopping_cart_cell.rb</tt>:
+Time to improve our cell code. Let's start with <tt>app/cells/cart_cell.rb</tt>:
 
-  class ShoppingCartCell < Cell::Rails
+  class CartCell < Cell::Rails
     def display(args)
       user    = args[:user]
       @items  = user.items_in_cart
@@ -65,7 +65,7 @@ Is that a controller? Hell, yeah. We even got a +#render+ method as we know it f
 
 == Views
 
-Since a plain call to +#render+ will start rendering <tt>app/cells/shopping_cart/display.html.haml</tt> we should put some meaningful markup there.
+Since a plain call to +#render+ will start rendering <tt>app/cells/cart/display.html.haml</tt> we should put some meaningful markup there.
 
   #cart
     You have #{@items.size} items in your shopping cart.
@@ -78,7 +78,7 @@ Yes, Cells support all template types that are supported by Rails itself. Rememb
 
 Yes, Cells have helpers just like controllers. If you need some specific helper, do
 
-  class ShoppingCartCell < Cell::Rails
+  class CartCell < Cell::Rails
     helper MyExtraHelper
 
 and it will be around in your cart views.
@@ -119,19 +119,19 @@ will render the configured +UnauthorizedUserCell+ instead of the original +Login
 
 Cells do strict view caching. No cluttered fragment caching. Add
 
-  class ShoppingCartCell < Cell::Rails
+  class CartCell < Cell::Rails
     cache :display, :expires_in => 10.minutes
 
 and your cart will be re-rendered after 10 minutes.
 
 You can expand the state's cache key - why not use a versioner block to do just this?
 
-  class ShoppingCartCell < Cell::Rails
+  class CartCell < Cell::Rails
     cache :display do |cell, options|
       options[:items].md5
     end
 
-The block's return value is appended to the state key: <tt>"cells/shopping_cart/display/0ecb1360644ce665a4ef"</tt>.
+The block's return value is appended to the state key: <tt>"cells/cart/display/0ecb1360644ce665a4ef"</tt>.
 
 Check the {API to learn more}[http://rdoc.info/gems/cells/Cell/Caching/ClassMethods#cache-instance_method].
 
@@ -141,9 +141,9 @@ Another big advantage compared to monolithic controller/helper/partial piles is
 
 === Test::Unit
 
-So what if you wanna test the cart cell? Use the generated <tt>test/cells/shopping_cart_cell_test.rb</tt> test.
+So what if you wanna test the cart cell? Use the generated <tt>test/cells/cart_cell_test.rb</tt> test.
 
-  class ShoppingCartCellTest < Cell::TestCase
+  class CartCellTest < Cell::TestCase
     test "display" do
       invoke :display, :user => @user_fixture
       assert_select "#cart", "You have 3 items in your shopping cart."

data/lib/cell/rails.rb

@@ -33,14 +33,14 @@ module Cell
 
 
     module Metal
-      delegate :session, :params, :request, :config, :env, :to => :parent_controller
+      delegate :session, :params, :request, :config, :env, :url_options, :to => :parent_controller
     end 
     
     
+    include VersionStrategy
     include Metal
     include Rendering
     include Caching
-    include VersionStrategy
     
     
     attr_reader :parent_controller
@@ -50,6 +50,7 @@ module Cell
 
 
     def initialize(parent_controller, *args)
+      super
       @parent_controller  = parent_controller
       setup_backwardibility(*args)
     end

data/lib/cell/rails3_0_strategy.rb

@@ -12,14 +12,12 @@ module Cell
     
     module ClassMethods
       def view_context_class
-        controller = self
-
-        Cell::Rails::View.class_eval do
-          include controller._helpers
-          include controller._routes.url_helpers
+        @view_context_class ||= begin
+          Class.new(Cell::Rails::View).tap do |klass|
+            klass.send(:include, _helpers)
+            klass.send(:include, _routes.url_helpers)
+          end
         end
-
-        @view_context_class ||= Cell::Rails::View
       end
       
       # Return the default view path for +state+. Override this if you cell has a differing naming style.

data/lib/cells.rb

@@ -83,8 +83,6 @@ end
 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.
 
 Cell::Base = Cell::Rails

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.6.2'
+  VERSION = '3.6.3'
 end

data/test/app/cells/club_security.rb

@@ -0,0 +1,2 @@
+module ClubSecurity    
+end

data/test/app/cells/club_security/guard/help.html.erb

@@ -0,0 +1 @@
+<%= respond_to?(:irritate) %> <%= respond_to?(:smile) %>

data/test/app/cells/club_security/guard_cell.rb

@@ -0,0 +1,6 @@
+class ClubSecurity::GuardCell < Cell::Base
+  helper do
+    def irritate; end
+  end
+  def help; render; end
+end

data/test/app/cells/club_security/medic/help.html.erb

@@ -0,0 +1 @@
+<%= respond_to?(:irritate) %> <%= respond_to?(:smile) %>

data/test/app/cells/club_security/medic_cell.rb

@@ -0,0 +1,8 @@
+class ClubSecurity::MedicCell < Cell::Base
+  module NiceGuy
+    def smile; end
+  end
+
+  helper NiceGuy
+  def help; render; end
+end

data/test/helper_test.rb

@@ -1,4 +1,7 @@
 require 'test_helper'
+require 'app/cells/club_security'
+require 'app/cells/club_security/guard_cell'
+require 'app/cells/club_security/medic_cell'
 
 module StringHelper
   def pick; "plong"; end
@@ -43,5 +46,17 @@ class HelperTest < ActionController::TestCase
     should "have access to methods provided by helper" do
       assert_equal "plong", render_cell(:drummer, :assist)
     end
+    
+    should "mix in required helpers, only" do
+      assert_equal "false true", render_cell(:"club_security/medic", :help)
+      assert_equal "true false", render_cell(:"club_security/guard", :help)
+    end
+    
+    should "include helpers only once" do
+      assert_equal "false true", render_cell(:"club_security/medic", :help)
+      assert_equal "true false", render_cell(:"club_security/guard", :help)
+      assert_equal "false true", render_cell(:"club_security/medic", :help)
+      assert_equal "true false", render_cell(:"club_security/guard", :help)
+    end
   end
 end

data/test/rails/render_test.rb

@@ -4,7 +4,6 @@ class RailsRenderTest < ActiveSupport::TestCase
   include Cell::TestCase::TestMethods
   
   context "Invoking render" do
-    
     should "render a plain view" do
       BassistCell.class_eval do
         def play; render; end
@@ -98,6 +97,15 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "<b>Doo</b>", render_cell(:bassist, :play)
     end
     
+    should "respect the #layout class method" do
+      puts 
+      class VanHalenBassistCell < BassistCell
+        layout 'b'
+        def play; render; end
+      end
+      assert_equal "<b>Doo</b>", render_cell("rails_render_test/van_halen_bassist", :play)
+    end
+    
     should "raise an error for a non-existent template" do
       BassistCell.class_eval do
         def groove; render; end

data/test/rails/router_test.rb

@@ -18,6 +18,16 @@ module ApplicationTests
         assert_response :success
         assert_equal "Find me at <a href=\"/musician\">vd.com</a>", @response.body
       end
+      
+      should "delegate #url_options to the parent_controller" do
+        @controller.instance_eval do
+          def default_url_options
+            {:host => "cells.rails.org"}
+          end
+        end
+        
+        assert_equal "http://cells.rails.org/", BassistCell.new(@controller).root_url
+      end
 
       should "allow cells to use *_url helpers when mixing in AC::UrlFor" do
         get "promote"

data/test/test_helper.rb

@@ -18,9 +18,6 @@ require "rails/test_help" # adds stuff like @routes, etc.
 gem_dir       = File.join(File.dirname(__FILE__), '..')
 test_app_dir  = File.join(gem_dir, 'test', 'app')
 
-# Important: Load any test ApplicationHelper before loading cells.
-Dir[File.join(test_app_dir, *%w[helpers ** *.rb]).to_s].each { |f| require f }
-
 require 'cells'
 
 Cell::Rails.append_view_path(File.join(test_app_dir, 'cells'))

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 6
-  - 2
-  version: 3.6.2
+  - 3
+  version: 3.6.3
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 +02:00
+date: 2011-07-14 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -143,6 +143,11 @@ files:
 - test/app/cells/bassist/slap.html.erb
 - test/app/cells/bassist/yell.en.html.erb
 - test/app/cells/bassist_cell.rb
+- test/app/cells/club_security.rb
+- test/app/cells/club_security/guard/help.html.erb
+- test/app/cells/club_security/guard_cell.rb
+- test/app/cells/club_security/medic/help.html.erb
+- test/app/cells/club_security/medic_cell.rb
 - test/app/cells/layouts/b.erb
 - test/app/cells/layouts/metal.html.erb
 - test/app/cells/producer/capture.html.erb