spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/lib/spontaneous/site/storage.rb

@@ -20,20 +20,6 @@ class Spontaneous::Site
   module Storage
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def storage(mimetype = nil)
-        instance.storage(mimetype)
-      end
-
-      def local_storage
-        instance.local_storage
-      end
-
-      def default_storage
-        instance.default_storage
-      end
-    end # ClassMethods
-
     def storage(mimetype = nil)
       storage_for_mimetype(mimetype)
     end
@@ -54,14 +40,22 @@ class Spontaneous::Site
       storage_backends = []
       storage_settings = config[:storage] || []
       storage_settings.each do |name, config|
-        backend = Spontaneous::Storage.create(config)
+        backend = Spontaneous::Media::Store.create(config)
         storage_backends << backend
       end
       storage_backends << default_storage
     end
 
     def default_storage
-      @default_storage ||= Spontaneous::Storage::Local.new(Spontaneous.media_dir, '/media', accepts=nil)
+      @default_storage ||= Spontaneous::Media::Store::Local.new(Spontaneous.media_dir, '/media', accepts=nil)
+    end
+
+    def file(owner, filename, headers = {})
+      Spontaneous::Media::File.new(self, owner, filename, headers)
+    end
+
+    def tempfile(owner, filename, headers = {})
+      Spontaneous::Media::TempFile.new(self, owner, filename, headers)
     end
   end
 end

data/lib/spontaneous/state.rb

@@ -53,6 +53,14 @@ module Spontaneous
         instance.modified_at || Time.now
       end
 
+      def must_publish_all?
+        instance.must_publish_all
+      end
+
+      def must_publish_all!(state = true)
+        instance.update must_publish_all: state
+      end
+
       # Called by Page.after_create and Page.after_destroy in order to update
       # the Site's modification time
       def site_modified!

data/lib/spontaneous/style.rb

@@ -3,11 +3,6 @@
 
 module Spontaneous
   class Style
-    def self.to_directory_name(klass)
-      return nil if klass.name.blank?
-      klass.name.demodulize.underscore
-    end
-
     attr_reader :owner, :prototype
 
     def initialize(owner, prototype = nil)
@@ -18,52 +13,47 @@ module Spontaneous
       self.prototype.schema_id
     end
 
-    def template(format = :html)
-      inline_template(format) || external_template(format)
+    def template(format = :html, renderer = default_renderer)
+      inline_template(format) || external_template(format, renderer)
     end
 
-    def external_template(format = :html)
-      unless (template = (file_template(format) || supertype_template(format)))
+    def external_template(format = :html, renderer)
+      unless (template = (file_template(format, renderer) || supertype_template(format, renderer)))
         logger.warn("No template file found for style #{owner}:#{name}.#{format}")
         template = anonymous_template
       end
       template
     end
 
-    def file_template(format)
-      local_template(format)
+    def file_template(format, renderer)
+      local_template(format, renderer)
     end
 
     # Tests to see if a template file exists for the specified format.
     # If one doesn't exist then the style would fall back to an
     # 'anonymous' template.
-    def template?(format = :html)
-      !(inline_template(format) || file_template(format)).nil?
+    def template?(format = :html, renderer = default_renderer)
+      !(inline_template(format) || file_template(format, renderer)).nil?
     end
 
     alias_method :path, :template
 
-    def local_template(format)
-      template_path = nil
-      Spontaneous::Site.paths(:templates).each do |template_root|
-        template_path = try_template_paths.detect do |path|
-          Spontaneous::Output.template_exists?(template_root, path, format)
-        end
-        return (template_root / template_path) if template_path
-      end
-      nil
+    def local_template(format, renderer)
+      template_path = try_template_paths.map { |path|
+        renderer.template_location(path, format)
+      }.detect { |path| !path.nil? }
     end
 
-    def supertype_template(format)
-      template = try_supertype_styles.each { |style|
-        template = style.template(format)
+    def supertype_template(format, renderer)
+      template = try_supertype_styles(renderer).each { |style|
+        template = style.template(format, renderer)
         return template unless template.nil?
       }
       nil
     end
 
-    def try_supertype_styles
-      class_ancestors(owner).take_while { |a| a and a < Spontaneous::Content }.
+    def try_supertype_styles(renderer)
+      class_ancestors(owner).take_while { |a| a and a < owner.model }.
         map { |s| supertype_style_class.new(s, prototype) }
     end
 
@@ -106,8 +96,13 @@ module Spontaneous
     end
 
     def owner_directory_names
-      classes = [owner].concat(owner.ancestors.take_while { |klass| klass < owner.content_model::Page or klass < owner.content_model::Piece })
-      classes.map { |klass| self.class.to_directory_name(klass) }
+      classes = [owner].concat(owner.ancestors.take_while { |klass| klass < owner.model::Page or klass < owner.model::Piece })
+      classes.map { |klass| to_directory_name(klass) }
+    end
+
+    def to_directory_name(klass)
+      return nil if klass.name.blank?
+      klass.name.demodulize.underscore
     end
 
     def owner_directory_paths(basename)
@@ -126,6 +121,10 @@ module Spontaneous
       other.class == self.class && other.prototype == self.prototype && other.owner == self.owner
     end
 
+    def default_renderer
+      Spontaneous::Output.default_renderer
+    end
+
     class Default < Style
       def name
         "<default>"
@@ -145,7 +144,7 @@ module Spontaneous
         @template_code = template_code
       end
 
-      def template(format = :html)
+      def template(format = :html, renderer = Spontaneous::Output.default_renderer)
         Proc.new { @template_code }
       end
 
@@ -167,13 +166,13 @@ module Spontaneous
         @instance = instance
       end
 
-      def template(format = :html)
+      def template(format = :html, renderer = Spontaneous::Output.default_renderer)
         target_is_content = @instance.target.respond_to?(:resolve_style)
         if (style = @instance.resolve_style(@instance.style_sid))
-          return style.template(format) if !target_is_content || style.template?(format)
+          return style.template(format, renderer) if !target_is_content || style.template?(format, renderer)
         end
         style = @instance.target.resolve_style(@instance.style_sid)
-        style.template(format)
+        style.template(format, renderer)
       end
     end
   end

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.beta4"
+  VERSION = "0.2.0.beta5"
   GEM = false
 end

data/spontaneous.gemspec

@@ -26,35 +26,36 @@ Gem::Specification.new do |s|
   # s.signing_key   = '/Volumes/Keys/rubygems-garry-magnetised-net-private_key.pem'
   # s.cert_chain    = ['gem-public_cert.pem']
 
-  s.add_dependency('activesupport',   ['~> 4.0.0'])
-  s.add_dependency('coffee-script',   ['~> 2.2.0'])
-  s.add_dependency('bcrypt-ruby',     ['~> 3.0.1'])
-  s.add_dependency('bundler',         ['>  1.0.15'])
-  s.add_dependency('cutaneous',       ['~> 0.1.6'])
+  s.add_dependency('activesupport',   ['~> 4.0'])
+  s.add_dependency('coffee-script',   ['~> 2.2'])
+  s.add_dependency('bcrypt-ruby',     ['~> 3.0'])
+  s.add_dependency('bundler',         ['>  1.0'])
+  s.add_dependency('cutaneous',       ['~> 0.2'])
   s.add_dependency('erubis',          ['~> 2.6'])
-  s.add_dependency('fog',             ['~> 1.6.0'])
-  s.add_dependency('foreman',         ['~> 0.60.2'])
-  s.add_dependency('kramdown',        ['~> 0.14.0'])
-  s.add_dependency('launchy',         ['~> 2.1.2'])
-  s.add_dependency('nokogiri',        ['~> 1.5.0'])
+  s.add_dependency('fog',             ['~> 1.17'])
+  s.add_dependency('foreman',         ['~> 0.60'])
+  s.add_dependency('kramdown',        ['~> 0.14'])
+  s.add_dependency('launchy',         ['~> 2.1'])
+  s.add_dependency('moneta',          ['~> 0.7'])
+  s.add_dependency('nokogiri',        ['~> 1.5'])
   s.add_dependency('posix-spawn',     ['~> 0.3.6'])
   s.add_dependency('public_suffix',   ['~> 1.0'])
-  s.add_dependency('rack',            ['~> 1.5.0'])
-  s.add_dependency('rake',            ['~> 0.9.2'])
-  s.add_dependency('sass',            ['~> 3.2.10'])
-  s.add_dependency('sequel',          ['~> 3.43.0'])
+  s.add_dependency('rack',            ['~> 1.5'])
+  s.add_dependency('rake',            ['~> 0.9'])
+  s.add_dependency('sass',            ['~> 3.2'])
+  s.add_dependency('sequel',          ['~> 4.8'])
   s.add_dependency('simultaneous',    ['~> 0.4.2'])
-  s.add_dependency('sinatra',         ['~> 1.3.4'])
-  s.add_dependency('skeptick',        ['~> 0.1.0'])
-  s.add_dependency('sprockets',       ['~> 2.9.0'])
+  s.add_dependency('sinatra',         ['~> 1.3'])
+  s.add_dependency('skeptick',        ['~> 0.1'])
+  s.add_dependency('sprockets',       ['~> 2.9'])
   s.add_dependency('stringex',        ['=  1.3'])
   s.add_dependency('thin',            ['~> 1.2'])
-  s.add_dependency('thor',            ['~> 0.16.0'])
-  s.add_dependency('uglifier',        ['~> 1.3.0'])
+  s.add_dependency('thor',            ['~> 0.16'])
+  s.add_dependency('uglifier',        ['~> 1.3'])
   s.add_dependency('xapian-fu',       ['~> 1.5'])
-  s.add_dependency('yajl-ruby',       ['~> 1.1.0'])
+  s.add_dependency('yajl-ruby',       ['~> 1.1'])
 
-  s.add_development_dependency('minitest',  ['~> 4.6.0'])
+  s.add_development_dependency('minitest',  ['~> 4.7.0'])
   s.add_development_dependency('minitest-colorize', ['~> 0.0.5'])
   s.add_development_dependency('mocha',     ['~> 0.13.2'])
   s.add_development_dependency('rack-test', ['~> 0.5'])

data/test/fixtures/public/templates/layouts/default.html.cut

@@ -1 +1 @@
-#{ page.path }.html
+${ page.path }.html

data/test/fixtures/public/templates/layouts/default.pdf.cut

@@ -1 +1 @@
-#{ page.path }.pdf
+${ page.path }.pdf

data/test/fixtures/public/templates/layouts/default.rss.cut

@@ -1 +1 @@
-#{ page.path }.rss
+${ page.path }.rss

data/test/fixtures/search/config/indexes.rb

@@ -1,4 +1,4 @@
 
-Site.index :fast do
+Spontaneous::Site.instance.index :fast do
   include_types "PageClass1", PageClass2, :PageClass3
 end

data/test/fixtures/serialisation/class_hash.yaml.erb

@@ -18,12 +18,14 @@
   :title: Title
   :comment: ""
   :writable: true
+  :list: true
 - :name: location
   :schema_id: <%= @fp[:location].schema_id.to_s %>
   :type: Spontaneous.Field.String
   :title: Where
   :comment: Fill in the address
   :writable: true
+  :list: true
 - :name: date
   :schema_id: <%= @fp[:date].schema_id.to_s %>
   :type: Spontaneous.Field.Date
@@ -31,19 +33,28 @@
   :comment: ""
   :writable: true
   :date_format: "%A, %-d %B, %Y"
+  :list: true
 - :name: image
   :schema_id: <%= @fp[:image].schema_id.to_s %>
   :type: Spontaneous.Field.Image
   :title: Image
   :comment: ""
   :writable: true
+  :list: true
+- :name: another
+  :schema_id: <%= @fp[:another].schema_id.to_s %>
+  :type: Spontaneous.Field.String
+  :title: Another
+  :comment: ""
+  :writable: true
+  :list: false
 :boxes:
 - :name: things
   :id: <%= SerialisedPiece.boxes[:things].schema_id.to_s %>
   :title: My Things
   :writable: true
   :allowed_types:
-  - SerialisedPage
+  - :type: SerialisedPage
   :fields:
   - :name: title
     :schema_id: <%= SerialisedPiece.boxes[:things].field_prototypes[:title].schema_id.to_s %>
@@ -51,4 +62,5 @@
     :title: Title
     :comment: ""
     :writable: true
+    :list: true
 :source: <%= source %>

data/test/fixtures/serialisation/root_hash.yaml.erb

@@ -76,6 +76,11 @@
           :src: ""
         :__ui__:
           :src: ""
+    - :unprocessed_value: ""
+      :name: another
+      :processed_value: ""
+      :version: 0
+      :id: <%= SerialisedPiece.field_prototypes[:another].schema_id.to_s %>
 
     :style: <%= @freezing_style.to_s %>
     :hidden: true
@@ -168,6 +173,11 @@
           :src: ""
         :__ui__:
           :src: ""
+    - :unprocessed_value: ""
+      :name: another
+      :processed_value: ""
+      :version: 0
+      :id: <%= SerialisedPiece.field_prototypes[:another].schema_id.to_s %>
 
     :style: <%= @boiling_style.to_s %>
     :hidden: false

data/test/functional/test_application.rb

@@ -18,18 +18,9 @@ describe "Application" do
   end
 
   finish do
-    Object.send :remove_const, :Page
-    Object.send :remove_const, :Piece
-    Object.send :remove_const, :Project
-    Object.send :remove_const, :ProjectImage
-    Object.send :remove_const, :ProjectsPage
-    Object.send :remove_const, :Text
-    Object.send :remove_const, :HomePage
-    Object.send :remove_const, :InfoPage
-    Object.send :remove_const, :ClientProject
-    Object.send :remove_const, :ClientProjects
-    Object.send :remove_const, :InlineImage
-
+    [:Page, :Piece, :Project, :ProjectImage, :ProjectsPage, :Text, :HomePage, :InfoPage, :ClientProject, :ClientProjects, :InlineImage].each do |klass|
+      Object.send :remove_const, klass rescue nil
+    end
     teardown_site(true)
   end
 
@@ -48,22 +39,27 @@ describe "Application" do
 
   describe "Site" do
     before do
-      Spontaneous.init(:root => site_root, :mode => :back, :environment => :development)
+      @site = Spontaneous.init(:root => site_root, :mode => :back, :environment => :development)
     end
+
+    it "returns an instance of the site from Spontaneous.init" do
+      @site.must_be_instance_of Spontaneous::Site
+    end
+
     it "have the same config as Spontaneous" do
-      Site.config.must_equal Spontaneous.config
+      @site.config.must_equal Spontaneous.config
     end
 
     it "enable setting config vars on Site" do
-      Site.config.butter = "yummy"
-      Site.config.butter.must_equal "yummy"
+      @site.config.butter = "yummy"
+      @site.config.butter.must_equal "yummy"
     end
   end
 
   describe "back, development" do
 
     before do
-      Spontaneous.init(:root => site_root, :mode => :back, :environment => :development)
+      @site = Spontaneous.init(:root => site_root, :mode => :back, :environment => :development)
       Sequel::Migrator.apply(Spontaneous.database, 'db/migrations')
     end
 
@@ -88,8 +84,8 @@ describe "Application" do
     end
 
     it "have correct db settings" do
-      Site.config.db[:adapter].must_equal "postgres"
-      Site.config.db[:database].must_equal "spontaneous2_test"
+      @site.config.db[:adapter].must_equal "postgres"
+      @site.config.db[:database].must_equal "spontaneous2_test"
       # Site.config.db[:user].must_equal "root"
       # Site.config.db[:password].should be_nil
       # Site.config.db[:host].must_equal "localhost"
@@ -139,7 +135,7 @@ describe "Application" do
 
   describe "back, production" do
     before do
-      Spontaneous.init(:root => site_root, :mode => :back, :environment => :production)
+      @site = Spontaneous.init(:root => site_root, :mode => :back, :environment => :production)
     end
 
     it "have the right mode setting" do
@@ -156,10 +152,10 @@ describe "Application" do
     end
 
     it "have correct db settings" do
-      Site.config.db[:adapter].must_equal "postgres"
-      Site.config.db[:database].must_equal "spontaneous_example_production"
-      Site.config.db[:user].must_equal "spontaneous_prod"
-      Site.config.db[:password].must_equal "Passw0rd"
+      @site.config.db[:adapter].must_equal "postgres"
+      @site.config.db[:database].must_equal "spontaneous_example_production"
+      @site.config.db[:user].must_equal "spontaneous_prod"
+      @site.config.db[:password].must_equal "Passw0rd"
       # Site.config.db[:host].must_equal "localhost"
     end
 

data/test/functional/test_back.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+
 
 require File.expand_path('../../test_helper', __FILE__)
 
@@ -72,7 +72,7 @@ describe "Back" do
     end
 
     class ::HomePage < Page
-      field :introduction, :text
+      field :introduction, :richtext
       box :projects do
         allow Project
       end
@@ -126,12 +126,12 @@ describe "Back" do
       Object.send(:remove_const, klass) rescue nil
     end
     Spontaneous::Permissions::User.delete
-    Content.delete
+    Content.delete if defined?(Content)
     teardown_site(true)
   end
 
   def app
-    Spontaneous::Rack::Back.application
+    @app ||= Spontaneous::Rack::Back.application(site)
   end
 
   let(:home) { Content[home_id] }
@@ -193,14 +193,14 @@ describe "Back" do
         auth_get '/@spontaneous/map'
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
-        assert_equal S::Site.map.to_json, last_response.body
+        assert_equal site.map.to_json, last_response.body
       end
 
       it "return a site map for any page id" do
         auth_get "/@spontaneous/map/#{home.id}"
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
-        assert_equal S::Site.map(home.id).to_json, last_response.body
+        assert_equal site.map(home.id).to_json, last_response.body
       end
 
       it "return a site map for any url" do
@@ -208,7 +208,7 @@ describe "Back" do
         auth_get "/@spontaneous/map/path#{project1.path}"
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
-        assert_equal S::Site.map(project1.id).to_json, last_response.body
+        assert_equal site.map(project1.id).to_json, last_response.body
       end
 
       it "return 404 when asked for map of non-existant page" do
@@ -220,7 +220,7 @@ describe "Back" do
 
       it "return the correct Last-Modified header for the site map" do
         now = Time.at(Time.now.to_i + 10000)
-        Spontaneous::Site.stubs(:modified_at).returns(now)
+        site.stubs(:modified_at).returns(now)
         auth_get '/@spontaneous/map'
         Time.httpdate(last_response.headers["Last-Modified"]).must_equal now
         auth_get "/@spontaneous/map/path#{project1.path}"
@@ -230,7 +230,7 @@ describe "Back" do
       it "reply with a 304 Not Modified if the site hasn't been updated since last request" do
         datestring = "Sat, 03 Mar 2012 00:49:44 GMT"
         now = Time.httpdate(datestring)
-        Spontaneous::Site.stubs(:modified_at).returns(now)
+        site.stubs(:modified_at).returns(now)
         auth_get "/@spontaneous/map/#{home.id}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring}
         last_response.status.must_equal 304
         auth_get "/@spontaneous/map", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring}
@@ -243,7 +243,7 @@ describe "Back" do
         datestring1 = "Sat, 03 Mar 2012 00:49:44 GMT"
         datestring2 = "Sat, 03 Mar 2012 01:49:44 GMT"
         now = Time.httpdate(datestring2)
-        Spontaneous::Site.stubs(:modified_at).returns(now)
+        site.stubs(:modified_at).returns(now)
         auth_get "/@spontaneous/map/#{home.id}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring1}
         last_response.status.must_equal 200
         auth_get "/@spontaneous/map/path#{project1.path}", {}, {"HTTP_IF_MODIFIED_SINCE" => datestring1}
@@ -332,14 +332,14 @@ describe "Back" do
 
     describe "/site" do
       before do
-        @root_class = S::Site.root.class
+        @root_class = site.home.class
       end
 
       it "return json for home page" do
         auth_get '/@spontaneous/site/home'
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
-        assert_equal S::JSON.encode(S::Site.root.export), last_response.body
+        assert_equal S::JSON.encode(site.home.export), last_response.body
       end
 
       it "return the typelist as part of the site metadata" do
@@ -347,7 +347,7 @@ describe "Back" do
         assert last_response.ok?, "Should have recieved a 200 OK but got a #{ last_response.status }"
         last_response.content_type.must_equal "application/json;charset=utf-8"
         result = Spot::JSON.parse(last_response.body)
-        result[:types].stringify_keys.must_equal S::Site.schema.export(user)
+        result[:types].stringify_keys.must_equal site.schema.export(user)
       end
 
       it "apply the current user's permissions to the exported schema" do
@@ -387,14 +387,14 @@ describe "Back" do
       end
 
       it "return the configured list of service URLs in the metadata" do
-        S::Site.config.stubs(:services).returns([
+        site.config.stubs(:services).returns([
           {:title => "Google Analytics", :url => "http://google.com/analytics"},
           {:title => "Facebook", :url => "http://facebook.com/spontaneous"}
         ])
         auth_get "/@spontaneous/site"
         assert last_response.ok?, "Should have recieved a 200 OK but got a #{ last_response.status }"
         result = Spot::JSON.parse(last_response.body)
-        result[:services].must_equal S::Site.config.services
+        result[:services].must_equal site.config.services
       end
       it "provides a format value for date fields" do
         field = Job.field :date, :date, :format => "%Y %d %a"
@@ -427,8 +427,8 @@ describe "Back" do
         it "creates a homepage of the specified type" do
           auth_post "/@spontaneous/site/home", 'type' => @root_class.schema_id
           assert last_response.ok?
-          S::Site.root.must_be_instance_of(@root_class)
-          S::Site.root.title.value.must_match /Home/
+          site.home.must_be_instance_of(@root_class)
+          site.home.title.value.must_match /Home/
         end
 
         it "only creates one homepage" do
@@ -600,8 +600,7 @@ describe "Back" do
 
       it "replace values of fields immediately when required" do
         image1.image.processed_value.must_equal ""
-        auth_put("@spontaneous/file/#{image1.id}",
-                 "file" => @upload, "field" => image1.image.schema_id.to_s )
+        auth_put("@spontaneous/file/#{image1.id}", "file" => @upload, "field" => image1.image.schema_id.to_s )
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
         image = Content[image1.id]
@@ -751,7 +750,7 @@ describe "Back" do
       end
 
       it "return json for individual pages" do
-        page = S::Site.root.children.first
+        page = site.home.children.first
         auth_get "/@spontaneous/page/#{page.id}"
         assert last_response.ok?
         last_response.content_type.must_equal "application/json;charset=utf-8"
@@ -838,17 +837,17 @@ describe "Back" do
         auth_get "/@spontaneous/changes"
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
         last_response.content_type.must_equal "application/json;charset=utf-8"
-        last_response.body.must_equal S::Change.serialise_http
+        last_response.body.must_equal S::Change.serialise_http(site)
       end
 
       it "be able to start a publish with a set of change sets" do
-        S::Site.expects(:publish_pages).with([project1.id])
+        site.expects(:publish_pages).with([project1.id])
         auth_post "/@spontaneous/changes", :page_ids => [project1.id]
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
       end
 
       it "not launch publish if list of changes is empty" do
-        S::Site.expects(:publish_pages).with().never
+        site.expects(:publish_pages).with().never
         auth_post "/@spontaneous/changes", :change_set_ids => ""
         assert last_response.status == 400, "Expected 400, recieved #{last_response.status}"
 
@@ -857,7 +856,7 @@ describe "Back" do
       end
 
       it "recognise when the list of changes is complete" do
-        S::Site.expects(:publish_pages).with([home.id, project1.id])
+        site.expects(:publish_pages).with([home.id, project1.id])
         auth_post "/@spontaneous/changes", :page_ids => [home.id, project1.id]
         assert last_response.ok?, "Expected 200 recieved #{last_response.status}"
       end
@@ -1017,7 +1016,7 @@ describe "Back" do
 
   describe "/" do
     before do
-      @renderer = Spontaneous::Output.preview_renderer
+      @renderer = Spontaneous::Output.preview_renderer(site)
     end
 
     def get_preview(path, params = {}, env = {})
@@ -1105,8 +1104,8 @@ describe "Back" do
 
     it "accept POST requests" do
       Project.expects(:posted!).with(project1)
-      Project.request :post do
-        Project.posted!(page)
+      Project.controller do
+        post { Project.posted!(page) }
       end
       post "/project1"
     end