cells 3.3.5 → 3.3.6

data/Gemfile.lock

@@ -1,33 +1,61 @@
+PATH
+  remote: .
+  specs:
+    cells (3.6.2)
+      actionpack (~> 3.0)
+      railties (~> 3.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.9)
-      actionpack (= 2.3.9)
-    actionpack (2.3.9)
-      activesupport (= 2.3.9)
-      rack (~> 1.1.0)
-    active_helper (0.2.2)
-      activesupport (>= 2.3.0)
-    activerecord (2.3.9)
-      activesupport (= 2.3.9)
-    activeresource (2.3.9)
-      activesupport (= 2.3.9)
-    activesupport (2.3.9)
-    rack (1.1.0)
-    rails (2.3.9)
-      actionmailer (= 2.3.9)
-      actionpack (= 2.3.9)
-      activerecord (= 2.3.9)
-      activeresource (= 2.3.9)
-      activesupport (= 2.3.9)
-      rake (>= 0.8.3)
-    rake (0.8.7)
+    abstract (1.0.0)
+    actionpack (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activesupport (3.0.8)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    haml (3.1.2)
+    i18n (0.5.0)
+    rack (1.2.3)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    railties (3.0.8)
+      actionpack (= 3.0.8)
+      activesupport (= 3.0.8)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.9.2)
     shoulda (2.11.3)
+    slim (0.9.4)
+      temple (~> 0.3.0)
+      tilt (~> 1.2)
+    temple (0.3.1)
+    thor (0.14.6)
+    tilt (1.3.2)
+    tzinfo (0.3.28)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  active_helper
-  rails (~> 2.3)
+  actionpack (~> 3.0)
+  cells!
+  haml
+  railties (~> 3.0)
   shoulda
+  slim

data/lib/cells/cell/base.rb

@@ -230,6 +230,11 @@ module Cells
         end
       end
       
+      class MissingTemplate < ActionView::ActionViewError
+        def initialize(message, possible_paths)
+          super(message + " and possible paths #{possible_paths}")
+        end
+      end
 
       class_inheritable_accessor :allow_forgery_protection
       self.allow_forgery_protection = true
@@ -395,8 +400,9 @@ module Cells
       ### DISCUSS: moved to Cell::View#find_template in rainhead's fork:
       def find_family_view_for_state(state, action_view)
         missing_template_exception = nil
-
-        possible_paths_for_state(state).each do |template_path|
+        possible_paths  = possible_paths_for_state(state)
+        
+        possible_paths.each do |template_path|
           # we need to catch MissingTemplate, since we want to try for all possible
           # family views.
           begin
@@ -407,7 +413,7 @@ module Cells
           end
         end
 
-        raise missing_template_exception
+        raise MissingTemplate.new(missing_template_exception.message, possible_paths)
       end
 
       # In production mode, the view for a state/template_format is cached.

data/lib/cells/cell/caching.rb

@@ -121,7 +121,7 @@ module Cells
       end
 
       def read_fragment(key, cache_options = nil) #:nodoc:
-        returning self.class.cache_store.read(key, cache_options) do |content|
+        self.class.cache_store.read(key, cache_options).tap do |content|
           log "Cell Cache hit: #{key}" unless content.blank?
         end
       end

data/lib/cells/cell/test_case.rb

@@ -68,6 +68,7 @@ module Cell
         @controller.request = @request
         @controller.response = @response
         @controller.params = {}
+        @controller.send(:initialize_current_url)
       end
       
       # Use this for functional tests of your application cells.

data/lib/cells/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Cells
-  VERSION = '3.3.5'
+  VERSION = '3.3.6'
 end

data/rails/init.rb

@@ -5,7 +5,13 @@ require 'cells'
 #
 #   * +app/cells+
 #
-ActiveSupport::Dependencies.load_paths << Rails.root.join(*%w[app cells])
+dep = ::ActiveSupport::Dependencies
+
+if dep.respond_to?(:autoload_paths)
+  dep.autoload_paths << Rails.root.join(*%w[app cells])
+else
+  dep.load_paths << Rails.root.join(*%w[app cells])
+end
 
 # Rails initialization hook.
 if defined?(Rails)
@@ -16,15 +22,23 @@ if defined?(Rails)
       if plugin.engine? && File.exists?(engine_cells_dir)
         # propagate the view- and code path of this engine-cell:
         ::Cell::Base.view_paths << engine_cells_dir
-        ::ActiveSupport::Dependencies.load_paths << engine_cells_dir
-
+        if dep.respond_to?(:autoload_paths)
+          dep.autoload_paths << engine_cells_dir
+        else
+          dep.load_paths << engine_cells_dir
+        end
+        
         # if a path is in +load_once_path+ it won't be reloaded between requests.
         unless config.reload_plugins?
-          ::ActiveSupport::Dependencies.load_once_paths << engine_cells_dir
+          if dep.respond_to?(:autoload_once_paths)
+            dep.autoload_once_paths << engine_cells_dir
+          else
+            dep.load_once_paths << engine_cells_dir
+          end
         end
       end
     end
   end
 else
   puts "[cells:] NOTE: Rails environment not available. Running isolated."
-end
+end

data/test/cells_test.rb

@@ -174,7 +174,7 @@ class CellsTest < ActionController::TestCase
     cell = MyTestCell.new(@controller)
     ### TODO: production <-> development/test context.
 
-    assert_raises ActionView::MissingTemplate do
+    assert_raises Cell::Base::MissingTemplate do
       c = cell.render_state(:missing_view)
     end
   end

data/test/dummy/tmp/app/cells/blog/post_cell.rb

@@ -0,0 +1,7 @@
+class Blog::PostCell < Cell::Rails
+
+  def latest
+    render
+  end
+
+end

data/test/render_test.rb

@@ -44,12 +44,15 @@ class RenderTest < ActiveSupport::TestCase
   end
 
   def test_render_with_not_existing_view
-    assert_raises ActionView::MissingTemplate do
+    assert_raises Cell::Base::MissingTemplate do
       render_cell(:a, :not_existing_view)
     end
-    assert_raises ActionView::MissingTemplate do
+    
+    e = assert_raise Cell::Base::MissingTemplate do
       render_cell(:b, :not_existing_view)
     end
+    
+    assert_equal "Missing template a/not_existing_view.erb in view path app/cells:app/cells/layouts:/home/nick/projects/cells/test/app/cells:/home/nick/projects/cells/test/app/cells/layouts and possible paths [\"b/not_existing_view\", \"a/not_existing_view\"]", e.message
   end
 
   def test_render_without_arguments_with_locally_existing_view

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: cells
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 3
   - 3
-  - 5
-  version: 3.3.5
+  - 6
+  version: 3.3.6
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -15,10 +14,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-06 00:00:00 +02:00
+date: 2011-06-29 00:00:00 +02:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: active_helper
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  prerelease: false
+  version_requirements: *id003
 description: Cells are lightweight controllers for Rails and can be rendered in controllers and views, providing an elegant and fast way for encapsulation and component-orientation.
 email: apotonick@gmail.com
 executables: []
@@ -50,7 +88,6 @@ files:
 - lib/cells/rails/action_view.rb
 - lib/cells/version.rb
 - rails/init.rb
-- rails/tasks/log.rake
 - rails_generators/cell/USAGE
 - rails_generators/cell/cell_generator.rb
 - rails_generators/cell/templates/cell.rb
@@ -61,35 +98,36 @@ files:
 - rails_generators/cells_install/cells_install_generator.rb
 - rails_generators/cells_install/templates/initializer.rb
 - rails_generators/cells_install/templates/tasks.rake
-- test/rails_test.rb
 - test/active_helper_test.rb
-- test/capture_helper_test.rb
-- test/assertions_helper_test.rb
-- test/cell_generator_test.rb
-- test/test_helper.rb
-- test/support/internal_assertions_helper.rb
-- test/bugs_test.rb
-- test/render_test.rb
-- test/test_case_test.rb
-- test/cells_test.rb
-- test/helper_test.rb
-- test/caching_test.rb
-- test/app/controllers/cells_test_controller.rb
 - test/app/cells/bassist_cell.rb
-- test/app/cells/really_module/nested_cell.rb
 - test/app/cells/cells_test_one_cell.rb
 - test/app/cells/cells_test_two_cell.rb
+- test/app/cells/really_module/nested_cell.rb
 - test/app/cells/simple_cell.rb
 - test/app/cells/test_cell.rb
+- test/app/controllers/cells_test_controller.rb
 - test/app/helpers/application_helper.rb
 - test/app/helpers/helper_using_cell_helper.rb
+- test/assertions_helper_test.rb
+- test/bugs_test.rb
+- test/caching_test.rb
+- test/capture_helper_test.rb
+- test/cell_generator_test.rb
+- test/cells_test.rb
+- test/dummy/tmp/app/cells/blog/post_cell.rb
+- test/helper_test.rb
+- test/rails_test.rb
+- test/render_test.rb
+- test/support/internal_assertions_helper.rb
+- test/test_case_test.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://cells.rubyforge.org
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,7 +135,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -106,7 +143,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -118,25 +154,26 @@ signing_key:
 specification_version: 3
 summary: Cells are lightweight controllers for Rails and can be rendered in controllers and views, providing an elegant and fast way for encapsulation and component-orientation.
 test_files: 
-- test/rails_test.rb
 - test/active_helper_test.rb
-- test/capture_helper_test.rb
-- test/assertions_helper_test.rb
-- test/cell_generator_test.rb
-- test/test_helper.rb
-- test/support/internal_assertions_helper.rb
-- test/bugs_test.rb
-- test/render_test.rb
-- test/test_case_test.rb
-- test/cells_test.rb
-- test/helper_test.rb
-- test/caching_test.rb
-- test/app/controllers/cells_test_controller.rb
 - test/app/cells/bassist_cell.rb
-- test/app/cells/really_module/nested_cell.rb
 - test/app/cells/cells_test_one_cell.rb
 - test/app/cells/cells_test_two_cell.rb
+- test/app/cells/really_module/nested_cell.rb
 - test/app/cells/simple_cell.rb
 - test/app/cells/test_cell.rb
+- test/app/controllers/cells_test_controller.rb
 - test/app/helpers/application_helper.rb
 - test/app/helpers/helper_using_cell_helper.rb
+- test/assertions_helper_test.rb
+- test/bugs_test.rb
+- test/caching_test.rb
+- test/capture_helper_test.rb
+- test/cell_generator_test.rb
+- test/cells_test.rb
+- test/dummy/tmp/app/cells/blog/post_cell.rb
+- test/helper_test.rb
+- test/rails_test.rb
+- test/render_test.rb
+- test/support/internal_assertions_helper.rb
+- test/test_case_test.rb
+- test/test_helper.rb

data/rails/tasks/log.rake

@@ -1,9 +0,0 @@
-namespace :log do
-  desc "Truncates all *.log files in log/ to zero bytes"
-  task :cleeeeear do
-    FileList["log/*.log"].each do |log_file|
-      f = File.open(log_file, "w")
-      f.close
-    end
-  end
-end