spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/unit/test_page.rb

@@ -4,7 +4,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 
 class PageTest < MiniTest::Spec
-  include Spontaneous
 
   def setup
     @site = setup_site
@@ -14,21 +13,14 @@ class PageTest < MiniTest::Spec
     teardown_site
   end
 
-  context "All pages" do
-    # should "have a pre-defined 'title' field" do
-    #   p = Page.new
-    #   p.field?(:title).should be_true
-    #   p.title.value.should == "New Page"
-    # end
-  end
   context "Pages:" do
     setup do
       Content.delete
-      class Page < Spot::Page
+      class Page < ::Page
         field :title, :string
         box :sub
       end
-      class Piece < Spontaneous::Piece; end
+      class Piece < ::Piece; end
     end
     teardown do
       PageTest.send(:remove_const, :Page)
@@ -184,6 +176,11 @@ class PageTest < MiniTest::Spec
         @s.page.should == @s
         @t.page.should == @t
       end
+
+      should "have a reference to themselves as content_instance" do
+        @p.content_instance.should == @p
+      end
+
       should "keep track of their depth" do
         @p.depth.should == 0
         @q.depth.should == 1

data/test/unit/test_permissions.rb

@@ -5,9 +5,11 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class PermissionsTest < MiniTest::Spec
 
+  Permissions = Spontaneous::Permissions
+
   def setup
     @site = setup_site
-    Spontaneous::Content.delete
+    ::Content.delete
     Permissions::UserLevel.reset!
     Permissions::UserLevel.stubs(:level_file).returns(File.expand_path('../../fixtures/permissions', __FILE__) / 'config/user_levels.yml')
   end
@@ -236,15 +238,6 @@ class PermissionsTest < MiniTest::Spec
       user.errors[:password].should_not be_blank
     end
 
-
-    should "have a random salt" do
-      user1 = Permissions::User.create(@valid)
-      user2 = Permissions::User.create(@valid.merge(:login => "person2"))
-      user1.salt.should_not be_blank
-      user2.salt.should_not be_blank
-      user1.salt.should_not == user2.salt
-    end
-
     context "who are valid" do
       setup do
         @user = Permissions::User.create(@valid)

data/test/unit/test_piece.rb

@@ -4,7 +4,6 @@ require File.expand_path('../../test_helper', __FILE__)
 
 
 class PieceTest < MiniTest::Spec
-  include Spontaneous
 
   def setup
     @site = setup_site
@@ -17,15 +16,11 @@ class PieceTest < MiniTest::Spec
   context "Pieces" do
     setup do
       Content.delete
-      class ::Piece < Spot::Piece; end
-      class ::Page < Spot::Page; end
       class ::Fridge < ::Piece; end
     end
 
     teardown do
-      Object.send(:remove_const, :Page)
-      Object.send(:remove_const, :Piece)
-      Object.send(:remove_const, :Fridge)
+      Object.send(:remove_const, :Fridge) rescue nil
     end
 
     should "not be pages" do
@@ -76,6 +71,10 @@ class PieceTest < MiniTest::Spec
         @f3.parent.should == @f2
       end
 
+      should "return themselves as content_instance" do
+        @f2.content_instance.should == @f2
+      end
+
       should "know their depth in the piece tree" do
         @f1.depth.should == 1
         @f2.depth.should == 2

data/test/unit/test_plugins.rb

@@ -13,11 +13,7 @@ class PluginsTest < MiniTest::Spec
     @site = setup_site
 
 
-    klass =  Class.new(Spontaneous::Page)
-    klass.box :box1
-    Object.send(:const_set, :Page, klass)
-    klass =  Class.new(Spontaneous::Piece)
-    Object.send(:const_set, :Piece, klass)
+    ::Page.box :box1
     klass =  Class.new(::Page) do
       layout :from_plugin
     end
@@ -35,11 +31,9 @@ class PluginsTest < MiniTest::Spec
   end
 
   def self.shutdown
-    teardown_site
-    Object.send(:remove_const, :Page) rescue nil
-    Object.send(:remove_const, :Piece) rescue nil
     Object.send(:remove_const, :LocalPage) rescue nil
     Object.send(:remove_const, :LocalPiece) rescue nil
+    teardown_site
   end
 
   def app
@@ -49,8 +43,8 @@ class PluginsTest < MiniTest::Spec
   context "Plugins:" do
 
     setup do
-      Site.publishing_method = :immediate
-      State.delete
+      S::Site.background_mode = :immediate
+      S::State.delete
       Content.delete
       @site = Spontaneous.instance
       page = ::Page.new
@@ -59,7 +53,7 @@ class PluginsTest < MiniTest::Spec
     end
 
     teardown do
-      State.delete
+      S::State.delete
       Content.delete
     end
 
@@ -100,18 +94,17 @@ class PluginsTest < MiniTest::Spec
 
       context "during publishing" do
         setup do
-
           Content.delete_revision(1) rescue nil
 
           Spontaneous.logger.silent! {
-            Site.publish_all
+            S::Site.publish_all
           }
         end
 
         teardown do
           FileUtils.rm_rf(@revision_root) rescue nil
           Content.delete
-          State.delete
+          S::State.delete
           Content.delete_revision(1)
         end
 

data/test/unit/test_prototypes.rb

@@ -13,7 +13,7 @@ class PrototypesTest < MiniTest::Spec
 
   context "Prototypes" do
     setup do
-      class ::ImageClass < Spontaneous::Piece
+      class ::ImageClass < ::Piece
         field :image
         field :description
 
@@ -26,7 +26,7 @@ class PrototypesTest < MiniTest::Spec
         end
       end
 
-      class ::PrototypeClass < Spontaneous::Piece
+      class ::PrototypeClass < ::Piece
         field :title, :string
         field :date,  :string
         field :something, :string, :default => "Here"
@@ -149,7 +149,7 @@ class PrototypesTest < MiniTest::Spec
 
     should "raise error if definition does not accept exactly 1 argument" do
       begin
-        class ::Prototype3Class < ::S::Piece
+        class ::Prototype3Class < ::Piece
           prototype {}
         end
         flunk("Defining prototypes with no arguments should raise error")

data/test/unit/test_publishing.rb

@@ -16,7 +16,8 @@ class PublishingTest < MiniTest::Spec
   end
 
   def self.shutdown
-    S::Content.delete_all_revisions! rescue nil
+    ::Content.delete_all_revisions! rescue nil
+    teardown_site(true)
   end
 
   @@now = Time.now
@@ -24,7 +25,11 @@ class PublishingTest < MiniTest::Spec
   def setup
     @site = setup_site(self.class.site_root)
     @now = @@now
-    Site.publishing_method = :immediate
+    Site.background_mode = :immediate
+  end
+
+  def teardown
+    teardown_site(false)
   end
 
   context "publishing" do
@@ -32,14 +37,13 @@ class PublishingTest < MiniTest::Spec
     setup do
       stub_time(@@now)
 
-      # DB.logger = Logger.new($stdout)
       Content.delete
 
-      class Page < Spontaneous::Page
+      class Page < ::Page
         field :title, :string, :default => "New Page"
         box :things
       end
-      class Piece < Spontaneous::Piece
+      class Piece < ::Piece
         box :things
       end
 
@@ -65,7 +69,6 @@ class PublishingTest < MiniTest::Spec
       PublishingTest.send(:remove_const, :Page) rescue nil
       PublishingTest.send(:remove_const, :Piece) rescue nil
       Content.delete
-      DB.logger = nil
     end
 
 
@@ -75,41 +78,40 @@ class PublishingTest < MiniTest::Spec
       setup do
         Content.delete
         @revision = 3
-        State.delete
-        State.create(:revision => @revision, :published_revision => 2)
-        State.revision.should == @revision
+        S::State.delete
+        S::State.create(:revision => @revision, :published_revision => 2)
+        S::State.revision.should == @revision
       end
 
       teardown do
         Content.delete_revision(@revision)
-        Revision.delete
+        S::Revision.delete
       end
 
       should "delete any conflicting revision tables" do
-        S::Content.create_revision(3)
-        Site.publish_all
+        S::Publishing::Revision.create(Content, 3)
+        S::Site.publish_all
       end
 
-
       should "issue a publish_all if passed page id list including all pages (in any order)" do
         skip "Implement after scheduled publishes"
       end
 
       should "publish all" do
         Content.expects(:publish).with(@revision, nil)
-        Site.publish_all
+        S::Site.publish_all
       end
 
       should "record date and time of publish" do
         Content.expects(:publish).with(@revision, nil)
-        Revision.expects(:create).with(:revision => @revision, :published_at => @now)
-        Site.publish_all
+        S::Revision.expects(:create).with(:revision => @revision, :published_at => @now)
+        S::Site.publish_all
       end
 
       should "bump revision after a publish" do
-        Site.publish_all
-        Site.revision.should == @revision + 1
-        Site.published_revision.should == @revision
+        S::Site.publish_all
+        S::Site.revision.should == @revision + 1
+        S::Site.published_revision.should == @revision
       end
 
       should "not delete scheduled changes after an exception during publish" do
@@ -129,7 +131,7 @@ class PublishingTest < MiniTest::Spec
       should "not update first_published or last_published if rendering fails" do
         c = Content.create
         c.first_published_at.should be_nil
-        Spontaneous::Page.expects(:order).returns([c])
+        Spontaneous::Site.expects(:pages).returns([c])
         # c.expects(:render).raises(Exception)
         begin
           silence_logger { Site.publish_all }
@@ -147,7 +149,7 @@ class PublishingTest < MiniTest::Spec
         # don't like peeking into implementation here but don't know how else
         # to simulate the right error
         root = Page.create()
-        Spontaneous::Page.expects(:order).returns([root])
+        Spontaneous::Site.expects(:pages).returns([root])
         output = root.output(:html)
         output.expects(:render_using).raises(Exception)
         root.expects(:outputs).at_least_once.returns([output])
@@ -170,9 +172,9 @@ class PublishingTest < MiniTest::Spec
         @revision = 2
         Content.delete_revision(@revision)
         Content.delete
-        State.delete
-        State.create(:revision => @revision, :published_revision => 2)
-        Site.revision.should == @revision
+        S::State.delete
+        S::State.create(:revision => @revision, :published_revision => 2)
+        S::Site.revision.should == @revision
 
 
         class ::PublishablePage < Page; end
@@ -213,7 +215,7 @@ class PublishingTest < MiniTest::Spec
         Content.delete_revision(@revision)
         Content.delete_revision(@revision+1)
         Content.delete
-        State.delete
+        S::State.delete
         Object.send(:remove_const, :PublishablePage) rescue nil
         Object.send(:remove_const, :DynamicPublishablePage) rescue nil
       end
@@ -270,6 +272,12 @@ class PublishingTest < MiniTest::Spec
         File.read(config_file).should =~ %r(#{Spontaneous.root})
       end
 
+      should "generate a REVISION file containing the published revision number" do
+        rev_file = @site.revision_root / "REVISION"
+        result = File.read(rev_file)
+        result.should == Spontaneous::Media.pad_revision(@revision)
+      end
+
       should "transparently support previously unknown formats by assuming a simple HTML like rendering model" do
         PublishablePage.add_output :rtf
         Content.delete_revision(@revision+1)
@@ -277,13 +285,18 @@ class PublishingTest < MiniTest::Spec
         File.read("#{@site.revision_root}/00003/static/index.rtf").should == "RICH!\n"
       end
 
-      should "respect a format's #dynamic? setting when deciding a rendered templates location xxx" do
+      should "respect a format's #dynamic? setting when deciding a rendered templates location" do
         PublishablePage.add_output :rtf, :dynamic => true
         Content.delete_revision(@revision+1)
         Site.publish_all
         File.read("#{@site.revision_root}/00003/dynamic/index.rtf.cut").should == "RICH!\n"
       end
 
+      should "run the content revision cleanup task after the revision is live xxx" do
+        Content.expects(:cleanup_revisions).with(@revision+1, 8)
+        Site.publish_all
+      end
+
       context "hooks & triggers" do
         setup do
         end
@@ -324,7 +337,16 @@ class PublishingTest < MiniTest::Spec
           previous_root = Spontaneous.revision_dir(@revision)
           published_root = Spontaneous.revision_dir(published_revision)
           symlink = Pathname.new Spontaneous.revision_dir
-          symlink.realpath.to_s.should == Pathname.new(previous_root).realpath.to_s
+          # JRuby's Pathname#realpath doesn't work properly
+          # See: http://jira.codehaus.org/browse/JRUBY-6460
+          #
+          # This workaround tests that the symlink has been re-pointed
+          #
+          # File.read(symlink + "REVISION").realpath.to_s.should == Pathname.new(previous_root).realpath.to_s
+          File.open(Pathname.new(previous_root) + "REVISION", "w") do |file|
+            file.write(@revision)
+          end
+          File.read(symlink + "REVISION").should == @revision.to_s
         end
       end
     end

data/test/unit/test_render.rb

@@ -5,10 +5,10 @@ require File.expand_path('../../test_helper', __FILE__)
 require 'sinatra/base'
 
 class RenderTest < MiniTest::Spec
-  include Spontaneous
 
   def setup
     @site = setup_site
+    Content.delete
   end
 
   def teardown
@@ -22,15 +22,13 @@ class RenderTest < MiniTest::Spec
 
   context "Publish rendering step" do
     setup do
-      Content.delete
       @site.paths.add(:templates, template_root)
 
-      class ::Page < Spontaneous::Page
-        field :title
-        box :sections1
-        box :sections2
-      end
-      class ::TemplateClass < Spontaneous::Piece
+      Page.field :title
+      Page.box :sections1
+      Page.box :sections2
+
+      class ::TemplateClass < ::Piece
         field :title do
           def to_epub
             to_html
@@ -103,19 +101,19 @@ class RenderTest < MiniTest::Spec
       a = b = c = nil
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
       renderer = Spontaneous::Output::Template::PreviewRenderer.new
-      a = renderer.render_string(template, S::Content[@section1.id].output(:html), {}).strip
-      b = renderer.render_string(template, S::Content[@section1.id].output(:html), {}).strip
+      a = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
+      b = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.should_not == b
 
       renderer = Spontaneous::Output::Template::PublishRenderer.new
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
-      a = renderer.render_string(template, S::Content[@section1.id].output(:html), {}).strip
-      b = renderer.render_string(template, S::Content[@section1.id].output(:html), {}).strip
+      a = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
+      b = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.should == b
 
       renderer = Spontaneous::Output::Template::PublishRenderer.new
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
-      c = renderer.render_string(template, S::Content[@section1.id].output(:html), {}).strip
+      c = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.should_not == c
     end
 
@@ -170,10 +168,28 @@ class RenderTest < MiniTest::Spec
         @content.bits << child
         @content.bits.last.style = TemplateClass.get_style(:this_template)
         @content.bits.last.hide!
-        @content.render.should == "<complex>\nThe Title\n<piece><html><title>Child Title</title><body>Child Description</body></html>\n</piece>\n</complex>\n"
+
+        expected = "<complex>\nThe Title\n<piece><html><title>Child Title</title><body>Child Description</body></html>\n</piece>\n</complex>\n"
+        @content.render.should == expected
       end
     end
 
+    context "fields" do
+      should "render a joined list of field values" do
+        Page.field :description, :markdown
+        Page.field :image
+        ::Page.layout do
+          %(${ fields })
+        end
+        @page.title = "Title & Things"
+        @page.image = "/photo.jpg"
+        @page.description = "Description & Stuff"
+        lines = @page.render.split(/\n(?=<div)/)
+        @page.fields.each_with_index do |field, i|
+          lines[i].should =~ /<div.+?>#{field.render(:html)}<\/div>/
+        end
+      end
+    end
     context "boxes" do
       setup do
         TemplateClass.style :slots_template, :default => true
@@ -190,9 +206,24 @@ class RenderTest < MiniTest::Spec
         @content.images.first.style = TemplateClass.get_style(:this_template)
       end
 
+      should "render box sets as a joined list of each box's output" do
+        ::Page.layout do
+          %(${ content })
+        end
+        @page.render.should == @page.boxes.map(&:render).join("\n")
+      end
+
+      should "render 'boxes' as a joined list of each box's output" do
+        ::Page.layout do
+          %(${ boxes })
+        end
+        @page.render.should == @page.boxes.map(&:render).join("\n")
+      end
+
       should "render boxes" do
         @content.render.should == "<boxes>\n  <img><html><title>Child Title</title><body>Child Description</body></html>\n</img>\n</boxes>\n"
       end
+
       should "render boxes to alternate formats" do
         ::Page.add_output :pdf
         @content.render(:pdf).should == "<boxes-pdf>\n  <img><PDF><title>Child Title</title><body>{Child Description}</body></PDF>\n</img>\n</boxes-pdf>\n"
@@ -325,7 +356,7 @@ class RenderTest < MiniTest::Spec
       end
 
       should "persist sub-page style settings" do
-        @parent = Page[@parent.id]
+        @parent = Content[@parent.id]
         @parent.contents.first.style.should == PageClass.default_style
       end