cells 3.11.3 → 4.0.0.beta1

data/test/cell_benchmark.rb

@@ -0,0 +1,32 @@
+require 'test_helper'
+require 'benchmark'
+
+Song = Struct.new(:title)
+
+
+class SongCell < Cell::ViewModel
+  self.view_paths = ['test']
+  property :title
+
+  def show
+    render
+  end
+end
+
+time = Benchmark.measure do
+  Cell::ViewModel.cell(:song, nil, collection: 1000.times.collect { Song.new("Anarchy Camp") })
+end
+
+puts time
+
+# 4.0
+  # 0.310000   0.010000   0.320000 (  0.320382)
+
+  # no caching of templates, puts
+  #   0.570000   0.030000   0.600000 (  0.600160)
+
+  # caching of templates
+  #  0.090000   0.000000   0.090000 (  0.085652)
+
+  # wed, 17.
+  #   0.120000   0.010000   0.130000 (  0.127731)

data/test/cell_generator_test.rb

@@ -1,118 +1,87 @@
 require 'test_helper'
-require 'generators/rails/cell_generator'
+require 'rails/generators/test_case'
+require 'rails/generators/cell/cell_generator'
 
 class CellGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root, "tmp")
+  tests Rails::Generators::CellGenerator
+  destination File.expand_path('../../tmp', File.dirname(__FILE__))
   setup :prepare_destination
-  tests ::Rails::Generators::CellGenerator
 
-  test "create the standard assets" do
-    run_generator %w(Blog post latest)
+  test 'create the standard assets' do
+    run_generator %w(blog post latest  -e 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"
-
-    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"
+    assert_file 'app/cells/blog_cell.rb', /class BlogCell < Cell::ViewModel/
+    assert_file 'app/cells/blog_cell.rb', /def post/
+    assert_file 'app/cells/blog_cell.rb', /def latest/
+    assert_file 'app/cells/blog/post.erb', %r{app/cells/blog/post\.erb}
+    assert_file 'app/cells/blog/post.erb', %r{<p>}
+    assert_file 'app/cells/blog/latest.erb', %r{app/cells/blog/latest\.erb}
   end
 
-  test "create cell that inherits from custom cell class if specified" do
-    run_generator %w(Blog --base-cell-class=ApplicationCell)
-    assert_file "app/cells/blog_cell.rb", /class BlogCell < ApplicationCell/
+  test 'create cell that inherits from custom cell class if specified' do
+    run_generator %w(Blog --parent=ApplicationCell)
+    assert_file 'app/cells/blog_cell.rb', /class BlogCell < ApplicationCell/
   end
-  
-  test "work with namespaces" do
-    run_generator %w(Blog::Post latest)
 
-    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)
+  test 'work with namespaces' do
+    run_generator %w(blog/post latest  -e erb)
+    assert_file 'app/cells/blog/post_cell.rb', /class Blog::PostCell < Cell::ViewModel/
+    assert_file 'app/cells/blog/post_cell.rb', /def show/
+    assert_file 'app/cells/blog/post_cell.rb', /def latest/
+    assert_file 'app/cells/blog/post/latest.erb', %r{app/cells/blog/post/latest\.erb}
   end
-  
-  test "work with namespaces and 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)
+  test 'work with namespaces and haml' do
+    run_generator %w(blog/post latest -e haml)
+    assert_file 'app/cells/blog/post_cell.rb', /class Blog::PostCell < Cell::ViewModel/
+    assert_file 'app/cells/blog/post/latest.haml', %r{app/cells/blog/post/latest\.haml}
   end
 
-  test "work with namespaces and slim" do
-    run_generator %w(Blog::Post latest -e slim)
+  test '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)
+    assert_file 'app/cells/blog/post_cell.rb', /class Blog::PostCell < Cell::ViewModel/
+    assert_file 'app/cells/blog/post/latest.slim', %r{app/cells/blog/post/latest\.slim}
   end
 
-  test "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)
-
+  test 'create slim assets with -e slim' do
+    run_generator %w(blog post latest -e 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"
+    assert_file 'app/cells/blog_cell.rb', /class BlogCell < Cell::ViewModel/
+    assert_file 'app/cells/blog_cell.rb', /def post/
+    assert_file 'app/cells/blog_cell.rb', /def latest/
+    assert_file 'app/cells/blog/post.slim', %r{app/cells/blog/post\.slim}
+    assert_file 'app/cells/blog/post.slim', %r{p}
+    assert_file 'app/cells/blog/latest.slim', %r{app/cells/blog/latest\.slim}
   end
 
-  test "create haml assets with -e haml" do
+  test '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"
-
-    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"
+    assert_file 'app/cells/blog_cell.rb', /class BlogCell < Cell::ViewModel/
+    assert_file 'app/cells/blog_cell.rb', /def post/
+    assert_file 'app/cells/blog_cell.rb', /def latest/
+    assert_file 'app/cells/blog/post.haml', %r{app/cells/blog/post\.haml}
+    assert_file 'app/cells/blog/post.haml', %r{%p}
+    assert_file 'app/cells/blog/latest.haml', %r{app/cells/blog/latest\.haml}
   end
 
-  test "create test_unit assets with -t test_unit" do
+  test 'create test_unit assets with -t test_unit' do
     run_generator %w(Blog post latest -t test_unit)
 
-    assert_file "test/cells/blog_cell_test.rb"
+    assert_file 'test/cells/blog_cell_test.rb'
   end
 
-  test "work with namespace and test_unit" do
-    run_generator %w(Blog::Post latest -t test_unit)
+  test 'work with namespace and test_unit' do
+    run_generator %w(blog/post latest -t test_unit)
 
-    assert_file "test/cells/blog/post_cell_test.rb",  /class Blog::PostCellTest < Cell::TestCase/
+    assert_file 'test/cells/blog/post_cell_test.rb',  /class Blog::PostCellTest < Cell::TestCase/
   end
 
-  test "create test_unit assets with -t rspec" do
+  test '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"
+    assert_no_file 'test/cells/blog_cell_test.rb'
   end
 
-  test "generate with custom base_path" do
-    run_generator %w(Blog --base-cell-path=app/components)
-    assert_file "app/components/blog_cell.rb"
-  end
 end

data/test/cell_test.rb

@@ -1,28 +1,13 @@
-require "test_helper"
+require 'test_helper'
 
 class CellTest < MiniTest::Spec
-  class ArtistCell < Cell::Rails
-  end
-  class SongCell < Cell::Base
-    include Cell::OptionsConstructor
-  end
-
-  describe "#initialize" do
-    it { Class.new(Cell::Base) { include Cell::OptionsConstructor }.new(:song => song=Object.new).song.must_equal song }
-    it { Class.new(Cell::Rack) { include Cell::OptionsConstructor }.new(Object, :song => song=Object.new).song.must_equal song }
-    it { Class.new(Cell::Rails) { include Cell::OptionsConstructor }.new(Object, :song => song=Object.new).song.must_equal song }
+  class SongCell < Cell::ViewModel
+    def show
+    end
   end
+  # ::rails_version
+  it { Cell.rails_version.must_equal Gem::Version.new(ActionPack::VERSION::STRING) }
 
-  describe "::create_cell_for" do
-    it { Cell::Base.create_cell_for("cell_test/song", :song => song=Object.new).song.must_equal song }
-  end
-
-  describe "#cell" do
-    it { Cell::Rails.new(Object).cell("cell_test/artist").must_be_instance_of ArtistCell }
-    it { Cell::Base.new.cell("cell_test/song").must_be_instance_of SongCell }
-  end
+  # #options
+  it { SongCell.new(nil, nil, genre: "Punkrock").send(:options)[:genre].must_equal "Punkrock" }
 end
-
-class OptionsConstructorTest < MiniTest::Spec
-  it { Class.new(Cell::Base) { include Cell::OptionsConstructor }.new(:song => song=Object.new).song.must_equal song }
-end

data/test/concept_generator_test.rb

@@ -1,24 +1,33 @@
 require 'test_helper'
-require 'generators/rails/concept_generator'
+require 'rails/generators/test_case'
+require 'rails/generators/concept/concept_generator'
 
 class ConceptGeneratorTest < Rails::Generators::TestCase
-  destination File.join(Rails.root, "tmp")
+  destination File.expand_path('../../tmp', File.dirname(__FILE__))
   setup :prepare_destination
-  tests ::Rails::Generators::ConceptGenerator
+  tests Rails::Generators::ConceptGenerator
 
-  test "[erb] standard assets, show view" do
-    run_generator %w(Song)
+  test '[erb] standard assets, show view' do
+    run_generator %w(song -e erb)
 
-    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Concept/
-    assert_file "app/concepts/song/cell.rb", /def show/
-    assert_file "app/concepts/song/views/show.erb", %r(app/concepts/song/views/show\.erb)
+    assert_file 'app/concepts/song/cell.rb', /class Song::Cell < Cell::Concept/
+    assert_file 'app/concepts/song/cell.rb', /def show/
+    assert_file 'app/concepts/song/views/show.erb', %r{app/concepts/song/views/show\.erb}
   end
 
-  test "[haml] standard assets, show view" do
-    run_generator %w(Song -e haml)
+  test '[haml] standard assets, show view' do
+    run_generator %w(song -e haml)
 
-    assert_file "app/concepts/song/cell.rb", /class Song::Cell < Cell::Concept/
-    assert_file "app/concepts/song/cell.rb", /def show/
-    assert_file "app/concepts/song/views/show.haml", %r(app/concepts/song/views/show\.haml)
+    assert_file 'app/concepts/song/cell.rb', /class Song::Cell < Cell::Concept/
+    assert_file 'app/concepts/song/cell.rb', /def show/
+    assert_file 'app/concepts/song/views/show.haml', %r{app/concepts/song/views/show\.haml}
+  end
+
+  test '[slim] standard assets, show view' do
+    run_generator %w(song -e slim)
+
+    assert_file 'app/concepts/song/cell.rb', /class Song::Cell < Cell::Concept/
+    assert_file 'app/concepts/song/cell.rb', /def show/
+    assert_file 'app/concepts/song/views/show.slim', %r{app/concepts/song/views/show\.slim}
   end
 end

data/test/concept_test.rb

@@ -1,94 +1,60 @@
 require 'test_helper'
 
-if Cell.rails_version >= 3.1
-  Cell::Concept.class_eval do
-    self.append_view_path "test/app/concepts"
-  end
-
-  # Trailblazer style:
-  module Record
-    class Cell < Cell::Concept # cell("record")
-      def show
-        render # Party On, #{model}
-      end
-
-      # cell(:song, concept: :record)
-      class Song < self # cell("record/cell/song")
-        def show
-          render :view => :song#, :layout => "layout"
-          # TODO: test layout: .. in ViewModel
-        end
-
-        def show_with_layout
-          render :view => :song, :layout => "layout"
-        end
-      end
+Cell::Concept.class_eval do
+  self.view_paths = ['test/fixtures/concepts']
+end
 
-      class Hit < ::Cell::Concept
-        inherit_views Record::Cell
-      end
+# Trailblazer style:
+module Record
+  class Cell < Cell::Concept # cell("record")
+    self.template_engine = "erb"
 
-      class Track < ::Cell::Concept
-        inherit_views Song
+    def show
+      render # Party On, #{model}
+    end
 
-        layout "layout"
-        def show
-          render :song
-        end
+    # cell(:song, concept: :record)
+    class Song < self # cell("record/cell/song")
+      def show
+        render :view => :song#, :layout => "layout"
+        # TODO: test layout: .. in ViewModel
       end
     end
-  end
-
-  # app/cells/comment/views
-  # app/cells/comment/form/views
-  # app/cells/comment/views/form inherit_views Comment::Cell, render form/show
-
-
-  class ConceptTest < MiniTest::Spec
-    include Cell::TestCase::TestMethods
 
-
-    describe "::controller_path" do
-      it { Record::Cell.new(@controller).controller_path.must_equal "record" }
-      it { Record::Cell::Song.new(@controller).controller_path.must_equal "record/song" }
+    class Hit < ::Cell::Concept
+      inherit_views Record::Cell
     end
+  end
+end
 
+# app/cells/comment/views
+# app/cells/comment/form/views
+# app/cells/comment/views/form inherit_views Comment::Cell, render form/show
 
-    describe "#_prefixes" do
-      it { Record::Cell.new(@controller)._prefixes.must_equal       ["record/views"] }
-      it { Record::Cell::Song.new(@controller)._prefixes.must_equal ["record/song/views", "record/views"] }
-      it { Record::Cell::Hit.new(@controller)._prefixes.must_equal  ["record/hit/views", "record/views"]  } # with inherit_views.
-    end
 
-    unless ::Cell.rails_version.~("3.0")
-      it { Record::Cell.new(@controller, "Wayne").render_state(:show).must_equal "Party on, Wayne!" }
-    end
+class ConceptTest < MiniTest::Spec
+  describe "::controller_path" do
+    it { Record::Cell.new(@controller).controller_path.must_equal "record" }
+    it { Record::Cell::Song.new(@controller).controller_path.must_equal "record/song" }
+  end
 
 
-    describe "#cell" do
-      it { Cell::Concept.cell("record/cell", @controller).must_be_instance_of(      Record::Cell) }
-      it { Cell::Concept.cell("record/cell/song", @controller).must_be_instance_of  Record::Cell::Song }
-      # cell("song", concept: "record/compilation") # record/compilation/cell/song
-    end
+  describe "#_prefixes" do
+    it { Record::Cell.new(@controller)._prefixes.must_equal       ["record/views"] }
+    it { Record::Cell::Song.new(@controller)._prefixes.must_equal ["record/song/views", "record/views"] }
+    it { Record::Cell::Hit.new(@controller)._prefixes.must_equal  ["record/hit/views", "record/views"]  } # with inherit_views.
+  end
 
+  it { Record::Cell.new(@controller, "Wayne").call(:show).must_equal "Party on, Wayne!" }
 
-    describe "#render with :layout" do
-      it { Cell::Concept.cell("record/cell/song", @controller).show_with_layout.must_equal "<p>\nLalala\n</p>\n" }
-    end
-    describe "#render with ::layout" do
-      it { Cell::Concept.cell("record/cell/track", @controller).show.must_equal "<p>\nLalala\n</p>\n" }
-    end
-    describe "#render" do
-      it { Cell::Concept.cell("record/cell/song", @controller).show.must_equal "Lalala" }
-    end
 
+  describe "#cell" do
+    it { Cell::Concept.cell("record/cell", @controller).must_be_instance_of(      Record::Cell) }
+    it { Cell::Concept.cell("record/cell/song", @controller).must_be_instance_of  Record::Cell::Song }
+    # cell("song", concept: "record/compilation") # record/compilation/cell/song
+  end
 
-    # inheriting
-    it "inherit play.html.erb from BassistCell" do
-      BadGuitaristCell.class_eval do
-        def play; render; end
-      end
-      assert_equal "Doo", render_cell(:bad_guitarist, :play)
-    end
+  describe "#render" do
+    it { Cell::Concept.cell("record/cell/song", @controller).show.must_equal "Lalala" }
   end
-end
+end

data/test/dummy/app/views/musician/hamlet.html.erb

@@ -0,0 +1 @@
+<%= render_cell :bassist, :provoke %>

data/test/dummy/config/application.rb

@@ -1,28 +1,41 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
+# require "active_model/railtie"
 require "action_controller/railtie"
 require "action_view/railtie"
 
 require "cells"
-require "sprockets/railtie" if Cell.rails_version >= "3.1"
 
 module Dummy
   class Application < Rails::Application
     config.encoding = "utf-8"
+    config.i18n.enforce_available_locales = false
 
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
     config.cache_store = :memory_store
-    config.secret_token = "some secret phrase of at least 30 characters"
+    config.secret_token = SecureRandom.uuid
+    config.secret_key_base = SecureRandom.uuid
 
     # enable asset pipeline as in development.
-    if Cell.rails_version >= "3.1"
-      config.assets.enabled = true
-      config.assets.compile = true
+    config.assets.enabled = true
+    config.assets.compile = true
+    config.cells.with_assets = ["album", "song"]
+    config.cache_classes = true
 
-      config.cells.with_assets = ["album", "song"]
-    end
+    # Show full error reports and disable caching
+    config.consider_all_requests_local       = true
+    config.action_controller.perform_caching = false
+
+    # Raise exceptions instead of rendering exception templates
+    config.action_dispatch.show_exceptions = false
+
+    # Disable request forgery protection in test environment
+    config.action_controller.allow_forgery_protection    = false
+    config.active_support.deprecation = :stderr
+
+    config.eager_load = false
+    config.active_support.test_order = :random
   end
 end