cells 3.7.0 → 3.7.1

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 3.7.1
+
+* Runs with Rails 3.2 now. Thanks to Mohammad Satrio [tyok] for fixing.
+
 h2. 3.7.0
 
 h3. Changes

data/lib/cell/base.rb

@@ -0,0 +1,41 @@
+require 'abstract_controller'
+require 'cell/builder'
+require 'cell/caching'
+require 'cell/rendering'
+require 'cell/rails3_0_strategy' if Cells.rails3_0?
+require 'cell/rails3_1_strategy' if Cells.rails3_1_or_more?
+    
+module Cell
+  class Base < AbstractController::Base
+    abstract!
+    DEFAULT_VIEW_PATHS = [File.join('app', 'cells')]
+    
+    extend Builder
+    include AbstractController
+    include AbstractController::Rendering, Layouts, Helpers, Callbacks, Translation, Logger
+    
+    include VersionStrategy
+    include Rendering
+    include Caching
+    
+    
+    class View < ActionView::Base
+      def render(*args, &block)
+        options = args.first.is_a?(::Hash) ? args.first : {}  # this is copied from #render by intention.
+        
+        return controller.render(*args, &block) if options[:state] or options[:view]
+        super
+      end
+    end
+    
+    
+    # Called in Railtie at initialization time.
+    def self.setup_view_paths!
+      self.view_paths = DEFAULT_VIEW_PATHS
+    end
+    
+    def self.controller_path
+      @controller_path ||= name.sub(/Cell$/, '').underscore unless anonymous?
+    end
+  end
+end

data/lib/cell/rails.rb

@@ -10,7 +10,7 @@ module Cell
     
     if Cells.rails3_0?
       require 'cell/rails3_0_strategy'
-    elsif Cells.rails3_1?
+    elsif Cells.rails3_1_or_more?
       require 'cell/rails3_1_strategy'
     end
     

data/lib/cells.rb

@@ -75,8 +75,8 @@ module Cells
     ::Rails::VERSION::MINOR == 0
   end
   
-  def self.rails3_1?
-    ::Rails::VERSION::MINOR == 1
+  def self.rails3_1_or_more?
+    ::Rails::VERSION::MINOR >= 1
   end
 end
 

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.7.0'
+  VERSION = '3.7.1'
 end

data/test/cells_module_test.rb

@@ -20,12 +20,15 @@ class CellsModuleTest < ActiveSupport::TestCase
       end
     end
     
-    should "respond to #rails3_1?" do
+    should "respond to #rails3_1_or_more?" do
       if Rails::VERSION::MINOR == 0
-        assert ! Cells.rails3_1?
+        assert ! Cells.rails3_1_or_more?
         assert Cells.rails3_0?
-      elsif
-        assert Cells.rails3_1?
+      elsif Rails::VERSION::MINOR == 1
+        assert Cells.rails3_1_or_more?
+        assert ! Cells.rails3_0?
+      elsif Rails::VERSION::MINOR == 2
+        assert Cells.rails3_1_or_more?
         assert ! Cells.rails3_0?
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 7
-  - 0
-  version: 3.7.0
+  - 1
+  version: 3.7.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 +02:00
+date: 2011-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -129,6 +129,7 @@ files:
 - about.yml
 - cells.gemspec
 - lib/cell.rb
+- lib/cell/base.rb
 - lib/cell/caching.rb
 - lib/cell/deprecations.rb
 - lib/cell/rails.rb