cells 3.8.1 → 3.8.2

data/.travis.yml

@@ -3,5 +3,6 @@ notifications:
   irc: "irc.freenode.org#cells"
 gemfile:
   - Gemfile
+  - gemfiles/Gemfile.rails3-0
   - gemfiles/Gemfile.rails3-1
   - gemfiles/Gemfile.rails3-2

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 3.8.2
+
+* Engines should work in Rails 3.0 now, too.
+
 h2. 3.8.1
 
 * Make it work with Rails 3.2 by removing deprecated stuff.

data/lib/cell/rails3_0_strategy.rb

@@ -1,3 +1,4 @@
+# This file contains VersionStrategies for the Cell and Cells module for Rails 3.0.
 module Cell
   # Methods to be included in Cell::Rails in 3.0 context, where there's no view inheritance.
   module VersionStrategy
@@ -28,7 +29,7 @@ module Cell
       # Returns all possible view paths for +state+ by invoking #view_for_state on all classes up
       # the inheritance chain.
       def find_class_view_for_state(state)
-        return [view_for_state(state)] unless superclass.respond_to?(:find_class_view_for_state)
+        return [view_for_state(state)] if superclass.abstract?
 
         superclass.find_class_view_for_state(state) << view_for_state(state)
       end
@@ -67,3 +68,12 @@ module Cell
     end
   end
 end
+
+
+module Cells::Engines
+  module VersionStrategy
+    def registered_engines
+      ::Rails::Application.railties.engines
+    end
+  end
+end

data/lib/cell/rails3_1_strategy.rb

@@ -1,3 +1,4 @@
+# This file contains VersionStrategies for the Cell and Cells module for Rails >= 3.1.
 module Cell
   # Methods to be included in Cell::Rails in 3.1 context.
   module VersionStrategy
@@ -24,3 +25,12 @@ module Cell
     end
   end
 end
+
+
+module Cells::Engines
+  module VersionStrategy
+    def registered_engines
+      ::Rails::Application::Railties.engines
+    end
+  end
+end

data/lib/cells/engines.rb

@@ -31,6 +31,8 @@ module Cells
   #   end
   #
   module Engines
+    extend VersionStrategy  # adds #registered_engines.
+    
     # Appends all <tt>Rails::Engine</tt>s cell-views path to Cell::Base#view_paths
     # 
     # All <tt>Rails::Engine</tt>s specified at <tt>config.view_path_engines</tt> will have its cell-views path appended to Cell::Base#view_paths
@@ -40,7 +42,7 @@ module Cells
     def self.append_engines_view_paths_for(config)
       return if config.view_path_engines == false
 
-      engines = config.view_path_engines || ::Rails::Application::Railties.engines
+      engines = config.view_path_engines || registered_engines#::Rails::Application::Railties.engines
       engines.each {|engine| append_engine_view_path!(engine) }
     end
 

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.8.1'
+  VERSION = '3.8.2'
 end

data/test/cell_module_test.rb

@@ -151,7 +151,7 @@ class CellModuleTest < ActiveSupport::TestCase
     
     if Cells.rails3_0?
       should "provide possible_paths_for_state" do
-        assert_equal ["bad_guitarist/play", "bassist/play", "cell/rails/play"], cell(:bad_guitarist).send(:possible_paths_for_state, :play)
+        assert_equal ["bad_guitarist/play", "bassist/play"], cell(:bad_guitarist).send(:possible_paths_for_state, :play)
       end
       
       should "provide Cell.cell_name" do

data/test/rails/render_test.rb

@@ -133,7 +133,7 @@ class RailsRenderTest < ActiveSupport::TestCase
           render_cell(:bad_guitarist, :groove)
         end
         
-        assert_includes e.message, "Missing template cell/rails/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"
+        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_raise ActionView::MissingTemplate do
           render_cell(:bad_guitarist, :groove)

data/test/test_case_test.rb

@@ -53,7 +53,11 @@ class TestCaseTest < Cell::TestCase
     context "#view_assigns" do
       should "be emtpy when nothing was set" do
         render_cell(:bassist, :play)
-        assert_equal({}, view_assigns)
+        if Cells.rails3_0?
+          assert_equal([:lookup_context], view_assigns.keys)
+        else
+          assert_equal({}, view_assigns)
+        end
       end
       
       should "return the instance variables from the last #render_cell" do
@@ -63,7 +67,12 @@ class TestCaseTest < Cell::TestCase
           end
         end
         render_cell(:bassist, :sleep)
-        assert_equal({:duration => "8h"}, view_assigns)
+        if Cells.rails3_0?
+          assert_equal([:lookup_context, :duration], view_assigns.keys)
+          assert_equal("8h", view_assigns[:duration])
+        else
+          assert_equal({:duration => "8h"}, view_assigns)
+        end
       end
     end
     

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 8
-  - 1
-  version: 3.8.1
+  - 2
+  version: 3.8.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 +01:00
+date: 2012-02-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency