cells 3.8.8 → 3.9.0

data/lib/cell/rails3_0_strategy.rb

@@ -69,7 +69,7 @@ module Cells
   module Engines
     module VersionStrategy
       def registered_engines
-        ::Rails::Application.railties.engines
+        ::Rails.application.railties.engines
       end
       
       def existent_directories_for(path)

data/lib/cell/rails3_1_strategy.rb

@@ -27,7 +27,7 @@ module Cells
   module Engines
     module VersionStrategy
       def registered_engines
-        ::Rails::Application::Railties.engines
+        ::Rails.application.railties.engines
       end
       
       def existent_directories_for(path)

data/lib/cell/rails4_0_strategy.rb

@@ -27,8 +27,7 @@ module Cells
   module Engines
     module VersionStrategy
       def registered_engines
-        #::Rails::Railties.engines
-        []
+        ::Rails::Engine::Railties.engines
       end
       
       def existent_directories_for(path)

data/lib/cell/test_case.rb

@@ -58,36 +58,36 @@ module Cell
         super(HTML::Document.new(last_invoke).root, *args, &block)
       end
     end
-    
+
     module CommonTestMethods
       def setup
-        @controller = Class.new(ActionController::Base).new
-        @request    = ::ActionController::TestRequest.new
+        @controller ||= Class.new(ActionController::Base).new
+        @request    ||= ::ActionController::TestRequest.new
         @response   = ::ActionController::TestResponse.new
         @controller.request = @request
         @controller.response = @response
         @controller.params = {}
       end
-      
-      # Runs the block while computing the instance variables diff from before and after. 
+
+      # Runs the block while computing the instance variables diff from before and after.
       def extract_state_ivars_for(cell)
         before  = cell.instance_variables
-        yield 
+        yield
         after   = cell.instance_variables
-        
+
         Hash[(after - before).collect do |var|
           next if var =~ /^@_/
           [var[1, var.length].to_sym, cell.instance_variable_get(var)]
         end.compact]
       end
     end
-    
+
 
     module TestMethods
       include CommonTestMethods
-      
+
       attr_reader :last_invoke, :subject_cell, :view_assigns
-      
+
       # Use this for functional tests of your application cells.
       #
       # Example:
@@ -100,7 +100,7 @@ module Cell
         @view_assigns = extract_state_ivars_for(@subject_cell) do
           @last_invoke = @subject_cell.render_state(state, *args)
         end
-        
+
         @last_invoke
       end
 

data/lib/cells.rb

@@ -2,7 +2,7 @@
 #
 # Cells are view components for Rails. Being lightweight controllers with actions and views, cells are the
 # answer to <tt>DoubleRenderError</tt>s and the long awaited ability to render actions within actions.
-# 
+#
 # == Directory structure
 #
 # Cells live in +app/cells/+ and have a similar file layout as controllers.
@@ -17,7 +17,7 @@
 #         box.html.erb
 #
 # == Cell nesting
-# 
+#
 # Is is good practice to split up complex cell views into multiple states or views. Remember, you can always use
 # <tt>render :view => ...</tt> and <tt>render :state => ...</tt> in your views.
 #
@@ -42,7 +42,7 @@
 #     = @item.title
 #
 #   render :state => :order_button
-# 
+#
 # which is more than just a partial, as you may execute additional code in the state method.
 #
 # == View inheritance
@@ -72,6 +72,7 @@ module Cells
   end
 end
 
+require 'cell'
 require 'cell/rails'
 require 'cells/rails'
 require 'cell/deprecations'

data/lib/cells/rails.rb

@@ -3,9 +3,14 @@
 module Cells
   module Rails
     module ActionController
+      def cell_for(name, *args, &block)
+        ::Cell::Base.cell_for(name, self, *args, &block)
+      end
+      alias_method :cell, :cell_for # DISCUSS: make this configurable?
+
       # Renders the cell state and returns the content. You may pass options here, too. They will be
       # around in @opts.
-      # 
+      #
       # Example:
       #
       #   @box = render_cell(:posts, :latest, :user => current_user)
@@ -41,19 +46,27 @@ module Cells
           ActiveSupport::Deprecation.warn "Please pass the cell class into #expire_cell_state, as in expire_cell_state(DirectorCell, :count, :user_id => 1)"
           cell_class = Cell::Rails.class_from_cell_name(cell_class)
         end
-        
+
         key = cell_class.state_cache_key(state, args)
         cell_class.expire_cache_key(key, opts)
       end
     end
 
     module ActionView
+      # Returns the cell instance for +name+. You may pass arbitrary options to your
+      # cell.
+      #
+      #   = cell(:song, :title => "Creeping Out Sara").render(:show)
+      def cell_for(name, *args, &block)
+        controller.cell_for(name, *args, &block)
+      end
+      alias_method :cell, :cell_for # DISCUSS: make this configurable?
+
       # See Cells::Rails::ActionController#render_cell.
       def render_cell(name, state, *args, &block)
         ::Cell::Rails.render_cell_for(name, state, controller, *args, &block)
       end
     end
-
   end
 end
 

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.8.8'
+  VERSION = '3.9.0'
 end

data/test/app/cells/bassist_cell.rb

@@ -1,8 +1,16 @@
 class BassistCell < Cell::Rails
-  def play; render; end
+  def play
+    render
+  end
 
   def shout(args)
     @words = args[:words]
     render
   end
+
+  def provoke
+    controller.config.relative_url_root = "" if Cell.rails3_0?
+
+    render
+  end
 end

data/test/app/cells/rails_helper_api_test/bassist/edit.html.erb

@@ -1,5 +1,5 @@
-<%= simple_form_for @fruit do |f| %>
-	<%= f.input :title %>
+<%= form_for @fruit do |f| %>
+	<%= f.text_field :title %>
 	<%= f.button :submit %>
-<% end %>	
+<% end %>
 <%= url_for(:host => "apotomo.de") %>

data/test/app/cells/song/dashboard.haml

@@ -0,0 +1,7 @@
+%h1 Dashboard
+
+= SongCell::Lyrics.new(controller, :song => song, :phrases => ["In the Mirror", "I can see"]).show
+
+= SongCell::PlaysCell.new(controller, :song => song).call
+
+= cell("song_cell/plays").call

data/test/app/cells/song/details.html.haml

@@ -0,0 +1 @@
+%h3 #{title}

data/test/app/cells/song/info.html.haml

@@ -0,0 +1 @@
+%li #{render :title}

data/test/app/cells/song/lyrics.html.haml

@@ -0,0 +1,6 @@
+-# notice how we use title from the superclass here.
+%h3 Lyrics for #{title}
+
+- phrases.each do |ln|
+  %li
+    = ln

data/test/app/cells/song/plays.haml

@@ -0,0 +1 @@
+Plays: 99

data/test/app/cells/song/show.html.haml

@@ -0,0 +1,3 @@
+%h1 #{title}
+
+= link_to "Permalink", song

data/test/app/cells/song/title.html.haml

@@ -0,0 +1 @@
+= title

data/test/app/cells/view_model_test/comments/show.haml

@@ -0,0 +1,7 @@
+%h1 "Comments from #{link_to title, Musician.new}"
+
+= local
+
+=# form
+
+=# comment.created_at

data/test/cell_module_test.rb

@@ -18,25 +18,23 @@ end
 
 
 class CellBaseTest < MiniTest::Spec
-  describe "Cell::Base" do
-    it "still have a working #url_for" do
-      cell = Cell::Base.new
-      cell.instance_eval do
-        # You can use #default_url_options.
-        def default_url_options
-          {:host => "cells-project.org"}
-        end
-        
+  it "still have a working #url_for" do
+    cell = Cell::Base.new
+    cell.instance_eval do
+      # You can use #default_url_options.
+      def default_url_options
+        {:host => "cells-project.org"}
       end
-      # You could also use a *_url or *_path helper method here.
-      assert_equal "http://cells-project.org/dashboard/show", cell.url_for(:action => :show, :controller => :dashboard)
+
     end
-    
-    describe ".render_cell_for" do
-      it "invokes controller-less cell" do
-        Cell::Base.view_paths= ["test/app/cells"]
-        assert_equal "YAAAaaargh!\n", Cell::Base.render_cell_for(:shouter, :sing, "Y")
-      end
+    # You could also use a *_url or *_path helper method here.
+    assert_equal "http://cells-project.org/dashboard/show", cell.url_for(:action => :show, :controller => :dashboard)
+  end
+
+  describe ".render_cell_for" do
+    it "invokes controller-less cell" do
+      Cell::Base.view_paths= ["test/app/cells"]
+      assert_equal "YAAAaaargh!\n", Cell::Base.render_cell_for(:shouter, :sing, "Y")
     end
   end
 end
@@ -50,19 +48,19 @@ class CellModuleTest < MiniTest::Spec
       it "render the actual cell" do
         assert_equal "Doo", Cell::Rails.render_cell_for(:bassist, :play, @controller)
       end
-      
+
       it "accept a block, passing the cell instance" do
         flag = false
         html = Cell::Rails.render_cell_for(:bassist, :play, @controller) do |cell|
           assert_equal BassistCell, cell.class
           flag = true
         end
-        
+
         assert_equal "Doo", html
         assert flag
       end
     end
-    
+
     describe "create_cell_for" do
       it "call the cell's builders, eventually returning a different class" do
         class DrummerCell < BassistCell
@@ -70,22 +68,22 @@ class CellModuleTest < MiniTest::Spec
             BassistCell
           end
         end
-        
+
         assert_instance_of BassistCell, Cell::Rails.create_cell_for("cell_module_test/drummer", :play, @controller)
       end
     end
-    
+
     describe "#create_cell_for with #build" do
       before do
         @controller.class_eval do
           attr_accessor :bassist
         end
-        
+
         MusicianCell.build do
           BassistCell if bassist
         end
       end
-      
+
       after do
         MusicianCell.class_eval do
           @builders = false
@@ -94,40 +92,40 @@ class CellModuleTest < MiniTest::Spec
           @builders = false
         end
       end
-      
+
       it "execute the block in controller describe" do
         @controller.bassist = true
         assert_is_a BassistCell,  Cell::Rails.create_cell_for(:musician, @controller)
       end
-      
+
       it "limit the builder to the receiving class" do
         assert_is_a PianistCell,   Cell::Rails.create_cell_for(:pianist, @controller)   # don't inherit anything.
         @controller.bassist = true
         assert_is_a BassistCell,   Cell::Rails.create_cell_for(:musician, @controller)
       end
-      
+
       it "chain build blocks and execute them by ORing them in the same order" do
         MusicianCell.build do
           PianistCell unless bassist
         end
-        
+
         MusicianCell.build do
           UnknownCell # it never be executed.
         end
-        
+
         assert_is_a PianistCell, Cell::Rails.create_cell_for(:musician, @controller)  # bassist is false.
         @controller.bassist = true
         assert_is_a BassistCell, Cell::Rails.create_cell_for(:musician, @controller)
       end
-      
+
       it "use the original cell if no builder matches" do
         assert_is_a MusicianCell, Cell::Rails.create_cell_for(:musician, @controller)  # bassist is false.
       end
-      
+
       it "stop at the first builder returning a valid cell" do
-        
+
       end
-      
+
       it "pass options to the block" do
         BassistCell.build do |opts|
           SingerCell if opts[:sing_the_song]
@@ -135,38 +133,38 @@ class CellModuleTest < MiniTest::Spec
         assert_kind_of BassistCell, Cell::Rails.create_cell_for(:bassist, @controller, {})
         assert_kind_of SingerCell,  Cell::Rails.create_cell_for(:bassist, @controller, {:sing_the_song => true})
       end
-      
+
       it "create the original target class if no block matches" do
         assert_kind_of PianistCell, Cell::Rails.create_cell_for(:pianist, @controller)
       end
-      
+
       it "builders it return an empty array per default" do
         assert_equal [], PianistCell.send(:builders)
       end
     end
-    
+
     it "provide class_from_cell_name" do
       assert_equal BassistCell, ::Cell::Rails.class_from_cell_name('bassist')
     end
-    
+
     if Cell.rails3_0?
       it "provide possible_paths_for_state" do
         assert_equal ["bad_guitarist/play", "bassist/play"], cell(:bad_guitarist).send(:possible_paths_for_state, :play)
       end
-      
+
       it "provide Cell.cell_name" do
         assert_equal 'bassist', cell(:bassist).class.cell_name
       end
-      
+
       it "provide cell_name for modules, too" do
         class SingerCell < Cell::Rails
         end
-        
+
         assert_equal "cell_module_test/singer", CellModuleTest::SingerCell.cell_name
       end
     end
   end
-  
+
   it "respond to #rails3_1_or_more?" do
     if Rails::VERSION::MAJOR == 3
       if Rails::VERSION::MINOR == 0

data/test/cell_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+class CellTest < MiniTest::Spec
+  class ArtistCell < Cell::Rails
+  end
+  class SongCell < Cell::Base
+    include Cell::OptionsConstructor
+  end
+
+  describe "#initialize" do
+    it { Class.new(Cell::Base) { include Cell::OptionsConstructor }.new(:song => song=Object.new).song.must_equal song }
+    it { Class.new(Cell::Rack) { include Cell::OptionsConstructor }.new(Object, :song => song=Object.new).song.must_equal song }
+    it { Class.new(Cell::Rails) { include Cell::OptionsConstructor }.new(Object, :song => song=Object.new).song.must_equal song }
+  end
+
+  describe "::create_cell_for" do
+    it { Cell::Base.create_cell_for("cell_test/song", :song => song=Object.new).song.must_equal song }
+  end
+
+  describe "#cell" do
+    it { Cell::Rails.new(Object).cell("cell_test/artist").must_be_instance_of ArtistCell }
+    it { Cell::Base.new.cell("cell_test/song").must_be_instance_of SongCell }
+  end
+end
+
+class OptionsConstructorTest < MiniTest::Spec
+  it { Class.new(Cell::Base) { include Cell::OptionsConstructor }.new(:song => song=Object.new).song.must_equal song }
+end