spontaneous 0.2.0.alpha2 → 0.2.0.alpha3

data/test/unit/test_serialisation.rb

@@ -116,7 +116,6 @@ class SerialisationTest < MiniTest::Spec
       setup do
 
         date = "2011-07-07"
-
         @root = SerialisedPage.new
         @piece1 = SerialisedPiece.new
         @piece2 = SerialisedPiece.new
@@ -153,6 +152,7 @@ class SerialisationTest < MiniTest::Spec
         @child.direction = "N"
         @child.uid = "about"
 
+        [@child, @piece1, @piece2, @piece3].each { |c| c.save; c.reload }
         @root.insides[0].style = :freezing
         @root.insides[0].visible = false
         @root.insides[1].style = :boiling
@@ -160,8 +160,7 @@ class SerialisationTest < MiniTest::Spec
 
         @child.path.should == "/about"
 
-
-        [@root, @child, @piece1, @piece2, @piece3].each { |c| c.save; c.reload }
+        @root.save
 
         template = ERB.new(File.read(File.expand_path('../../fixtures/serialisation/root_hash.yaml.erb', __FILE__)))
         @root_hash = YAML.load(template.result(binding))
@@ -184,48 +183,4 @@ class SerialisationTest < MiniTest::Spec
 
     end
   end
-
-  context "Publishing" do
-    setup do
-      class ::Page < Spontaneous::Page
-        field :title, :string, :default => "New Page"
-        box   :box1
-      end
-      @now = Time.now
-      Time.stubs(:now).returns(@now)
-      Content.delete
-      Change.delete
-      @page1 = ::Page.create
-      @page2 = ::Page.create(:slug => "page2")
-      @page1.box1 << @page2
-      @page2.save
-      @c1 = Change.new
-      @c1.push(@page1)
-      @c1.push(@page2)
-      @c1.save
-      @c2 = Change.new
-      @c2.push(@page1)
-      @c2.push(@page2)
-      @c2.save
-    end
-
-    teardown do
-      Object.send(:remove_const, :Page) rescue nil
-      Content.delete
-      Change.delete
-    end
-
-    should "serialise outstanding changes" do
-      Spot.deserialise_http(Change.serialise_http).should == [
-        {
-        :pages=> [
-          {:path=>"/", :title=>"New Page", :depth => 0, :id=>@page1.id},
-          {:path=>"/page2", :title=>"New Page", :depth => 1, :id=>@page2.id}
-      ],
-        :changes=> [
-          {:page_ids=>[@page1.id, @page2.id], :created_at=> @now.to_s, :id=>@c1.id},
-          {:page_ids=>[@page1.id, @page2.id], :created_at=> @now.to_s, :id=>@c2.id}
-      ] } ]
-    end
-  end
 end

data/test/unit/test_site.rb

@@ -14,50 +14,56 @@ class SiteTest < MiniTest::Spec
     teardown_site
   end
 
-  context "Site:" do
+  context "Site" do
     setup do
       Content.delete
       class ::Page < Spontaneous::Page
         field :title
         box :subpages
       end
-      Content.delete
-      @root = ::Page.new
-      @root.title = "Homepage"
-      @page1_1 = ::Page.new(:slug => "page1-1")
-      @page1_1.title = "Page 1 1"
-      @page1_2 = ::Page.new(:slug => "page1-2")
-      @page1_2.title = "Page 1 2"
-      @page2_1 = ::Page.new(:slug => "page2-1")
-      @page2_1.title = "Page 2 1"
-      @page3_1 = ::Page.new(:slug => "page3-1")
-      @page3_1.title = "Page 3 1"
-      @page3_2 = ::Page.new(:slug => "page3-2")
-      @page3_2.title = "Page 3 2"
-      @page3_2.uid = "page3_2"
-
-      @root.subpages << @page1_1
-      @root.subpages << @page1_2
-      @page1_1.subpages << @page2_1
-      @page2_1.subpages << @page3_1
-      @page2_1.subpages << @page3_2
-      @root.save.reload
-      @page1_1.save.reload
-      @page1_2.save.reload
-      @page2_1.save.reload
-      @page3_1.save.reload
-      @page3_2.save.reload
+      class ::Piece < Spontaneous::Piece; end
     end
+
     teardown do
       Object.send(:remove_const, :Page)
+      Object.send(:remove_const, :Piece)
     end
-    # context "site instance" do
-    #   should "be unique" do
-    #     i = Site.instance
-    #     j = Site.instance
-    #     i.should == j
-    #     Site.count.should == 1
-    #   end
+
+    context "contents" do
+      setup do
+        @root = ::Page.new
+        @root.title = "Homepage"
+        @page1_1 = ::Page.new(:slug => "page1-1")
+        @page1_1.title = "Page 1 1"
+        @page1_2 = ::Page.new(:slug => "page1-2")
+        @page1_2.title = "Page 1 2"
+        @page2_1 = ::Page.new(:slug => "page2-1")
+        @page2_1.title = "Page 2 1"
+        @page3_1 = ::Page.new(:slug => "page3-1")
+        @page3_1.title = "Page 3 1"
+        @page3_2 = ::Page.new(:slug => "page3-2")
+        @page3_2.title = "Page 3 2"
+        @page3_2.uid = "page3_2"
+
+        @root.subpages << @page1_1
+        @root.subpages << @page1_2
+        @page1_1.subpages << @page2_1
+        @page2_1.subpages << @page3_1
+        @page2_1.subpages << @page3_2
+        @root.save.reload
+        @page1_1.save.reload
+        @page1_2.save.reload
+        @page2_1.save.reload
+        @page3_1.save.reload
+        @page3_2.save.reload
+      end
+      # context "site instance" do
+      #   should "be unique" do
+      #     i = Site.instance
+      #     j = Site.instance
+      #     i.should == j
+      #     Site.count.should == 1
+      #   end
       # should "be a singleton within a site cache" do
       #   o = nil
       #   Site.with_cache do
@@ -70,92 +76,195 @@ class SiteTest < MiniTest::Spec
       #   i.object_id.should_not == o
       # end
 
-    # end
-    context 'Site mapping' do
-      should "include the necessary details in the map" do
-        @page3_2.map_entry.should == {
-          :id => @page3_2.id,
-          :title => "Page 3 2",
-          :path => '/page1-1/page2-1/page3-2',
-          :slug => 'page3-2',
-          :type => 'Page',
-          :type_id => ::Page.schema_id,
-          :depth => 3,
-          :children => [],
-          :ancestors => [
-            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 },
-            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
-        ],
-          :generation => [
-            { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :slug => 'page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 },
-            { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :slug => 'page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 }
-        ],
-          :children => []
-        }
-
-        @page2_1.map_entry.should == {
-          :id => @page2_1.id,
-          :title => "Page 2 1",
-          :path => '/page1-1/page2-1',
-          :slug => 'page2-1',
-          :type => 'Page',
-          :type_id => ::Page.schema_id.to_s,
-          :depth => 2,
-          :children => [{:depth=>3,
-                         :type=>"Page",
-          :type_id => ::Page.schema_id.to_s,
-                         :children=>0,
-                         :path=>"/page1-1/page2-1/page3-1",
-                          :slug => 'page3-1',
-                         :title=>"Page 3 1",
-                         :id=>@page3_1.id},
-                         {:depth=>3,
-                          :type=>"Page",
-          :type_id => ::Page.schema_id.to_s,
-                          :children=>0,
-                          :path=>"/page1-1/page2-1/page3-2",
-                          :slug => 'page3-2',
-                          :title=>"Page 3 2",
-                          :id=>@page3_2.id}],
-                          :ancestors => [
-                            { :id => @root.id, :title => "Homepage", :path => '/', :slug => '',:type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
-                            { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 }
-        ],
-          :generation => [
-            { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
-        ]
-        }
-      end
+      # end
+      context 'mapping' do
+        should "include the necessary details in the map" do
+          @page3_2.map_entry.should == {
+            :id => @page3_2.id,
+            :title => "Page 3 2",
+            :path => '/page1-1/page2-1/page3-2',
+            :slug => 'page3-2',
+            :type => 'Page',
+            :type_id => ::Page.schema_id,
+            :depth => 3,
+            :children => {},
+            :ancestors => [
+              { :id => @root.id, :title => "Homepage", :path => '/', :slug => '', :type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
+              { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 },
+              { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+            ],
+              :generation => { "Subpages" => [
+                { :id => @page3_1.id, :title => "Page 3 1", :path => '/page1-1/page2-1/page3-1', :slug => 'page3-1', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 },
+                { :id => @page3_2.id, :title => "Page 3 2", :path => '/page1-1/page2-1/page3-2', :slug => 'page3-2', :type => 'Page', :type_id => ::Page.schema_id, :depth => 3, :children => 0 }
+            ] }
+          }
+
+          @page2_1.map_entry.should == {
+            :id => @page2_1.id,
+            :title => "Page 2 1",
+            :path => '/page1-1/page2-1',
+            :slug => 'page2-1',
+            :type => 'Page',
+            :type_id => ::Page.schema_id.to_s,
+            :depth => 2,
+            :children => {
+              "Subpages" => [
+                {:depth=>3,
+                 :type=>"Page",
+                 :type_id => ::Page.schema_id.to_s,
+                 :children=>0,
+                 :path=>"/page1-1/page2-1/page3-1",
+                 :slug => 'page3-1',
+                 :title=>"Page 3 1",
+                 :id=>@page3_1.id},
+                 {:depth=>3,
+                  :type=>"Page",
+                  :type_id => ::Page.schema_id.to_s,
+                  :children=>0,
+                  :path=>"/page1-1/page2-1/page3-2",
+                  :slug => 'page3-2',
+                  :title=>"Page 3 2",
+                  :id=>@page3_2.id}]},
+                  :ancestors => [
+                    { :id => @root.id, :title => "Homepage", :path => '/', :slug => '',:type => 'Page', :type_id => ::Page.schema_id, :depth => 0, :children => 2 },
+                    { :id => @page1_1.id, :title => "Page 1 1", :path => '/page1-1', :slug => 'page1-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 1, :children => 1 }
+                  ],
+                    :generation => {"Subpages" => [
+                      { :id => @page2_1.id, :title => "Page 2 1", :path => '/page1-1/page2-1', :slug => 'page2-1',:type => 'Page', :type_id => ::Page.schema_id, :depth => 2, :children => 2 }
+                  ]}
+          }
+        end
+
 
+        should "retrieve details of the root by default" do
+          Site.map.should == Page.root.map_entry
+        end
 
-      should "retrieve details of the root by default" do
-        Site.map.should == Page.root.map_entry
+        should "retrieve the details of the children of any page" do
+          Site.map(@root.id).should == Page.root.map_entry
+          Site.map(@page3_2.id).should == @page3_2.map_entry
+        end
       end
 
-      should "retrieve the details of the children of any page" do
-        Site.map(@root.id).should == Page.root.map_entry
-        Site.map(@page3_2.id).should == @page3_2.map_entry
+      context "page retrieval" do
+        should "work with paths" do
+          Site['/page1-1/page2-1'].should == @page2_1.reload
+        end
+
+        should "work with UIDs" do
+          Site["page3_2"].should == @page3_2.reload
+        end
+
+        should "have a shortcut direct method on Site" do
+          Site.page3_2.should == @page3_2.reload
+        end
+
+        should "return section pages in the right order" do
+          Site.at_depth(0).should == @root
+          Site.at_depth(:root).should == @root
+          Site.at_depth(1).should == [@page1_1, @page1_2]
+          Site.at_depth(:section).should == [@page1_1, @page1_2]
+        end
       end
     end
-    context "page retrieval" do
-      should "work with paths" do
-        Site['/page1-1/page2-1'].should == @page2_1.reload
+
+    context "Structure modification times" do
+      setup do
+        State.delete
+        # remove microseconds from time value
+        @now = Time.at(Time.now.to_i)
       end
 
-      should "work with UIDs" do
-        Site["page3_2"].should == @page3_2.reload
+      should "just return the current time if no modifications have been made" do
+        now = @now + 12
+        Time.stubs(:now).returns(now)
+        Site.modified_at.should == now
       end
 
-      should "have a shortcut direct method on Site" do
-        Site.page3_2.should == @page3_2.reload
+      should "be updated when a page is added" do
+        now = @now + 24
+        Time.stubs(:now).returns(now)
+        root = ::Page.create
+        Time.stubs(:now).returns(now + 200)
+        Site.modified_at.should == now
+      end
+
+      should "be updated when a page's title changes" do
+        root = ::Page.create
+        now = @now + 98
+        Time.stubs(:now).returns(now)
+        root.update(:title => "Some Title")
+        Site.modified_at.should == now
+      end
+
+      should "not be updated when a piece is added" do
+        now1 = @now + 24
+        Time.stubs(:now).returns(now1)
+        root = ::Page.create
+        now2 = @now + 240
+        Time.stubs(:now).returns(now2)
+        root.subpages << Piece.create
+        Site.modified_at.should == now1
+      end
+
+      should "be updated when a page is deleted" do
+        now1 = @now + 24
+        Time.stubs(:now).returns(now1)
+        root = ::Page.create
+        now2 = @now + 48
+        Time.stubs(:now).returns(now2)
+        child = ::Page.new
+        root.subpages << child
+        root.save
+        Site.modified_at.should == now2
+        now3 = @now + 128
+        Time.stubs(:now).returns(now3)
+        child.destroy
+        Site.modified_at.should == now3
+      end
+
+      should "not be updated when a piece is deleted" do
+        now1 = @now + 24
+        Time.stubs(:now).returns(now1)
+        root = ::Page.create
+        now2 = @now + 240
+        Time.stubs(:now).returns(now2)
+        piece = ::Piece.create
+        root.subpages << piece
+        Site.modified_at.should == now1
+        now3 = @now + 480
+        Time.stubs(:now).returns(now3)
+        piece.reload.destroy
+        Site.modified_at.should == now1
+      end
+    end
+
+    context "URLs" do
+      should "use the site_domain config value" do
+        @site.config.site_domain = "spontaneouscms.org"
+        @site.public_url.should == "http://spontaneouscms.org/"
+        @site.public_url("/").should == "http://spontaneouscms.org/"
+        @site.public_url("/something").should == "http://spontaneouscms.org/something"
+        Site.public_url("/something").should == "http://spontaneouscms.org/something"
+      end
+    end
+
+    context "Paths" do
+      setup do
+        FileUtils.mkdir(@site.root / "templates")
+        @template_dir1 = File.expand_path("../../fixtures/templates", __FILE__)
+        @plugin_dir = File.expand_path("../../fixtures/plugins/schema_plugin", __FILE__)
+        @site.paths[:templates] << "non-existant-dir"
+        @site.paths[:templates] << @template_dir1
+
+        plugin = @site.load_plugin @plugin_dir
+        plugin.init!
+        plugin.load!
       end
 
-      should "return section pages in the right order" do
-        Site.at_depth(0).should == @root
-        Site.at_depth(:root).should == @root
-        Site.at_depth(1).should == [@page1_1, @page1_2]
-        Site.at_depth(:section).should == [@page1_1, @page1_2]
+      should "include all facet paths for a particular path group" do
+        dirs = [@site.root / "templates", @template_dir1, @plugin_dir / "templates"]
+        Site.paths(:templates).should == dirs
       end
     end
   end

data/test/unit/test_storage.rb

@@ -65,6 +65,32 @@ class StorageTest < MiniTest::Spec
       @storage.local?.should be_false
     end
 
+    context "remote files" do
+      setup do
+        @existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)
+        @media_path = %w(0003 0567 rose.jpg)
+      end
+      should "have the correct mimetype" do
+        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
+        file.content_type.should == "image/jpeg"
+      end
+
+      should "be given a far future expiry" do
+        now = DateTime.now
+        DateTime.stubs(:now).returns(now)
+        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
+        file.expires.should == (now + 20.years).to_s(:rfc822)
+      end
+
+      should "be set as publicly visible" do
+        file = @storage.copy(@existing_file, @media_path, "image/jpeg")
+        acl = file.connection.get_object_acl(file.directory.key, file.key).body['AccessControlList']
+        perms = acl.detect {|grant| grant['Grantee']['URI'] == 'http://acs.amazonaws.com/groups/global/AllUsers' }
+        perms["Permission"].should == "READ"
+      end
+
+    end
+
     context "public urls" do
       setup do
         existing_file = File.expand_path("../../fixtures/images/rose.jpg", __FILE__)

data/test/unit/test_structure.rb

@@ -60,8 +60,8 @@ class StructureTest < MiniTest::Spec
       should "contain references to their owning page" do
         @home.in_progress.page.should == @home
 
-        @home.in_progress.pieces.first.page.should == @home
-        @home.in_progress.pieces.first.images.page.should == @home
+        @home.in_progress.contents.first.page.should == @home
+        @home.in_progress.contents.first.images.page.should == @home
       end
       should "have the right depth" do
         @home.in_progress.depth.should == 0