cells 4.0.5 → 4.1.0.rc1

data/test/context_test.rb

@@ -0,0 +1,33 @@
+require "test_helper"
+
+class ContextTest < MiniTest::Spec
+  class ParentCell < Cell::ViewModel
+    def user
+      context[:user]
+    end
+
+    def controller
+      context[:controller]
+    end
+  end
+
+  let (:model) { Object.new }
+  let (:user) { Object.new }
+  let (:controller) { Object.new }
+
+  it do
+    cell = ParentCell.(model, admin: true, context: { user: user, controller: controller })
+    # cell.extend(ParentController)
+
+    cell.model.must_equal model
+    cell.controller.must_equal controller
+    cell.user.must_equal user
+
+    # nested cell
+    child = cell.cell("context_test/parent", "")
+
+    child.model.must_equal ""
+    child.controller.must_equal controller
+    child.user.must_equal user
+  end
+end

data/test/fixtures/cell_test/song/show_with_block.erb

@@ -0,0 +1 @@
+<b><%= yield %></b>

data/test/fixtures/comment/layout/show.erb

@@ -0,0 +1 @@
+$layout.erb{<%= yield %>, <%= context.inspect %>}

data/test/fixtures/comment/show/show.erb

@@ -0,0 +1 @@
+$show.erb, <%= context.inspect %>

data/test/fixtures/song/with_block.erb

@@ -0,0 +1 @@
+Yo! <%= yield %>

data/test/layout_test.rb

@@ -55,4 +55,37 @@ class LayoutTest < MiniTest::Spec
 
   # with ::layout and :layout, :layout wins.
   it { SongWithLayoutOnClassCell.new(nil).show_with_layout.must_equal "Happy Friday!" }
-end
+end
+
+module Comment
+  class ShowCell < Cell::ViewModel
+    self.view_paths = ['test/fixtures']
+    include Layout::External
+
+    def show
+      render + render
+    end
+  end
+
+  class LayoutCell < Cell::ViewModel
+    self.view_paths = ['test/fixtures']
+  end
+end
+
+class ExternalLayoutTest < Minitest::Spec
+  it do
+    Comment::ShowCell.new(nil, layout: Comment::LayoutCell, context: { beer: true }).
+      ().must_equal "$layout.erb{$show.erb, {:beer=>true}\n$show.erb, {:beer=>true}\n, {:beer=>true}}\n"
+  end
+
+  # collection :layout
+  it do
+    Cell::ViewModel.cell("comment/show", collection: [Object, Module], layout: Comment::LayoutCell).().
+      must_equal "$layout.erb{$show.erb, nil
+$show.erb, nil
+$show.erb, nil
+$show.erb, nil
+, nil}
+"
+  end
+end

data/test/prefixes_test.rb

@@ -42,8 +42,8 @@ class PrefixesTest < MiniTest::Spec
 
 
   describe "::controller_path" do
-    it { ::BassistCell.new(@controller).controller_path.must_equal "bassist" }
-    it { SingerCell.new(@controller).controller_path.must_equal "prefixes_test/singer" }
+    it { ::BassistCell.new(@controller).class.controller_path.must_equal "bassist" }
+    it { SingerCell.new(@controller).class.controller_path.must_equal "prefixes_test/singer" }
   end
 
   describe "#_prefixes" do
@@ -130,4 +130,4 @@ class InheritViewsTest < MiniTest::Spec
   it { cell('inherit_views_test/popper').call(:play).must_equal 'Dooom!' }
   #  Popper renders its tap
   it { cell('inherit_views_test/popper').call(:tap).must_equal "TTttttap I'm not good enough!" }
-end
+end

data/test/public_test.rb

@@ -21,27 +21,61 @@ class PublicTest < MiniTest::Spec
 
   # ViewModel.cell returns the cell instance.
   it { Cell::ViewModel.cell("public_test/song").must_be_instance_of SongCell }
+  it { Cell::ViewModel.cell(PublicTest::SongCell).must_be_instance_of SongCell }
 
   # Concept.cell simply camelizes the string before constantizing.
   it { Cell::Concept.cell("public_test/songs").must_be_instance_of Songs }
 
+  it { Cell::Concept.cell(PublicTest::Songs).must_be_instance_of Songs }
+
   # ViewModel.cell passes options to cell.
   it { Cell::ViewModel.cell("public_test/song", Object, genre: "Metal").initialize_args.must_equal [Object, {genre:"Metal"}] }
 
   # ViewModel.cell(collection: []) renders cells.
-  it { Cell::ViewModel.cell('public_test/song', collection: [Object, Module]).must_equal '[Object, {}][Module, {}]' }
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).to_s.must_equal '[Object, {}][Module, {}]' }
 
   # ViewModel.cell(collection: []) renders cells with custom join.
-  it { Cell::ViewModel.cell('public_test/song', collection: [Object, Module], collection_join: '<br/>').must_equal '[Object, {}]<br/>[Module, {}]' }
-
-  # ViewModel.cell(collection: []) renders html_safe.
-  it { Cell::ViewModel.cell("public_test/song", collection: [Object]).class.must_equal ActiveSupport::SafeBuffer }
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], collection_join: '<br/>').to_s.must_equal '[Object, {}]<br/>[Module, {}]' }
 
   # ViewModel.cell(collection: []) passes generic options to cell.
-  it { Cell::ViewModel.cell('public_test/song', collection: [Object, Module], genre: 'Metal').must_equal "[Object, {:genre=>\"Metal\"}][Module, {:genre=>\"Metal\"}]" }
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], genre: 'Metal', context: { ready: true }).to_s.must_equal "[Object, {:genre=>\"Metal\", :context=>{:ready=>true}}][Module, {:genre=>\"Metal\", :context=>{:ready=>true}}]" }
 
   # ViewModel.cell(collection: [], method: :detail) invokes #detail instead of #show.
-  it { Cell::ViewModel.cell('public_test/song', collection: [Object, Module], method: :detail).must_equal '* [Object, {}]* [Module, {}]' }
-end
+  # TODO: remove in 5.0.
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module], method: :detail).to_s.must_equal '* [Object, {}]* [Module, {}]' }
+
+  # ViewModel.cell(collection: []).() invokes #show.
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).().must_equal '[Object, {}][Module, {}]' }
+
+  # ViewModel.cell(collection: []).(:detail) invokes #detail instead of #show.
+  it { Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).(:detail).must_equal '* [Object, {}]* [Module, {}]' }
+
+  # #cell(collection: [], genre: "Fusion").() doesn't change options hash.
+  it do
+    Cell::ViewModel.cell("public_test/song", options = { genre: "Fusion", collection: [Object] }).()
+    options.to_s.must_equal "{:genre=>\"Fusion\", :collection=>[Object]}"
+  end
 
-# TODO: test AV::concept.
+  # it do
+  #   content = ""
+  #   Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).each_with_index do |cell, i|
+  #     content += (i == 1 ? cell.(:detail) : cell.())
+  #   end
+
+  #   content.must_equal '[Object, {}]* [Module, {}]'
+  # end
+
+  # cell(collection: []).join captures return value and joins it for you.
+  it do
+    Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).join do |cell, i|
+      i == 1 ? cell.(:detail) : cell.()
+    end.must_equal '[Object, {}]* [Module, {}]'
+  end
+
+  # cell(collection: []).join("<") captures return value and joins it for you with join.
+  it do
+    Cell::ViewModel.cell("public_test/song", collection: [Object, Module]).join(">") do |cell, i|
+      i == 1 ? cell.(:detail) : cell.()
+    end.must_equal '[Object, {}]>* [Module, {}]'
+  end
+end

data/test/render_test.rb

@@ -47,6 +47,10 @@ class SongCell < Cell::ViewModel
     "send"
   end
 
+  def with_block
+    render { "Clean Sheets" + render(:with_html) }
+  end
+
 private
   def title
     "Papertiger"
@@ -72,9 +76,6 @@ class RenderTest < MiniTest::Spec
   # works with state called `send`
   it { SongCell.new(nil).call(:send).must_equal "send" }
 
-  # #call returns html_safe.
-  it { SongCell.new(nil).call.must_be_instance_of ActiveSupport::SafeBuffer }
-
   # throws an exception when not found.
   it do
     exception = assert_raises(Cell::TemplateMissingError) { SongCell.new(nil).unknown }
@@ -99,6 +100,9 @@ class RenderTest < MiniTest::Spec
 
   # doesn't escape HTML.
   it { SongCell.new(nil).call(:with_html).must_equal "<p>Yew!</p>" }
+
+  # render {} with block
+  it { SongCell.new(nil).with_block.must_equal "Yo! Clean Sheets<p>Yew!</p>\n" }
 end
 
 # test inheritance

data/test/test_helper.rb

@@ -1,13 +1,5 @@
-ENV['RAILS_ENV'] = 'test'
-require_relative 'dummy/config/environment'
-
-require 'minitest/autorun'
-
-require 'minitest/reporters'
-Minitest::Reporters.use! [Minitest::Reporters::ProgressReporter.new]
-require "rails/test_help" # adds stuff like @routes, etc.
-
-require 'cells'
+require "minitest/autorun"
+require "cells"
 require "cells-erb"
 
 Cell::ViewModel.send(:include, Cell::Erb) if Cell.const_defined?(:Erb) # FIXME: should happen in inititalizer.
@@ -19,31 +11,3 @@ end
 class BassistCell < Cell::ViewModel
   self.view_paths = ['test/fixtures']
 end
-
-class MusicianController < ActionController::Base
-  def view_with_concept_with_show
-    render inline: %{<%= concept("view_extensions_test/cell", "Up For Breakfast", volume: 1).show %>} # TODO: concept doesn't need .call
-  end
-
-  def view_with_concept_without_call
-    render inline: %{<%= concept("view_extensions_test/cell", "A Tale That Wasn't Right") %>} # this tests ViewModel#to_s.
-  end
-
-  def view_with_concept_with_call
-    render inline: %{<%= concept("view_extensions_test/cell", "A Tale That Wasn't Right").call %>}
-  end
-
-  def view_with_cell_with_call
-    render inline: %{<%= cell("view_extensions_test/song", "A Tale That Wasn't Right").call %>}
-  end
-
-  def action_with_concept_with_call
-    render text: concept("view_extensions_test/cell", "A Tale That Wasn't Right").call
-  end
-
-  def action_with_cell_with_call
-    render text: cell("view_extensions_test/song", "A Tale That Wasn't Right").call
-  end
-end
-
-Rails.backtrace_cleaner.remove_silencers! # YES, stacktraces are awesome!

data/test/{test_case_test.rb → testing_test.rb}

@@ -21,7 +21,7 @@ class TestCaseTest < MiniTest::Spec
     it { subject.must_be_instance_of SongCell }
     it { subject.model.must_equal song }
 
-    it { cell("test_case_test/song", collection: [song, song]).must_equal "Give It All!Give It All!" }
+    it { cell("test_case_test/song", collection: [song, song]).().must_equal "Give It All!Give It All!" }
   end
 
 
@@ -51,7 +51,7 @@ class CapybaraTest < MiniTest::Spec
 
     it { subject.(:show).has_selector?('b').must_equal true }
 
-    it { cell("capybara_test/capybara", collection: [1, 2]).has_selector?('b').must_equal true }
+    it { cell("capybara_test/capybara", collection: [1, 2]).().has_selector?('b').must_equal true }
 
     # FIXME: this kinda sucks, what if you want the string in a Capybara environment?
     it { subject.(:show).to_s.must_match "<b>Grunt</b>" }

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 4.0.5
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-19 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.9
 - !ruby/object:Gem::Dependency
@@ -58,20 +58,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
@@ -115,74 +101,38 @@ files:
 - README.md
 - Rakefile
 - TODO.md
+- benchmarks/class_builder.rb
+- benchmarks/collection.rb
 - cells.gemspec
-- gemfiles/rails3.2.gemfile
-- gemfiles/rails4.0.gemfile
-- gemfiles/rails4.1.gemfile
-- gemfiles/rails4.2.gemfile
 - lib/cell.rb
 - lib/cell/abstract.rb
+- lib/cell/builder.rb
 - lib/cell/caching.rb
-- lib/cell/caching/notification.rb
+- lib/cell/collection.rb
 - lib/cell/concept.rb
 - lib/cell/development.rb
 - lib/cell/escaped.rb
 - lib/cell/layout.rb
 - lib/cell/partial.rb
 - lib/cell/prefixes.rb
-- lib/cell/rails.rb
-- lib/cell/railtie.rb
 - lib/cell/self_contained.rb
 - lib/cell/templates.rb
-- lib/cell/test_case.rb
 - lib/cell/testing.rb
-- lib/cell/translation.rb
 - lib/cell/twin.rb
 - lib/cell/util.rb
 - lib/cell/version.rb
 - lib/cell/view_model.rb
 - lib/cells.rb
-- lib/rails/generators/cell/cell_generator.rb
-- lib/rails/generators/cell/templates/cell.rb.erb
-- lib/rails/generators/cell/templates/view.erb
-- lib/rails/generators/cell/templates/view.haml
-- lib/rails/generators/cell/templates/view.slim
-- lib/rails/generators/concept/concept_generator.rb
-- lib/rails/generators/concept/templates/concept.rb.erb
-- lib/rails/generators/concept/templates/view.erb
-- lib/rails/generators/concept/templates/view.haml
-- lib/rails/generators/concept/templates/view.slim
-- lib/rails/generators/test_unit/cell/cell_generator.rb
-- lib/rails/generators/test_unit/cell/templates/unit_test.rb.erb
-- lib/rails/generators/test_unit/concept/concept_generator.rb
-- lib/rails/generators/test_unit/concept/templates/unit_test.rb.erb
 - lib/tasks/cells.rake
 - test/builder_test.rb
-- test/caching_test.rb
 - test/cell_benchmark.rb
-- test/cell_generator_test.rb
 - test/cell_test.rb
-- test/concept_generator_test.rb
 - test/concept_test.rb
-- test/dummy/Rakefile
-- test/dummy/app/assets/javascripts/application.js
-- test/dummy/app/cells/album/assets/album.js
-- test/dummy/app/concepts/song/assets/songs.js
-- test/dummy/app/controllers/application_controller.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.erb
-- test/dummy/app/views/musician/title.erb
-- test/dummy/config.ru
-- test/dummy/config/application.rb
-- test/dummy/config/boot.rb
-- test/dummy/config/database.yml
-- test/dummy/config/environment.rb
-- test/dummy/config/locales/en.yml
-- test/dummy/config/routes.rb
-- test/dummy/script/rails
+- test/context_test.rb
 - test/fixtures/bassist/play.erb
+- test/fixtures/cell_test/song/show_with_block.erb
+- test/fixtures/comment/layout/show.erb
+- test/fixtures/comment/show/show.erb
 - test/fixtures/concepts/record/views/layout.erb
 - test/fixtures/concepts/record/views/show.erb
 - test/fixtures/concepts/record/views/song.erb
@@ -194,6 +144,7 @@ files:
 - test/fixtures/partials/_show.xml.erb
 - test/fixtures/song/ivar.erb
 - test/fixtures/song/show.erb
+- test/fixtures/song/with_block.erb
 - test/fixtures/song/with_erb.erb
 - test/fixtures/song/with_html.erb
 - test/fixtures/song/with_locals.erb
@@ -213,104 +164,10 @@ files:
 - test/prefixes_test.rb
 - test/property_test.rb
 - test/public_test.rb
-- test/rails/translation_test.rb
-- test/rails4.2/.gitignore
-- test/rails4.2/Gemfile
-- test/rails4.2/README.rdoc
-- test/rails4.2/Rakefile
-- test/rails4.2/app/assets/images/.keep
-- test/rails4.2/app/assets/stylesheets/application.css.erb
-- test/rails4.2/app/cells/form_for/show.erb
-- test/rails4.2/app/cells/form_for_cell.rb
-- test/rails4.2/app/cells/form_tag/show.erb
-- test/rails4.2/app/cells/form_tag_cell.rb
-- test/rails4.2/app/cells/formtastic/show.erb
-- test/rails4.2/app/cells/formtastic_cell.rb
-- test/rails4.2/app/cells/simple_form/show.erb
-- test/rails4.2/app/cells/simple_form_cell.rb
-- test/rails4.2/app/cells/song/song.css
-- test/rails4.2/app/cells/song/with_escaped.erb
-- test/rails4.2/app/cells/song_cell.rb
-- test/rails4.2/app/controllers/application_controller.rb
-- test/rails4.2/app/controllers/concerns/.keep
-- test/rails4.2/app/controllers/index_controller.rb
-- test/rails4.2/app/controllers/songs_controller.rb
-- test/rails4.2/app/helpers/application_helper.rb
-- test/rails4.2/app/mailers/.keep
-- test/rails4.2/app/models/.keep
-- test/rails4.2/app/models/artist.rb
-- test/rails4.2/app/models/concerns/.keep
-- test/rails4.2/app/models/song.rb
-- test/rails4.2/app/views/index/index.html.erb
-- test/rails4.2/app/views/layouts/application.html.erb
-- test/rails4.2/app/views/songs/show.html.erb
-- test/rails4.2/app/views/songs/with_escaped.html.erb
-- test/rails4.2/bin/bundle
-- test/rails4.2/bin/rails
-- test/rails4.2/bin/rake
-- test/rails4.2/bin/setup
-- test/rails4.2/config.ru
-- test/rails4.2/config/application.rb
-- test/rails4.2/config/boot.rb
-- test/rails4.2/config/environment.rb
-- test/rails4.2/config/environments/development.rb
-- test/rails4.2/config/environments/production.rb
-- test/rails4.2/config/environments/test.rb
-- test/rails4.2/config/initializers/backtrace_silencers.rb
-- test/rails4.2/config/initializers/cookies_serializer.rb
-- test/rails4.2/config/initializers/filter_parameter_logging.rb
-- test/rails4.2/config/initializers/formtastic.rb
-- test/rails4.2/config/initializers/inflections.rb
-- test/rails4.2/config/initializers/mime_types.rb
-- test/rails4.2/config/initializers/session_store.rb
-- test/rails4.2/config/initializers/wrap_parameters.rb
-- test/rails4.2/config/locales/en.yml
-- test/rails4.2/config/routes.rb
-- test/rails4.2/config/secrets.yml
-- test/rails4.2/db/seeds.rb
-- test/rails4.2/engines/my_engine/.gitignore
-- test/rails4.2/engines/my_engine/Gemfile
-- test/rails4.2/engines/my_engine/MIT-LICENSE
-- test/rails4.2/engines/my_engine/README.rdoc
-- test/rails4.2/engines/my_engine/Rakefile
-- test/rails4.2/engines/my_engine/app/assets/images/my_engine/.keep
-- test/rails4.2/engines/my_engine/app/assets/stylesheets/my_engine/application.css
-- test/rails4.2/engines/my_engine/app/concepts/user/cell.rb
-- test/rails4.2/engines/my_engine/app/concepts/user/views/show.erb
-- test/rails4.2/engines/my_engine/app/concepts/user/views/user.scss
-- test/rails4.2/engines/my_engine/app/controllers/my_engine/application_controller.rb
-- test/rails4.2/engines/my_engine/app/controllers/my_engine/user_controller.rb
-- test/rails4.2/engines/my_engine/app/helpers/my_engine/application_helper.rb
-- test/rails4.2/engines/my_engine/app/models/my_engine/user.rb
-- test/rails4.2/engines/my_engine/app/views/layouts/my_engine/application.html.erb
-- test/rails4.2/engines/my_engine/app/views/my_engine/user/show.html.erb
-- test/rails4.2/engines/my_engine/bin/rails
-- test/rails4.2/engines/my_engine/config/routes.rb
-- test/rails4.2/engines/my_engine/db/migrate/20150530135920_create_my_engine_users.rb
-- test/rails4.2/engines/my_engine/lib/my_engine.rb
-- test/rails4.2/engines/my_engine/lib/my_engine/engine.rb
-- test/rails4.2/engines/my_engine/lib/my_engine/version.rb
-- test/rails4.2/engines/my_engine/lib/tasks/my_engine_tasks.rake
-- test/rails4.2/engines/my_engine/my_engine.gemspec
-- test/rails4.2/engines/my_engine/test/fixtures/my_engine/users.yml
-- test/rails4.2/engines/my_engine/test/models/my_engine/user_test.rb
-- test/rails4.2/lib/assets/.keep
-- test/rails4.2/lib/tasks/.keep
-- test/rails4.2/log/.keep
-- test/rails4.2/test/integration/asset_pipeline_test.rb
-- test/rails4.2/test/integration/controller_test.rb
-- test/rails4.2/test/integration/form_for_test.rb
-- test/rails4.2/test/integration/form_tag_test.rb
-- test/rails4.2/test/integration/formtastic_test.rb
-- test/rails4.2/test/integration/simple_form_test.rb
-- test/rails4.2/test/integration/url_helper_test.rb
-- test/rails4.2/test/test_helper.rb
-- test/rails4.2/vendor/assets/stylesheets/.keep
-- test/rails_extensions_test.rb
 - test/render_test.rb
 - test/templates_test.rb
-- test/test_case_test.rb
 - test/test_helper.rb
+- test/testing_test.rb
 - test/twin_test.rb
 homepage: https://github.com/apotonick/cells
 licenses:
@@ -327,9 +184,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.8