cells 3.9.0 → 3.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f0e0a0f0e9e01a740baa8dcabe12f82876ca1ef
-  data.tar.gz: a0a66d1ecd8e09265efc3a8c5fe7e293bc8df5d1
+  metadata.gz: f2a369ee523b519082124fc42f359172124f6e45
+  data.tar.gz: bc788476880fec68c6134ab8111f5ea62d519b26
 SHA512:
-  metadata.gz: 33577d3b2e94dde50fb8f68ff2695fbaa1dbc73a04fb839fbb14e4ca215f83d01b854ec57454cf75488210a2ef8060312cdfc9ae865ece439af2fd84ab4df111
-  data.tar.gz: 7c03b94c1a6dee95e672a0411025e9fa7afb6414d4a3c43a4038b70e45f381f4bde3d9cf66a2364f953ef381b27220af690da67685f5aaddb8be8e09d4f3a4c0
+  metadata.gz: 54a6bbc71fd9fadae7fd54a940bf1c160b9675e03eff6b2320f5dd4c590fc22229f692e6f7db77b06ed3c64ef09186cee732cbda52e7a6c55295a7c46dfea7c0
+  data.tar.gz: 2271f4d6188a31b7b2c64617fffaf83adc30c8c3cff7c18124072fb8aff1c03c5f3fb267b87cf313099eb5a70c21571bd35a5f324428c632ab7319a61bbd188a

data/.travis.yml

@@ -9,3 +9,4 @@ gemfile:
   - gemfiles/Gemfile.rails3-1
   - gemfiles/Gemfile.rails3-2
   - gemfiles/Gemfile.rails4-0
+  - gemfiles/Gemfile.rails4-1

data/CHANGES.textile

@@ -1,3 +1,8 @@
+h2. 3.9.1
+
+* Runs with Rails 4.1 now.
+* Internal changes on `Layouts` to prepare 4.1 compat.
+
 h2. 3.9.0
 
 * Cells in engines are now recognized under Rails 4.0.

data/README.md

@@ -367,10 +367,13 @@ Note that this currently "only" works with Rails 3.2-4.0.
 
 Now `Rails::Engine`s can contribute to Cells view paths. By default, any 'app/cells' found inside any Engine is automatically included into Cells view paths. If you need to, you can customize the view paths changing/appending to the `'app/cell_views'` path configuration. See the `Cell::EngineIntegration` for more details.
 
-## Generators
+
+## Generator Options
 
 By default, generated cells inherit from `Cell::Rails`. If you want to change this, specify your new class name in `config/application.rb`:
 
+### Base Class
+
 ```ruby
 module MyApp
   class Application < Rails::Application
@@ -381,6 +384,16 @@ module MyApp
 end
 ```
 
+### Base Path
+
+You can configure the cells path in case your cells don't reside in `app/cells`.
+
+```ruby
+config.generators do |g|
+  g.base_cell_path "app/widgets"
+end
+```
+
 ## Rails 2.3 note
 
 In order to copy the cells rake tasks to your app, run

data/cells.gemspec

@@ -26,5 +26,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "haml"
   s.add_development_dependency "slim"
   s.add_development_dependency "tzinfo" # FIXME: why the hell do we need this for 3.1?
-  s.add_development_dependency "minitest",	"~> 4.7.5"
+  s.add_development_dependency "minitest",	">= 4.7.5"
+  s.add_development_dependency "activemodel"
 end

data/gemfiles/Gemfile.rails3-0

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'railties', '3.0.20'
+gem 'minitest', '4.7.5'

data/gemfiles/Gemfile.rails3-1

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'railties', '~> 3.1.0'
+gem 'minitest', '4.7.5'

data/gemfiles/Gemfile.rails3-2

@@ -4,3 +4,4 @@ source "http://rubygems.org"
 gemspec path: '../'
 
 gem 'railties', '~> 3.2.0'
+gem 'minitest', '4.7.5'

data/gemfiles/Gemfile.rails4-0

@@ -3,5 +3,8 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in cells.gemspec
 gemspec path: '../'
 
-gem 'railties', '4.0.0'
-gem 'activemodel'
+gem 'railties', '4.0.2'
+gem 'activemodel', '4.0.2'
+gem 'minitest', '4.7.5'
+
+gem 'label', :path => "../test/dummy/label"

data/gemfiles/Gemfile.rails4-1

@@ -0,0 +1,10 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in cells.gemspec
+gemspec path: '../'
+
+gem 'railties', '4.1.0.beta1'
+gem 'activemodel', '4.1.0.beta1'
+gem 'minitest', '5.2.0'
+
+gem 'label', :path => "../test/dummy/label"

data/lib/cell/base.rb

@@ -5,21 +5,29 @@ require 'cell/rendering'
 require 'cell/dsl'
 
 module Cell
-  def self.rails3_0?
-    ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR == 0
-  end
+  module RailsVersion
+    def rails3_0?
+      ::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR == 0
+    end
 
-  def self.rails3_1_or_more?
-    (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 1) or ::ActionPack::VERSION::MAJOR > 3
-  end
+    def rails3_1_or_more?
+      (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 1)
+    end
 
-  def self.rails3_2_or_more?
-    (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2) or ::ActionPack::VERSION::MAJOR > 3
-  end
+    def rails3_2_or_more?
+      (::ActionPack::VERSION::MAJOR == 3 and ::ActionPack::VERSION::MINOR >= 2)
+    end
+
+    def rails4_0?
+      ::ActionPack::VERSION::MAJOR == 4 and ::ActionPack::VERSION::MINOR == 0
+    end
 
-  def self.rails4_0_or_more?
-    (::ActionPack::VERSION::MAJOR == 4 and ::ActionPack::VERSION::MINOR >= 0) or ::ActionPack::VERSION::MAJOR > 4
+    def rails4_1_or_more?
+      (::ActionPack::VERSION::MAJOR == 4 and ::ActionPack::VERSION::MINOR >= 1) or ::ActionPack::VERSION::MAJOR > 4
+    end
+    alias_method :rails4_1?, :rails4_1_or_more?
   end
+  extend RailsVersion # TODO: deprecate in 3.10.
 
 
   class Base < AbstractController::Base
@@ -30,12 +38,14 @@ module Cell
 
     extend Builder
     include AbstractController
-    include AbstractController::Rendering, Layouts, Helpers, Callbacks, Translation, Logger
+    include AbstractController::Rendering, Helpers, Callbacks, Translation, Logger
 
     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?
+    require 'cell/rails4_0_strategy' if Cell.rails4_0?
+    require 'cell/rails4_1_strategy' if Cell.rails4_1_or_more?
     include VersionStrategy
+    include Layouts
     include Rendering
     include Caching
     include Cell::DSL

data/lib/cell/rails/view_model.rb

@@ -12,8 +12,8 @@ class Cell::Rails
     attr_reader :model
 
     module ClassMethods
-      def property(name)
-        delegate name, :to => :model
+      def property(*names)
+        delegate *names, :to => :model
       end
     end
     extend ActiveSupport::Concern
@@ -106,7 +106,7 @@ class Cell::Rails
   end
 
   # FIXME: fix that in rails core.
-  if Cell.rails4_0_or_more?
+  if Cell.rails4_0?
     include LinkToHelper
   else
     include ActionView::Helpers::UrlHelper

data/lib/cell/rails3_0_strategy.rb

@@ -1,21 +1,23 @@
 # This file contains VersionStrategies for the Cell and Cells module for Rails 3.0.
 module Cell
+  Layouts = AbstractController::Layouts
+
   # Methods to be included in Cell::Rails in 3.0 context, where there's no view inheritance.
   module VersionStrategy
     extend ActiveSupport::Concern
-    
+
     class MissingTemplate < ActionView::ActionViewError
       def initialize(message, possible_paths)
         super(message + " and possible paths #{possible_paths}")
       end
     end
-    
-    
+
+
     module ClassMethods
       def helper_modules
         [_helpers, _routes.url_helpers]
       end
-      
+
       # Return the default view path for +state+. Override this if you cell has a differing naming style.
       def view_for_state(state)
         "#{cell_name}/#{state}"
@@ -33,13 +35,13 @@ module Cell
         controller_path
       end
     end
-    
+
   private
     # Computes all possible paths for +state+ by traversing up the inheritance chain.
     def possible_paths_for_state(state)
       self.class.find_class_view_for_state(state).reverse!
     end
-    
+
     # Climbs up the inheritance chain, looking for a view for the current +state+.
     def find_family_view_for_state(state)
       exception       = nil
@@ -55,10 +57,10 @@ module Cell
 
       raise MissingTemplate.new(exception.message, possible_paths)
     end
-    
+
     def process_opts_for(opts, state)
       lookup_context.formats = opts.delete(:format) if opts[:format]
-      
+
       opts[:template] = find_family_view_for_state(opts.delete(:view) || state)
     end
   end
@@ -71,7 +73,7 @@ module Cells
       def registered_engines
         ::Rails.application.railties.engines
       end
-      
+
       def existent_directories_for(path)
         path.to_a.select { |d| File.directory?(d) }
       end

data/lib/cell/rails3_1_strategy.rb

@@ -1,22 +1,24 @@
 # This file contains VersionStrategies for the Cell and Cells module for Rails >= 3.1.
 module Cell
+  Layouts = AbstractController::Layouts
+
   # Methods to be included in Cell::Rails in 3.1 context.
   module VersionStrategy
     extend ActiveSupport::Concern
-    
+
     include AbstractController::UrlFor  # must be included before _routes is set in Railstie. # TODO: remove that.
-    
-    
+
+
     module ClassMethods
       def helper_modules
         [_routes.url_helpers, _routes.mounted_helpers, _helpers]
       end
     end
-    
-  private    
+
+  private
     def process_opts_for(opts, state)
       opts[:action] = opts[:view] || state
-      
+
       lookup_context.formats = [opts.delete(:format)] if opts[:format]
     end
   end
@@ -29,7 +31,7 @@ module Cells
       def registered_engines
         ::Rails.application.railties.engines
       end
-      
+
       def existent_directories_for(path)
         path.existent_directories
       end

data/lib/cell/rails4_0_strategy.rb

@@ -1,22 +1,23 @@
-# This file contains VersionStrategies for the Cell and Cells module for Rails >= 3.1.
 module Cell
+  Layouts = AbstractController::Layouts
+
   # Methods to be included in Cell::Rails in 3.1 context.
   module VersionStrategy
     extend ActiveSupport::Concern
-    
+
     include AbstractController::UrlFor  # must be included before _routes is set in Railstie. # TODO: remove that.
-    
-    
+
+
     module ClassMethods
       def helper_modules
         [_routes.url_helpers, _routes.mounted_helpers, _helpers]
       end
     end
-    
-  private    
+
+  private
     def process_opts_for(opts, state)
       opts[:action] = opts[:view] || state
-      
+
       lookup_context.formats = [opts.delete(:format)] if opts[:format]
     end
   end
@@ -29,7 +30,7 @@ module Cells
       def registered_engines
         ::Rails::Engine::Railties.engines
       end
-      
+
       def existent_directories_for(path)
         path.existent_directories
       end

data/lib/cell/rails4_1_strategy.rb

@@ -0,0 +1,40 @@
+# This file contains VersionStrategies for the Cell and Cells module for Rails >= 3.1.
+module Cell
+  Layouts = ActionView::Layouts
+
+  # Methods to be included in Cell::Rails in 3.1 context.
+  module VersionStrategy
+    extend ActiveSupport::Concern
+
+    include AbstractController::UrlFor  # must be included before _routes is set in Railstie. # TODO: remove that.
+
+
+    module ClassMethods
+      def helper_modules
+        [_routes.url_helpers, _routes.mounted_helpers, _helpers]
+      end
+    end
+
+  private
+    def process_opts_for(opts, state)
+      opts[:action] = opts[:view] || state
+
+      lookup_context.formats = [opts.delete(:format)] if opts[:format]
+    end
+  end
+end
+
+
+module Cells
+  module Engines
+    module VersionStrategy
+      def registered_engines
+        ::Rails::Engine::Railties.new
+      end
+
+      def existent_directories_for(path)
+        path.existent_directories
+      end
+    end
+  end
+end

data/lib/cell/test_case.rb

@@ -149,5 +149,15 @@ module Cell
     def invoke(state, *args)
       @last_invoke = self.class.controller_class.new(@controller).render_state(state, *args)
     end
+
+    if Cell.rails4_0? or Cell.rails4_1?
+      include ActiveSupport::Testing::ConstantLookup
+      def self.determine_default_controller_class(name) # FIXME: fix that in Rails 4.x.
+        determine_constant_from_test_name(name) do |constant|
+          Class === constant #&& constant < ActionController::Metal
+        end
+      end
+    end
+
   end
 end

data/lib/cells/engines.rb

@@ -3,38 +3,38 @@ module Cells
   # By default, any 'app/cells' found inside any Engine is automatically included into Cells view paths.
   #
   # You can customize the view paths changing/appending to the <tt>'app/cell_views'</tt> path configuration:
-  # 
+  #
   #   module MyAwesome
   #     class Engine < Rails::Engine
   #       # loads views from 'cell/views' and NOT from 'app/cells'
   #       config.paths.add 'app/cell_views', :with => 'cell/views'
-  # 
+  #
   #       # appends 'lib/my_cells_view_path' to this Railtie view path contribution
   #       config.paths['app/cell_views'] << 'lib/my_cells_view_path'
   #     end
   #   end
-  # 
+  #
   # You can manually specify which Engines will be added to Cell view paths
-  # 
+  #
   #   Cell::Base.config.view_path_engines = [MyAwesome::Engine]
-  # 
+  #
   # And even disable the automatic loading
-  # 
+  #
   #   Cell::Base.config.view_path_engines = false
-  # 
+  #
   # You can programatically append a Rails::Engine to Cell view path
-  # 
+  #
   #   Cells.setup do |config|
   #     config.append_engine_view_path!(MyEngine::Engine)
   #   end
   #
   module Engines
     extend VersionStrategy  # adds #registered_engines and #existent_directories_for.
-    
+
     # 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
-    #  
+    #
     # Defaults <tt>config.view_path_engines</tt> to all loaded <tt>Rails::Engine</tt>s.
     #
     def self.append_engines_view_paths_for(config)
@@ -52,6 +52,8 @@ module Cells
     # Defaults <tt>paths['app/cell_views']</tt> to 'app/cells'
     #
     def self.append_engine_view_path!(engine)
+      return unless engine.is_a?(::Rails::Engine) # In Rails 4.1, this could be a Rails::Railtie, which doesn't make sense.
+
       engine.paths['app/cell_views'] || engine.paths.add('app/cell_views', :with => 'app/cells')
       Cell::Rails.append_view_path(existent_directories_for(engine.paths["app/cell_views"]))
     end