cells 3.5.4 → 3.5.5

data/CHANGES.textile

@@ -1,4 +1,12 @@
-h2. 3.5.3
+h2. 3.5.5
+  
+h3. Bugfixes
+  * The generator now places views of namespaced cells into the correct directory. E.g. `rails g Blog::Post display` puts views to `app/cells/blog/post/display.html.erb`.
+
+h3. Changes
+  * Gem dependencies changed, we now require @actionpack@ and @railties@ >= 3.0.0 instead of @rails@.
+
+h2. 3.5.4
   
 h3. Bugfixes
   * state-args work even if your state method receives optional arguments or default values, like @def show(user, age=18)@.

data/README.rdoc

@@ -45,7 +45,7 @@ Now, render your cart. Why not put it in <tt>layouts/application.html.erb</tt> f
   <div id="header">
     <%= render_cell :shopping_cart, :display, :user => @current_user %>
 
-Feels like rendering a controller action. As additional encapsulation we pass the current +user+ from outside. Call it knowledge hiding.
+Feels like rendering a controller action. For good encapsulation we pass the current +user+ from outside into the cell - a dependency injection.
 
 == Code
 
@@ -60,12 +60,12 @@ Time to improve our cell code. Let's start with <tt>app/cells/shopping_cart_cell
     end
   end
 
-Is that a controller? Hell, yeah. We even got a +render+ method as we know it from the good ol' +ActionController+.
+Is that a controller? Hell, yeah. We even got a +#render+ method as we know it from the good ol' +ActionController+.
 
 
 == Views
 
-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.
+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. 
@@ -131,9 +131,9 @@ You can expand the state's cache key - why not use a versioner block to do just
       options[:items].md5
     end
 
-The return value is appended to the state key: <tt>"cells/shopping_cart/display/0ecb1360644ce665a4ef"</tt>.
+The block's return value is appended to the state key: <tt>"cells/shopping_cart/display/0ecb1360644ce665a4ef"</tt>.
 
-API here[http://rdoc.info/gems/cells/Cell/Caching/ClassMethods#cache-instance_method].
+Check the {API to learn more}[http://rdoc.info/gems/cells/Cell/Caching/ClassMethods#cache-instance_method].
 
 == Testing
 

data/cells.gemspec

@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
   
-  s.add_dependency "rails",   "~> 3.0.0"
+  s.add_dependency "actionpack",  "~> 3.0.0"
+  s.add_dependency "railties",    "~> 3.0.0"
   
   s.add_development_dependency "shoulda"
   s.add_development_dependency "haml"

data/lib/cell/rails.rb

@@ -157,35 +157,26 @@ module Cell
 
       raise MissingTemplate.new(exception.message, possible_paths)
     end
-
+    
     # Renders the view belonging to the given state. Will raise ActionView::MissingTemplate
     # if it can't find a view.
     def render_view_for(state, *args)
       opts = args.first.is_a?(::Hash) ? args.shift : {}
       
       return "" if opts[:nothing]
-
-      rails_options = [:text, :inline, :file]
-      if (opts.keys & rails_options).present?
-      elsif opts[:state]
-        opts[:text] = render_state(opts[:state], *args)
-      else
-        opts            = defaultize_render_options_for(opts, state)
-        template        = find_family_view_for_state(opts[:view])
-        opts[:template] = template
+      
+      if opts[:state]
+        opts[:text] = render_state(opts.delete(:state), *args)
+      elsif (opts.keys & [:text, :inline, :file]).blank?
+        opts = defaultize_render_options_for(opts, state)
+        opts[:template] = find_family_view_for_state(opts.delete(:view))
       end
-
-      opts = sanitize_render_options(opts)
+      
       render_to_string(opts).html_safe # ActionView::Template::Text doesn't do that for us.
     end
-
-    # Defaultize the passed options from #render.
+    
     def defaultize_render_options_for(opts, state)
       opts.reverse_merge!(:view => state)
     end
-
-    def sanitize_render_options(opts)
-      opts.except!(:view, :state)
-    end
   end
 end

data/lib/cells.rb

@@ -47,7 +47,7 @@
 #
 # == View inheritance
 #
-# Unlike controllers, Cells can form a class hierarchy. Even Views are inherited, which is pretty useful
+# Unlike controllers, Cells can form a class hierarchy. Even views are inherited, which is pretty useful
 # when overriding only small parts of the view.
 #
 # So if you'd need a special "Order!" button with sparkling stars on christmas, your cell would go like this.

data/lib/cells/version.rb

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

data/lib/generators/cells/base.rb

@@ -9,6 +9,11 @@ module Cells
 
       argument :actions, :type => :array, :default => [], :banner => "action action"
       check_class_collision :suffix => "Cell"
+      
+    private
+      def base_path
+        File.join('app/cells', class_path, file_name)
+      end
     end
   end
 end

data/lib/generators/cells/cell_generator.rb

@@ -1,17 +1,10 @@
-require 'generators/cells/base'
+require 'generators/rails/cell_generator'
 
 module Cells
   module Generators
-    class CellGenerator < ::Cells::Generators::Base
+    class CellGenerator < ::Rails::Generators::CellGenerator
       source_root File.expand_path('../../templates', __FILE__)
-
-      def create_cell_file
-        template 'cell.rb', File.join('app/cells', class_path, "#{file_name}_cell.rb")
-      end
-
-      hook_for(:template_engine)
-      hook_for(:test_framework)
-
+      
       def say_deprecated
         say "====> This generator is now DEPRECATED. <====", :red
         say "Please use:"

data/lib/generators/erb/cell_generator.rb

@@ -8,7 +8,7 @@ module Erb
       def create_views
         for state in actions do
           @state = state
-          @path = File.join('app/cells', file_name, "#{state}.html.erb")
+          @path = File.join(base_path, "#{state}.html.erb")  #base_path defined in Cells::Generators::Base.
           template "view.erb", @path
         end
       end

data/lib/generators/haml/cell_generator.rb

@@ -8,8 +8,7 @@ module Haml
       def create_views
         for state in actions do
           @state  = state
-          @path   = File.join('app/cells', file_name, "#{state}.html.haml")
-
+          @path   = File.join(base_path, "#{state}.html.haml")  #base_path defined in Cells::Generators::Base.
           template "view.haml", @path
         end
       end

data/lib/generators/rails/cell_generator.rb

@@ -6,7 +6,7 @@ module Rails
       source_root File.expand_path('../../templates', __FILE__)
 
       def create_cell_file
-        template 'cell.rb', File.join('app/cells', class_path, "#{file_name}_cell.rb")
+        template 'cell.rb', "#{base_path}_cell.rb"
       end
 
       hook_for(:template_engine)

data/test/cell_generator_test.rb

@@ -1,58 +1,69 @@
 require 'test_helper'
-require 'generators/cells/cell_generator'
+require 'generators/rails/cell_generator'
 
 class CellGeneratorTest < Rails::Generators::TestCase
   destination File.join(Rails.root, "tmp")
   setup :prepare_destination
-  tests ::Cells::Generators::CellGenerator
+  tests ::Rails::Generators::CellGenerator
 
-  context "Running script/generate cell" do
-    context "Blog post latest" do
+  context "CellGenerator" do
+    should "create the standard assets" do
+      run_generator %w(Blog post latest)
 
-      should "create the standard assets" do
-        run_generator %w(Blog post latest)
+      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.erb", %r(app/cells/blog/post\.html\.erb)
+      assert_file "app/cells/blog/post.html.erb", %r(<p>)
+      assert_file "app/cells/blog/latest.html.erb", %r(app/cells/blog/latest\.html\.erb)
 
-        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.erb", %r(app/cells/blog/post\.html\.erb)
-        assert_file "app/cells/blog/post.html.erb", %r(<p>)
-        assert_file "app/cells/blog/latest.html.erb", %r(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 "work with namespaces" do
+      run_generator %w(Blog::Post latest)
 
-        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
+      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+      assert_file "app/cells/blog/post_cell.rb", /def latest/
+      assert_file "app/cells/blog/post/latest.html.erb", %r(app/cells/blog/post/latest\.html\.erb)
+    end
+    
+    should "work with namespaces and haml" do
+      run_generator %w(Blog::Post latest -e haml)
 
-      should "create haml assets with -e haml" do
-        run_generator %w(Blog post latest -e haml)
+      assert_file "app/cells/blog/post_cell.rb", /class Blog::PostCell < Cell::Rails/
+      assert_file "app/cells/blog/post/latest.html.haml", %r(app/cells/blog/post/latest\.html\.haml)
+    end
 
-        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.haml", %r(app/cells/blog/post\.html\.haml)
-        assert_file "app/cells/blog/post.html.haml", %r(%p)
-        assert_file "app/cells/blog/latest.html.haml", %r(app/cells/blog/latest\.html\.haml)
+    should "create haml assets with -e haml" do
+      run_generator %w(Blog post latest -e haml)
 
+      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.haml", %r(app/cells/blog/post\.html\.haml)
+      assert_file "app/cells/blog/post.html.haml", %r(%p)
+      assert_file "app/cells/blog/latest.html.haml", %r(app/cells/blog/latest\.html\.haml)
 
-        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"
-      end
 
-      should "create test_unit assets with -t test_unit" do
-        run_generator %w(Blog post latest -t test_unit)
+      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"
+    end
 
-        assert_file "test/cells/blog_cell_test.rb"
-      end
+    should "create test_unit assets with -t test_unit" do
+      run_generator %w(Blog post latest -t test_unit)
 
-      should "create test_unit assets with -t rspec" do
-        run_generator %w(Blog post latest -t rspec)
+      assert_file "test/cells/blog_cell_test.rb"
+    end
 
-        assert_no_file "test/cells/blog_cell_test.rb"
-      end
+    should "create test_unit assets with -t rspec" do
+      run_generator %w(Blog post latest -t rspec)
 
+      assert_no_file "test/cells/blog_cell_test.rb"
     end
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 3
   - 5
-  - 4
-  version: 3.5.4
+  - 5
+  version: 3.5.5
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,11 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-20 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rails
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -33,9 +33,24 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: railties
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,11 +59,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -57,7 +72,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 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