cells 3.8.0 → 3.8.1

data/.gitignore

@@ -2,7 +2,7 @@
 pkg
 .*~
 .bundle
-Gemfile.lock
+Gemfile*.lock
 test/dummy/log/*.log
 test/dummy/tmp/
 /.rvmrc

data/.travis.yml

@@ -1,3 +1,7 @@
 rvm: 1.9.2
 notifications:
-  irc: "irc.freenode.org#cells"
+  irc: "irc.freenode.org#cells"
+gemfile:
+  - Gemfile
+  - gemfiles/Gemfile.rails3-1
+  - gemfiles/Gemfile.rails3-2

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 3.8.1
+
+* Make it work with Rails 3.2 by removing deprecated stuff.
+
 h2. 3.8.0
 
 * @Cell::Base@ got rid of the controller dependency. If you want the @ActionController@ instance around in your cell, use @Cell::Rails@ - this should be the default in a standard Rails setup. However, if you plan on using a Cell in a Rack middleware or don't need the controller, use @Cell::Base@.

data/README.rdoc

@@ -175,17 +175,21 @@ To run your specs we got a rake task, too!
 
 == Mountable Cells
 
-Cells 3.8 got rid of the ActionController dependency. This essentially means you can mount Cells to routes or use them like a Rack middleware. All you need to do is derive from @Cell::Base@.
+Cells 3.8 got rid of the ActionController dependency. This essentially means you can mount Cells to routes or use them like a Rack middleware. All you need to do is derive from Cell::Base.
 
   class PostCell < Cell::Base
   	..
 
-In your @routes.rb@ file, mount the cell like a Rack app.
+In your <tt>routes.rb</tt> file, mount the cell like a Rack app.
 
   match "/posts" => proc { |env|
     [ 200, {}, [ Cell::Base.render_cell_for(:post, :show) ]]
   }
 
+== Cells is Rails::Engine aware!
+
+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. If you need to, you can customize the view paths changing/appending to the <tt>'app/cell_views'</tt> path configuration. See the @Cell::EngineIntegration@ for more details.
+
 == Rails 2.3 note
 
 In order to copy the cells rake tasks to your app, run

data/cells.gemspec

@@ -27,5 +27,5 @@ 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"
+  s.add_development_dependency "minitest",	">= 2.8.1"
 end

data/gemfiles/Gemfile.rails3-0

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in roar-rails.gemspec
+gemspec path: '../'
+
+gem 'railties', '~> 3.0.11'

data/gemfiles/Gemfile.rails3-1

@@ -0,0 +1,6 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in roar-rails.gemspec
+gemspec path: '../'
+
+gem 'railties', '~> 3.1.0'

data/gemfiles/Gemfile.rails3-2

@@ -0,0 +1,7 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in roar-rails.gemspec
+gemspec path: '../'
+
+gem 'railties', '~> 3.2.0'
+gem 'haml', '~> 3.1.4'

data/lib/cell/base.rb

@@ -4,7 +4,7 @@ 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!
@@ -18,7 +18,6 @@ module Cell
     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.

data/lib/cell/deprecations.rb

@@ -3,41 +3,39 @@ module Cell
   # Note that Deprecations are only available for Cell::Rails.
   module Deprecations
     extend ActiveSupport::Concern
-    
+
     included do
       attr_reader :options
     end
-    
-    
+
+
     module ClassMethods
       def build_for(controller, *args)
         build_class_for(controller, *args).
         new(controller, *args)
       end
     end
-    
-    
-    module InstanceMethods
-      def initialize(parent_controller, *args)
-        super(parent_controller)  # the real Rails.new.
-        setup_backwardibility(*args)
-      end
-      
-      # Some people still like #options and assume it's a hash.
-      def setup_backwardibility(*args)
-        @_options = (args.first.is_a?(Hash) and args.size == 1) ? args.first : args
-        @options  = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(@_options, "#options is deprecated and was removed in Cells 3.7. Please use state-args.")
-      end
-      
-      def render_state(state, *args)
-        return super(state, *args) if state_accepts_args?(state)
-        super(state)  # backward-compat.
-      end
-      
-      def state_accepts_args?(state)
-        method(state).arity != 0
-      end
+
+
+    def initialize(parent_controller, *args)
+      super(parent_controller)  # the real Rails.new.
+      setup_backwardibility(*args)
+    end
+
+    # Some people still like #options and assume it's a hash.
+    def setup_backwardibility(*args)
+      @_options = (args.first.is_a?(Hash) and args.size == 1) ? args.first : args
+      @options  = ActiveSupport::Deprecation::DeprecatedObjectProxy.new(@_options, "#options is deprecated and was removed in Cells 3.7. Please use state-args.")
+    end
+
+    def render_state(state, *args)
+      return super(state, *args) if state_accepts_args?(state)
+      super(state)  # backward-compat.
+    end
+
+    def state_accepts_args?(state)
+      method(state).arity != 0
     end
-    
+
   end
 end

data/lib/cells.rb

@@ -78,9 +78,14 @@ module Cells
   def self.rails3_1_or_more?
     ::Rails::VERSION::MINOR >= 1
   end
+  
+  def self.rails3_2_or_more?  # FIXME: move to tests.
+    ::Rails::VERSION::MINOR >= 2
+  end
 end
 
 require 'cell/rails'
-require 'cells/railtie'
 require 'cells/rails'
 require 'cell/deprecations'
+require 'cells/engines'
+require 'cells/railtie'

data/lib/cells/engines.rb

@@ -0,0 +1,59 @@
+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.
+  #
+  # 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
+    # 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)
+      return if config.view_path_engines == false
+
+      engines = config.view_path_engines || ::Rails::Application::Railties.engines
+      engines.each {|engine| append_engine_view_path!(engine) }
+    end
+
+    # Appends a <tt>Rails::Engine</tt> cell-views path to @Cell::Base@
+    #
+    # The <tt>Rails::Engine</tt> cell-views path is obtained from the <tt>paths['app/cell_views']</tt> configuration.
+    # All existing directories specified at cell-views path will be appended do Cell::Base#view_paths
+    #
+    # Defaults <tt>paths['app/cell_views']</tt> to 'app/cells'
+    #
+    def self.append_engine_view_path!(engine)
+      engine.paths['app/cell_views'] || engine.paths.add('app/cell_views', :with => 'app/cells')
+      Cell::Rails.append_view_path(engine.paths["app/cell_views"].existent_directories)
+    end
+  end
+end

data/lib/cells/railtie.rb

@@ -1,7 +1,7 @@
 require "rails/railtie"
 
 module Cells
-  class Railtie < Rails::Railtie
+  class Railtie < ::Rails::Railtie
     initializer "cells.attach_router" do |app|
       Cell::Base.class_eval do
         include app.routes.url_helpers
@@ -12,6 +12,10 @@ module Cells
       Cell::Base.setup_view_paths!
     end
     
+    initializer "cells.setup_engines_view_paths" do |app|
+      Cells::Engines.append_engines_view_paths_for(app.config.action_controller)
+    end
+    
     rake_tasks do
       load "cells/cells.rake"
     end

data/lib/cells/version.rb

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

data/test/app/cells/bassist/promote.html.erb

@@ -1 +1 @@
-Find me at <%= link_to "vd.com", :action => "index", :controller => "musician" %>
+Find me at <%= link_to "vd.com", musicians_path %>

data/test/app/cells/trumpeter/promote.html.erb

@@ -1 +1 @@
-Find me at <%= link_to "vd.com", root_url %>
+Find me at <%= link_to "vd.com", musicians_url %>

data/test/cells_module_test.rb

@@ -16,7 +16,11 @@ class CellsModuleTest < ActiveSupport::TestCase
           c.append_view_path "/road/to/nowhere"
         end
         
-        assert_equal "/road/to/nowhere", Cell::Rails.view_paths.last.to_s
+        if Cells.rails3_2_or_more?
+          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
+        end
       end
     end
     

data/test/dummy/config/routes.rb

@@ -1,4 +1,4 @@
 Dummy::Application.routes.draw do
   match ':controller(/:action(/:id(.:format)))'
-  root :to => 'musician#index'
+  resources :musicians
 end

data/test/rails/caching_test.rb

@@ -28,30 +28,43 @@ class CachingUnitTest < ActiveSupport::TestCase
   
   context ".state_cache_key" do
     should "accept state only" do
-      assert_equal "cells/director/count/", @class.state_cache_key(:count)
+      if Cells.rails3_2_or_more?
+        assert_equal "cells/Array/director/count/", @class.state_cache_key(:count)
+      else
+        assert_equal "cells/director/count/", @class.state_cache_key(:count)
+      end
     end
     
     should "accept hash as key parts" do
-      assert_equal "cells/director/count/a=1&b=2", @class.state_cache_key(:count, :b=>2, :a=>1)
+      if Cells.rails3_2_or_more?
+        assert_equal "cells/Array/director/count/a=1&b=2", @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)
+      end
     end
     
     should "accept array as key parts" do
-      assert_equal "cells/director/count/1/2/3", @class.state_cache_key(:count, [1,2,3])
+      if Cells.rails3_2_or_more?
+        assert_equal "cells/Array/director/count/Array/1/2/3", @class.state_cache_key(:count, [1,2,3])
+      else
+        assert_equal "cells/director/count/1/2/3", @class.state_cache_key(:count, [1,2,3])
+      end
     end
     
     should "accept string as key parts" do
-      assert_equal "cells/director/count/1/2", @class.state_cache_key(:count, "1/2")
+      if Cells.rails3_2_or_more?
+        assert_equal "cells/Array/director/count/1/2", @class.state_cache_key(:count, "1/2")
+      else
+        assert_equal "cells/director/count/1/2", @class.state_cache_key(:count, "1/2")
+      end
     end
     
     should "accept nil as key parts" do
-      assert_equal "cells/director/count/", @class.state_cache_key(:count, nil)
-    end
-  end
-  
-  
-  context ".expand_cache_key" do
-    should "add :cells namespace" do
-      assert_equal "cells/director/count", @class.send(:expand_cache_key, [:director, :count])
+      if Cells.rails3_2_or_more?
+        assert_equal "cells/Array/director/count/", @class.state_cache_key(:count, nil)
+      else
+        assert_equal "cells/director/count/", @class.state_cache_key(:count, nil)
+      end
     end
   end
   

data/test/rails/cells_test.rb

@@ -54,7 +54,11 @@ class RailsCellsTest < ActiveSupport::TestCase
     should "respond to .setup_view_paths!" do
       swap( Cell::Rails, :view_paths => [])  do
         Cell::Rails.setup_view_paths!
-        assert_equal ActionView::PathSet.new(Cell::Rails::DEFAULT_VIEW_PATHS), Cell::Rails.view_paths
+        if Cells.rails3_2_or_more?
+          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
+        end
       end
     end
     

data/test/rails/render_test.rb

@@ -134,12 +134,12 @@ class RailsRenderTest < ActiveSupport::TestCase
         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"
-      else  # 3.1
+      else  # >= 3.1
         e = assert_raise ActionView::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
         
-        assert_includes e.message, "Missing template bad_guitarist/groove, bassist/groove with {:handlers=>[:erb, :builder, :haml], :formats=>[:html, :text, :js, :css, :ics, :csv, :xml, :rss, :atom, :yaml, :multipart_form, :url_encoded_form, :json], :locale=>[:en, :en]}. Searched in:\n  "
+        assert_includes e.message, "Missing template bad_guitarist/groove, bassist/groove with"
       end
     end
     

data/test/rails/router_test.rb

@@ -6,7 +6,7 @@ module ApplicationTests
 
     context "A Rails app" do
       should "pass url_helpers to the cell instance" do
-        assert_equal "/", BassistCell.new(@controller).root_path
+        assert_equal "/musicians", BassistCell.new(@controller).musicians_path
       end
       
       should "allow cells to use url_helpers" do
@@ -16,7 +16,7 @@ module ApplicationTests
 
         get "index"
         assert_response :success
-        assert_equal "Find me at <a href=\"/musician\">vd.com</a>", @response.body
+        assert_equal "Find me at <a href=\"/musicians\">vd.com</a>\n", @response.body
       end
       
       should "delegate #url_options to the parent_controller" do
@@ -27,13 +27,13 @@ module ApplicationTests
           
         end
         
-        assert_equal "http://cells.rails.org/", BassistCell.new(@controller).root_url
+        assert_equal "http://cells.rails.org/musicians", BassistCell.new(@controller).musicians_url
       end
 
       should "allow cells to use *_url helpers when mixing in AC::UrlFor" do
         get "promote"
         assert_response :success
-        assert_equal "Find me at <a href=\"http://test.host/\">vd.com</a>\n", @response.body
+        assert_equal "Find me at <a href=\"http://test.host/musicians\">vd.com</a>\n", @response.body
       end
 
       should "allow cells to use #config" do

data/test/test_helper.rb

@@ -4,15 +4,8 @@ require 'test/unit'
 require 'shoulda'
 require 'minitest/spec'
 
-# wycats says...
-require 'bundler'
-Bundler.setup
-
-
 ENV['RAILS_ENV'] = 'test'
 
-$:.unshift File.dirname(__FILE__) # add current dir to LOAD_PATHS
-
 require "dummy/config/environment"
 require "rails/test_help" # adds stuff like @routes, etc.
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 8
-  - 0
-  version: 3.8.0
+  - 1
+  version: 3.8.1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-21 00:00:00 +01:00
+date: 2012-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -119,8 +119,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
-        - 0
-        version: "0"
+        - 2
+        - 8
+        - 1
+        version: 2.8.1
   type: :development
   version_requirements: *id008
 description: Cells are view components for Rails. They are lightweight controllers, can be rendered in views and thus provide an elegant and fast way for encapsulation and component-orientation.
@@ -141,6 +143,9 @@ files:
 - Rakefile
 - about.yml
 - cells.gemspec
+- gemfiles/Gemfile.rails3-0
+- gemfiles/Gemfile.rails3-1
+- gemfiles/Gemfile.rails3-2
 - lib/cell.rb
 - lib/cell/base.rb
 - lib/cell/builder.rb
@@ -153,6 +158,7 @@ files:
 - lib/cell/test_case.rb
 - lib/cells.rb
 - lib/cells/cells.rake
+- lib/cells/engines.rb
 - lib/cells/rails.rb
 - lib/cells/railtie.rb
 - lib/cells/version.rb