cells 3.4.1 → 3.4.2

data/Gemfile

@@ -2,9 +2,9 @@ source :gemcutter
 gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'	# needed in router_test, whatever.
 
 #gem "rails" , :path => "/home/nick/projects/rails"
-gem "rails" #, :git => "http://github.com/rails/rails.git"
+gem "rails", '3.0.0' #, :git => "http://github.com/rails/rails.git"
 gem "haml"
 
 group :test do
   gem "shoulda"
-end
+end

data/Gemfile.lock

@@ -33,9 +33,9 @@ GEM
     builder (2.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    haml (3.0.15)
+    haml (3.0.21)
     i18n (0.4.1)
-    mail (2.2.5)
+    mail (2.2.6.1)
       activesupport (>= 2.3.6)
       mime-types
       treetop (>= 1.4.5)
@@ -44,7 +44,7 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.4)
+    rack-test (0.5.6)
       rack (>= 1.0)
     rails (3.0.0)
       actionmailer (= 3.0.0)
@@ -62,7 +62,7 @@ GEM
     rake (0.8.7)
     shoulda (2.11.3)
     sqlite3-ruby (1.2.5)
-    thor (0.14.0)
+    thor (0.14.3)
     treetop (1.4.8)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -72,6 +72,6 @@ PLATFORMS
 
 DEPENDENCIES
   haml
-  rails
+  rails (= 3.0.0)
   shoulda
   sqlite3-ruby (= 1.2.5)

data/README.rdoc

@@ -22,7 +22,7 @@ Rails 3:
 
 Rails 2.3:
 
-  gem install cells -v 3.3.4
+  gem install cells -v 3.3.5
 
 
 == Generate
@@ -129,6 +129,12 @@ Run your tests with
 
 That's easy, clean and strongly improves your component-driven software quality. How'd you do that with partials?
 
+=== Rails 2.3 note
+
+In order to copy the cells rake tasks to your app, run
+
+  $ script/generate cells_install
+
 
 == More features
 

data/lib/cell/rails.rb

@@ -19,28 +19,27 @@ module Cell
     end
     
     
+    class MissingTemplate < ActionView::ActionViewError
+      def initialize(message, possible_paths)
+        super(message + " and possible paths #{possible_paths}")
+      end
+    end
+    
+    
     module Rendering
       # Invoke the state method for +state+ which usually renders something nice.
       def render_state(state)
-        dispatch(state, parent_controller.request)
+        process(state)
       end
     end
     
     
     module Metal
-      def dispatch(name, request)
-        @_request = request
-        @_env = request.env
-        @_env['action_controller.instance'] = self
-        process(name)
-      end
-      
       def params
         @_params ||= request.parameters # DISCUSS: let rails helper access @controller.params!
       end
       
-      delegate :request,  :to => :parent_controller
-      delegate :config,   :to => :parent_controller
+      attr_internal :request
       delegate :session,  :to => :parent_controller
     end 
     
@@ -56,8 +55,10 @@ module Cell
     abstract!
     
     
-    def initialize(parent_controller=nil, options={})
+    def initialize(parent_controller, options={})
       @parent_controller  = parent_controller
+      @_request           = parent_controller.request # DISCUSS: save request only?
+      @_config            = parent_controller.config.dup
       @opts = @options    = options
     end
     
@@ -129,17 +130,18 @@ module Cell
 
     # Climbs up the inheritance chain, looking for a view for the current +state+.
     def find_family_view_for_state(state)
-      missing_template_exception = nil
-
-      possible_paths_for_state(state).each do |template_path|
+      exception       = nil
+      possible_paths  = possible_paths_for_state(state)
+      
+      possible_paths.each do |template_path|
         begin
           template = find_template(template_path)
           return template if template
-        rescue ::ActionView::MissingTemplate => missing_template_exception
+        rescue ::ActionView::MissingTemplate => exception
         end
       end
       
-      raise missing_template_exception
+      raise MissingTemplate.new(exception.message, possible_paths)
     end
     
     # Renders the view belonging to the given state. Will raise ActionView::MissingTemplate
@@ -158,7 +160,7 @@ module Cell
       end
 
       opts = sanitize_render_options(opts)
-      render_to_string(opts)
+      render_to_string(opts).html_safe # ActionView::Template::Text doesn't do that for us.
     end
 
     # Defaultize the passed options from #render.

data/lib/cells.rb

@@ -63,7 +63,7 @@ require 'action_controller'
 require 'cell'
 require 'cells/rails'
 require 'cell/rails'
-require 'cell/test_case' if Rails.env == "test"
+require 'cell/test_case' if Object.const_defined?("Rails") and Rails.env == "test"
 
 module Cells
   # Any config should be placed here using +mattr_accessor+.

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.4.1'
+  VERSION = '3.4.2'
 end

data/test/rails/cells_test.rb

@@ -27,6 +27,14 @@ class RailsCellsTest < ActiveSupport::TestCase
       end
     end
     
+    should "respond to #request" do
+      assert_equal @request, cell(:bassist).request
+    end
+    
+    should "respond to #config" do
+      assert_equal({}, cell(:bassist).config)
+    end
+    
     
     context "invoking defaultize_render_options_for" do
       should "set default values" do

data/test/rails/integration_test.rb

@@ -34,6 +34,16 @@ class RailsIntegrationTest < ActionController::TestCase
       get 'skills', :note => "D"
       assert_equal "That's a D", @response.body
     end
+    
+    should "respond to #config" do
+      BassistCell.class_eval do
+        def listen
+          render :view => 'contact_form'  # form_tag internally calls config.allow_forgery_protection
+        end
+      end
+      get 'skills'
+      assert_equal "<form accept-charset=\"UTF-8\" action=\"musician/index\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>\n", @response.body
+    end
   end
   
 end

data/test/rails/render_test.rb

@@ -13,15 +13,11 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_equal "Doo", render_cell(:bassist, :play)
     end
     
-    should "also render alternative engines" do
+    should "also render alternative engines, like haml" do
       BassistCell.class_eval do
-        def sing; @xm = Builder::XmlMarkup.new; render; end
+        def sing; render; end
       end
-      assert_equal "", render_cell(:bassist, :sing) ### FIXME: where's the rendered xml?
-    end
-    
-    should "accept the :template_format option" do
-      
+      assert_equal "<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
     
     should "accept the :nothing option" do
@@ -44,6 +40,7 @@ class RailsRenderTest < ActiveSupport::TestCase
         def sing; render :text => "Shoobie"; end
       end
       assert_equal "Shoobie", render_cell(:bassist, :sing)
+      assert render_cell(:bassist, :sing).html_safe?
     end
     
     should "accept the :inline option" do
@@ -85,8 +82,18 @@ class RailsRenderTest < ActiveSupport::TestCase
       assert_raises ActionView::MissingTemplate do
         render_cell(:bassist, :groove)
       end
+    end
+    
+    should "raise an error for a non-existent template" do
+      BadGuitaristCell.class_eval do
+        def groove; render; end
+      end
       
-      ### TODO: test error message sanity.
+      e = assert_raise Cell::Rails::MissingTemplate do
+        render_cell(:bad_guitarist, :groove)
+      end
+      
+      assert_equal "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 \"/home/nick/projects/cells/app/cells\", \"/home/nick/projects/cells/app/cells/layouts\", \"/home/nick/projects/cells/test/app/cells\", \"/home/nick/projects/cells/test/app/cells/layouts\" and possible paths [\"bad_guitarist/groove\", \"bassist/groove\", \"cell/rails/groove\"]", e.message
     end
     
     should "render instance variables from the cell" do
@@ -101,23 +108,23 @@ class RailsRenderTest < ActiveSupport::TestCase
     should "allow subsequent calls to render in the rendered view" do
       BassistCell.class_eval do
         def jam; @chords = [:a, :c]; render; end
-        def play; render; end
+        def sing; render; end
       end
-      assert_equal "Doo\nDoo\n", render_cell(:bassist, :jam)
+      assert_equal "<h1>Laaa</h1>\n\n<h1>Laaa</h1>\n\n", render_cell(:bassist, :jam)
     end
     
     should "allow multiple calls to render" do
       BassistCell.class_eval do
-        def play; render + render + render; end
+        def sing; render + render + render; end
       end
-      assert_equal "DooDooDoo", render_cell(:bassist, :play)
+      assert_equal "<h1>Laaa</h1>\n<h1>Laaa</h1>\n<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
     
-    
-    
-    
     # inheriting
     should "inherit play.html.erb from BassistCell" do
+      BassistCell.class_eval do
+        def play; render; end
+      end
       assert_equal "Doo", render_cell(:bad_guitarist, :play)
     end
   end

data/test/rails/router_test.rb

@@ -1,5 +1,5 @@
 module ApplicationTests
-  class RouterTest < ActionController::TestCase#Test::Unit::TestCase
+  class RouterTest < ActionController::TestCase
     tests MusicianController
 
     context "A Rails app" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 4
-  - 1
-  version: 3.4.1
+  - 2
+  version: 3.4.2
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 +02:00
+date: 2010-10-11 00:00:00 +02:00
 default_executable: 
 dependencies: []