cells 3.8.8 → 3.9.0

data/test/rails/cells_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RailsCellsTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
-  
+
   def swap(object, new_values)
     old_values = {}
     new_values.each do |key, value|
@@ -15,7 +15,7 @@ class RailsCellsTest < MiniTest::Spec
       object.send :"#{key}=", value
     end
   end
-  
+
   describe "#render_state" do
     it "work without args" do
       BassistCell.class_eval do
@@ -25,7 +25,7 @@ class RailsCellsTest < MiniTest::Spec
       end
       assert_equal "That's a D!", cell(:bassist).render_state(:listen)
     end
-    
+
     it "accept state-args" do
       BassistCell.class_eval do
         def listen(args)
@@ -34,7 +34,7 @@ class RailsCellsTest < MiniTest::Spec
       end
       assert_equal "D", cell(:bassist).render_state(:listen, :note => "D")
     end
-    
+
     it "accept state-args with default parameters" do
       BassistCell.class_eval do
         def listen(first, second="D")
@@ -44,13 +44,13 @@ class RailsCellsTest < MiniTest::Spec
       assert_equal "AD", cell(:bassist).render_state(:listen, "A")
     end
   end
-  
-  
+
+
   describe "A rails cell" do
     it "respond to DEFAULT_VIEW_PATHS" do
       assert_equal ["app/cells"], Cell::Rails::DEFAULT_VIEW_PATHS
     end
-    
+
     it "respond to .setup_view_paths!" do
       swap( Cell::Rails, :view_paths => [])  do
         Cell::Rails.setup_view_paths!
@@ -61,46 +61,46 @@ class RailsCellsTest < MiniTest::Spec
         end
       end
     end
-    
+
     it "respond to view_paths" do
       assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must be a PathSet for proper template caching/reloading (see issue#2)"
     end
-    
+
     it "respond to view_paths=" do
       swap( Cell::Rails, :view_paths => ['you', 'are', 'here'])  do
         assert_kind_of ActionView::PathSet, Cell::Rails.view_paths, "must not wipe out the PathSet"
       end
     end
-    
+
     it "respond to #request" do
       assert_equal @request, cell(:bassist).request
     end
-    
+
     it "respond to #config" do
       assert_equal({}, cell(:bassist).config)
     end
-    
-    
+
+
     if Cell.rails3_0?
       describe "invoking find_family_view_for_state" do
         it "raise an error when a template is missing" do
           assert_raises ActionView::MissingTemplate do
             cell(:bassist).find_template("bassist/playyy")
           end
-          
+
           #puts "format: #{cell(:bassist).find_template("bassist/play.js").formats.inspect}"
         end
-        
+
         it "return play.html.erb" do
           assert_equal "bassist/play", cell(:bassist).send(:find_family_view_for_state, :play).virtual_path
         end
-        
+
         it "find inherited play.html.erb" do
           assert_equal "bassist/play", cell(:bad_guitarist).send(:find_family_view_for_state, :play).virtual_path
         end
       end
     end
-    
+
     describe "delegation" do
       before do
         @request.env["action_dispatch.request.request_parameters"] = {:song => "Creatures"}
@@ -108,25 +108,27 @@ class RailsCellsTest < MiniTest::Spec
         @controller.request = @request
         @cell = cell(:bassist)
       end
-      
+
       it "delegate log" do
         skip
         assert_nothing_raised do
           cell(:bassist).class.logger.info("everything is perfect!")
         end
       end
-      
+
       it "respond to session" do
-        assert_kind_of Hash, @cell.session
+        session_kind = Hash
+        session_kind = ActionController::TestSession if Cell.rails4_0_or_more?
+        assert_kind_of session_kind, @cell.session
       end
-          
+
       it "respond to #params and return the request parameters" do
         assert_equal({"song" => "Creatures"}, cell(:bassist).params)
       end
-      
+
       it "not merge #params and #options" do
         assert_equal({"song" => "Creatures"}, cell(:bassist, "song" => "Lockdown").params)
       end
     end
-  end   
+  end
 end

data/test/rails/integration_test.rb

@@ -1,76 +1,95 @@
 require 'test_helper'
 
-class RailsIntegrationTest < ActionController::TestCase
+class ControllerMethodsTest < ActionController::TestCase
   tests MusicianController
-  
-  describe "A Rails controller" do
-    it "respond to #render_cell" do
-      get 'promotion'
-      assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
-    end
-    
-    it "respond to #render_cell with arbitrary options" do
-      BassistCell.class_eval do
-        def enjoy(what, where="the bar")
-          render :text => "I like #{what} in #{where}."
-        end
-      end
-      
-      @controller.instance_eval do
-        def promotion
-          render :text => render_cell(:bassist, :enjoy, "The Stranglers", "my room")
-        end
+
+  class SongCell < Cell::Rails
+    include Cell::OptionsConstructor
+  end
+
+  test "#render_cell" do
+    get 'promotion'
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
+  end
+
+  test "#render_cell with arbitrary options" do
+    BassistCell.class_eval do
+      def enjoy(what, where="the bar")
+        render :text => "I like #{what} in #{where}."
       end
-      get 'promotion'
-      assert_equal "I like The Stranglers in my room.", @response.body
     end
-    
-    it "be able to pass a block to #render_cell" do
-      get 'promotion_with_block'
-      assert_equal "Doo",       @response.body
-      assert_equal BassistCell, @controller.flag
-    end
-    
-    it "respond to render_cell in the view without escaping twice" do
-      BassistCell.class_eval do
-        def provoke; render; end
+
+    @controller.instance_eval do
+      def promotion
+        render :text => render_cell(:bassist, :enjoy, "The Stranglers", "my room")
       end
-      get 'featured'
-      assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
     end
-    
-    it "respond to render_cell with a block in the view" do
-      get 'featured_with_block'
-      assert_equal "Doo from BassistCell\n", @response.body
-    end
-    
-    it "respond to render_cell in a haml view" do
-      BassistCell.class_eval do
-        def provoke; render; end
+    get 'promotion'
+    assert_equal "I like The Stranglers in my room.", @response.body
+  end
+
+  test "#render_cell with block" do
+    get 'promotion_with_block'
+    assert_equal "Doo",       @response.body
+    assert_equal BassistCell, @controller.flag
+  end
+
+  test "#cell_for" do
+    @controller.cell_for(: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").
+      title.must_equal "We Called It America"
+  end
+end
+
+
+class ViewMethodsTest < ActionController::TestCase
+  tests MusicianController
+
+  test "#cell_for" do
+    @controller.instance_eval do
+      def title
       end
-      get 'hamlet'
-      assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />\n", @response.body
     end
-    
-    it "make params (and friends) available in a cell" do
-      BassistCell.class_eval do
-        def listen
-          render :text => "That's a #{params[:note]}"
-        end
+
+    get :title
+    @response.body.must_equal "First Call"
+  end
+
+  test "#render_cell" do
+    get 'featured'
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
+  end
+
+  test "#render_cell with a block" do
+    get 'featured_with_block'
+    assert_equal "Boing in D from BassistCell\n", @response.body
+  end
+
+  test "#render_cell in a haml view" do
+    get 'hamlet'
+    assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />\n", @response.body
+  end
+
+  test "make params (and friends) available in a cell" do
+    BassistCell.class_eval do
+      def listen
+        render :text => "That's a #{params[:note]}"
       end
-      get 'skills', :note => "D"
-      assert_equal "That's a D", @response.body
     end
-    
-    it "respond to #config" do
-      BassistCell.class_eval do
-        def listen
-          render :view => 'contact_form'  # form_tag internally calls config.allow_forgery_protection
-        end
+    get 'skills', :note => "D"
+    assert_equal "That's a D", @response.body
+  end
+
+  test "respond to #config" do
+    BassistCell.class_eval do
+      def listen
+        render :view => 'contact_form'  # form_tag internally calls config.allow_forgery_protection
       end
-      get 'skills'
-      assert_equal "<form accept-charset=\"UTF-8\" action=\"musician/index\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>\n", @response.body
     end
+    get 'skills'
+    assert_equal "<form accept-charset=\"UTF-8\" action=\"musician/index\" method=\"post\"><div style=\"margin:0;padding:0;display:inline\"><input name=\"utf8\" type=\"hidden\" value=\"&#x2713;\" /></div>\n", @response.body
   end
-  
 end

data/test/rails/view_model_test.rb

@@ -0,0 +1,119 @@
+require 'test_helper'
+require 'cell/rails/view_model'
+
+class Song < OpenStruct
+  extend ActiveModel::Naming
+
+  def persisted?
+    true
+  end
+
+  def to_param
+    id
+  end
+end
+
+
+
+class SongCell < Cell::Rails
+    include Cell::Rails::ViewModel
+
+    def show
+      render
+    end
+
+    def title
+      song.title.upcase
+    end
+
+    def self_url
+      url_for(song)
+    end
+
+    def details
+      render
+    end
+
+    def stats
+      render :details
+    end
+
+    def info
+      render :info
+    end
+
+    def dashboard
+      render :dashboard
+    end
+
+    class Lyrics < self
+      def show
+        render :lyrics
+      end
+    end
+
+    class PlaysCell < self
+    end
+  end
+
+class ViewModelTest < MiniTest::Spec
+  # views :show, :create #=> wrap in render_state(:show, *)
+  let (:cell) { SongCell.build_for(nil, :title => "Shades Of Truth") }
+
+  it { cell.title.must_equal "Shades Of Truth" }
+
+  class HitCell < Cell::Base
+    include Cell::Rails::ViewModel
+    property :title
+  end
+
+  let (:song) { Song.new(:title => "65") }
+  it { HitCell.new(song).title.must_equal "65" }
+ end
+
+if Cell.rails3_2_or_more?
+  class ViewModelIntegrationTest < ActionController::TestCase
+    tests MusicianController
+
+    #let (:song) { Song.new(:title => "Blindfold", :id => 1) }
+    #let (:html) { %{<h1>Shades Of Truth</h1>\n} }
+    #let (:cell) {  }
+
+    setup do
+      @cell = SongCell.build_for(@controller, :song => Song.new(:title => "Blindfold", :id => 1))
+
+      @url = "/songs/1"
+      @url = "http://test.host/songs/1" if Cell.rails4_0_or_more?
+    end
+
+
+    test "URL helpers in view" do
+        @cell.show.must_equal %{<h1>BLINDFOLD</h1>
+<a href=\"#{@url}\">Permalink</a>
+} 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 "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"
+    end
+
+    test "nested render" do
+      @cell.info.must_equal "<li>BLINDFOLD\n</li>\n"
+    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"
+    end
+
+    # TODO: when we don't pass :song into Lyrics
+  end
+end

data/test/rails_helper_api_test.rb

@@ -6,15 +6,15 @@ class RailsHelperAPITest < MiniTest::Spec
   class ::Fruit
     extend ActiveModel::Naming
     include ActiveModel::Conversion
-    
+
     def initialize(attributes={})
       @attributes = attributes
     end
-    
+
     def title
       @attributes[:title]
     end
-    
+
     def persisted?
       false
     end
@@ -32,28 +32,26 @@ class RailsHelperAPITest < MiniTest::Spec
     end
   end
 
-  require "simple_form"
   class BassistCell < Cell::Base
     include Cell::Rails::HelperAPI
-    
+
     self._helpers = FakeHelpers
     self._routes = FakeUrlFor.new
-    
+
     def edit
       @tone = "C"
       @fruit = Fruit.new(:title => "Banana")
       render
     end
   end
-  
+
   describe "Rails::HelperAPI" do
     it "allows accessing the request object" do
-      #BassistCell.append_view_path(".")
-      assert_equal '<form accept-charset="UTF-8" action="/fruits" class="simple_form new_fruit" id="new_fruit" method="post"><div style="margin:0;padding:0;display:inline"><input name="utf8" type="hidden" value="&#x2713;" /></div>
-	<div class="input string required"><label class="string required" for="fruit_title"><abbr title="required">*</abbr> Title</label><input class="string required" id="fruit_title" name="fruit[title]" required="required" size="50" type="text" value="Banana" /></div>
-	<input class="button" name="commit" type="submit" value="Create Fruit" />
-</form>
-', BassistCell.new.render_state(:edit) if Cell.rails3_1_or_more? and Rails::VERSION::MINOR == 2
+      skip unless Cell.rails3_1_or_more? and Rails::VERSION::MINOR == 2
+
+      form = BassistCell.new.render_state(:edit)
+      form.must_match /<form accept-charset="UTF-8" action="\/fruits"/
+      form.must_match /name="fruit\[title\]"/
     end
   end
 end