spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/unit/test_serialisation.rb

@@ -13,7 +13,7 @@ describe "Serialisation" do
 
     class ::SerialisedPage < ::Page
       field :direction, :title => "Pointing Direction", :comment => "NSEW" do
-        def preprocess(value)
+        def preprocess(value, site)
           ({
             "N" => "North",
             "S" => "South",
@@ -41,6 +41,7 @@ describe "Serialisation" do
           width 50
         end
       end
+      field :another, list: false
 
       style :freezing
       style :boiling
@@ -92,7 +93,7 @@ describe "Serialisation" do
         class InnerClass < Piece
         end
       end
-      Site.schema.export['SerialisedPage.InnerClass'].must_equal  ::SerialisedPage::InnerClass.export
+      @site.schema.export['SerialisedPage.InnerClass'].must_equal  ::SerialisedPage::InnerClass.export
     end
   end
 

data/test/unit/test_site.rb

@@ -127,60 +127,72 @@ describe "Site" do
 
 
       it "retrieve details of the root by default" do
-        Site.map.must_equal Page.root.map_entry
+        @site.map.must_equal Page.root.map_entry
       end
 
       it "retrieve the details of the children of any page" do
-        Site.map(@root.id).must_equal Page.root.map_entry
-        Site.map(@page3_2.id).must_equal @page3_2.map_entry
+        @site.map(@root.id).must_equal Page.root.map_entry
+        @site.map(@page3_2.id).must_equal @page3_2.map_entry
       end
     end
 
     describe "page retrieval" do
       it "finds the root" do
-        Site.root.must_equal @root
+        @site.home.must_equal @root
       end
 
       it "returns all roots" do
         hidden = Page.create slug: "hidden"
-        roots = Site.roots
+        roots = @site.roots
         roots["public"].must_equal "spontaneous.io"
         roots["roots"].keys.must_equal ["spontaneous.io", "#hidden"]
       end
 
       it "returns an empty roots object if no root exists" do
         @root.destroy
-        roots = Site.roots
+        roots = @site.roots
         roots['roots'].must_equal({})
       end
 
+      it "finds ids" do
+        @page3_2.reload
+        [@page3_2.id, @page3_2.id.to_s].each do |id|
+          @site[id].must_equal @page3_2
+        end
+      end
+
       it "work with paths" do
-        Site['/page1-1/page2-1'].must_equal @page2_1.reload
+        @site['/page1-1/page2-1'].must_equal @page2_1.reload
       end
 
       it "work with UIDs" do
-        Site["page3_2"].must_equal @page3_2.reload
-        Site["$page3_2"].must_equal @page3_2.reload
+        @site["page3_2"].must_equal @page3_2.reload
+        @site["$page3_2"].must_equal @page3_2.reload
+      end
+
+      it "maps symbols to UIDs" do
+        @site[:page3_2].must_equal @page3_2.reload
       end
 
       it "finds hidden roots" do
         root = Page.create slug: "hidden"
-        Site["#hidden"].must_equal root.reload
+        @site["#hidden"].must_equal root.reload
         child = Page.create slug: "something"
         root.subpages << child
         root.save
-        Site["#hidden/something"].must_equal child.reload
+        @site["#hidden/something"].must_equal child.reload
       end
 
       it "have a shortcut direct method on Site" do
-        Site.page3_2.must_equal @page3_2.reload
+        @site.page3_2.must_equal @page3_2.reload
       end
 
       it "return section pages in the right order" do
-        Site.at_depth(0).must_equal @root
-        Site.at_depth(:root).must_equal @root
-        Site.at_depth(1).must_equal [@page1_1, @page1_2]
-        Site.at_depth(:section).must_equal [@page1_1, @page1_2]
+        @site.at_depth(0).must_equal @root
+        @site.at_depth(:root).must_equal @root
+        @site.at_depth(:home).must_equal @root
+        @site.at_depth(1).must_equal [@page1_1, @page1_2]
+        @site.at_depth(:section).must_equal [@page1_1, @page1_2]
       end
     end
   end
@@ -195,7 +207,7 @@ describe "Site" do
     it "just return the current time if no modifications have been made" do
       now = @now + 12
       Time.stubs(:now).returns(now)
-      Site.modified_at.must_equal now
+      @site.modified_at.must_equal now
     end
 
     it "be updated when a page is added" do
@@ -203,7 +215,7 @@ describe "Site" do
       Time.stubs(:now).returns(now)
       root = ::Page.create
       Time.stubs(:now).returns(now + 200)
-      Site.modified_at.must_equal now
+      @site.modified_at.must_equal now
     end
 
     it "be updated when a page's title changes" do
@@ -211,7 +223,7 @@ describe "Site" do
       now = @now + 98
       Time.stubs(:now).returns(now)
       root.update(:title => "Some Title")
-      Site.modified_at.must_equal now
+      @site.modified_at.must_equal now
     end
 
     it "be updated when a page's slug changes" do
@@ -219,7 +231,7 @@ describe "Site" do
       now = @now + 98
       Time.stubs(:now).returns(now)
       root.update(:slug => "updated-slug")
-      Site.modified_at.must_equal now
+      @site.modified_at.must_equal now
     end
 
     it "not be updated when a piece is added" do
@@ -229,7 +241,7 @@ describe "Site" do
       now2 = @now + 240
       Time.stubs(:now).returns(now2)
       root.subpages << Piece.create
-      Site.modified_at.must_equal now1
+      @site.modified_at.must_equal now1
     end
 
     it "be updated when a page is deleted" do
@@ -241,11 +253,11 @@ describe "Site" do
       child = ::Page.new
       root.subpages << child
       root.save
-      Site.modified_at.must_equal now2
+      @site.modified_at.must_equal now2
       now3 = @now + 128
       Time.stubs(:now).returns(now3)
       child.destroy
-      Site.modified_at.must_equal now3
+      @site.modified_at.must_equal now3
     end
 
     it "not be updated when a piece is deleted" do
@@ -256,11 +268,11 @@ describe "Site" do
       Time.stubs(:now).returns(now2)
       piece = ::Piece.create
       root.subpages << piece
-      Site.modified_at.must_equal now1
+      @site.modified_at.must_equal now1
       now3 = @now + 480
       Time.stubs(:now).returns(now3)
       piece.reload.destroy
-      Site.modified_at.must_equal now1
+      @site.modified_at.must_equal now1
     end
   end
 
@@ -270,7 +282,7 @@ describe "Site" do
       @site.public_url.must_equal "http://spontaneouscms.org/"
       @site.public_url("/").must_equal "http://spontaneouscms.org/"
       @site.public_url("/something").must_equal "http://spontaneouscms.org/something"
-      Site.public_url("/something").must_equal "http://spontaneouscms.org/something"
+      @site.public_url("/something").must_equal "http://spontaneouscms.org/something"
     end
   end
 
@@ -289,7 +301,7 @@ describe "Site" do
 
     it "include all facet paths for a particular path group" do
       dirs = [@site.root / "templates", @template_dir1, @plugin_dir / "templates"]
-      Site.paths(:templates).must_equal dirs
+      @site.paths(:templates).must_equal dirs
     end
   end
 end

data/test/unit/test_storage.rb

@@ -3,7 +3,7 @@
 require File.expand_path('../../test_helper', __FILE__)
 require 'fog'
 
-describe "Storage" do
+describe "Media Store" do
   before do
     @site = setup_site
     @config_dir = File.expand_path("../../fixtures/storage", __FILE__)
@@ -22,7 +22,7 @@ describe "Storage" do
       @storage = @site.storage
     end
     it "be the default" do
-      @storage.must_be_instance_of Spontaneous::Storage::Local
+      @storage.must_be_instance_of Spontaneous::Media::Store::Local
     end
     it "have the right base url" do
       @storage.public_url("test.jpg").must_equal "/media/test.jpg"
@@ -46,16 +46,19 @@ describe "Storage" do
       }
       ::Fog.mock!
       @connection = Fog::Storage.new(@aws_credentials)
-      @bucket = @connection.directories.create(:key => @bucket_name)
+      @bucket = @connection.directories.create(key: @bucket_name)
       @site.paths.add :config, File.expand_path(@config_dir / "cloud", __FILE__)
       @site.load_config!
       # sanity check
       assert @site.config.test_setting
       @storage = @site.storage
+      # Fog's mocks used to apply directory additions globally but latest version
+      # doesn't so I have to stub it out :(
+      @storage.stubs(:backend).returns(@connection)
     end
 
     it "be detected by configuration" do
-      @storage.must_be_instance_of Spontaneous::Storage::Cloud
+      @storage.must_be_instance_of Spontaneous::Media::Store::Cloud
     end
 
     it "have the correct bucket name" do
@@ -86,7 +89,7 @@ describe "Storage" do
 
       it "be set as publicly visible" do
         file = @storage.copy(@existing_file, @media_path, { content_type: "image/jpeg" })
-        acl = file.connection.get_object_acl(file.directory.key, file.key).body['AccessControlList']
+        acl = file.service.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"].must_equal "READ"
       end
@@ -110,7 +113,7 @@ describe "Storage" do
 
 
       it "use custom urls if configured" do
-        storage = Spontaneous::Storage::Cloud.new(@aws_credentials.merge({
+        storage = Spontaneous::Media::Store::Cloud.new(@aws_credentials.merge({
           :public_host => "http://media.example.com",
         }), @bucket_name)
         storage.public_url(@media_path).must_equal "http://media.example.com/0003/0567/rose.jpg"

data/test/unit/test_styles.rb

@@ -9,8 +9,7 @@ describe "Styles" do
     @site = setup_site
     @template_root = File.expand_path(File.join(File.dirname(__FILE__), "../fixtures/styles"))
     @site.paths.add(:templates, @template_root)
-    @renderer = S::Output::Template::PreviewRenderer.new
-    S::Output.renderer = @renderer
+    @renderer = S::Output::Template::PreviewRenderer.new(@site)
   end
 
   after do
@@ -53,12 +52,11 @@ describe "Styles" do
         it "return anonymous style if no templates are found" do
           piece = MissingClass.new
           piece.style.class.must_equal Spontaneous::Style::Default
-          # piece.style.template.must_be_instance_of(Proc)
-          piece.style.template.call.must_equal ""
+          piece.style.template(:html, @renderer).call.must_equal ""
         end
 
         it "derive path from owning class and name" do
-          assert_correct_template(@piece, @template_root / 'template_class')
+          assert_correct_template(@piece, @template_root / 'template_class', @renderer)
         end
 
         it "render using correct template" do
@@ -87,28 +85,27 @@ describe "Styles" do
 
         it "use template found in class directory if exists" do
           TemplateClass.style :named1
-          assert_correct_template(@piece, @template_root / 'template_class/named1')
+          assert_correct_template(@piece, @template_root / 'template_class/named1', @renderer)
           @piece.render.must_equal "template_class/named1.html.cut\n"
         end
 
         it "use template in template root with correct name if it exists" do
           TemplateClass.style :named2
-          assert_correct_template(@piece, @template_root / 'named2')
+          assert_correct_template(@piece, @template_root / 'named2', @renderer)
           @piece.render.must_equal "named2.html.cut\n"
         end
 
         it "allow passing of directory/stylename" do
           TemplateClass.style :'orange/apple'
           # piece.style.template.must_equal 'orange/apple'
-          assert_correct_template(@piece, @template_root / 'orange/apple')
+          assert_correct_template(@piece, @template_root / 'orange/apple', @renderer)
           @piece.render.must_equal "orange/apple.html.cut\n"
         end
 
         it "default to styles marked as 'default'" do
           TemplateClass.style :named1
           TemplateClass.style :named2, :default => true
-          assert_correct_template(@piece, @template_root / 'named2')
-          # @piece.style.template.must_equal 'named2'
+          assert_correct_template(@piece, @template_root / 'named2', @renderer)
           @piece.render.must_equal "named2.html.cut\n"
         end
       end
@@ -120,14 +117,13 @@ describe "Styles" do
           @page  = ::Page.new
           @piece = TemplateClass.new
           @page.box1 << @piece
-          assert_correct_template(@piece, @template_root / 'named2')
-          # @piece.style.template.must_equal 'named2'
+          assert_correct_template(@piece, @template_root / 'named2', @renderer)
           @piece.render.must_equal "named2.html.cut\n"
         end
 
         it "be possible" do
           @piece.style = :named1
-          assert_correct_template(@piece, @template_root / 'template_class/named1')
+          assert_correct_template(@piece, @template_root / 'template_class/named1', @renderer)
           @piece.render.must_equal "template_class/named1.html.cut\n"
         end
 
@@ -135,27 +131,24 @@ describe "Styles" do
           @piece.style = :named1
           @piece.save
           @piece = Content[@piece.id]
-          # @piece.style.template.must_equal 'template_class/named1'
-          assert_correct_template(@piece, @template_root / 'template_class/named1')
+          assert_correct_template(@piece, @template_root / 'template_class/named1', @renderer)
         end
       end
 
       describe "inheriting styles" do
         it "use default for sub class if it exists" do
           piece = TemplateSubClass1.new
-          assert_correct_template(piece, @template_root / 'template_sub_class1')
+          assert_correct_template(piece, @template_root / 'template_sub_class1', @renderer)
         end
 
         it "fall back to default style for superclass if default for class doesn't exist" do
           piece = TemplateSubClass2.new
-          assert_correct_template(piece, @template_root / 'template_class')
-          # piece.style.template.must_equal 'template_class'
+          assert_correct_template(piece, @template_root / 'template_class', @renderer)
         end
         it "fall back to defined default style for superclass if default for class doesn't exist" do
           TemplateClass.style :named1
           piece = TemplateSubClass2.new
-          # piece.style.template.must_equal 'template_class/named1'
-          assert_correct_template(piece, @template_root / 'template_class/named1')
+          assert_correct_template(piece, @template_root / 'template_class/named1', @renderer)
         end
       end
 
@@ -288,11 +281,11 @@ describe "Styles" do
         end
 
         it "be used to render the content" do
-          @a.render.must_equal  "html: Total Title"
+          @a.render_using(@renderer).must_equal  "html: Total Title"
         end
 
         it "be used to render the content with the right format" do
-          @a.render(:pdf).must_equal  "pdf: Total Title"
+          @a.render_using(@renderer, :pdf).must_equal  "pdf: Total Title"
         end
       end
 
@@ -362,7 +355,7 @@ describe "Styles" do
 
         it "use template with their name inside container class template dir if it exists" do
           @piece.results << TemplateClass.new
-          assert_correct_template(@piece.results, @template_root / 'template_class/results')
+          assert_correct_template(@piece.results, @template_root / 'template_class/results', @renderer)
           @piece.results.render.must_equal "template_class/results.html.cut\n"
         end
 
@@ -370,7 +363,7 @@ describe "Styles" do
           @piece.entities << TemplateClass.new
           @piece.entities << TemplateClass.new
           @piece.entities.render.must_equal "template_class.html.cut\n\ntemplate_class.html.cut\n"
-          @piece.entities.style.template.call.must_equal '${ render_content }'
+          @piece.entities.style.template(:html, @renderer).call.must_equal '${ render_content }'
         end
 
 
@@ -380,7 +373,7 @@ describe "Styles" do
           end
           @piece = TemplateClass.new
           @page.box1 << @piece
-          assert_correct_template(@piece.things, @template_root / 'template_class/named1')
+          assert_correct_template(@piece.things, @template_root / 'template_class/named1', @renderer)
           @piece.things.render.must_equal "template_class/named1.html.cut\n"
 
           TemplateClass.box :dongles do
@@ -388,7 +381,7 @@ describe "Styles" do
           end
           @piece = TemplateClass.new
           @page.box1 << @piece
-          assert_correct_template(@piece.dongles, @template_root / 'named2')
+          assert_correct_template(@piece.dongles, @template_root / 'named2', @renderer)
           @piece.dongles.render.must_equal "named2.html.cut\n"
         end
 
@@ -422,7 +415,7 @@ describe "Styles" do
                 FileUtils.mkdir_p(File.dirname(path))
                 FileUtils.touch(path + '.html.cut')
 
-                assert_correct_template(box, template_root / "templates" / test_template)
+                assert_correct_template(box, template_root / "templates" / test_template, @renderer)
 
                 FileUtils.rm_r(template_root / "templates")
               end
@@ -445,12 +438,12 @@ describe "Styles" do
         end
 
         it "use the box name template if it exists" do
-          assert_correct_template(@piece.results, @template_root / 'template_class/results')
+          assert_correct_template(@piece.results, @template_root / 'template_class/results', @renderer)
           @piece.results.render.must_equal "template_class/results.html.cut\n"
         end
 
         it "use the box classes default template if box name template is missing" do
-          assert_correct_template(@piece.entities, @template_root / 'box_a')
+          assert_correct_template(@piece.entities, @template_root / 'box_a', @renderer)
           @piece.entities.render.must_equal "box_a.html.cut\n"
         end
 
@@ -463,7 +456,7 @@ describe "Styles" do
           end
           piece = TemplateSubClass.new
           @page.box1 << piece
-          assert_correct_template(piece.lastly, @template_root / 'box_a')
+          assert_correct_template(piece.lastly, @template_root / 'box_a', @renderer)
           Object.send(:remove_const, :BoxASubclass) rescue nil
           Object.send(:remove_const, :TemplateSubClass) rescue nil
         end
@@ -480,8 +473,8 @@ describe "Styles" do
             page = ::Page.new
             piece = TemplateClass.new
             page.box1 << piece
-            assert_correct_template(piece.strollers, @template_root / 'template_class/walky')
-            assert_correct_template(piece.sprinters, @template_root / 'box_a/runny')
+            assert_correct_template(piece.strollers, @template_root / 'template_class/walky', @renderer)
+            assert_correct_template(piece.sprinters, @template_root / 'box_a/runny', @renderer)
           end
         end
       end