spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/unit/test_changesets.rb

@@ -28,18 +28,30 @@ describe "Change" do
     Content.delete_revision(@revision) rescue nil
     Content.delete_revision(@revision+1) rescue nil
     Content.delete
+    @site.must_publish_all!(false)
     teardown_site
   end
 
+  def outstanding_changes
+    S::Change.outstanding(@site)
+  end
+
   it "flag if the site has never been published" do
     root = Page.create(:title => "root")
     5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
-    result = S::Change.outstanding
+    result = outstanding_changes
     assert result.key?(:published_revision)
     result[:published_revision].must_equal 0
     assert result[:first_publish]
   end
 
+  it "honors the site must_publish_all? flag" do
+    @site.must_publish_all!
+    root = Page.create(:title => "root")
+    result = outstanding_changes
+    result[:must_publish_all].must_equal true
+  end
+
 
   it "list all newly created pages" do
     root = Page.create(:title => "root")
@@ -48,7 +60,7 @@ describe "Change" do
 
     5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
 
-    result = S::Change.outstanding
+    result = outstanding_changes
     result.must_be_instance_of(Hash)
 
     pages = result[:changes]
@@ -68,7 +80,7 @@ describe "Change" do
     root[:first_published_at] = root[:last_published_at] = root.modified_at - 1000
     root.things << Piece.new
     root.save.reload
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     result.length.must_equal 1
     result.first.page.must_equal root
   end
@@ -83,7 +95,7 @@ describe "Change" do
 
     Content.publish(@revision+1, [root.id, root.things.first.id])
 
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     result.length.must_equal 4
     Set.new(result.map(&:page_id).flatten).must_equal Set.new(root.things[1..-1].map(&:id))
   end
@@ -110,7 +122,7 @@ describe "Change" do
 
 
     Content.publish(@revision+1, [root.id])
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
 
     result.length.must_equal 5
 
@@ -148,7 +160,7 @@ describe "Change" do
 
 
     Content.publish(@revision+1, [root.id])
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
 
     e = nil
     begin
@@ -174,7 +186,7 @@ describe "Change" do
     root.save
 
     Content.publish(@revision+1, [root.id])
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     change = result.detect { |change| change.page.id == new_child1.id }
     change.export.must_equal({
       :id => new_child1.id,
@@ -212,7 +224,7 @@ describe "Change" do
     root.save
     last = Time.now + 100
     ::Content.filter(:id => new_child1.id).update(:modified_at => last)
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     assert result.first.modified_at > result.last.modified_at, "Change list in incorrect order"
   end
 
@@ -235,7 +247,7 @@ describe "Change" do
     page1.slug = "changed"
     page1.save
 
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
 
     change = result.detect { |change| change.page.id == page1.id }
     change.export[:side_effects].must_equal({
@@ -261,7 +273,7 @@ describe "Change" do
     page1.hide!
 
     page1.reload
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     change = result.detect { |change| change.page.id == page1.id }
     change.export[:side_effects].must_equal({
       :visibility => [{ :count => 1, :created_at => later.httpdate, :old_value => false, :new_value => true}]
@@ -281,7 +293,7 @@ describe "Change" do
 
     lock = Spontaneous::PageLock.create(:page_id => page.id, :content_id => piece.id, :field_id => piece.async.id, :description => "Update Lock")
     assert page.locked_for_update?
-    result = S::Change.outstanding[:changes]
+    result = outstanding_changes[:changes]
     change = result.detect { |change| change.page.id == page.id }
     change.export[:update_locks].must_equal [{
       id: lock.id,

data/test/unit/test_content.rb

@@ -330,4 +330,19 @@ describe "Content" do
       skip "Implement this"
     end
   end
+
+  describe "filtering" do
+    before do
+      @instances = [P.create, C.create, P.create, C.create]
+    end
+
+    after do
+      C.delete
+      P.delete
+    end
+
+    it "provides a to_proc method that makes filtering by class easy" do
+      @instances.select(&C).map(&:class).must_equal [C, C]
+    end
+  end
 end

data/test/unit/test_context.rb

@@ -0,0 +1,139 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_helper', __FILE__)
+
+describe "Context" do
+  describe "navigation helper" do
+    before do
+      @site = setup_site
+      Page.box :area1
+      Page.box :area2
+      class ::OtherPage < Page
+        box :area3
+        box :area4
+      end
+
+      @root = Page.create
+      @root.is_root?.must_equal true
+      @area1_page1 = Page.create(slug: 'area1_page1')
+      @area1_page2 = OtherPage.create(slug: 'area1_page2')
+      @root.area1 << @area1_page1
+      @root.area1 << @area1_page2
+      @area2_page1 = Page.create(slug: 'area2_page1')
+      @area2_page2 = OtherPage.create(slug: 'area2_page2')
+      @root.area2 << @area2_page1
+      @root.area2 << @area2_page2
+      @context_class = Class.new do
+        include Spontaneous::Output::Context::Navigation
+        def initialize(target)
+          @target = target
+        end
+        def __target
+          @target
+        end
+      end
+      [@root, @area1_page1, @area1_page2, @area2_page1, @area2_page2].each { |p| p.save.reload }
+    end
+
+    after do
+      Content.delete
+      teardown_site @site
+      Object.send :remove_const, :OtherPage rescue nil
+    end
+
+    it "correctly flags active pages" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+
+      result = @context.navigation.map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "yields the results to a block if given" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = []
+      @context.navigation { |p, a| result << [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "doesn't show an active state for root" do
+      @context = @context_class.new(@root)
+      result = @context.navigation.map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", false], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "shows the section pages as active" do
+      @context = @context_class.new(@area1_page2)
+      result = @context.navigation.map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true], ["/area2-page1", false], ["/area2-page2", false]]
+    end
+
+    it "allows for limiting the navigation to a particular box with :only" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(only: :area1).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
+    end
+
+    it "allows for limiting the navigation to a particular box with [ :only ]" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(only: [:area1]).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
+    end
+
+    it "allows for limiting the navigation to a particular box with :box" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(box: :area1).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
+    end
+
+    it "allows for limiting the navigation to a particular box with :boxes" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(boxes: [:area1]).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
+    end
+
+    it "allows for limiting the navigation to a particular box" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(except: :area2).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page1", false], ["/area1-page2", true]]
+    end
+
+    it "allows for including certain content types" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(include: :OtherPage).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page2", true], ["/area2-page2", false]]
+    end
+
+    it "allows for rejecting certain content types" do
+      @target = Page.new
+      @area1_page2.area2 << @target
+      @target.save.reload
+      @context = @context_class.new(@target)
+      result = @context.navigation(exclude: Page).map { |p, a| [p.path, a]}
+      result.must_equal [["/area1-page2", true], ["/area2-page2", false]]
+    end
+  end
+end

data/test/unit/test_controllers.rb

@@ -0,0 +1,374 @@
+# encoding: UTF-8
+
+require File.expand_path('../../test_helper', __FILE__)
+
+ENV['RACK_ENV'] = 'test'
+describe "Controllers" do
+  include RackTestMethods
+  start do
+    @site_root = Dir.mktmpdir
+    let(:root) { @site_root }
+    S::State.delete
+  end
+
+  finish do
+    ::FileUtils.rm_rf(@site_root)
+  end
+
+  class Wrappit
+    def initialize(app, options = {})
+      @app, @options = app, options
+    end
+
+    def call(env)
+      status, headers, body = @app.call(env)
+      with = @options[:with]
+      wrapped = body.map { |part| [with, part, with].join("") }
+      [status, headers, wrapped]
+    end
+  end
+
+  before do
+    @site = setup_site(root)
+
+    class ::Page
+      controller do
+        use Wrappit, with: "*"
+        set :something, "else"
+      end
+    end
+
+    class ::SubPage < ::Page
+      controller do
+        get do
+          settings.something
+        end
+      end
+
+      controller :comments do
+        use Wrappit, with: "+"
+        get "/" do
+          settings.something
+        end
+      end
+    end
+
+    class ::DeepPage < ::SubPage
+      attr_accessor :dynamic_value
+      layout do
+        "{{ dynamic_value }}"
+      end
+      controller do
+        post {
+          page.dynamic_value = params[:value]
+          render
+        }
+      end
+      controller :comments do
+        post '/' do
+          params[:comment]
+        end
+      end
+    end
+
+    @page = ::SubPage.new(slug: 'something')
+    @deep_page = ::DeepPage.new(slug: 'deep')
+  end
+
+  let(:app) { Spontaneous::Rack::Front.application(@site) }
+
+  after do
+    Object.send(:remove_const, :SubPage) rescue nil
+    Object.send(:remove_const, :DeepPage) rescue nil
+    teardown_site(false)
+  end
+
+  describe "requests" do
+    before do
+      @site.stubs(:by_path).with('/something').returns(@page)
+      @site.stubs(:by_path).with('/deep').returns(@deep_page)
+    end
+
+    it "propagates settings to sub-classes" do
+      get '/something'
+      last_response.body.must_equal "*else*"
+    end
+
+    it "propagates settings on the base controller to named controllers" do
+      get '/something/@comments'
+      last_response.body.must_equal "*+else+*"
+    end
+
+    it "allows extension of existing controllers in sub-classes" do
+      post '/deep/@comments', comment: "Pungent"
+      last_response.body.must_equal "*+Pungent+*"
+    end
+
+    it "can set variables in the resultant render" do
+      post '/deep', value: "Present"
+      last_response.body.must_equal "*Present*"
+    end
+
+  end
+
+  it "sets the type as dynamic" do
+    SubPage.dynamic?(:get).must_equal true
+    SubPage.dynamic?("GET").must_equal true
+    @page.dynamic?(:get).must_equal true
+    @page.dynamic?("GET").must_equal true
+  end
+
+  describe "PageController" do
+    let(:owner) { SubPage.new(uid: "owner") }
+    let(:other) { SubPage.new(uid: "other") }
+    let(:ctrl)  { Spontaneous::Rack::PageController.new!(@site, owner, :html) }
+    let(:env)   { {Spontaneous::Rack::RENDERER => Spontaneous::Output.published_renderer(@site) } }
+
+    before do
+      ctrl.env = env
+      ctrl.request = Rack::Request.new(env)
+      ctrl.response = Rack::Response.new
+      SubPage.layout { "${uid}:{{success}}" }
+      SubPage.add_output :xml
+      @site.stubs(:by_uid).with('other').returns(other)
+      @site.stubs(:by_uid).with(:other).returns(other)
+    end
+
+    it "allows setting the output format" do
+      ctrl.output :xml
+      ctrl.render
+      ctrl.content_type.must_equal "application/xml;charset=utf-8"
+    end
+
+    it "allows changing the rendered page" do
+      ctrl.page(other)
+      ctrl.render
+      ctrl.body.must_equal "other:"
+    end
+
+    # show allows changing the page, output, status & locals without calling #render
+    describe "#show" do
+      it "accepts instance, format, status" do
+        ctrl.show(other, :xml, 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal []
+      end
+
+      it "it sets up params for #render" do
+        ctrl.show(other, :xml, 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal []
+        ctrl.render success: "yes"
+        ctrl.body.must_equal "other:yes"
+        ctrl.content_type.must_equal "application/xml;charset=utf-8"
+      end
+
+      it "allows render to overwrite the settings" do
+        ctrl.show(other, :xml, 403)
+        ctrl.render owner, success: "no"
+        ctrl.body.must_equal "owner:no"
+        ctrl.content_type.must_equal "application/xml;charset=utf-8"
+      end
+
+      it "accepts uid (string), format, status" do
+        ctrl.show('other', :xml, 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (symbol), format, status" do
+        ctrl.show(:other, :xml, 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (string), status" do
+        ctrl.show('other', 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (symbol), status" do
+        ctrl.show(:other, 403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (string)" do
+        ctrl.show('other')
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (symbol)" do
+        ctrl.show(:other)
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts instance (Content)" do
+        ctrl.show(other)
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (string), status" do
+        ctrl.show('other', 409)
+        ctrl.status.must_equal 409
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts uid (symbol), status" do
+        ctrl.show(:other, 410)
+        ctrl.status.must_equal 410
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts instance (Content), status" do
+        ctrl.show(other, 411)
+        ctrl.status.must_equal 411
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+
+      it "accepts status" do
+        ctrl.show(403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal []
+      end
+    end
+
+    describe "#render" do
+      it "renders the owning page by default" do
+        ctrl.render
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "owner:"
+      end
+
+      it "accepts instance, format, status, locals" do
+        ctrl.render(other, :xml, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (string), format, status, locals" do
+        ctrl.render('other', :xml, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (symbol), format, status, locals" do
+        ctrl.render(:other, :xml, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :xml
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (string), status, locals" do
+        ctrl.render('other', 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (symbol), status, locals" do
+        ctrl.render(:other, 403, success: "yes")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (string)" do
+        ctrl.render('other')
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts uid (symbol)" do
+        ctrl.render(:other)
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts instance (Content)" do
+        ctrl.render(other)
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts uid (string), status" do
+        ctrl.render('other', 409)
+        ctrl.status.must_equal 409
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts uid (symbol), status" do
+        ctrl.render(:other, 410)
+        ctrl.status.must_equal 410
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts instance (Content), status" do
+        ctrl.render(other, 411)
+        ctrl.status.must_equal 411
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:"
+      end
+
+      it "accepts locals" do
+        ctrl.render(success: "yes")
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "owner:yes"
+      end
+
+      it "accepts uid (string), locals" do
+        ctrl.render('$other', success: "yes")
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts uid (symbol), locals" do
+        ctrl.render(:other, success: "yes")
+        ctrl.status.must_equal 200
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "other:yes"
+      end
+
+      it "accepts status" do
+        ctrl.render(403)
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "owner:"
+      end
+
+      it "accepts status, locals" do
+        ctrl.render(403, success: "no")
+        ctrl.status.must_equal 403
+        ctrl.output.must_equal :html
+        ctrl.body.must_equal "owner:no"
+      end
+    end
+  end
+end