spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/test/unit/test_page.rb

@@ -87,7 +87,7 @@ describe "Page" do
       Page.root.must_equal nil
       root = ErrorPage.create_root "error"
       Page.root.must_equal nil
-      Site["#error"].must_equal root
+      @site["#error"].must_equal root
     end
   end
 
@@ -473,5 +473,12 @@ describe "Page" do
     it "know their owner" do
       @page_piece.owner.must_equal @piece
     end
+
+    it "tests as equal to the page target" do
+      @piece.reload
+      assert @piece.things.first == @child, "PagePiece must == its target"
+      assert @child == @piece.things.first, "Page must == a PagePiece that wraps it"
+      refute @parent == @piece.things.first
+    end
   end
 end

data/test/unit/test_permissions.rb

@@ -409,7 +409,7 @@ describe "Permissions" do
     it "be guaranteed unique" do
       Permissions.stubs(:random_string).returns("xxxx")
       key1 = Permissions::AccessKey.create()
-      lambda { Permissions::AccessKey.create() }.must_raise(Sequel::DatabaseError)
+      lambda { Permissions::AccessKey.create() }.must_raise(Sequel::UniqueConstraintViolation)
     end
 
     it "have a creation date" do
@@ -784,6 +784,10 @@ describe "Permissions" do
     end
 
     it "only list allowed types addable by the user" do
+      allowed_type_names = Proc.new do |a|
+        a[:type]
+      end
+
       expected = [
         ["editor_level", ["D", "C"]],
         ["admin_level", ["C"]],
@@ -791,16 +795,16 @@ describe "Permissions" do
         ["mixed_level", ["C"]],
         ["default_level", ["C"]]
       ]
-      C.export[:boxes].map { |b| [b[:name], b[:allowed_types]] }.must_equal expected
+      C.export[:boxes].map { |b| [b[:name], b[:allowed_types].map(&allowed_type_names)] }.must_equal expected
 
       # Permissions.with_user(@root) do
-        C.export(@root)[:boxes].map { |b| [b[:name], b[:allowed_types]] }.must_equal expected
+        C.export(@root)[:boxes].map { |b| [b[:name], b[:allowed_types].map(&allowed_type_names)] }.must_equal expected
       # end
       # Permissions.with_user(@visitor) do
         expected = [
           ["default_level", []]
         ]
-        C.export(@visitor)[:boxes].map { |b| [b[:name], b[:allowed_types]] }.must_equal expected
+        C.export(@visitor)[:boxes].map { |b| [b[:name], b[:allowed_types].map(&allowed_type_names)] }.must_equal expected
       # end
       # Permissions.with_user(@editor) do
         expected = [
@@ -808,7 +812,7 @@ describe "Permissions" do
           ["mixed_level", []],
           ["default_level", ["C"]]
         ]
-        C.export(@editor)[:boxes].map { |b| [b[:name], b[:allowed_types]] }.must_equal expected
+        C.export(@editor)[:boxes].map { |b| [b[:name], b[:allowed_types].map(&allowed_type_names)] }.must_equal expected
       # end
       # Permissions.with_user(@admin) do
         expected = [
@@ -817,7 +821,7 @@ describe "Permissions" do
           ["mixed_level", []],
           ["default_level", ["C"]]
         ]
-        C.export(@admin)[:boxes].map { |b| [b[:name], b[:allowed_types]] }.must_equal expected
+        C.export(@admin)[:boxes].map { |b| [b[:name], b[:allowed_types].map(&allowed_type_names)] }.must_equal expected
       # end
     end
 
@@ -890,7 +894,7 @@ describe "Permissions" do
     end
 
     it "determine what fields are visible in the exoported schema" do
-      schema = Site.schema.export(@editor)
+      schema = @site.schema.export(@editor)
       c_schema = schema["C"]
       c_schema[:fields].map { |f| f[:name] }.must_equal %w(editor_level mixed_level default_level)
       c_schema[:boxes].map { |b| b[:name] }.must_equal %w(editor_level mixed_level default_level)

data/test/unit/test_plugins.rb

@@ -32,15 +32,15 @@ describe "Plugins" do
   end
 
   def app
-    Spontaneous::Rack.application
+    Spontaneous::Rack.application(@site)
   end
 
 
   before do
-    S::Site.background_mode = :immediate
     S::State.delete
     Content.delete
     @site = Spontaneous.instance
+    @site.background_mode = :immediate
     page = ::Page.new
     page.save
 
@@ -91,7 +91,7 @@ describe "Plugins" do
         Content.delete_revision(1) rescue nil
 
         Spontaneous.logger.silent! {
-          S::Site.publish_all
+          @site.publish_all
         }
       end
 

data/test/unit/test_prototype_set.rb

@@ -89,6 +89,13 @@ describe "PrototypeSet" do
     lambda { @set.nine }.must_raise(NoMethodError)
   end
 
+  it "uses the given block to set default values" do
+    set = Spontaneous::Collections::PrototypeSet.new { |set, key| set[key] = key.to_s.upcase }
+    set.key?(:one).must_equal false
+    set[:one].must_equal "ONE"
+    set.keys.must_equal [:one]
+  end
+
   describe "with superset" do
     before do
       @superset = @set.dup
@@ -96,7 +103,7 @@ describe "PrototypeSet" do
       @superset.order = [:three, :one, :two]
       @super = Super.new
       @super.prototypes = @superset
-      @set = Spontaneous::Collections::PrototypeSet.new(@super, :prototypes)
+      @set = Spontaneous::Collections::PrototypeSet.new(@super, :prototypes) { |set, key| set[key] = key.to_s.upcase }
       @four = "Four"
       @five = "Five"
       @four.stubs(:schema_id).returns("four_id")

data/test/unit/test_publishing.rb

@@ -21,7 +21,8 @@ describe "Publishing" do
     stub_time(@now)
 
     @site = setup_site(site_root)
-    Site.background_mode = :immediate
+    @site.background_mode = :immediate
+    @output_store = @site.output_store(:Memory)
 
     Content.delete
 
@@ -57,7 +58,7 @@ describe "Publishing" do
 
     it "delete any conflicting revision tables" do
       S::Publishing::Revision.create(Content, 3)
-      S::Site.publish_all
+      @site.publish_all
     end
 
     it "issue a publish_all if passed page id list including all pages (in any order)" do
@@ -66,19 +67,19 @@ describe "Publishing" do
 
     it "publish all" do
       Content.expects(:publish).with(@revision, nil)
-      S::Site.publish_all
+      @site.publish_all
     end
 
     it "record date and time of publish" do
       Content.expects(:publish).with(@revision, nil)
       S::PublishedRevision.expects(:create).with(:revision => @revision, :published_at => @now)
-      S::Site.publish_all
+      @site.publish_all
     end
 
     it "bump revision after a publish" do
-      S::Site.publish_all
-      S::Site.revision.must_equal @revision + 1
-      S::Site.published_revision.must_equal @revision
+      @site.publish_all
+      @site.revision.must_equal @revision + 1
+      @site.published_revision.must_equal @revision
     end
 
     it "not delete scheduled changes after an exception during publish" do
@@ -86,23 +87,22 @@ describe "Publishing" do
     end
 
     it "set Site.pending_revision before publishing" do
-      Content.expects(:publish).with(@revision, nil) { Site.pending_revision == @revision }
-      Site.publish_all
+      Content.expects(:publish).with(@revision, nil) { @site.pending_revision == @revision }
+      @site.publish_all
     end
 
     it "reset Site.pending_revision after publishing" do
-      Site.publish_all
-      Site.pending_revision.must_be_nil
+      @site.publish_all
+      @site.pending_revision.must_be_nil
     end
 
     it "not update first_published or last_published if rendering fails" do
       c = Content.create
       c.first_published_at.must_be_nil
-      Spontaneous::Site.expects(:pages).returns([c])
+      @site.expects(:pages).returns([c])
       # c.expects(:render).raises(Exception)
       begin
-        silence_logger { Site.publish_all }
-        # Site.publish_all
+        silence_logger { @site.publish_all }
       rescue Exception; end
       c.reload
       Content.with_editable do
@@ -111,26 +111,39 @@ describe "Publishing" do
     end
 
     it "clean up state on publishing failure" do
-      Site.pending_revision.must_be_nil
+      @site.pending_revision.must_be_nil
       refute Content.revision_exists?(@revision)
       # don't like peeking into implementation here but don't know how else
       # to simulate the right error
       root = Page.create()
-      Spontaneous::Site.expects(:pages).returns([root])
+      @site.expects(:pages).returns([root])
       output = root.output(:html)
       output.expects(:render_using).raises(Exception)
       root.expects(:outputs).at_least_once.returns([output])
+      revision_store = @output_store.revision(@revision)
+      @output_store.expects(:revision).with(@revision).at_least_once.returns(revision_store)
+      transaction = []
+      revision_store.expects(:delete)
+      revision_store.expects(:transaction).returns(transaction)
+      transaction.expects(:rollback)
       begin
-        silence_logger { Site.publish_all }
+        silence_logger { @site.publish_all }
       rescue Exception; end
-      Site.pending_revision.must_be_nil
+      @site.pending_revision.must_be_nil
+      @output_store.revisions.must_equal []
       refute Content.revision_exists?(@revision)
       begin
-        silence_logger { Site.publish_pages([change1]) }
+        silence_logger { @site.publish_pages([change1]) }
       rescue Exception; end
-      Site.pending_revision.must_be_nil
+      @site.pending_revision.must_be_nil
       refute Content.revision_exists?(@revision)
     end
+
+    it "resets the must_publish_all flag after a successful publish" do
+      @site.must_publish_all!
+      @site.publish_all
+      @site.must_publish_all?.must_equal false
+    end
   end
 
 
@@ -141,7 +154,7 @@ describe "Publishing" do
       Content.delete
       S::State.delete
       S::State.create(:revision => @revision, :published_revision => 2)
-      S::Site.revision.must_equal @revision
+      @site.revision.must_equal @revision
 
 
       class ::PublishablePage < Page; end
@@ -154,7 +167,9 @@ describe "Publishing" do
       DynamicPublishablePage.layout :"static"
       DynamicPublishablePage.layout :"dynamic"
 
-      DynamicPublishablePage.request { show "/about" }
+      DynamicPublishablePage.controller do
+        get { show "/about" }
+      end
 
       @home = PublishablePage.create(:title => 'Home')
       @home.layout = :"dynamic"
@@ -175,7 +190,8 @@ describe "Publishing" do
       @blog.box1 << @post3
       @pages = [@home, @about, @blog, @news, @post1, @post2, @post3]
       @pages.each { |p| p.save }
-      Site.publish_all
+      @site.publish_all
+      @template_revision = @output_store.revision(2)
     end
 
     after do
@@ -187,10 +203,6 @@ describe "Publishing" do
       Object.send(:remove_const, :DynamicPublishablePage) rescue nil
     end
 
-    it "put its files into a numbered revision directory" do
-      Spontaneous.revision_dir(2).must_equal Pathname.new(@site.root / 'cache/revisions' / "00002").realpath.to_s
-    end
-
     it "symlink the latest revision to 'current'" do
       revision_dir = @site.revision_root / "00002"
       current_dir = @site.revision_root / "current"
@@ -200,30 +212,29 @@ describe "Publishing" do
     end
 
     it "have access to the current revision within the templates" do
-      revision_dir = @site.revision_root / "00002"
-      File.read(revision_dir / "static/about.html").must_equal "Page: 'About' 2\n"
+      @template_revision.static_template(@about.output(:html)).read.must_equal "Page: 'About' 2\n"
     end
 
     it "produce rendered versions of each page" do
       revision_dir = @site.revision_root / "00002"
-      file = result = nil
+      file = result = expected = nil
       @pages.each do |page|
+        output = page.output(:html)
         case page.slug
         when "" # root is a dynamic page with no request handler
-          file = revision_dir / "dynamic/index.html.cut"
-          result = "Page: '#{page.title}' {{Time.now.to_i}}\n"
+          expected = "Page: '#{page.title}' {{Time.now.to_i}}\n"
+          result = @template_revision.dynamic_template(output)
         when "news" # news produces a static template but has a request handler
-          file = revision_dir / "protected/news.html"
-          result = "Page: 'News' 2\n"
+          expected = "Page: 'News' 2\n"
+          result = @template_revision.static_template(output)
         when "contact" # contact is both dynamic and has a request handler
-          file = revision_dir / "dynamic/contact.html.cut"
-          result = "Page: 'Contact' {{Time.now.to_i}}\n"
+          expected = "Page: 'Contact' {{Time.now.to_i}}\n"
+          result = @template_revision.dynamic_template(output)
         else # the other pages are static
-          file = revision_dir / "static#{page.path}.html"
-          result = "Page: '#{page.title}' 2\n"
+          expected = "Page: '#{page.title}' 2\n"
+          result = @template_revision.static_template(output)
         end
-        assert File.exists?(file), "File '#{file}' should exist"
-        File.read(file).must_equal result
+        assert_equal expected, result.read
       end
       revision_dir = @site.revision_root / "00002"
       Dir[S.root / "public/**/*"].each do |public_file|
@@ -248,20 +259,22 @@ describe "Publishing" do
     it "transparently support previously unknown formats by assuming a simple HTML like rendering model" do
       PublishablePage.add_output :rtf
       Content.delete_revision(@revision+1)
-      Site.publish_all
-      File.read("#{@site.revision_root}/00003/static/index.rtf").must_equal "RICH!\n"
+      @site.publish_all
+      template_revision = @output_store.revision(@revision+1)
+      render = template_revision.static_template(@home.output(:rtf))
+      render.read.must_equal "RICH!\n"
     end
 
     it "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").must_equal "RICH!\n"
+      @site.publish_all
+      @output_store.revision(@revision + 1).dynamic_template(@home.output(:rtf)).read.must_equal "RICH!\n"
     end
 
     it "run the content revision cleanup task after the revision is live" do
       Content.expects(:cleanup_revisions).with(@revision+1, 8)
-      Site.publish_all
+      @site.publish_all
     end
 
     describe "hooks & triggers" do
@@ -270,32 +283,32 @@ describe "Publishing" do
         publish1.expects(:finished).with(@revision+1)
         publish2 = mock
         publish2.expects(:finished)
-        Site.after_publish do |revision|
+        @site.after_publish do |revision|
           publish1.finished(revision)
         end
-        Site.after_publish do
+        @site.after_publish do
           publish2.finished
         end
         Content.delete_revision(@revision+1)
-        Site.publish_all
-        Site.published_revision.must_equal @revision+1
+        @site.publish_all
+        @site.published_revision.must_equal @revision+1
       end
 
       it "abort publish if hook raises error" do
         published_revision = @revision+1
-        Site.pending_revision.must_be_nil
+        @site.pending_revision.must_be_nil
         refute Content.revision_exists?(published_revision)
 
-        Site.after_publish do |revision|
+        @site.after_publish do |revision|
           raise "Boom"
         end
 
         begin
-          silence_logger { Site.publish_all }
+          silence_logger { @site.publish_all }
         rescue Exception; end
 
-        Site.pending_revision.must_be_nil
-        Site.published_revision.must_equal @revision
+        @site.pending_revision.must_be_nil
+        @site.published_revision.must_equal @revision
         refute Content.revision_exists?(published_revision)
         S::PublishedRevision.first(:revision => published_revision).must_be_nil
         previous_root = Spontaneous.revision_dir(@revision)

data/test/unit/test_render.rb

@@ -35,9 +35,19 @@ describe "Render" do
           end
         end
         field :description do
+          def render(format = :html, locals = {}, parent_context = nil)
+            case format
+            when :pdf
+              to_pdf
+            else
+              super
+            end
+          end
+
           def to_pdf
             "{#{value}}"
           end
+
           def to_epub
             to_html
           end
@@ -68,8 +78,7 @@ describe "Render" do
 
       @root.sections2.entries.last.set_position(0)
       @root.save.reload
-      @renderer = Spontaneous::Output::Template::PublishRenderer.new
-      Spontaneous::Output.renderer = @renderer
+      @renderer = Spontaneous::Output::Template::PublishRenderer.new(@site)
     end
 
     after do
@@ -82,9 +91,9 @@ describe "Render" do
     end
 
     it "use a cache for the site root" do
-        a = @renderer.render_string('#{root.object_id} #{root.object_id}', @page.output(:html), {})
-        a.wont_equal "#{nil.object_id} #{nil.object_id}"
-        a.split.uniq.length.must_equal 1
+      a = @renderer.render_string('#{root.object_id} #{root.object_id}', @page.output(:html), {})
+      a.wont_equal "#{nil.object_id} #{nil.object_id}"
+      a.split.uniq.length.must_equal 1
     end
 
     it "uses a cache for site pages" do
@@ -98,27 +107,27 @@ describe "Render" do
       template = '%%{ navigation(%s) do |section, active| }${section.title}/${active} %%{ end }'
       a = @renderer.render_string(template % "", @section1.output(:html), {})
       a.must_equal "Section 1/true Section 2/false Section 4/false Section 3/false "
-      a = @renderer.render_string(template % "1", @section2.output(:html), {})
+      a = @renderer.render_string(template % "depth: 1", @section2.output(:html), {})
       a.must_equal "Section 1/false Section 2/true Section 4/false Section 3/false "
-      a = @renderer.render_string(template % ":section", @section1.output(:html), {})
+      a = @renderer.render_string(template % "depth: :section", @section1.output(:html), {})
       a.must_equal "Section 1/true Section 2/false Section 4/false Section 3/false "
     end
 
     it "use a cache for navigation pages" do
       a = b = c = nil
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
-      renderer = Spontaneous::Output::Template::PreviewRenderer.new
+      renderer = Spontaneous::Output::Template::PreviewRenderer.new(@site)
       a = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       b = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.wont_equal b
 
-      renderer = Spontaneous::Output::Template::PublishRenderer.new
+      renderer = Spontaneous::Output::Template::PublishRenderer.new(@site)
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
       a = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       b = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.must_equal b
 
-      renderer = Spontaneous::Output::Template::PublishRenderer.new
+      renderer = Spontaneous::Output::Template::PublishRenderer.new(@site)
       template = '%{ navigation do |section, active| }${section.object_id} %{ end }'
       c = renderer.render_string(template, ::Content[@section1.id].output(:html), {}).strip
       a.wont_equal c
@@ -222,8 +231,8 @@ describe "Render" do
         end
         @page.image = "/photo.jpg"
         output =  @page.render
-        output.must_match /width=['"]10['"]/
-        output.must_match /height=['"]50['"]/
+        output.must_match /width=['"]10["']/
+        output.must_match /height=["']50['"]/
       end
 
     end
@@ -388,7 +397,7 @@ describe "Render" do
       it "use their default page style when accessed directly" do
         @page = PageClass[@page.id]
         @page.layout.must_equal PageClass.default_layout
-        assert_correct_template(@parent, template_root / 'layouts/page_style')
+        assert_correct_template(@parent, template_root / 'layouts/page_style', @renderer)
         @page.render.must_equal "<html></html>\n"
       end
 
@@ -398,7 +407,7 @@ describe "Render" do
       end
 
       it "render using the inline style" do
-        assert_correct_template(@parent.contents.first, template_root / 'page_class/inline_style')
+        assert_correct_template(@parent.contents.first, template_root / 'page_class/inline_style', @renderer)
         @parent.contents.first.render.must_equal "Child\n"
         @parent.things.render.must_equal "Child\n"
         @parent.render.must_equal "<html>Child\n</html>\n"
@@ -450,8 +459,7 @@ describe "Render" do
 
     describe "Preview render" do
       before do
-        @renderer = Spontaneous::Output::Template::PreviewRenderer.new
-        Spontaneous::Output.renderer = @renderer
+        @renderer = Spontaneous::Output::Template::PreviewRenderer.new(@site)
         PreviewRender.layout :preview_render
       end
 
@@ -482,13 +490,12 @@ describe "Render" do
     end
     describe "Request rendering" do
       before do
-        @renderer = Spontaneous::Output::Template::PreviewRenderer.new
-        Spontaneous::Output.renderer = @renderer
+        @renderer = Spontaneous::Output::Template::PreviewRenderer.new(@site)
         PreviewRender.layout :params
       end
 
       it "pass on passed params" do
-        result = @page.render({
+        result = @page.render_using(@renderer, :html, {
           :welcome => "hello"
         })
         result.must_equal "PAGE hello\n"
@@ -498,8 +505,7 @@ describe "Render" do
 
     describe "entry parameters" do
       before do
-        @renderer = Spontaneous::Output::Template::PreviewRenderer.new
-        Spontaneous::Output.renderer = @renderer
+        @renderer = Spontaneous::Output::Template::PreviewRenderer.new(@site)
         PreviewRender.layout :entries
         @first = PreviewRender.new(:title => "first")
         @second = PreviewRender.new(:title => "second")
@@ -522,8 +528,7 @@ describe "Render" do
         FileUtils.mkdir_p(@temp_template_root / "layouts")
         @site.paths.add(:templates, @temp_template_root)
 
-        @renderer = Spontaneous::Output::Template::PublishRenderer.new(true)
-        Spontaneous::Output.renderer = @renderer
+        @renderer = Spontaneous::Output::Template::PublishRenderer.new(@site, true)
 
         @template_path = @temp_template_root / "layouts/standard.html.cut"
         @compiled_path = @temp_template_root / "layouts/standard.html.rb"
@@ -542,27 +547,75 @@ describe "Render" do
         @first.save
       end
 
-      it "ignore compiled template file if it is older than the template" do
-        @first.render.must_equal "compiled"
-        File.open(@temp_template_root / "layouts/standard.html.cut", "w") do |t|
-          t.write("updated template")
+      # Disabled pending decision about the best way to optimize templates
+      # in the case of this example, where we are optimizing the first render
+      # of a site template (not a rendered page) I'm not sure that it's worth it
+      # at all...
+      it "ignore compiled template file if it is older than the template"
+      #   @first.render_using(@renderer).must_equal "compiled"
+      #   File.open(@temp_template_root / "layouts/standard.html.cut", "w") do |t|
+      #     t.write("updated template")
+      #   end
+      #   later = Time.now + 1000
+      #   File.utime(later, later, @template_path)
+      #   template_mtime = File.mtime(@template_path)
+      #   compiled_mtime = File.mtime(@compiled_path)
+      #   assert template_mtime > compiled_mtime, "Template file should register as newer"
+      #   # Need to use a new renderer because the existing one will have cached the compiled template
+      #   @renderer = Spontaneous::Output::Template::PublishRenderer.new(@site)
+      #   @first.render.must_equal "updated template"
+      # end
+    end
+
+    describe "PublishedRenderer" do
+      before do
+        @site.background_mode = :immediate
+        @site.output_store :Memory
+
+        ::Content.delete
+        ::Content.delete_revision(1) rescue nil
+        @renderer = Spontaneous::Output::Template::PublishedRenderer.new(@site, 1)
+        Page.box :other
+        class ::DynamicPage < Page
+          layout(:html) { "${path}.${ __format }:{{ something }}"}
         end
-        later = Time.now + 1000
-        File.utime(later, later, @template_path)
-        template_mtime = File.mtime(@template_path)
-        compiled_mtime = File.mtime(@compiled_path)
-        assert template_mtime > compiled_mtime, "Template file should register as newer"
-        # Need to use a new renderer because the existing one will have cached the compiled template
-        @renderer = Spontaneous::Output::Template::PublishRenderer.new
-        Spontaneous::Output.renderer = @renderer
-        @first.render.must_equal "updated template"
+        class ::StaticPage < Page
+          layout(:html) { "${ path }.${ __format }"}
+        end
+
+        @root = Page.create
+        assert @root.is_root?
+
+        @dynamic = DynamicPage.new(slug: "dynamic", uid: "dynamic")
+        @static = StaticPage.new(slug: "static", uid: "static")
+        @root.other << @dynamic
+        @root.other << @static
+
+        [@root, @dynamic, @static].each(&:save)
+
+        @site.publish_all
+      end
+
+      after do
+        Object.send :remove_const, :StaticPage
+        Object.send :remove_const, :DynamicPage
+        ::Content.delete
+      end
+
+      it "should render dynamic pages from the template store xxx" do
+        result = @renderer.render!(@dynamic.output(:html), { something: "something here" }, nil)
+        result.must_equal "/dynamic.html:something here"
+      end
+
+      it "should render static pages from the template store xxx" do
+        result = @renderer.render!(@static.output(:html), { something: "something here" }, nil)
+        result.read.must_equal "/static.html"
       end
     end
 
     describe "variables in render command" do
       before do
-        @renderer = Spontaneous::Output::Template::PublishRenderer.new
-        Spontaneous::Output.renderer = @renderer
+        @renderer = Spontaneous::Output::Template::PublishRenderer.new(@site)
 
         PreviewRender.layout :variables
         PreviewRender.style :variables