cells 3.10.1 → 3.11.0

data/test/rails/forms_test.rb

@@ -39,6 +39,7 @@ class FormsTest < MiniTest::Spec
   end
 
   it "renders input fields within the form tag with ERB and ViewModel" do
+    skip if ::Cell.rails_version.~("3.0")
 
     html = SongFormCell.new(@controller).form
     puts html.to_s
@@ -65,7 +66,7 @@ class FormsTest < MiniTest::Spec
   end
 
   it "renders input fields within the form tag with HAML and ViewModel" do
-
+    skip
     html = HamlSongFormCell.new(@controller).form
     puts html.to_s
 

data/test/rails/integration_test.rb

@@ -1,5 +1,65 @@
 require 'test_helper'
 
+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
+  end
+
+  def song
+    render :inline => %{<%= concept("view_methods_test/cell", "Up For Breakfast").call %>} # TODO: concept doesn't need .call
+  end
+
+  def songs
+    render :inline => %{<%= concept("view_methods_test/cell", :collection => %w{Alltax Ronny}) %>} # TODO: concept doesn't need .call
+  end
+
+  def album
+    render :inline => %{<%= cell("view_methods_test/album", "Dreiklang").call %>} # DISCUSS: make .call in #cell?
+  end
+
+  def albums
+    render :inline => %{<%= cell("view_methods_test/album", :collection => %w{Dreiklang Coaster}) %>}
+  end
+end
+
+ActionController::TestCase.class_eval do
+  def png_src
+    return "/images/me.png" if Cell.rails_version >= 4.0
+    return "/assets/me.png" if Cell.rails_version >= 3.1
+    "/images/me.png"
+  end
+end
+
 class ControllerMethodsTest < ActionController::TestCase
   tests MusicianController
 
@@ -11,7 +71,7 @@ class ControllerMethodsTest < ActionController::TestCase
     fix_relative_url_root
 
     get 'promotion'
-    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"#{png_src}\" />", @response.body
   end
 
   test "#render_cell with arbitrary options" do
@@ -36,20 +96,63 @@ class ControllerMethodsTest < ActionController::TestCase
     assert_equal BassistCell, @controller.flag
   end
 
-  test "#cell_for" do
-    @controller.cell_for(:bassist).must_be_instance_of BassistCell
+  test "#cell" do
+    @controller.cell(:bassist).must_be_instance_of BassistCell
   end
 
-  test "#cell_for with options" do
-    @controller.cell_for("controller_methods_test/song", :title => "We Called It America").
+  test "#cell with options" do
+    @controller.cell("controller_methods_test/song", :title => "We Called It America").
       title.must_equal "We Called It America"
   end
 
-  if Cell.rails4_0? or Cell.rails4_1_or_more?
+  if Cell.rails_version >= "5.0" # TODO: make run.
     test "#render_cell for engine" do
       @controller.render_cell(:label, :show).must_equal "Fat Wreck"
     end
   end
+
+
+
+
+
+
+ test "pass url_helpers to the cell instance" do
+    assert_equal "/musicians", BassistCell.new(@controller).musicians_path
+  end
+
+  test "allow cells to use url_helpers" do
+    get "index"
+    assert_response :success
+    assert_equal "Find me at <a href=\"/musicians\">vd.com</a>\n", @response.body
+  end
+
+  test "delegate #url_options to the parent_controller" do
+    @controller.instance_eval do
+      def default_url_options
+        {:host => "cells.rails.org"}
+      end
+    end
+
+    assert_equal "http://cells.rails.org/musicians", BassistCell.new(@controller).musicians_url
+  end
+
+  test "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/musicians\">vd.com</a>\n", @response.body
+  end
+
+  test "allow cells to use #config" do
+    BassistCell.class_eval do
+      def provoke; render; end
+    end
+
+    fix_relative_url_root
+
+    get "promotion"
+    assert_response :success
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"#{png_src}\" />", @response.body
+  end
 end
 
 
@@ -70,7 +173,7 @@ class ViewMethodsTest < ActionController::TestCase
     fix_relative_url_root
 
     get 'featured'
-    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"#{png_src}\" />", @response.body
   end
 
   test "#render_cell with a block" do
@@ -82,9 +185,97 @@ class ViewMethodsTest < ActionController::TestCase
     fix_relative_url_root
 
     get 'hamlet'
-    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />\n", @response.body
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"#{png_src}\" />\n", @response.body
   end
 
+
+
+  unless ::Cell.rails_version.~("3.0")
+
+    # concept -------------------
+    class Cell < Cell::Concept
+      def show
+        render :text => "<b>#{model}</b>"
+      end
+
+
+      class Collection < ::Cell::Concept
+        def show
+          concept("view_methods_test/cell", "Dreiklang").call
+        end
+
+        def collection
+          concept("view_methods_test/cell", :collection => %w{Dreiklang Coaster})
+        end
+      end
+    end
+
+    # Concept#concept(:album, "Dreiklang").call
+    test "Concept#cell" do # FIXME: move to HelperTest.
+      Cell::Collection.new(@controller).call.must_equal "<b>Dreiklang</b>"
+    end
+
+    # Concept#concept(:album, collection: [])
+    test "Concept#cell collection: []" do # FIXME: move to HelperTest.
+      Cell::Collection.new(@controller).call(:collection).must_equal "<b>Dreiklang</b>\n<b>Coaster</b>"
+    end
+
+
+    # concept(:song, "Alltax").call
+    test "#concept" do
+      get :song
+      @response.body.must_equal "<b>Up For Breakfast</b>"
+    end
+
+    # concept(:song, collection: [..])
+    test "#concept with collection" do
+      get :songs
+      @response.body.must_equal "<b>Alltax</b>\n<b>Ronny</b>"
+    end
+
+
+
+    # view model ------------------
+    class AlbumCell < ::Cell::ViewModel
+      def show
+        "<b>#{model}</b>"
+      end
+    end
+
+    class AlbumsCell < ::Cell::ViewModel
+      def show
+        cell("view_methods_test/album", "Dreiklang").call
+      end
+
+      def collection
+        cell("view_methods_test/album", :collection => %w{Dreiklang Coaster})
+      end
+    end
+
+    # ViewModel#cell(:album, "Dreiklang").call
+    test "ViewModel#cell" do # FIXME: move to HelperTest.
+      AlbumsCell.new(@controller).call.must_equal "<b>Dreiklang</b>"
+    end
+
+    test "ViewModel#cell collection: []" do # FIXME: move to HelperTest.
+      AlbumsCell.new(@controller).call(:collection).must_equal "<b>Dreiklang</b>\n<b>Coaster</b>"
+    end
+
+
+    # cell(:album, "Dreiklang").call
+    test "#cell for view model" do
+      get :album
+      @response.body.must_equal "<b>Dreiklang</b>"
+    end
+
+    # cell(:album, collection: [..])
+    test "#cell with collection for view model" do
+      get :albums
+      @response.body.must_equal "<b>Dreiklang</b>\n<b>Coaster</b>"
+    end
+  end
+
+
   test "make params (and friends) available in a cell" do
     BassistCell.class_eval do
       def listen

data/test/rails/render_test.rb

@@ -122,7 +122,7 @@ class RailsRenderTest < MiniTest::Spec
       end
 
       exception = ActionView::MissingTemplate
-      exception = Cell::VersionStrategy::MissingTemplate if Cell.rails3_0?
+      exception = Cell::VersionStrategy::MissingTemplate if Cell.rails_version.~("3.0")
 
       assert_raises exception do
         render_cell(:bassist, :groove)
@@ -134,7 +134,7 @@ class RailsRenderTest < MiniTest::Spec
         def groove; render; end
       end
 
-      if Cell.rails3_0?
+      if Cell.rails_version.~("3.0")
         e = assert_raises Cell::Rails::MissingTemplate do
           render_cell(:bad_guitarist, :groove)
         end
@@ -167,14 +167,6 @@ class RailsRenderTest < MiniTest::Spec
       end
       assert_equal "<h1>Laaa</h1>\n<h1>Laaa</h1>\n<h1>Laaa</h1>\n", render_cell(:bassist, :sing)
     end
-
-    # inheriting
-    it "inherit play.html.erb from BassistCell" do
-      BassistCell.class_eval do
-        def play; render; end
-      end
-      assert_equal "Doo", render_cell(:bad_guitarist, :play)
-    end
   end
 
   describe "A cell view" do

data/test/rails/view_model_test.rb

@@ -1,24 +1,22 @@
 require 'test_helper'
 
-# TODO: test if nested state renders are html_safe.
+if Cell.rails_version >= 3.1
 
-class Song < OpenStruct
-  extend ActiveModel::Naming
+  class Song < OpenStruct
+    extend ActiveModel::Naming
 
-  def persisted?
-    true
-  end
+    def persisted?
+      true
+    end
 
-  def to_param
-    id
+    def to_param
+      id
+    end
   end
-end
 
 
 
-class SongCell < Cell::Rails
-    include Cell::Rails::ViewModel
-
+  class SongCell < Cell::ViewModel
     def show
       render
     end
@@ -47,6 +45,10 @@ class SongCell < Cell::Rails
       render :dashboard
     end
 
+    def scale
+      render :layout => 'b'
+    end
+
     class Lyrics < self
       def show
         render :lyrics
@@ -54,81 +56,154 @@ class SongCell < Cell::Rails
     end
 
     class PlaysCell < self
+      def show
+        render :plays
+      end
     end
   end
 
-class ViewModelTest < MiniTest::Spec
-  # class PianoSongCell < Cell::Rails
-  #   include ViewModel
+  class ViewModelTest < MiniTest::Spec
+    # views :show, :create #=> wrap in render_state(:show, *)
+    let (:cell) { SongCell.new(nil, :title => "Shades Of Truth") }
 
-  #   property :title
-  # end
+    it { cell.title.must_equal "Shades Of Truth" }
 
-  # views :show, :create #=> wrap in render_state(:show, *)
-  let (:cell) { SongCell.build_for(nil, :title => "Shades Of Truth") }
+    class HitCell < Cell::ViewModel
+      property :title, :artist
 
-  it { cell.title.must_equal "Shades Of Truth" }
+      def show
+        "Great!"
+      end
 
-  class HitCell < Cell::Base
-    include Cell::Rails::ViewModel
-    property :title, :artist
-  end
+      def rate
+        "Fantastic!"
+      end
+
+      attr_accessor :count
+      cache :count
+    end
+
+    let (:song) { Song.new(:title => "65", artist: "Boss") }
+    it { HitCell.new(nil, song).title.must_equal "65" }
+    it { HitCell.new(nil, song).artist.must_equal "Boss" }
 
-  let (:song) { Song.new(:title => "65", artist: "Boss") }
-  it { HitCell.new(song).title.must_equal "65" }
-  it { HitCell.new(song).artist.must_equal "Boss" }
- end
 
-if Cell.rails3_2_or_more?
-  class ViewModelIntegrationTest < ActionController::TestCase
-    tests MusicianController
+    describe "#call" do
+      let (:cell) { HitCell.new(nil, song) }
 
-    #let (:song) { Song.new(:title => "Blindfold", :id => 1) }
-    #let (:html) { %{<h1>Shades Of Truth</h1>\n} }
-    #let (:cell) {  }
+      it { cell.call.must_equal "Great!" }
+      it { cell.call(:rate).must_equal "Fantastic!" }
+
+      it "no caching" do
+        cell.instance_eval do
+          def cache_configured?
+            false
+          end
+        end
+
+        cell.count = 1
+        cell.call(:count).must_equal "1"
+        cell.count = 2
+        cell.call(:count).must_equal "2"
+      end
 
-    setup do
-      @cell = SongCell.build_for(@controller, :song => Song.new(:title => "Blindfold", :id => "1"))
+      it "with caching" do
+        cell.instance_eval do
+          self.cache_store = ActiveSupport::Cache::MemoryStore.new
+          self.cache_configured = true
+        end
 
-      @url = "/songs/1"
-      @url = "http://test.host/songs/1" if Cell.rails4_0?
+        cell.count = 1
+        cell.call(:count).must_equal "1"
+        cell.count = 2
+        cell.call(:count).must_equal "1"
+      end
     end
 
 
-    # test "instantiating without model, but call to ::property" do
-    #   assert_raises do
-    #     @controller.cell("view_model_test/piano_song")
-    #   end
+    # describe "::helper" do
+    #   it { assert_raises { HitCell.helper Module.new } }
     # end
+  end
+
 
+  if Cell.rails_version >= "3.2"
+    class ViewModelIntegrationTest < ActionController::TestCase
+      tests MusicianController
 
-    test "URL helpers in view" do
-        @cell.show.must_equal %{<h1>BLINDFOLD</h1>
+      #let (:song) { Song.new(:title => "Blindfold", :id => 1) }
+      #let (:html) { %{<h1>Shades Of Truth</h1>\n} }
+      #let (:cell) {  }
+
+      setup do
+        @cell = SongCell.new(@controller, :song => Song.new(:title => "Blindfold", :id => "1"))
+
+        @url = "/songs/1"
+        @url = "http://test.host/songs/1" if Cell.rails_version.>=("4.0")
+      end
+
+
+      # test "instantiating without model, but call to ::property" do
+      #   assert_raises do
+      #     @controller.cell("view_model_test/piano_song")
+      #   end
+      # end
+
+
+      test "URL helpers in view" do
+          @cell.show.must_equal %{<h1>BLINDFOLD</h1>
 <a href=\"#{@url}\">Permalink</a>
-} end
+}     end
 
-    test "URL helper in instance" do
-      @cell.self_url.must_equal @url
-    end
+      test "URL helper in instance" do
+        @cell.self_url.must_equal @url
+      end
 
-    test "implicit #render" do
-      @cell.details.must_equal "<h3>BLINDFOLD</h3>\n"
-      SongCell.build_for(@controller, :song => Song.new(:title => "Blindfold", :id => 1)).details
-    end
+      test "implicit #render" do
+        @cell.details.must_equal "<h3>BLINDFOLD</h3>\n"
+        SongCell.new(@controller, :song => Song.new(:title => "Blindfold", :id => 1)).details
+      end
+
+      test "explicit #render with one arg" do
+        @cell = SongCell.new(@controller, :song => Song.new(:title => "Blindfold", :id => 1))
+        @cell.stats.must_equal "<h3>BLINDFOLD</h3>\n"
+      end
+
+      test "nested render" do
+        @cell.info.must_equal "<li>BLINDFOLD\n</li>\n"
+      end
 
-    test "explicit #render with one arg" do
-      @cell = SongCell.build_for(@controller, :song => Song.new(:title => "Blindfold", :id => 1))
-      @cell.stats.must_equal "<h3>BLINDFOLD</h3>\n"
+      test "nested rendering method" do
+        @cell.dashboard.must_equal "<h1>Dashboard</h1>\n<h3>Lyrics for BLINDFOLD</h3>\n<li>\nIn the Mirror\n</li>\n<li>\nI can see\n</li>\n\nPlays: 99\n\nPlays: 99\n\n"
+      end
+
+      test( "layout") { @cell.scale.must_equal "<b>A Minor!\n</b>" }
+
+      # TODO: when we don't pass :song into Lyrics
     end
+  end
 
-    test "nested render" do
-      @cell.info.must_equal "<li>BLINDFOLD\n</li>\n"
+  class CollectionTest < MiniTest::Spec
+    class ReleasePartyCell < Cell::ViewModel
+      def show
+        "Party on, #{model}!"
+      end
+
+      def show_more
+        "Go nuts, #{model}!"
+      end
     end
 
-    test "nested rendering method" do
-      @cell.dashboard.must_equal "<h1>Dashboard</h1>\n<h3>Lyrics for BLINDFOLD</h3>\n<li>\nIn the Mirror\n</li>\n<li>\nI can see\n</li>\n\nPlays: 99\n\nPlays: 99\n\n"
+
+    describe "::collection" do
+      it { Cell::ViewModel.collection("collection_test/release_party", @controller, %w{Garth Wayne}).must_equal "Party on, Garth!\nParty on, Wayne!" }
+      it { Cell::ViewModel.collection("collection_test/release_party", @controller, %w{Garth Wayne}, :show_more).must_equal "Go nuts, Garth!\nGo nuts, Wayne!" }
     end
+    # TODO: test with builders ("polymorphic collections") and document that.
 
-    # TODO: when we don't pass :song into Lyrics
+    describe "::cell" do
+      it { Cell::ViewModel.cell("collection_test/release_party", @controller, "Garth").call.must_equal "Party on, Garth!" }
+    end
   end
+
 end