cells 3.9.0 → 3.9.1

data/test/rails/router_test.rb

@@ -4,47 +4,42 @@ module ApplicationTests
   class RouterTest < ActionController::TestCase
     tests MusicianController
 
-    describe "A Rails app" do
-      it "pass url_helpers to the cell instance" do
-        assert_equal "/musicians", BassistCell.new(@controller).musicians_path
-      end
-      
-      it "allow cells to use url_helpers" do
-        BassistCell.class_eval do
-          def promote; render; end
-        end
+    test "pass url_helpers to the cell instance" do
+      assert_equal "/musicians", BassistCell.new(@controller).musicians_path
+    end
 
-        get "index"
-        assert_response :success
-        assert_equal "Find me at <a href=\"/musicians\">vd.com</a>\n", @response.body
-      end
-      
-      it "delegate #url_options to the parent_controller" do
-        @controller.instance_eval do
-          def default_url_options
-            {:host => "cells.rails.org"}
-          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
-        
-        assert_equal "http://cells.rails.org/musicians", BassistCell.new(@controller).musicians_url
       end
 
-      it "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
+      assert_equal "http://cells.rails.org/musicians", BassistCell.new(@controller).musicians_url
+    end
 
-      it "allow cells to use #config" do
-        BassistCell.class_eval do
-          def provoke; render; end
-        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
 
-        get "promotion"
-        assert_response :success
-        assert_equal "That's me, naked <img alt=\"Me\" src=\"/images/me.png\" />", @response.body
+    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=\"/images/me.png\" />", @response.body
     end
   end
 end

data/test/rails/view_model_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+  require 'test_helper'
 require 'cell/rails/view_model'
 
 class Song < OpenStruct
@@ -64,11 +64,12 @@ class ViewModelTest < MiniTest::Spec
 
   class HitCell < Cell::Base
     include Cell::Rails::ViewModel
-    property :title
+    property :title, :artist
   end
 
-  let (:song) { Song.new(:title => "65") }
+  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?
@@ -80,10 +81,10 @@ if Cell.rails3_2_or_more?
     #let (:cell) {  }
 
     setup do
-      @cell = SongCell.build_for(@controller, :song => Song.new(:title => "Blindfold", :id => 1))
+      @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?
+      @url = "http://test.host/songs/1" if Cell.rails4_0?
     end
 
 

data/test/rails/view_test.rb

@@ -2,7 +2,7 @@ require 'test_helper'
 
 class RailsViewTest < MiniTest::Spec
   include Cell::TestCase::TestMethods
-  
+
   describe "A cell view" do
     # DISCUSS: it we allow :partial from a state, too?
     describe "calling render :partial" do
@@ -11,7 +11,7 @@ class RailsViewTest < MiniTest::Spec
           render :partial => 'dii'
         end)
       end
-      
+
       it "render the foreign cell partial in bad_guitarist/dii" do
         assert_equal("Dooom", in_view(:bassist) do
           render :partial => "bad_guitarist/dii"
@@ -28,13 +28,13 @@ class RailsViewTest < MiniTest::Spec
         end)
       end
     end
-    
+
     it "respond to render :state" do
       assert_equal("Doo", in_view(:bassist) do
         render :state => :play
       end)
     end
-    
+
     it "respond to render :state with options" do
       BassistCell.class_eval do
         def listen(*args)

data/test/test_case_test.rb

@@ -2,135 +2,141 @@ require 'test_helper'
 
 class TestCaseTest < Cell::TestCase
   include ActiveSupport::Testing::Deprecation
-    
-  describe "A TestCase" do
-    before do
-      @test = Cell::TestCase.new(:cell_test)
-      
-      BassistCell.class_eval do
-        def play; render; end
+
+  class << self # FIXME: why use Minitest::Spec syntax here. how does C::TC work with that?
+    alias_method :before, :setup
+    alias_method :it, :test
+
+    def describe(msg, &block)
+      instance_exec &block
+    end
+  end
+
+  before do
+    @test = Cell::TestCase.new(:cell_test)
+
+    BassistCell.class_eval do
+      def play; render; end
+    end
+  end
+
+  describe "#render_cell" do
+    it "invokes the state" do
+      assert_equal "Doo", render_cell(:bassist, :play)
+    end
+
+    it "accept state args" do
+      assert_equal "*shouts* Listen!\n", render_cell(:bassist, :shout, :words => "Listen!")
+    end
+  end
+
+  it "respond to #assert_selector with 3 args" do
+    assert_selector "p", "Doo", "<p>Doo</p>y"
+  end
+
+  describe "#cell" do
+    it "create a cell" do
+      assert_kind_of BassistCell, cell(:bassist)
+    end
+
+    it "accept a block" do
+      assert_respond_to cell(:bassist){ def whatever; end }, :whatever
+    end
+  end
+
+  describe "#subject_cell" do
+    it "return the last rendered cell" do
+      render_cell(:bassist, :play)
+      assert_kind_of BassistCell, subject_cell
+    end
+  end
+
+
+  describe "#view_assigns" do
+    it "be emtpy when nothing was set" do
+      render_cell(:bassist, :play)
+      if Cell.rails3_0?
+        assert_equal([:lookup_context], view_assigns.keys)
+      else
+        assert_equal({}, view_assigns)
       end
     end
-    
-    describe "#render_cell" do
-      it "invokes the state" do
-        assert_equal "Doo", render_cell(:bassist, :play)
+
+    it "return the instance variables from the last #render_cell" do
+      BassistCell.class_eval do
+        def sleep
+          @duration = "8h"
+        end
       end
-      
-      it "accept state args" do
-        assert_equal "*shouts* Listen!\n", render_cell(:bassist, :shout, :words => "Listen!")
+      render_cell(:bassist, :sleep)
+      if Cell.rails3_0?
+        assert_equal("8h", view_assigns[:duration])
+      else
+        assert_equal({:duration => "8h"}, view_assigns)
       end
     end
-    
-    it "respond to #assert_selector with 3 args" do
-      assert_selector "p", "Doo", "<p>Doo</p>y"
+  end
+
+  describe "in declarative tests" do
+    it "respond to TestCase.tests" do
+      self.class.tests BassistCell
+      assert_equal BassistCell, self.class.controller_class
     end
-    
-    describe "#cell" do
-      it "create a cell" do
-        assert_kind_of BassistCell, cell(:bassist)
+
+    it "infer the cell name" do
+      class SingerCell < Cell::Rails
       end
-      
-      it "accept a block" do
-        assert_respond_to cell(:bassist){ def whatever; end }, :whatever
+
+      class SingerCellTest < Cell::TestCase
       end
+
+      assert_equal SingerCell, SingerCellTest.new(:cell_test).class.controller_class
     end
-    
-    describe "#subject_cell" do
-      it "return the last rendered cell" do
-        render_cell(:bassist, :play)
-        assert_kind_of BassistCell, subject_cell
+
+    describe "with #invoke" do
+      before do
+        self.class.tests BassistCell
       end
-    end
-    
-    
-    describe "#view_assigns" do
-      it "be emtpy when nothing was set" do
-        render_cell(:bassist, :play)
-        if Cell.rails3_0?
-          assert_equal([:lookup_describe], view_assigns.keys)
-        else
-          assert_equal({}, view_assigns)
-        end
+
+      it "provide #invoke" do
+        assert_equal "Doo", invoke(:play)
       end
-      
-      it "return the instance variables from the last #render_cell" do
-        BassistCell.class_eval do
-          def sleep
-            @duration = "8h"
-          end
-        end
-        render_cell(:bassist, :sleep)
-        if Cell.rails3_0?
-          assert_equal([:lookup_describe, :duration], view_assigns.keys)
-          assert_equal("8h", view_assigns[:duration])
-        else
-          assert_equal({:duration => "8h"}, view_assigns)
-        end
+
+      it "provide #last_invoke" do
+        assert_equal nil, last_invoke
+        assert_equal "Doo", invoke(:play)
+        assert_equal "Doo", last_invoke
       end
-    end
-    
-    describe "in declarative tests" do
-      it "respond to TestCase.tests" do
-        self.class.tests BassistCell
-        assert_equal BassistCell, self.class.controller_class
+
+      it "provide #invoke accepting options" do
+        #assert_equal "Doo", invoke(:play)
       end
-      
-      it "infer the cell name" do
-        class SingerCell < Cell::Rails
-        end
-        
-        class SingerCellTest < Cell::TestCase
-        end
-        
-        assert_equal SingerCell, SingerCellTest.new(:cell_test).class.controller_class
+
+      it "provide #invoke accepting args" do
+        assert_equal "*shouts* Listen!\n", invoke(:shout, :words => "Listen!")
       end
-      
-      describe "with #invoke" do
-        before do
-          self.class.tests BassistCell
-        end
-        
-        it "provide #invoke" do
-          assert_equal "Doo", invoke(:play)
-        end
-        
-        it "provide #last_invoke" do
-          assert_equal nil, last_invoke
-          assert_equal "Doo", invoke(:play)
-          assert_equal "Doo", last_invoke
-        end
-        
-        it "provide #invoke accepting options" do
-          #assert_equal "Doo", invoke(:play)
-        end
-        
-        it "provide #invoke accepting args" do
-          assert_equal "*shouts* Listen!\n", invoke(:shout, :words => "Listen!")
-        end
-        
-        it "provide assert_select" do
-          invoke :promote
-          assert_select "a", "vd.com"
-        end
+
+      it "provide assert_select" do
+        invoke :promote
+        assert_select "a", "vd.com"
       end
-      
-      describe "#before_test_states_in" do
-        it "add the :in_view state" do
-          c = cell(:bassist)
-          assert_not c.respond_to?(:in_view)
-          
-          setup_test_states_in(c)
-          assert_equal "Cells rock.", c.render_state(:in_view, lambda{"Cells rock."})
-        end
+    end
+
+    describe "#before_test_states_in" do
+      it "add the :in_view state" do
+        c = cell(:bassist)
+        assert ! c.respond_to?(:in_view)
+
+        setup_test_states_in(c)
+        assert_equal "Cells rock.", c.render_state(:in_view, lambda{"Cells rock."})
       end
-      
-      describe "#in_view" do
-        it "execute the block in a real view" do
-          content = "Cells rule."
-          @test.setup
-          assert_equal("<h1>Cells rule.</h1>", @test.in_view(:bassist) do content_tag("h1", content) end)
-        end
+    end
+
+    describe "#in_view" do
+      it "execute the block in a real view" do
+        content = "Cells rule."
+        @test.setup
+        assert_equal("<h1>Cells rule.</h1>", @test.in_view(:bassist) do content_tag("h1", content) end)
       end
     end
   end

data/test/test_helper.rb

@@ -20,7 +20,7 @@ MiniTest::Spec.class_eval do
   def assert_not(assertion)
     assert !assertion
   end
-  
+
   def assert_is_a(klass, object)
     assert object.is_a?(klass)
   end
@@ -37,3 +37,15 @@ require File.join(test_app_dir, 'cells', 'bad_guitarist_cell')
 
 require "haml"
 require "haml/template" # Thanks, Nathan!
+
+ActiveSupport::TestCase.class_eval do # this is only needed in integration tests (AC::TestCase).
+  def fix_relative_url_root
+    return unless Cell.rails3_0?
+
+    @controller.config.instance_eval do
+      def relative_url_root
+        ""
+      end
+    end
+end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cells
 version: !ruby/object:Gem::Version
-  version: 3.9.0
+  version: 3.9.1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-22 00:00:00.000000000 Z
+date: 2013-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -98,16 +98,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.7.5
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  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'
 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.
@@ -128,6 +142,7 @@ files:
 - gemfiles/Gemfile.rails3-1
 - gemfiles/Gemfile.rails3-2
 - gemfiles/Gemfile.rails4-0
+- gemfiles/Gemfile.rails4-1
 - lib/cell.rb
 - lib/cell/base.rb
 - lib/cell/builder.rb
@@ -141,6 +156,7 @@ files:
 - lib/cell/rails3_0_strategy.rb
 - lib/cell/rails3_1_strategy.rb
 - lib/cell/rails4_0_strategy.rb
+- lib/cell/rails4_1_strategy.rb
 - lib/cell/rendering.rb
 - lib/cell/test_case.rb
 - lib/cells.rb
@@ -225,6 +241,11 @@ files:
 - test/dummy/config/locales/en.yml
 - test/dummy/config/routes.rb
 - test/dummy/db/test.sqlite3
+- test/dummy/label/app/cells/label/show.erb
+- test/dummy/label/app/cells/label_cell.rb
+- test/dummy/label/label.gemspec
+- test/dummy/label/lib/label.rb
+- test/dummy/label/lib/label/version.rb
 - test/dummy/log/production.log
 - test/dummy/log/server.log
 - test/dummy/public/404.html