cells 3.9.0 → 3.9.1

data/lib/cells/version.rb

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

data/lib/generators/cells/base.rb

@@ -7,13 +7,15 @@ module Cells
       class_option :template_engine
       class_option :test_framework
       class_option :base_cell_class, :type => :string, :default => "Cell::Rails"
+      class_option :base_cell_path
 
       argument :actions, :type => :array, :default => [], :banner => "action action"
       check_class_collision :suffix => "Cell"
-      
+
     private
       def base_path
-        File.join('app/cells', class_path, file_name)
+        path = (options[:base_cell_path] || 'app/cells').to_s
+        File.join(path, class_path, file_name)
       end
     end
   end

data/test/app/cells/bassist_cell.rb

@@ -13,4 +13,13 @@ class BassistCell < Cell::Rails
 
     render
   end
+
+  def promote
+    render
+  end
+
+  def slap
+    @note = "D"
+    render
+  end
 end

data/test/cell_generator_test.rb

@@ -110,4 +110,9 @@ class CellGeneratorTest < Rails::Generators::TestCase
 
     assert_no_file "test/cells/blog_cell_test.rb"
   end
+
+  test "generate with custom base_path" do
+    run_generator %w(Blog --base-cell-path=app/components)
+    assert_file "app/components/blog_cell.rb"
+  end
 end

data/test/cell_module_test.rb

@@ -178,7 +178,12 @@ class CellModuleTest < MiniTest::Spec
         assert ! Cell.rails3_0?
       end
     elsif Rails::VERSION::MAJOR == 4
-      assert Cell.rails4_0_or_more?
+      if Rails::VERSION::MINOR == 0
+        assert ! Cell.rails3_1_or_more?
+        assert Cell.rails4_0?
+      elsif Rails::VERSION::MINOR == 1
+        assert Cell.rails4_1?
+      end
     end
   end
 end

data/test/cells_module_test.rb

@@ -6,17 +6,17 @@ class CellsModuleTest < MiniTest::Spec
       before do
         @old_view_paths = Cell::Rails.view_paths.clone
       end
-      
+
       after do
         Cell::Rails.view_paths = @old_view_paths
       end
-      
+
       it "provide .before" do
         Cells.setup do |c|
           c.append_view_path "/road/to/nowhere"
         end
-        
-        if Cell.rails3_2_or_more? or Cell.rails4_0_or_more?
+
+        if Cell.rails3_2_or_more? or Cell.rails4_0? or Cell.rails4_1?
           assert_equal "/road/to/nowhere", Cell::Rails.view_paths.paths.last.to_s
         else
           assert_equal "/road/to/nowhere", Cell::Rails.view_paths.last.to_s

data/test/deprecations_test.rb

@@ -7,7 +7,7 @@ end
 
 class DeprecationsTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
-  
+
   describe "#render_state" do
     it "work without args and provide #options" do
       SongwriterCell.class_eval do
@@ -17,7 +17,7 @@ class DeprecationsTest < MiniTest::Spec
       end
       assert_equal "D", cell(:songwriter, :note => "D").render_state(:listen)
     end
-    
+
     include ActiveSupport::Testing::Deprecation
     it "mark @options as deprecated, but still work" do
       res = nil
@@ -29,7 +29,7 @@ class DeprecationsTest < MiniTest::Spec
       assert_equal "Lockdown", res
     end
   end
-  
+
   describe "render_cell_for" do
     it "make options available in #options if not receiving state-args" do
       SongwriterCell.class_eval do
@@ -39,7 +39,7 @@ class DeprecationsTest < MiniTest::Spec
       end
       assert_equal "C-minor", Cell::Rails.render_cell_for(:songwriter, :listen, @controller, :note => "C-minor")
     end
-      
+
     it "pass options as state-args and still set #options otherwise" do
       SongwriterCell.class_eval do
         def listen(args)
@@ -49,43 +49,49 @@ class DeprecationsTest < MiniTest::Spec
       assert_equal "C-minorC-minor", Cell::Rails.render_cell_for(:songwriter, :listen, @controller, :note => "C-minor")
     end
   end
-  
+
   describe "#state_accepts_args?" do
     it "be false if state doesn't want args" do
       assert_not cell(:songwriter).state_accepts_args?(:play)
     end
-    
+
     it "be true for one arg" do
-      assert(cell(:songwriter) do 
-        def listen(args) end 
+      assert(cell(:songwriter) do
+        def listen(args) end
       end.state_accepts_args?(:listen))
     end
-    
+
     it "be true for multiple arg" do
-      assert(cell(:songwriter) do 
-        def listen(what, where) end 
+      assert(cell(:songwriter) do
+        def listen(what, where) end
       end.state_accepts_args?(:listen))
     end
-    
+
     it "be true for multiple arg with defaults" do
-      assert(cell(:songwriter) do 
-        def listen(what, where="") end 
+      assert(cell(:songwriter) do
+        def listen(what, where="") end
       end.state_accepts_args?(:listen))
     end
   end
-  
+
   describe ".cache" do
+    after do
+      ActionController::Base.perform_caching = false
+    end
+
     it "still be able to use options in the block" do
+      ActionController::Base.perform_caching = true
+
       SongwriterCell.class_eval do
         def count(args)
           render :text => args[:int]
         end
-        
+
         cache :count do |cell, i|
           (cell.options[:int] % 2)==0 ? {:count => "even"} : {:count => "odd"}
         end
       end
-      
+
       assert_equal "1", render_cell(:songwriter, :count, :int => 1)
       assert_equal "2", render_cell(:songwriter, :count, :int => 2)
       assert_equal "1", render_cell(:songwriter, :count, :int => 3)

data/test/dummy/label/app/cells/label/show.erb

@@ -0,0 +1 @@
+Fat Wreck

data/test/dummy/label/app/cells/label_cell.rb

@@ -0,0 +1,5 @@
+class LabelCell < Cell::Rails
+  def show
+    render
+  end
+end

data/test/dummy/label/label.gemspec

@@ -0,0 +1,20 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+# Maintain your gem's version:
+require "label/version"
+
+# Describe your gem and declare its dependencies:
+Gem::Specification.new do |s|
+  s.name        = "label"
+  s.version     = Label::VERSION
+  s.authors     = ["TODO: Your name"]
+  s.email       = ["TODO: Your email"]
+  s.homepage    = "TODO"
+  s.summary     = "TODO: Summary of Label."
+  s.description = "TODO: Description of Label."
+
+  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"]
+  s.test_files = Dir["test/**/*"]
+
+  #s.add_dependency "railties", ">= 4.0.0"
+end

data/test/dummy/label/lib/label.rb

@@ -0,0 +1,4 @@
+module Label
+  class Engine < Rails::Engine
+  end
+end

data/test/dummy/label/lib/label/version.rb

@@ -0,0 +1,3 @@
+module Label
+  VERSION = "0.0.1"
+end

data/test/helper_test.rb

@@ -32,7 +32,7 @@ class HelperTest < MiniTest::Spec
 
     it "allows using helpers using #controller on instance level" do
       alt = "No-more-the-meek"
-      alt = "No more the meek" if Cell.rails4_0_or_more?
+      alt = "No more the meek" if Cell.rails4_0? or Cell.rails4_1?
       assert_equal "<img alt=\"#{alt}\" src=\"/images/no-more-the-meek.jpg\" />", render_cell("helper_test/song", :show)
     end
   end

data/test/rails/caching_test.rb

@@ -38,7 +38,7 @@ class CachingUnitTest < MiniTest::Spec
     end
 
     it "accept hash as key parts" do
-      if Cell.rails4_0_or_more?
+      if Cell.rails4_0? or Cell.rails4_1?
         assert_equal "cells/director/count/b/2/a/1", @class.state_cache_key(:count, :b=>2, :a=>1)
       else
         assert_equal "cells/director/count/a=1&b=2", @class.state_cache_key(:count, :b=>2, :a=>1)

data/test/rails/cells_test.rb

@@ -54,7 +54,7 @@ class RailsCellsTest < MiniTest::Spec
     it "respond to .setup_view_paths!" do
       swap( Cell::Rails, :view_paths => [])  do
         Cell::Rails.setup_view_paths!
-        if Cell.rails3_2_or_more? or Cell.rails4_0_or_more?
+        if Cell.rails3_2_or_more? or Cell.rails4_0? or Cell.rails4_1?
           assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS).paths, Cell::Rails.view_paths.paths
         else
           assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS), Cell::Rails.view_paths
@@ -118,7 +118,7 @@ class RailsCellsTest < MiniTest::Spec
 
       it "respond to session" do
         session_kind = Hash
-        session_kind = ActionController::TestSession if Cell.rails4_0_or_more?
+        session_kind = ActionController::TestSession if Cell.rails4_0? or Cell.rails4_1?
         assert_kind_of session_kind, @cell.session
       end
 

data/test/rails/integration_test.rb

@@ -8,6 +8,8 @@ class ControllerMethodsTest < ActionController::TestCase
   end
 
   test "#render_cell" do
+    fix_relative_url_root
+
     get 'promotion'
     assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
   end
@@ -42,6 +44,12 @@ class ControllerMethodsTest < ActionController::TestCase
     @controller.cell_for("controller_methods_test/song", :title => "We Called It America").
       title.must_equal "We Called It America"
   end
+
+  if Cell.rails4_0? or Cell.rails4_1_or_more?
+    test "#render_cell for engine" do
+      @controller.render_cell(:label, :show).must_equal "Fat Wreck"
+    end
+  end
 end
 
 
@@ -59,6 +67,8 @@ class ViewMethodsTest < ActionController::TestCase
   end
 
   test "#render_cell" do
+    fix_relative_url_root
+
     get 'featured'
     assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
   end
@@ -69,6 +79,8 @@ class ViewMethodsTest < ActionController::TestCase
   end
 
   test "#render_cell in a haml view" do
+    fix_relative_url_root
+
     get 'hamlet'
     assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />\n", @response.body
   end

data/test/rails/render_test.rb

@@ -2,52 +2,54 @@ require 'test_helper'
 
 class RailsRenderTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
-  
+
+  let (:bassist) { cell(:bassist) }
+
   describe "Invoking render" do
     it "render a plain view" do
-      BassistCell.class_eval do
+      bassist.instance_eval do
         def play; render; end
       end
-      assert_equal "Doo", render_cell(:bassist, :play)
+      assert_equal "Doo", bassist.render_state(:play)
     end
-    
+
     it "accept :format" do
-      BassistCell.class_eval do
+      bassist.instance_eval do
         def play; render :format => :js; end
       end
-      assert_equal "alert(\"Doo\");\n", render_cell(:bassist, :play)
+      assert_equal "alert(\"Doo\");\n", bassist.render_state(:play)
     end
-    
+
     it "accept :format without messing up following render calls" do
       skip
-      BassistCell.class_eval do
+      bassist.instance_eval do
         def play; render(:format => :js) + render; end
       end
-      assert_equal "alert(\"Doo\");\nDoo\n", render_cell(:bassist, :play)
+      assert_equal "alert(\"Doo\");\nDoo\n", bassist.render_state(:play)
     end
-    
+
     it "also render alternative engines, like haml" do
       BassistCell.class_eval do
         def sing; render; end
       end
       assert_equal "<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
-    
+
     it "accept the :nothing option" do
       BassistCell.class_eval do
         def sleep; render :nothing => true; end
       end
       assert_equal "", render_cell(:bassist, :sleep)
     end
-    
-    
+
+
     it "accept the :view option" do
       BassistCell.class_eval do
         def solo; render :view => :play; end
       end
       assert_equal "Doo", render_cell(:bassist, :solo)
     end
-    
+
     it "accept the :text options" do
       BassistCell.class_eval do
         def sing; render :text => "Shoobie"; end
@@ -55,14 +57,14 @@ class RailsRenderTest < MiniTest::Spec
       assert_equal "Shoobie", render_cell(:bassist, :sing)
       assert render_cell(:bassist, :sing).html_safe?
     end
-    
+
     it "accept the :inline option" do
       BassistCell.class_eval do
         def sleep; render :inline => "<%= 'Snooore' %>"; end
       end
       assert_equal "Snooore", render_cell(:bassist, :sleep)
     end
-    
+
     it "accept the :state option with state-args" do
       BassistCell.class_eval do
         def listen(band, song)
@@ -71,7 +73,7 @@ class RailsRenderTest < MiniTest::Spec
         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]}"
@@ -80,7 +82,7 @@ class RailsRenderTest < MiniTest::Spec
       end
       assert_equal "Listening to Belvedere", render_cell(:bassist, :groove)
     end
-    
+
     it "accept the :state option" do
       BassistCell.class_eval do
         def play; render; end
@@ -88,37 +90,37 @@ class RailsRenderTest < MiniTest::Spec
       end
       assert_equal "Doo", render_cell(:bassist, :groove)
     end
-    
+
     it "accept the :locals option" do
       BassistCell.class_eval do
         def ahem; render :locals => {:times => 2}; end
       end
       assert_equal "AhemAhem", render_cell(:bassist, :ahem)
     end
-    
-    
+
+
     # layout
     it "accept the :layout option" do
-      BassistCell.class_eval do
+      bassist.instance_eval do
         def play; render :layout => 'b'; end
       end
-      assert_equal "<b>Doo</b>", render_cell(:bassist, :play)
+      assert_equal "<b>Doo</b>", bassist.render_state(:play)
     end
-    
+
     it "respect the #layout class method" do
-      puts 
+      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
-    
+
     it "raise an error for a non-existent template" do
       BassistCell.class_eval do
         def groove; render; end
       end
-      
+
       exception = ActionView::MissingTemplate
       exception = Cell::VersionStrategy::MissingTemplate if Cell.rails3_0?
 
@@ -126,36 +128,31 @@ class RailsRenderTest < MiniTest::Spec
         render_cell(:bassist, :groove)
       end
     end
-    
+
     it "raise an error for a non-existent template" do
       BadGuitaristCell.class_eval do
         def groove; render; end
       end
-      
+
       if Cell.rails3_0?
         e = assert_raises Cell::Rails::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
-        
+
         assert_includes e.message, "Missing template bassist/groove with {:handlers=>[:erb, :rjs, :builder, :rhtml, :rxml, :haml], :formats=>[:html, :text, :js, :css, :ics, :csv, :xml, :rss, :atom, :yaml, :multipart_form, :url_encoded_form, :json], :locale=>[:en, :en]} in view paths"
       else  # >= 3.1
         e = assert_raises ActionView::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
-        
+
         assert_includes e.message, "Missing template bad_guitarist/groove, bassist/groove with"
       end
     end
-    
+
     it "render instance variables from the cell" do
-      BassistCell.class_eval do
-        def slap
-          @note = "D"; render
-        end
-      end
       assert_equal "Boing in D", render_cell(:bassist, :slap)
     end
-    
+
     it "allow subsequent calls to render in the rendered view" do
       BassistCell.class_eval do
         def jam; @chords = [:a, :c]; render; end
@@ -163,14 +160,14 @@ class RailsRenderTest < MiniTest::Spec
       end
       assert_equal "<h1>Laaa</h1>\n\n<h1>Laaa</h1>\n\n", render_cell(:bassist, :jam)
     end
-    
+
     it "allow multiple calls to render" do
       BassistCell.class_eval do
         def sing; render + render + render; end
       end
       assert_equal "<h1>Laaa</h1>\n<h1>Laaa</h1>\n<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
-    
+
     # inheriting
     it "inherit play.html.erb from BassistCell" do
       BassistCell.class_eval do
@@ -179,22 +176,22 @@ class RailsRenderTest < MiniTest::Spec
       assert_equal "Doo", render_cell(:bad_guitarist, :play)
     end
   end
-  
+
   describe "A cell view" do
     # rails view api
     it "allow calls to params/response/..." do
       BassistCell.class_eval do
         def pose; render; end
       end
-      
+
       @request.env["action_dispatch.request.request_parameters"] = {:what => 'get'} # FIXME: duplicated in cells_test.rb.
       @controller = Class.new(ActionController::Base).new
       @controller.request = @request
       @cell = cell(:bassist)
-      
+
       assert_equal "Come and get me!", @cell.render_state(:pose)
     end
-    
-    
+
+
   end
 end