cells 3.8.6 → 3.8.7

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 3.8.7
+
+* Cells runs with Rails 4.
+
 h2. 3.8.6
 
 * @cell/base@ can now be required without trouble.

data/Gemfile

@@ -2,4 +2,4 @@ source :gemcutter
 
 gemspec
 
-#gem "rails" , :path => "/home/nick/projects/rayls"
+#gem "rails" , :path => "../rayls"

data/README.rdoc

@@ -18,7 +18,7 @@ And the best: You can have as many cells in your page as you need!
 
 It's a gem!
 
-Rails 3.x:
+Rails >= 3.0:
 
   gem install cells
 
@@ -235,7 +235,7 @@ Your views can now use the gem's helpers.
     <%= f.button :submit %>
   <% end %>
 
-Note that this currently "only" works with Rails 3.2.
+Note that this currently "only" works with Rails 3.2-4.0.
 
 == Cells is Rails::Engine aware!
 

data/cells.gemspec

@@ -19,11 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "actionpack",  "~> 3.0"
-  s.add_dependency "railties",    "~> 3.0"
+  s.add_dependency "actionpack",  ">= 3.0"
+  s.add_dependency "railties",    ">= 3.0"
   
   s.add_development_dependency "rake"
-  s.add_development_dependency "shoulda"
   s.add_development_dependency "haml"
   s.add_development_dependency "slim"
   s.add_development_dependency "simple_form"

data/lib/cell/base.rb

@@ -5,15 +5,19 @@ require 'cell/rendering'
 
 module Cell
   def self.rails3_0?
-    ::ActionPack::VERSION::MINOR == 0
+    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR == 0
   end
   
   def self.rails3_1_or_more?
-    ::ActionPack::VERSION::MINOR >= 1
+    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 1
   end
   
   def self.rails3_2_or_more?  # FIXME: move to tests.
-    ::ActionPack::VERSION::MINOR >= 2
+    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2
+  end
+
+  def self.rails4_0_or_more?  # FIXME: move to tests.
+    ::ActionPack::VERSION::MAJOR == 4
   end
   
   
@@ -27,6 +31,7 @@ module Cell
     
     require 'cell/rails3_0_strategy' if Cell.rails3_0?
     require 'cell/rails3_1_strategy' if Cell.rails3_1_or_more?
+    require 'cell/rails4_0_strategy' if Cell.rails4_0_or_more?
     include VersionStrategy
     include Rendering
     include Caching

data/lib/cell/rails.rb

@@ -29,6 +29,7 @@ module Cell
     
     
     attr_reader :parent_controller
+    alias_method :controller, :parent_controller
     
     def initialize(parent_controller)
       super

data/lib/cell/rails3_0_strategy.rb

@@ -65,14 +65,16 @@ module Cell
 end
 
 
-module Cells::Engines
-  module VersionStrategy
-    def registered_engines
-      ::Rails::Application.railties.engines
-    end
-    
-    def existent_directories_for(path)
-      path.to_a.select { |d| File.directory?(d) }
+module Cells
+  module Engines
+    module VersionStrategy
+      def registered_engines
+        ::Rails::Application.railties.engines
+      end
+      
+      def existent_directories_for(path)
+        path.to_a.select { |d| File.directory?(d) }
+      end
     end
   end
 end

data/lib/cell/rails3_1_strategy.rb

@@ -23,14 +23,16 @@ module Cell
 end
 
 
-module Cells::Engines
-  module VersionStrategy
-    def registered_engines
-      ::Rails::Application::Railties.engines
-    end
-    
-    def existent_directories_for(path)
-      path.existent_directories
+module Cells
+  module Engines
+    module VersionStrategy
+      def registered_engines
+        ::Rails::Application::Railties.engines
+      end
+      
+      def existent_directories_for(path)
+        path.existent_directories
+      end
     end
   end
 end

data/lib/cell/test_case.rb

@@ -78,7 +78,7 @@ module Cell
         Hash[(after - before).collect do |var|
           next if var =~ /^@_/
           [var[1, var.length].to_sym, cell.instance_variable_get(var)]
-        end]
+        end.compact]
       end
     end
     

data/lib/cells/engines.rb

@@ -1,5 +1,3 @@
-require 'rails/application/railties'
-
 module Cells
   # Now <tt>Rails::Engine</tt>s can contribute to Cells view paths.
   # By default, any 'app/cells' found inside any Engine is automatically included into Cells view paths.

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.8.6'
+  VERSION = '3.8.7'
 end

data/test/cell_generator_test.rb

@@ -6,110 +6,108 @@ class CellGeneratorTest < Rails::Generators::TestCase
   setup :prepare_destination
   tests ::Rails::Generators::CellGenerator
 
-  context "CellGenerator" 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/
-      assert_file "app/cells/blog/post.html.erb", %r(app/cells/blog/post\.html\.erb)
-      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_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"
-
-      assert_no_file "app/cells/blog/post.html.slim"
-      assert_no_file "app/cells/blog/post.html.slim"
-      assert_no_file "app/cells/blog/latest.html.slim"
-    end
-
-    should "create cell that inherits from custom cell class if specified" do
-      run_generator %w(Blog --base-cell-class=ApplicationCell)
-      assert_file "app/cells/blog_cell.rb", /class BlogCell < ApplicationCell/
-    end
-    
-    should "work with namespaces" do
-      run_generator %w(Blog::Post latest)
-
-      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
-      assert_file "app/cells/blog/post_cell.rb", /def latest/
-      assert_file "app/cells/blog/post/latest.html.erb", %r(app/cells/blog/post/latest\.html\.erb)
-    end
-    
-    should "work with namespaces and haml" do
-      run_generator %w(Blog::Post latest -e haml)
-
-      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
-      assert_file "app/cells/blog/post/latest.html.haml", %r(app/cells/blog/post/latest\.html\.haml)
-    end
-
-    should "work with namespaces and slim" do
-      run_generator %w(Blog::Post latest -e slim)
-
-      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
-      assert_file "app/cells/blog/post/latest.html.slim", %r(app/cells/blog/post/latest\.html\.slim)
-    end
-
-    should "create slim assets with -e slim" do
-      run_generator %w(Blog post latest -e slim)
-
-      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.slim", %r(app/cells/blog/post\.html\.slim)
-      assert_file "app/cells/blog/post.html.slim", %r(p)
-      assert_file "app/cells/blog/latest.html.slim", %r(app/cells/blog/latest\.html\.slim)
-
-
-      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"
-
-      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 -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/
-      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)
-
-
-      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"
-
-      assert_no_file "app/cells/blog/post.html.slim"
-      assert_no_file "app/cells/blog/post.html.slim"
-      assert_no_file "app/cells/blog/latest.html.slim"
-    end
-
-    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 "work with namespace and test_unit" do
-      run_generator %w(Blog::Post latest -t test_unit)
-
-      assert_file "test/cells/blog/post_cell_test.rb",  /class Blog::PostCellTest < Cell::TestCase/
-    end
-
-    should "create test_unit assets with -t rspec" do
-      run_generator %w(Blog post latest -t rspec)
+  test "create the standard assets" do
+    run_generator %w(Blog post latest)
 
-      assert_no_file "test/cells/blog_cell_test.rb"
-    end
+    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.erb", %r(app/cells/blog/post\.html\.erb)
+    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_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"
+
+    assert_no_file "app/cells/blog/post.html.slim"
+    assert_no_file "app/cells/blog/post.html.slim"
+    assert_no_file "app/cells/blog/latest.html.slim"
+  end
+
+  test "create cell that inherits from custom cell class if specified" do
+    run_generator %w(Blog --base-cell-class=ApplicationCell)
+    assert_file "app/cells/blog_cell.rb", /class BlogCell < ApplicationCell/
+  end
+  
+  test "work with namespaces" do
+    run_generator %w(Blog::Post latest)
+
+    assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+    assert_file "app/cells/blog/post_cell.rb", /def latest/
+    assert_file "app/cells/blog/post/latest.html.erb", %r(app/cells/blog/post/latest\.html\.erb)
+  end
+  
+  test "work with namespaces and haml" do
+    run_generator %w(Blog::Post latest -e haml)
+
+    assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+    assert_file "app/cells/blog/post/latest.html.haml", %r(app/cells/blog/post/latest\.html\.haml)
+  end
+
+  test "work with namespaces and slim" do
+    run_generator %w(Blog::Post latest -e slim)
+
+    assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+    assert_file "app/cells/blog/post/latest.html.slim", %r(app/cells/blog/post/latest\.html\.slim)
+  end
+
+  test "create slim assets with -e slim" do
+    run_generator %w(Blog post latest -e slim)
+
+    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.slim", %r(app/cells/blog/post\.html\.slim)
+    assert_file "app/cells/blog/post.html.slim", %r(p)
+    assert_file "app/cells/blog/latest.html.slim", %r(app/cells/blog/latest\.html\.slim)
+
+
+    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"
+
+    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
+
+  test "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/
+    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)
+
+
+    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"
+
+    assert_no_file "app/cells/blog/post.html.slim"
+    assert_no_file "app/cells/blog/post.html.slim"
+    assert_no_file "app/cells/blog/latest.html.slim"
+  end
+
+  test "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
+
+  test "work with namespace and test_unit" do
+    run_generator %w(Blog::Post latest -t test_unit)
+
+    assert_file "test/cells/blog/post_cell_test.rb",  /class Blog::PostCellTest < Cell::TestCase/
+  end
+
+  test "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

data/test/cell_module_test.rb

@@ -42,16 +42,16 @@ class CellBaseTest < MiniTest::Spec
 end
 
 
-class CellModuleTest < ActiveSupport::TestCase
+class CellModuleTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
-  context "Cell::Rails" do
+  describe "Cell::Rails" do
     # FUNCTIONAL:
-    context "render_cell_for" do
-      should "render the actual cell" do
+    describe "render_cell_for" do
+      it "render the actual cell" do
         assert_equal "Doo", Cell::Rails.render_cell_for(:bassist, :play, @controller)
       end
       
-      should "accept a block, passing the cell instance" do
+      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
@@ -63,8 +63,8 @@ class CellModuleTest < ActiveSupport::TestCase
       end
     end
     
-    context "create_cell_for" do
-      should "call the cell's builders, eventually returning a different class" do
+    describe "create_cell_for" do
+      it "call the cell's builders, eventually returning a different class" do
         class DrummerCell < BassistCell
           build do
             BassistCell
@@ -75,8 +75,8 @@ class CellModuleTest < ActiveSupport::TestCase
       end
     end
     
-    context "#create_cell_for with #build" do
-      setup do
+    describe "#create_cell_for with #build" do
+      before do
         @controller.class_eval do
           attr_accessor :bassist
         end
@@ -86,7 +86,7 @@ class CellModuleTest < ActiveSupport::TestCase
         end
       end
       
-      teardown do
+      after do
         MusicianCell.class_eval do
           @builders = false
         end
@@ -95,24 +95,24 @@ class CellModuleTest < ActiveSupport::TestCase
         end
       end
       
-      should "execute the block in controller context" do
+      it "execute the block in controller describe" do
         @controller.bassist = true
         assert_is_a BassistCell,  Cell::Rails.create_cell_for(:musician, @controller)
       end
       
-      should "limit the builder to the receiving class" do
+      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
       
-      should "chain build blocks and execute them by ORing them in the same order" do
+      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 # should never be executed.
+          UnknownCell # it never be executed.
         end
         
         assert_is_a PianistCell, Cell::Rails.create_cell_for(:musician, @controller)  # bassist is false.
@@ -120,15 +120,15 @@ class CellModuleTest < ActiveSupport::TestCase
         assert_is_a BassistCell, Cell::Rails.create_cell_for(:musician, @controller)
       end
       
-      should "use the original cell if no builder matches" do
+      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
       
-      should "stop at the first builder returning a valid cell" do
+      it "stop at the first builder returning a valid cell" do
         
       end
       
-      should "pass options to the block" do
+      it "pass options to the block" do
         BassistCell.build do |opts|
           SingerCell if opts[:sing_the_song]
         end
@@ -136,29 +136,29 @@ class CellModuleTest < ActiveSupport::TestCase
         assert_kind_of SingerCell,  Cell::Rails.create_cell_for(:bassist, @controller, {:sing_the_song => true})
       end
       
-      should "create the original target class if no block matches" do
+      it "create the original target class if no block matches" do
         assert_kind_of PianistCell, Cell::Rails.create_cell_for(:pianist, @controller)
       end
       
-      should "builders should return an empty array per default" do
+      it "builders it return an empty array per default" do
         assert_equal [], PianistCell.send(:builders)
       end
     end
     
-    should "provide class_from_cell_name" do
+    it "provide class_from_cell_name" do
       assert_equal BassistCell, ::Cell::Rails.class_from_cell_name('bassist')
     end
     
     if Cell.rails3_0?
-      should "provide possible_paths_for_state" do
+      it "provide possible_paths_for_state" do
         assert_equal ["bad_guitarist/play", "bassist/play"], cell(:bad_guitarist).send(:possible_paths_for_state, :play)
       end
       
-      should "provide Cell.cell_name" do
+      it "provide Cell.cell_name" do
         assert_equal 'bassist', cell(:bassist).class.cell_name
       end
       
-      should "provide cell_name for modules, too" do
+      it "provide cell_name for modules, too" do
         class SingerCell < Cell::Rails
         end
         
@@ -167,16 +167,20 @@ class CellModuleTest < ActiveSupport::TestCase
     end
   end
   
-  should "respond to #rails3_1_or_more?" do
-    if Rails::VERSION::MINOR == 0
-      assert ! Cell.rails3_1_or_more?
-      assert Cell.rails3_0?
-    elsif Rails::VERSION::MINOR == 1
-      assert Cell.rails3_1_or_more?
-      assert ! Cell.rails3_0?
-    elsif Rails::VERSION::MINOR == 2
-      assert Cell.rails3_1_or_more?
-      assert ! Cell.rails3_0?
+  it "respond to #rails3_1_or_more?" do
+    if Rails::VERSION::MAJOR == 3
+      if Rails::VERSION::MINOR == 0
+        assert ! Cell.rails3_1_or_more?
+        assert Cell.rails3_0?
+      elsif Rails::VERSION::MINOR == 1
+        assert Cell.rails3_1_or_more?
+        assert ! Cell.rails3_0?
+      elsif Rails::VERSION::MINOR == 2
+        assert Cell.rails3_1_or_more?
+        assert ! Cell.rails3_0?
+      end
+    elsif Rails::VERSION::MAJOR == 4
+      assert Cell.rails4_0_or_more?
     end
   end
 end