cells 3.5.5 → 3.5.6

data/CHANGES.textile

@@ -1,3 +1,9 @@
+h2. 3.5.6
+
+h3. Changes
+  * Added a generator for slim. Use it with `-e slim` when generating.
+
+
 h2. 3.5.5
   
 h3. Bugfixes
@@ -6,6 +12,7 @@ h3. Bugfixes
 h3. Changes
   * Gem dependencies changed, we now require @actionpack@ and @railties@ >= 3.0.0 instead of @rails@.
 
+
 h2. 3.5.4
   
 h3. Bugfixes

data/README.rdoc

@@ -29,7 +29,7 @@ Rails 2.3:
 
 Creating a cell is nothing more than
 
-  $ rails generate cell ShoppingCart display -t haml
+  $ rails generate cell ShoppingCart display -e haml
     create  app/cells/
     create  app/cells/shopping_cart
     create  app/cells/shopping_cart_cell.rb
@@ -40,7 +40,7 @@ That looks very familiar.
 
 == Render the cell
 
-Now, render your cart. Why not put it in <tt>layouts/application.html.erb</tt> for now? 
+Now, render your cart. Why not put it in <tt>layouts/application.html.erb</tt> for now?
 
   <div id="header">
     <%= render_cell :shopping_cart, :display, :user => @current_user %>
@@ -51,11 +51,11 @@ Feels like rendering a controller action. For good encapsulation we pass the cur
 
 Time to improve our cell code. Let's start with <tt>app/cells/shopping_cart_cell.rb</tt>:
 
-  class ShoppingCartCell < Cell::Rails 
+  class ShoppingCartCell < Cell::Rails
     def display(args)
       user    = args[:user]
       @items  = user.items_in_cart
-      
+
       render  # renders display.html.haml
     end
   end
@@ -68,8 +68,8 @@ Is that a controller? Hell, yeah. We even got a +#render+ method as we know it f
 Since a plain call to +#render+ will start rendering <tt>app/cells/shopping_cart/display.html.haml</tt> we should put some meaningful markup there.
 
   #cart
-    You have #{@items.size} items in your shopping cart. 
-  
+    You have #{@items.size} items in your shopping cart.
+
 === ERB? Haml? Builder?
 
 Yes, Cells support all template types that are supported by Rails itself. Remember- it's a controller!
@@ -78,7 +78,7 @@ Yes, Cells support all template types that are supported by Rails itself. Rememb
 
 Yes, Cells have helpers just like controllers. If you need some specific helper, do
 
-  class ShoppingCartCell < Cell::Rails 
+  class ShoppingCartCell < Cell::Rails
     helper MyExtraHelper
 
 and it will be around in your cart views.
@@ -107,7 +107,7 @@ Let +render_cell+ take care of creating the right cell. Just configure your supe
     build do
       UnauthorizedUserCell unless logged_in?
     end
-  
+
 A call to
 
   render_cell(:login, :box)
@@ -119,14 +119,14 @@ will render the configured +UnauthorizedUserCell+ instead of the original +Login
 
 Cells do strict view caching. No cluttered fragment caching. Add
 
-  class ShoppingCartCell < Cell::Rails 
+  class ShoppingCartCell < Cell::Rails
     cache :display, :expires_in => 10.minutes
 
 and your cart will be re-rendered after 10 minutes.
 
 You can expand the state's cache key - why not use a versioner block to do just this?
 
-  class ShoppingCartCell < Cell::Rails 
+  class ShoppingCartCell < Cell::Rails
     cache :display do |cell, options|
       options[:items].md5
     end
@@ -181,7 +181,7 @@ In order to copy the cells rake tasks to your app, run
 Cells can do more.
 
 <b>No Limits</b>::  Have as many cells in your page as you need - no limitation to your +render_cell+ calls.
-<b>Cell Nesting</b>:: Have complex cell hierarchies as you can call +render_cell+ within cells, too. 
+<b>Cell Nesting</b>:: Have complex cell hierarchies as you can call +render_cell+ within cells, too.
 
 Go for it, you'll love it!
 

data/cells.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "shoulda"
   s.add_development_dependency "haml"
+  s.add_development_dependency "slim"
 end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.5.5'
+  VERSION = '3.5.6'
 end

data/lib/generators/cells/view_generator.rb

@@ -0,0 +1,18 @@
+module Cells
+  module Generators
+    class ViewGenerator < Base
+      def create_views
+        for state in actions do
+          @state  = state
+          @path   = File.join(base_path, "#{state}.html.#{handler}")  #base_path defined in Cells::Generators::Base.
+          template "view.#{handler}", @path
+        end
+      end
+      
+    private
+      def handler
+        raise "Please implement #handler in your view generator and return something like `:erb`."
+      end
+    end
+  end
+end

data/lib/generators/erb/cell_generator.rb

@@ -1,16 +1,14 @@
-require 'generators/cells/base'
+require 'generators/cells/view_generator'
 
 module Erb
   module Generators
-    class CellGenerator < ::Cells::Generators::Base
+    class CellGenerator < ::Cells::Generators::ViewGenerator
+      
       source_root File.expand_path('../../templates', __FILE__)
-
-      def create_views
-        for state in actions do
-          @state = state
-          @path = File.join(base_path, "#{state}.html.erb")  #base_path defined in Cells::Generators::Base.
-          template "view.erb", @path
-        end
+      
+    private
+      def handler
+        :erb
       end
     end
   end

data/lib/generators/haml/cell_generator.rb

@@ -1,16 +1,14 @@
-require 'generators/cells/base'
+require 'generators/cells/view_generator'
 
 module Haml
   module Generators
-    class CellGenerator < ::Cells::Generators::Base
+    class CellGenerator < ::Cells::Generators::ViewGenerator
+      
       source_root File.expand_path('../../templates', __FILE__)
-
-      def create_views
-        for state in actions do
-          @state  = state
-          @path   = File.join(base_path, "#{state}.html.haml")  #base_path defined in Cells::Generators::Base.
-          template "view.haml", @path
-        end
+      
+    private
+      def handler
+        :haml
       end
     end
   end

data/lib/generators/slim/cell_generator.rb

@@ -0,0 +1,17 @@
+require 'generators/cells/view_generator'
+
+module Slim
+  module Generators
+    class CellGenerator < ::Cells::Generators::ViewGenerator
+      
+      source_root File.expand_path('../../templates', __FILE__)
+    
+    private
+      def handler
+        :slim
+      end
+    end
+  end
+end
+
+

data/lib/generators/templates/view.slim

@@ -0,0 +1,4 @@
+h1
+  <%= class_name %>#<%= @state %>
+p
+  Find me in <%= @path %>

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

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

data/test/app/cells/trumpeter_cell.rb

@@ -0,0 +1,8 @@
+class TrumpeterCell < Cell::Rails
+  include ActionController::UrlFor
+  
+  def promote
+    render
+  end
+
+end

data/test/cell_generator_test.rb

@@ -21,6 +21,10 @@ class CellGeneratorTest < Rails::Generators::TestCase
       assert_no_file "app/cells/blog/post.html.haml"
       assert_no_file "app/cells/blog/post.html.haml"
       assert_no_file "app/cells/blog/latest.html.haml"
+
+      assert_no_file "app/cells/blog/post.html.slim"
+      assert_no_file "app/cells/blog/post.html.slim"
+      assert_no_file "app/cells/blog/latest.html.slim"
     end
     
     should "work with namespaces" do
@@ -38,6 +42,33 @@ class CellGeneratorTest < Rails::Generators::TestCase
       assert_file "app/cells/blog/post/latest.html.haml", %r(app/cells/blog/post/latest\.html\.haml)
     end
 
+    should "work with namespaces and slim" do
+      run_generator %w(Blog::Post latest -e slim)
+
+      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+      assert_file "app/cells/blog/post/latest.html.slim", %r(app/cells/blog/post/latest\.html\.slim)
+    end
+
+    should "create slim assets with -e slim" do
+      run_generator %w(Blog post latest -e slim)
+
+      assert_file "app/cells/blog_cell.rb", /class BlogCell < Cell::Rails/
+      assert_file "app/cells/blog_cell.rb", /def post/
+      assert_file "app/cells/blog_cell.rb", /def latest/
+      assert_file "app/cells/blog/post.html.slim", %r(app/cells/blog/post\.html\.slim)
+      assert_file "app/cells/blog/post.html.slim", %r(p)
+      assert_file "app/cells/blog/latest.html.slim", %r(app/cells/blog/latest\.html\.slim)
+
+
+      assert_no_file "app/cells/blog/post.html.erb"
+      assert_no_file "app/cells/blog/post.html.erb"
+      assert_no_file "app/cells/blog/latest.html.erb"
+
+      assert_no_file "app/cells/blog/post.html.haml"
+      assert_no_file "app/cells/blog/post.html.haml"
+      assert_no_file "app/cells/blog/latest.html.haml"
+    end
+
     should "create haml assets with -e haml" do
       run_generator %w(Blog post latest -e haml)
 
@@ -52,6 +83,10 @@ class CellGeneratorTest < Rails::Generators::TestCase
       assert_no_file "app/cells/blog/post.html.erb"
       assert_no_file "app/cells/blog/post.html.erb"
       assert_no_file "app/cells/blog/latest.html.erb"
+
+      assert_no_file "app/cells/blog/post.html.slim"
+      assert_no_file "app/cells/blog/post.html.slim"
+      assert_no_file "app/cells/blog/latest.html.slim"
     end
 
     should "create test_unit assets with -t test_unit" do

data/test/dummy/app/controllers/musician_controller.rb

@@ -2,31 +2,35 @@ class MusicianController < ActionController::Base
   def index
     render :text => render_cell(:bassist, :promote)
   end
-            
+
+  def promote
+    render :text => render_cell(:trumpeter, :promote)
+  end
+
   def promotion
     render :text => render_cell(:bassist, :provoke)
   end
-  
+
   def featured
   end
-  
+
   def featured_with_block
   end
-  
+
   def skills
     render :text => render_cell(:bassist, :listen)
   end
-  
+
   def hamlet
   end
-  
+
   attr_reader :flag
   def promotion_with_block
     html = render_cell(:bassist, :play) do |cell|
       @flag = cell.class
     end
-    
-    render :text => html 
+
+    render :text => html
   end
-  
+
 end

data/test/dummy/config/environments/development.rb

@@ -13,7 +13,4 @@ Dummy::Application.configure do
   config.consider_all_requests_local       = true
   config.action_view.debug_rjs             = true
   config.action_controller.perform_caching = false
-
-  # Don't care if the mailer can't send
-  config.action_mailer.raise_delivery_errors = false
 end

data/test/dummy/config/routes.rb

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

data/test/rails/router_test.rb

@@ -7,25 +7,27 @@ module ApplicationTests
         BassistCell.class_eval do
           def promote; render; end
         end
-      
-        #assert ::Cell::Rails.view_context_class._routes, "Cells::Railtie initializer wasn't invoked."
-        #assert ! ::OmgController.new.respond_to?( :render_cell)
-        
+
         get "index"
         assert_response :success
         assert_equal "Find me at <a href=\"/musician\">vd.com</a>", @response.body
       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
+      end
+
       should "allow cells to use #config" do
-        
         BassistCell.class_eval do
           def provoke; render; end
         end
-        
+
         get "promotion"
         assert_response :success
         assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
-      end 
+      end
     end
   end
 end

data/test/test_helper.rb

@@ -40,6 +40,7 @@ class Cell::Rails
 end
 
 require File.join(test_app_dir, 'cells', 'bassist_cell')
+require File.join(test_app_dir, 'cells', 'trumpeter_cell')
 require File.join(test_app_dir, 'cells', 'bad_guitarist_cell')
 
 require "haml"

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 5
-  - 5
-  version: 3.5.5
+  - 6
+  version: 3.5.6
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 +01:00
+date: 2011-03-24 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,19 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: slim
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 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
@@ -103,13 +116,16 @@ files:
 - lib/generators/USAGE
 - lib/generators/cells/base.rb
 - lib/generators/cells/cell_generator.rb
+- lib/generators/cells/view_generator.rb
 - lib/generators/erb/cell_generator.rb
 - lib/generators/haml/cell_generator.rb
 - lib/generators/rails/cell_generator.rb
+- lib/generators/slim/cell_generator.rb
 - lib/generators/templates/cell.rb
 - lib/generators/templates/cell_test.rb
 - lib/generators/templates/view.erb
 - lib/generators/templates/view.haml
+- lib/generators/templates/view.slim
 - lib/generators/test_unit/cell_generator.rb
 - test/active_helper_test.rb
 - test/app/cells/bad_guitarist/_dii.html.erb
@@ -132,6 +148,8 @@ files:
 - test/app/cells/layouts/metal.html.erb
 - test/app/cells/producer/capture.html.erb
 - test/app/cells/producer/content_for.html.erb
+- test/app/cells/trumpeter/promote.html.erb
+- test/app/cells/trumpeter_cell.rb
 - test/cell_generator_test.rb
 - test/cell_module_test.rb
 - test/cells_module_test.rb