spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/test/unit/test_changesets.rb

@@ -16,17 +16,16 @@ class ChangeTest < MiniTest::Spec
 
   context "Changes" do
     setup do
-      @revision = 1
       stub_time(@now)
+      @revision = 1
 
-      # 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
     end
@@ -41,6 +40,15 @@ class ChangeTest < MiniTest::Spec
     end
 
 
+    should "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
+      assert result.key?(:published_revision)
+      result[:published_revision].should == 0
+      result[:first_publish].should be_true
+    end
+
 
     should "list all newly created pages" do
       root = Page.create(:title => "root")
@@ -49,13 +57,16 @@ class ChangeTest < MiniTest::Spec
 
       5.times { |i| root.things << Page.create(:title => "Page #{i+1}") }
 
-      result = Change.outstanding
-      result.must_be_instance_of(Array)
-      result.length.should == 5
+      result = S::Change.outstanding
+      result.must_be_instance_of(Hash)
+
+      pages = result[:changes]
+      pages.must_be_instance_of(Array)
+      pages.length.should == 5
 
-      result.map(&:class).should == [Change]*5
+      pages.map(&:class).should == [S::Change]*5
 
-      Set.new(result.map(&:page_id)).should == Set.new(root.things.map { |p| p.id })
+      Set.new(pages.map(&:page_id)).should == Set.new(root.things.map { |p| p.id })
     end
 
     should "not list new pieces as available for publish" do
@@ -66,7 +77,7 @@ class ChangeTest < MiniTest::Spec
       root[:first_published_at] = root[:last_published_at] = root.modified_at - 1000
       root.things << Piece.new
       root.save.reload
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
       result.length.should == 1
       result.first.page.should == root
     end
@@ -81,7 +92,7 @@ class ChangeTest < MiniTest::Spec
 
       Content.publish(@revision+1, [root.id, root.things.first.id])
 
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
       result.length.should == 4
       Set.new(result.map(&:page_id).flatten).should == Set.new(root.things[1..-1].map(&:id))
     end
@@ -108,7 +119,7 @@ class ChangeTest < MiniTest::Spec
 
 
       Content.publish(@revision+1, [root.id])
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
 
       result.length.should == 5
 
@@ -146,7 +157,7 @@ class ChangeTest < MiniTest::Spec
 
 
       Content.publish(@revision+1, [root.id])
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
 
       e = nil
       begin
@@ -172,7 +183,7 @@ class ChangeTest < MiniTest::Spec
       root.save
 
       Content.publish(@revision+1, [root.id])
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
       change = result.detect { |change| change.page.id == new_child1.id }
       change.export.should == {
         :id => new_child1.id,
@@ -183,12 +194,14 @@ class ChangeTest < MiniTest::Spec
         # :editor_login => "someone",
         :depth => new_child1.depth,
         :side_effects => {},
+        :update_locks => [],
         :dependent => [{
           :id => page1.id,
           :depth => page1.depth,
           :title => page1.title.value,
           :url => page1.path,
           :side_effects => {},
+          :update_locks => [],
           :published_at => nil,
           :modified_at => page1.modified_at.httpdate,
         }]
@@ -207,8 +220,8 @@ class ChangeTest < MiniTest::Spec
       page1.things << new_child1
       root.save
       last = Time.now + 100
-      S::Content.filter(:id => new_child1.id).update(:modified_at => last)
-      result = Change.outstanding
+      ::Content.filter(:id => new_child1.id).update(:modified_at => last)
+      result = S::Change.outstanding[:changes]
       assert result.first.modified_at > result.last.modified_at, "Change list in incorrect order"
     end
 
@@ -225,14 +238,17 @@ class ChangeTest < MiniTest::Spec
 
       Content.publish(@revision)
 
+      later = @now + 10
+      stub_time(later)
       old_slug = page1.slug
       page1.slug = "changed"
       page1.save
 
-      result = Change.outstanding
+      result = S::Change.outstanding[:changes]
+
       change = result.detect { |change| change.page.id == page1.id }
       change.export[:side_effects].should == {
-        :slug => [{ :count => 1, :created_at => @now.httpdate, :old_value => old_slug, :new_value => "changed"}]
+        :slug => [{ :count => 1, :created_at => later.httpdate, :old_value => old_slug, :new_value => "changed"}]
       }
     end
 
@@ -249,13 +265,42 @@ class ChangeTest < MiniTest::Spec
 
       Content.publish(@revision)
 
+      later = @now + 10
+      stub_time(later)
       page1.hide!
 
-      result = Change.outstanding
+      page1.reload
+      result = S::Change.outstanding[:changes]
       change = result.detect { |change| change.page.id == page1.id }
       change.export[:side_effects].should == {
-        :visibility => [{ :count => 1, :created_at => @now.httpdate, :old_value => false, :new_value => true}]
+        :visibility => [{ :count => 1, :created_at => later.httpdate, :old_value => false, :new_value => true}]
       }
     end
+
+    should "provide information about any update locks that exist on a page" do
+      Piece.field :async
+      page = Page.create(:title => "page")
+
+
+      piece = Piece.new
+
+      page.things << piece
+      page.save
+      piece.save
+
+      lock = Spontaneous::PageLock.create(:page_id => page.id, :content_id => piece.id, :field_id => piece.async.id, :description => "Update Lock")
+      page.locked_for_update?.should be_true
+      result = S::Change.outstanding[:changes]
+      change = result.detect { |change| change.page.id == page.id }
+      change.export[:update_locks].should == [{
+        id: lock.id,
+        content_id: piece.id,
+        field_id: piece.async.id,
+        field_name: :async,
+        location: "Field ‘async’ of entry 1 in box ‘things’",
+        description: "Update Lock",
+        created_at: @now.httpdate
+      }]
+    end
   end
 end

data/test/unit/test_config.rb

@@ -33,7 +33,7 @@ class ConfigTest < MiniTest::Spec
 
     context "Config" do
       setup do
-        @config = Config.new(:development)
+        @config = Spontaneous::Config.new(:development)
         @config.load(@config_dir)
       end
       should "load the first time its accessed" do
@@ -44,7 +44,7 @@ class ConfigTest < MiniTest::Spec
     context "containing blocks" do
       setup do
         @settings = {}
-        @config = Config::Loader.new(@settings)
+        @config = Spontaneous::Config::Loader.new(@settings)
       end
       should "add a hash to the settings under the defined key" do
         @config.storage :key1 do |config|
@@ -71,7 +71,7 @@ class ConfigTest < MiniTest::Spec
         # defined?(Spontaneous).should be_nil
         # require @lib_dir + '/spontaneous/config.rb'
         # Config.environment = :development
-        @config = Config.new(:development)
+        @config = Spontaneous::Config.new(:development)
         @config.load(@config_dir)
       end
 
@@ -98,10 +98,10 @@ class ConfigTest < MiniTest::Spec
 
       should "overwrite values depending on environment" do
         @config.over_ridden.should == :development_value
-        config = Config.new(:production)
+        config = Spontaneous::Config.new(:production)
         config.load(@config_dir)
         config.over_ridden.should == :production_value
-        config = Config.new(:staging)
+        config = Spontaneous::Config.new(:staging)
         config.load(@config_dir)
         config.over_ridden.should == :environment_value
       end
@@ -120,10 +120,10 @@ class ConfigTest < MiniTest::Spec
 
       should "dynamically switch values according to the configured env" do
         @config.over_ridden.should == :development_value
-        config = Config.new(:production)
+        config = Spontaneous::Config.new(:production)
         config.load(@config_dir)
         config.over_ridden.should == :production_value
-        config = Config.new(:staging)
+        config = Spontaneous::Config.new(:staging)
         config.load(@config_dir)
         config.over_ridden.should == :environment_value
       end
@@ -157,7 +157,7 @@ class ConfigTest < MiniTest::Spec
 
       context "Spontaneous :back" do
         setup do
-          @config = Config.new(:development, :back)
+          @config = Spontaneous::Config.new(:development, :back)
           @config.load(@config_dir)
         end
         should "read the correct configuration values" do
@@ -166,7 +166,7 @@ class ConfigTest < MiniTest::Spec
       end
       context "Spontaneous :front" do
         setup do
-          @config = Config.new(:development, :front)
+          @config = Spontaneous::Config.new(:development, :front)
           @config.load(@config_dir)
         end
         should "read the correct configuration values" do

data/test/unit/test_content.rb

@@ -7,21 +7,19 @@ class ContentTest < MiniTest::Spec
   context "Content:" do
     setup do
       @site = setup_site
-      class Piece < Spontaneous::Piece; end
-      class Page < Spontaneous::Page; end
-      class C < Piece; end
-      class P < Page; end
+      # class Piece < Spontaneous::Piece; end
+      # class Page < Spontaneous::Page; end
+      class C < ::Piece; end
+      class P < ::Page; end
       C.box :things
       P.box :box1
       P.box :box2
     end
 
     teardown do
-      teardown_site
-      ContentTest.send(:remove_const, :Piece) rescue nil
-      ContentTest.send(:remove_const, :Page) rescue nil
       ContentTest.send(:remove_const, :C) rescue nil
       ContentTest.send(:remove_const, :P) rescue nil
+      teardown_site
     end
 
     context "Content instances" do
@@ -31,7 +29,7 @@ class ContentTest < MiniTest::Spec
         })
         @instance.monkey.should == 'magic'
         id = @instance.id
-        @instance = Content[id]
+        @instance = ::Content[id]
         @instance.monkey.should == 'magic'
       end
     end
@@ -41,8 +39,9 @@ class ContentTest < MiniTest::Spec
       end
 
       teardown do
-        Content.delete
+        ::Content.delete rescue nil
       end
+
       should "be initialised empty" do
         @instance.contents.should == []
       end
@@ -330,51 +329,51 @@ class ContentTest < MiniTest::Spec
       end
 
       should "ensure that child pages have their visibility paths updated" do
-        flunk "Implement this"
+        skip "Implement this"
       end
     end
 
 
-    context "identity map" do
-      setup do
-
-        Content.delete
-        Content.delete_all_revisions!
-        class ::IdentitySubclass < C; end
-        @c1 = C.create
-        @c2 = C.create
-        @i1 = IdentitySubclass.create
-        @i2 = IdentitySubclass.create
-      end
-      teardown do
-        Object.send(:remove_const, :IdentitySubclass) rescue nil
-        # Content.delete
-        # Content.delete_all_revisions!
-      end
-      should "work for Content" do
-        Content.with_identity_map do
-          Content[@c1.id].object_id.should == Content[@c1.id].object_id
-        end
-      end
-
-      should "work for subclasses" do
-        Content.with_identity_map do
-          IdentitySubclass[@i1.id].object_id.should == IdentitySubclass[@i1.id].object_id
-        end
-      end
-
-      should "return different objects for different revisions" do
-        revision = 2
-        a = b = nil
-        Content.publish(revision)
-        Content.with_identity_map do
-          a = Content[@c1.id]
-          Content.with_revision(revision) do
-            b = Content[@c1.id]
-          end
-          a.object_id.should_not == b.object_id
-        end
-      end
-    end
+    # context "identity map" do
+    #   setup do
+
+    #     ::Content.delete
+    #     ::Content.delete_all_revisions!
+    #     class ::IdentitySubclass < C; end
+    #     @c1 = C.create
+    #     @c2 = C.create
+    #     @i1 = IdentitySubclass.create
+    #     @i2 = IdentitySubclass.create
+    #   end
+    #   teardown do
+    #     Object.send(:remove_const, :IdentitySubclass) rescue nil
+    #     # Content.delete
+    #     # Content.delete_all_revisions!
+    #   end
+    #   should "work for Content" do
+    #     Content.with_identity_map do
+    #       Content[@c1.id].object_id.should == Content[@c1.id].object_id
+    #     end
+    #   end
+
+    #   should "work for subclasses" do
+    #     Content.with_identity_map do
+    #       IdentitySubclass[@i1.id].object_id.should == IdentitySubclass[@i1.id].object_id
+    #     end
+    #   end
+
+    #   should "return different objects for different revisions" do
+    #     revision = 2
+    #     a = b = nil
+    #     Content.publish(revision)
+    #     Content.with_identity_map do
+    #       a = Content[@c1.id]
+    #       Content.with_revision(revision) do
+    #         b = Content[@c1.id]
+    #       end
+    #       a.object_id.should_not == b.object_id
+    #     end
+    #   end
+    # end
   end
 end

data/test/unit/test_content_inheritance.rb

@@ -10,7 +10,6 @@ class ContentInheritanceTest < MiniTest::Spec
       @site = setup_site
 
       Content.delete
-      class ::Page < Spontaneous::Page; end
       class ::PageClass1 < ::Page; end
       class ::PageClass11 < ::PageClass1; end
       class ::PageClass111 < ::PageClass1; end
@@ -23,7 +22,6 @@ class ContentInheritanceTest < MiniTest::Spec
       @page2 = PageClass2.create.reload
       @page22 = PageClass22.create.reload
 
-      class ::Piece < Spontaneous::Piece; end
       class ::PieceClass1 < ::Piece; end
       class ::PieceClass11 < PieceClass1; end
       class ::PieceClass111 < PieceClass11; end
@@ -39,7 +37,6 @@ class ContentInheritanceTest < MiniTest::Spec
 
     teardown do
       [
-        :Page, :Piece,
         :PageClass1, :PageClass11, :PageClass111, :PageClass2, :PageClass22,
         :PieceClass1, :PieceClass11, :PieceClass111, :PieceClass2, :PieceClass22
       ].each do |klass|
@@ -48,7 +45,7 @@ class ContentInheritanceTest < MiniTest::Spec
       teardown_site
     end
 
-    should "aaa correctly type subclasses found via Content" do
+    should "correctly type subclasses found via Content" do
       Set.new(Content.all.map { |c| c.class }).should == \
         Set.new([PageClass1, PageClass11, PageClass111, PageClass2, PageClass22,
           PieceClass1, PieceClass11, PieceClass111, PieceClass2, PieceClass22])
@@ -59,16 +56,10 @@ class ContentInheritanceTest < MiniTest::Spec
 
     context "Pages" do
 
-      should "type subclasses found via Page" do
-        Set.new(::Page.all.map { |c| c.class }).should == \
+      should "type subclasses found via Content::Page" do
+        Set.new(Content::Page.all.map { |c| c.class }).should == \
           Set.new([PageClass1, PageClass11, PageClass111, PageClass2, PageClass22])
-        Set.new(::Page.all).should == Set.new([@page1, @page11, @page111, @page2, @page22])
-      end
-
-      should "type subclasses found via Spontaneous::Page" do
-        Set.new(Spontaneous::Page.all.map { |c| c.class }).should == \
-          Set.new([PageClass1, PageClass11, PageClass111, PageClass2, PageClass22])
-        Set.new(Spontaneous::Page.all).should == Set.new([@page1, @page11, @page111, @page2, @page22])
+        Set.new(Content::Page.all).should == Set.new([@page1, @page11, @page111, @page2, @page22])
       end
 
       should "only find instances of a single class when searching via that subclass" do
@@ -82,14 +73,9 @@ class ContentInheritanceTest < MiniTest::Spec
 
     context "Pieces" do
       should "type subclasses found via Spontaneous::Piece" do
-        Set.new(Spontaneous::Piece.all.map { |c| c.class }).should == \
-          Set.new([PieceClass1, PieceClass11, PieceClass111, PieceClass2, PieceClass22])
-        Set.new(Spontaneous::Piece.all).should == Set.new([@piece1, @piece11, @piece111, @piece2, @piece22])
-      end
-      should "type subclasses found via Piece" do
-        Set.new(::Piece.all.map { |c| c.class }).should == \
+        Set.new(Content::Piece.all.map { |c| c.class }).should == \
           Set.new([PieceClass1, PieceClass11, PieceClass111, PieceClass2, PieceClass22])
-        Set.new(::Piece.all).should == Set.new([@piece1, @piece11, @piece111, @piece2, @piece22])
+        Set.new(Content::Piece.all).should == Set.new([@piece1, @piece11, @piece111, @piece2, @piece22])
       end
 
       should "only find instances of a single class when searching via that subclass" do