cells 3.6.5 → 3.6.6

data/.gitignore

@@ -3,5 +3,5 @@ pkg
 .*~
 .bundle
 Gemfile.lock
-test/dummy/log/test.log
+test/dummy/log/*.log
 test/dummy/tmp/

data/CHANGES.textile

@@ -1,3 +1,9 @@
+h2. 3.6.6
+
+h3. Changes
+  * Added the @:format@ option for @#render@ which should be used with caution. Sorry for that.
+  * Removed the useless @layouts/@ view path from Cell::Base. 
+
 h2. 3.6.5
 
 h3. Bugfixes

data/README.rdoc

@@ -149,7 +149,9 @@ So what if you wanna test the cart cell? Use the generated <tt>test/cells/cart_c
       assert_select "#cart", "You have 3 items in your shopping cart."
     end
 
-Run your tests with
+Don't forget to put <tt>require 'cell/test_case'</tt> in your project's <tt>test/test_helper.rb</tt> file.
+
+Then, run your tests with
 
   $ rake test:cells
 

data/Rakefile

@@ -3,7 +3,9 @@ Bundler::GemHelper.install_tasks
 
 require 'rake/testtask'
 
-desc 'Test the cells plugin.'
+desc 'Test the cells gem.'
+task :default => :test
+
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   test.test_files = FileList['test/*_test.rb', 'test/rails/*_test.rb'] - ['test/rails/capture_test.rb']

data/cells.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
   s.add_dependency "actionpack",  "~> 3.0"
   s.add_dependency "railties",    "~> 3.0"
   
+  s.add_development_dependency "rake"
   s.add_development_dependency "shoulda"
   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?
 end

data/lib/cell.rb

@@ -5,7 +5,6 @@ module Cell
   
   DEFAULT_VIEW_PATHS = [
     File.join('app', 'cells'),
-    File.join('app', 'cells', 'layouts')
   ]
     
   module ClassMethods

data/lib/cell/rails.rb

@@ -77,7 +77,7 @@ module Cell
     # +:file+::   Specifies the name of the file template to render.
     # +:nothing+:: Doesn't invoke the rendering process.
     # +:state+::  Instantly invokes another rendering cycle for the passed state and returns. You may pass arbitrary state-args to the called state.  
-    # +:format+:: Sets a different template format, e.g. +:json+.
+    # +:format+:: Sets a different template format, e.g. +:json+. Use this option with caution as it currently modifies the global format variable. This might lead to unexpected subsequent render behaviour due to a design flaw in Rails.
     #
     # Example:
     #  class MusicianCell < ::Cell::Base

data/lib/cell/rails3_1_strategy.rb

@@ -20,7 +20,7 @@ module Cell
     def process_opts_for(opts, state)
       opts[:action] = opts[:view] || state
       
-      lookup_context.formats = opts.delete(:format) if opts[:format]
+      lookup_context.formats = [opts.delete(:format)] if opts[:format]
     end
   end
 end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.6.5'
+  VERSION = '3.6.6'
 end

data/test/dummy/config/application.rb

@@ -17,5 +17,7 @@ module Dummy
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
+    
+    config.cache_store = :memory_store
   end
 end

data/test/rails/cells_test.rb

@@ -48,7 +48,7 @@ class RailsCellsTest < ActiveSupport::TestCase
   
   context "A rails cell" do
     should "respond to DEFAULT_VIEW_PATHS" do
-      assert_equal ["app/cells", "app/cells/layouts"], Cell::Base::DEFAULT_VIEW_PATHS
+      assert_equal ["app/cells"], Cell::Base::DEFAULT_VIEW_PATHS
     end
     
     should "respond to .setup_view_paths!" do

data/test/rails/render_test.rb

@@ -18,6 +18,13 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "alert(\"Doo\");\n", render_cell(:bassist, :play)
     end
     
+    should_eventually "accept :format without messing up following render calls" do
+      BassistCell.class_eval do
+        def play; render(:format => :js) + render; end
+      end
+      assert_equal "alert(\"Doo\");\nDoo\n", render_cell(:bassist, :play)
+    end
+    
     should "also render alternative engines, like haml" do
       BassistCell.class_eval do
         def sing; render; end

data/test/rails/router_test.rb

@@ -24,6 +24,7 @@ module ApplicationTests
           def default_url_options
             {:host => "cells.rails.org"}
           end
+          
         end
         
         assert_equal "http://cells.rails.org/", BassistCell.new(@controller).root_url

data/test/test_helper.rb

@@ -21,7 +21,6 @@ test_app_dir  = File.join(gem_dir, 'test', 'app')
 require 'cells'
 
 Cell::Rails.append_view_path(File.join(test_app_dir, 'cells'))
-Cell::Rails.append_view_path(File.join(test_app_dir, 'cells', 'layouts'))
 
 require "cell/test_case"
 # Extend TestCase.

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 6
-  - 5
-  version: 3.6.5
+  - 6
+  version: 3.6.6
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-15 00:00:00 +02:00
+date: 2011-09-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -46,7 +46,7 @@ dependencies:
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: rake
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -59,7 +59,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: haml
+  name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -72,7 +72,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: slim
+  name: haml
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -84,6 +84,32 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: slim
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: tzinfo
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id007
 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