cells 3.8.2 → 3.8.3

data/CHANGES.textile

@@ -1,3 +1,7 @@
+h2. 3.8.3
+
+* Added @Engines.existent_directories_for@ to prevent Rails 3.0 from crashing when it detects engines. 
+
 h2. 3.8.2
 
 * Engines should work in Rails 3.0 now, too.

data/lib/cell/rails3_0_strategy.rb

@@ -75,5 +75,9 @@ module Cells::Engines
     def registered_engines
       ::Rails::Application.railties.engines
     end
+    
+    def existent_directories_for(path)
+      path.to_a.select { |d| File.directory?(d) }
+    end
   end
 end

data/lib/cell/rails3_1_strategy.rb

@@ -32,5 +32,9 @@ module Cells::Engines
     def registered_engines
       ::Rails::Application::Railties.engines
     end
+    
+    def existent_directories_for(path)
+      path.existent_directories
+    end
   end
 end

data/lib/cells/engines.rb

@@ -31,7 +31,7 @@ module Cells
   #   end
   #
   module Engines
-    extend VersionStrategy  # adds #registered_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
     # 
@@ -42,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 || registered_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
 
@@ -55,7 +55,7 @@ module 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)
+      Cell::Rails.append_view_path(existent_directories_for(engine.paths["app/cell_views"]))
     end
   end
 end

data/lib/cells/version.rb

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

data/test/rails/caching_test.rb

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

metadata

@@ -1,140 +1,113 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: cells
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 3
-  - 8
-  - 2
-  version: 3.8.2
+version: !ruby/object:Gem::Version
+  version: 3.8.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-08 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: actionpack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &78710300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *78710300
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: &78710010 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *78710010
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &78709820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *78709820
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &78709590 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: haml
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *78709590
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: &78709380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: slim
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *78709380
+- !ruby/object:Gem::Dependency
+  name: slim
+  requirement: &78709170 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: tzinfo
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *78709170
+- !ruby/object:Gem::Dependency
+  name: tzinfo
+  requirement: &78708950 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *78708950
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &78708700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 8
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         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.
-email: 
+  prerelease: false
+  version_requirements: *78708700
+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.
+email:
 - apotonick@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGES.textile
@@ -252,37 +225,28 @@ files:
 - test/rails/view_test.rb
 - test/test_case_test.rb
 - test/test_helper.rb
-has_rdoc: true
 homepage: http://cells.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: View Components for Rails.
 test_files: []
-