cells 3.4.4 → 3.5.0.beta1

data/.gitignore

@@ -0,0 +1,7 @@
+.DS_Store
+pkg
+.*~
+.bundle
+Gemfile.lock
+test/dummy/log/test.log
+test/dummy/tmp/

data/CHANGES.textile

@@ -1,3 +1,9 @@
+h2. 3.5.0
+
+h3. Changes
+  * Deprecated @opts, use #options now. This should be the prefered way of parameter exchange with the outer world.
+  * #params is now delegated to @parent_controller. 
+
 h2. 3.4.4
 
 h3. Changes

data/Gemfile

@@ -1,11 +1,5 @@
 source :gemcutter
-gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'	# needed in router_test, whatever.
 
-#gem "rails" , :path => "/home/nick/projects/rayls"
-gem "rails", '~> 3.0'
-gem "haml"
+gemspec
 
-group :test do
-  gem "shoulda"
-end
-gem "rack", :git => "git://github.com/rack/rack.git"
+#gem "rails" , :path => "/home/nick/projects/rayls"

data/README.rdoc

@@ -53,7 +53,7 @@ Time to improve our cell code. Let's start with <tt>app/cells/shopping_cart_cell
 
   class ShoppingCartCell < Cell::Rails 
     def display 
-      user    = @opts[:user]        # @opts exposes options passed to #render_cell.
+      user    = options[:user]        # #options exposes options passed to #render_cell.
       @items  = user.items_in_cart
       
       render  # renders display.html.erb

data/Rakefile

@@ -1,11 +1,7 @@
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), 'lib', 'cells', 'version')
-
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-desc 'Default: run unit tests.'
-task :default => :test
+require 'rake/testtask'
 
 desc 'Test the cells plugin.'
 Rake::TestTask.new(:test) do |test|
@@ -13,28 +9,3 @@ Rake::TestTask.new(:test) do |test|
   test.test_files = FileList['test/*_test.rb', 'test/rails/*_test.rb'] - ['test/rails/capture_test.rb']
   test.verbose = true
 end
-
-begin
-  gem 'jeweler'
-  require 'jeweler'
-
-  Jeweler::Tasks.new do |spec|
-    spec.name         = "cells"
-    spec.version      = ::Cells::VERSION
-    spec.summary      = %{View Components for Rails.}
-    spec.description  = %{Cells are lightweight controllers for Rails and can be rendered in views, providing an elegant and fast way for encapsulation and component-orientation.}
-    spec.homepage     = "http://cells.rubyforge.org"
-    spec.authors      = ["Nick Sutterer"]
-    spec.email        = "apotonick@gmail.com"
-
-    spec.files        = FileList["[A-Z]*", "lib/**/*"] - ["Gemfile.lock"]
-    spec.test_files   = FileList["test/**/*"] - FileList["test/dummy/tmp", "test/dummy/tmp/**/*", "test/dummy/log/*"]
-
-    # spec.add_dependency 'activesupport', '>= 2.3.0' # Dependencies and minimum versions?
-  end
-
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler - or one of its dependencies - is not available. " <<
-  "Install it with: sudo gem install jeweler -s http://gemcutter.org"
-end

data/about.yml

@@ -0,0 +1,7 @@
+author: Nick Sutterer, Peter Bex, Bob Leers
+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.
+homepage: http://cells.rubyforge.org
+plugin:
+license: MIT
+version: 1.1
+rails_version: 2.1

data/cells.gemspec

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib/', __FILE__)
+$:.unshift lib unless $:.include?(lib)
+
+require 'cells/version'
+
+Gem::Specification.new do |s|
+  s.name        = "cells"
+  s.version     = Cells::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Nick Sutterer"]
+  s.email       = ["apotonick@gmail.com"]
+  s.homepage    = "http://cells.rubyforge.org"
+  s.summary     = %q{View Components for Rails.}
+  s.description = %q{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.}
+  
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_dependency "rails",   "~> 3.0"
+  
+  s.add_development_dependency "shoulda"
+  s.add_development_dependency "haml"
+end

data/lib/cell/rails.rb

@@ -35,12 +35,8 @@ module Cell
     
     
     module Metal
-      def params
-        @_params ||= request.parameters # DISCUSS: let rails helper access @controller.params!
-      end
-      
       attr_internal :request
-      delegate :session,  :to => :parent_controller
+      delegate :session, :params, :to => :parent_controller
     end 
     
     
@@ -49,15 +45,17 @@ module Cell
     include Caching
     
     attr_reader :parent_controller
+    attr_accessor :options
     
     abstract!
     
     
     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
+      @_request           = parent_controller.request # DISCUSS: delegate?
+      @_config            = parent_controller.config.dup  # FIXME: delegate!
+      @options            = options
+      @opts               = ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, :options)
     end
     
     def self.view_context_class

data/lib/cell/test_case.rb

@@ -106,7 +106,7 @@ module Cell
       def setup_test_states_in(cell)
         cell.instance_eval do
           def in_view
-            render :inline => "<%= instance_exec(&block) %>", :locals => {:block => @opts[:block]}
+            render :inline => "<%= instance_exec(&block) %>", :locals => {:block => options[:block]}
           end
         end
       end

data/lib/cells/version.rb

@@ -1,3 +1,3 @@
 module Cells
-  VERSION = '3.4.4'
+  VERSION = '3.5.0.beta1'
 end

data/test/dummy/config/application.rb

@@ -1,10 +1,8 @@
 require File.expand_path('../boot', __FILE__)
 
 require "active_model/railtie"
-require "active_record/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
-require "action_mailer/railtie"
 
 Bundler.require
 

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

@@ -23,7 +23,7 @@ Dummy::Application.configure do
   # Tell Action Mailer not to deliver emails to the real world.
   # The :test delivery method accumulates sent emails in the
   # ActionMailer::Base.deliveries array.
-  config.action_mailer.delivery_method = :test
+  #config.action_mailer.delivery_method = :test
 
   # Use SQL instead of Active Record's schema dumper when creating the test database.
   # This is necessary if your schema can't be completely dumped by the schema dumper,

data/test/rails/cells_test.rb

@@ -35,6 +35,20 @@ class RailsCellsTest < ActiveSupport::TestCase
       assert_equal({}, cell(:bassist).config)
     end
     
+    include ActiveSupport::Testing::Deprecation
+    should "mark @opts as deprecated, but still works" do
+      res = nil
+      assert_deprecated do
+        res = cell(:bassist, :song => "Lockdown").instance_eval do
+          @opts[:song]
+        end
+      end
+      assert_equal "Lockdown", res
+    end
+    
+    should "respond to #options and return the cell options" do
+      assert_equal({:song => "Lockdown"}, cell(:bassist, :song => "Lockdown").options)
+    end
     
     context "invoking defaultize_render_options_for" do
       should "set default values" do
@@ -77,8 +91,9 @@ class RailsCellsTest < ActiveSupport::TestCase
     
     context "delegation" do
       setup do
-        @request = ActionController::TestRequest.new 
         @request.env["action_dispatch.request.request_parameters"] = {:song => "Creatures"}
+        @controller = Class.new(ActionController::Base).new
+        @controller.request = @request
         @cell = cell(:bassist)
       end
       
@@ -91,9 +106,18 @@ class RailsCellsTest < ActiveSupport::TestCase
       should "respond to session" do
         assert_kind_of Hash, @cell.session
       end
+          
+      should "respond to #params and return the request parameters" do
+        assert_equal({"song" => "Creatures"}, cell(:bassist).params)
+      end
+      
+      should "not merge #params and #options" do
+        assert_equal({"song" => "Creatures"}, cell(:bassist, "song" => "Lockdown").params)
+      end
     end
     
     
+    # DISCUSS: do we really need that test anymore?
     should "precede cell ivars over controller ivars" do
       @controller.instance_variable_set(:@note, "E")
       BassistCell.class_eval do

data/test/rails/render_test.rb

@@ -92,7 +92,7 @@ class RailsRenderTest < ActiveSupport::TestCase
         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
+      assert_includes e.message, "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"
     end
     
     should "render instance variables from the cell" do
@@ -135,7 +135,9 @@ class RailsRenderTest < ActiveSupport::TestCase
         def pose; render; end
       end
       
-      @request.env["action_dispatch.request.request_parameters"] = {:what => 'get'}
+      @request.env["action_dispatch.request.request_parameters"] = {:what => 'get'} # FIXME: duplicated in cells_test.rb.
+      @controller = Class.new(ActionController::Base).new
+      @controller.request = @request
       @cell = cell(:bassist)
       
       assert_equal "Come and get me!", @cell.render_state(:pose)

data/test/test_case_test.rb

@@ -22,15 +22,14 @@ class TestCaseTest < Cell::TestCase
     
     should "respond to #cell" do
       assert_kind_of BassistCell, cell(:bassist)
-      assert !cell(:bassist).respond_to?(:opts)
     end
     
     should "respond to #cell with a block" do
-      assert_respond_to cell(:bassist) { def opts; @opts; end }, :opts
+      assert_respond_to cell(:bassist){ def whatever; end }, :whatever
     end
     
     should "respond to #cell with options and block" do
-      assert_equal({:topic => :peace}, cell(:bassist, :topic => :peace) { def opts; @opts; end }.opts)
+      assert_equal({:topic => :peace}, cell(:bassist, :topic => :peace).options)
     end
     
     context "in declarative tests" do
@@ -64,7 +63,7 @@ class TestCaseTest < Cell::TestCase
           assert_equal "Doo", last_invoke
         end
         
-        should "provide #invoke accepting opts" do
+        should "provide #invoke accepting options" do
           #assert_equal "Doo", invoke(:play)
         end
         

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cells
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  prerelease: true
   segments: 
   - 3
-  - 4
-  - 4
-  version: 3.4.4
+  - 5
+  - 0
+  - beta1
+  version: 3.5.0.beta1
 platform: ruby
 authors: 
 - Nick Sutterer
@@ -14,23 +15,66 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-02 00:00:00 +01:00
+date: 2011-01-26 00:00:00 +01:00
 default_executable: 
-dependencies: []
-
-description: Cells are lightweight controllers for Rails and can be rendered in views, providing an elegant and fast way for encapsulation and component-orientation.
-email: apotonick@gmail.com
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        version: "3.0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: haml
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+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
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
+- .gitignore
 - CHANGES.textile
 - Gemfile
 - README.rdoc
 - Rakefile
+- about.yml
+- cells.gemspec
 - lib/cell.rb
 - lib/cell/active_helper.rb
 - lib/cell/caching.rb
@@ -49,76 +93,79 @@ files:
 - lib/generators/cells/templates/view.erb
 - lib/generators/cells/templates/view.haml
 - test/active_helper_test.rb
-- test/rails/router_test.rb
-- test/rails/view_test.rb
-- test/rails/capture_test.rb
-- test/rails/integration_test.rb
-- test/rails/render_test.rb
-- test/rails/cells_test.rb
-- test/rails/caching_test.rb
+- test/app/cells/bad_guitarist/_dii.html.erb
+- test/app/cells/bad_guitarist_cell.rb
+- test/app/cells/bassist/_dii.html.erb
+- test/app/cells/bassist/ahem.html.erb
+- test/app/cells/bassist/compose.html.erb
+- test/app/cells/bassist/contact_form.html.erb
+- test/app/cells/bassist/jam.html.erb
+- test/app/cells/bassist/play.html.erb
+- test/app/cells/bassist/play.js.erb
+- test/app/cells/bassist/pose.html.erb
+- test/app/cells/bassist/promote.html.erb
+- test/app/cells/bassist/provoke.html.erb
+- test/app/cells/bassist/sing.html.haml
+- test/app/cells/bassist/slap.html.erb
+- test/app/cells/bassist/yell.en.html.erb
+- test/app/cells/bassist_cell.rb
+- test/app/cells/layouts/b.erb
+- test/app/cells/layouts/metal.html.erb
+- test/app/cells/producer/capture.html.erb
+- test/app/cells/producer/content_for.html.erb
 - test/cell_generator_test.rb
-- test/test_helper.rb
+- test/cell_module_test.rb
+- test/cells_module_test.rb
+- test/dummy/Rakefile
+- test/dummy/app/controllers/application_controller.rb
+- test/dummy/app/controllers/musician_controller.rb
+- test/dummy/app/helpers/application_helper.rb
+- test/dummy/app/views/layouts/application.html.erb
+- test/dummy/app/views/musician/featured.html.erb
+- test/dummy/app/views/musician/featured_with_block.html.erb
+- test/dummy/app/views/musician/hamlet.html.haml
+- test/dummy/config.ru
 - test/dummy/config/application.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
 - test/dummy/config/boot.rb
+- test/dummy/config/database.yml
 - test/dummy/config/environment.rb
+- test/dummy/config/environments/development.rb
 - test/dummy/config/environments/production.rb
 - test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/script/rails
-- test/dummy/config.ru
+- test/dummy/config/locales/en.yml
+- test/dummy/config/routes.rb
 - test/dummy/db/test.sqlite3
-- test/dummy/Rakefile
+- test/dummy/log/production.log
+- test/dummy/log/server.log
+- test/dummy/public/404.html
 - test/dummy/public/422.html
-- test/dummy/public/favicon.ico
 - test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/javascripts/controls.js
+- test/dummy/public/favicon.ico
 - test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/rails.js
+- test/dummy/public/javascripts/controls.js
 - test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/prototype.js
 - test/dummy/public/javascripts/effects.js
-- test/dummy/app/controllers/musician_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/musician/featured_with_block.html.erb
-- test/dummy/app/views/musician/hamlet.html.haml
-- test/dummy/app/views/musician/featured.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/cells_module_test.rb
-- test/test_case_test.rb
+- test/dummy/public/javascripts/prototype.js
+- test/dummy/public/javascripts/rails.js
+- test/dummy/public/stylesheets/.gitkeep
+- test/dummy/script/rails
 - test/helper_test.rb
-- test/cell_module_test.rb
-- test/app/cells/layouts/metal.html.erb
-- test/app/cells/layouts/b.erb
-- test/app/cells/bassist_cell.rb
-- test/app/cells/producer/capture.html.erb
-- test/app/cells/producer/content_for.html.erb
-- test/app/cells/bad_guitarist/_dii.html.erb
-- test/app/cells/bad_guitarist_cell.rb
-- test/app/cells/bassist/contact_form.html.erb
-- test/app/cells/bassist/slap.html.erb
-- test/app/cells/bassist/play.html.erb
-- test/app/cells/bassist/play.js.erb
-- test/app/cells/bassist/sing.html.haml
-- test/app/cells/bassist/jam.html.erb
-- test/app/cells/bassist/ahem.html.erb
-- test/app/cells/bassist/provoke.html.erb
-- test/app/cells/bassist/pose.html.erb
-- test/app/cells/bassist/promote.html.erb
-- test/app/cells/bassist/compose.html.erb
-- test/app/cells/bassist/_dii.html.erb
-- test/app/cells/bassist/yell.en.html.erb
+- test/rails/caching_test.rb
+- test/rails/capture_test.rb
+- test/rails/cells_test.rb
+- test/rails/integration_test.rb
+- test/rails/render_test.rb
+- test/rails/router_test.rb
+- test/rails/view_test.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 
@@ -132,11 +179,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -144,68 +193,5 @@ rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: View Components for Rails.
-test_files: 
-- test/active_helper_test.rb
-- test/rails/router_test.rb
-- test/rails/view_test.rb
-- test/rails/capture_test.rb
-- test/rails/integration_test.rb
-- test/rails/render_test.rb
-- test/rails/cells_test.rb
-- test/rails/caching_test.rb
-- test/cell_generator_test.rb
-- test/test_helper.rb
-- test/dummy/config/application.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/environment.rb
-- test/dummy/config/environments/production.rb
-- test/dummy/config/environments/test.rb
-- test/dummy/config/environments/development.rb
-- test/dummy/config/database.yml
-- test/dummy/script/rails
-- test/dummy/config.ru
-- test/dummy/db/test.sqlite3
-- test/dummy/Rakefile
-- test/dummy/public/422.html
-- test/dummy/public/favicon.ico
-- test/dummy/public/500.html
-- test/dummy/public/404.html
-- test/dummy/public/javascripts/controls.js
-- test/dummy/public/javascripts/application.js
-- test/dummy/public/javascripts/rails.js
-- test/dummy/public/javascripts/dragdrop.js
-- test/dummy/public/javascripts/prototype.js
-- test/dummy/public/javascripts/effects.js
-- test/dummy/app/controllers/musician_controller.rb
-- test/dummy/app/controllers/application_controller.rb
-- test/dummy/app/views/layouts/application.html.erb
-- test/dummy/app/views/musician/featured_with_block.html.erb
-- test/dummy/app/views/musician/hamlet.html.haml
-- test/dummy/app/views/musician/featured.html.erb
-- test/dummy/app/helpers/application_helper.rb
-- test/cells_module_test.rb
-- test/test_case_test.rb
-- test/helper_test.rb
-- test/cell_module_test.rb
-- test/app/cells/layouts/metal.html.erb
-- test/app/cells/layouts/b.erb
-- test/app/cells/bassist_cell.rb
-- test/app/cells/producer/capture.html.erb
-- test/app/cells/producer/content_for.html.erb
-- test/app/cells/bad_guitarist/_dii.html.erb
-- test/app/cells/bad_guitarist_cell.rb
-- test/app/cells/bassist/contact_form.html.erb
-- test/app/cells/bassist/slap.html.erb
-- test/app/cells/bassist/play.html.erb
-- test/app/cells/bassist/play.js.erb
-- test/app/cells/bassist/sing.html.haml
-- test/app/cells/bassist/jam.html.erb
-- test/app/cells/bassist/ahem.html.erb
-- test/app/cells/bassist/provoke.html.erb
-- test/app/cells/bassist/pose.html.erb
-- test/app/cells/bassist/promote.html.erb
-- test/app/cells/bassist/compose.html.erb
-- test/app/cells/bassist/_dii.html.erb
-- test/app/cells/bassist/yell.en.html.erb
+test_files: []
+