spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/lib/spontaneous/rack.rb

@@ -21,6 +21,7 @@ module Spontaneous
       # Rack env params
       ACTIVE_USER    = "spot.user".freeze
       ACTIVE_KEY     = "spot.key".freeze
+      SITE           = "spot.site".freeze
       RENDERER       = "spot.renderer".freeze
       REVISION       = "spot.revision".freeze
       CSRF_VALID     = "spot.csrf_valid".freeze
@@ -36,12 +37,12 @@ module Spontaneous
     include Constants
 
     class << self
-      def application
+      def application(site)
         case Spontaneous.mode
         when :back
-          Back.application
+          Back.application(site)
         when :front
-          Front.application
+          Front.application(site)
         end
       end
 
@@ -49,12 +50,12 @@ module Spontaneous
         Site.config.port
       end
 
-      def make_front_controller(controller_class)
-        Spontaneous::Rack::Front.make_controller(controller_class)
+      def make_front_controller(controller_class, site)
+        Spontaneous::Rack::Front.make_controller(controller_class, site)
       end
 
-      def make_back_controller(controller_class)
-        Spontaneous::Rack::Back.make_controller(controller_class)
+      def make_back_controller(controller_class, site)
+        Spontaneous::Rack::Back.make_controller(controller_class, site)
       end
     end
 
@@ -62,6 +63,10 @@ module Spontaneous
       include Constants
 
       set :environment, Proc.new { Spontaneous.environment }
+
+      def site
+        @site ||= env[Spontaneous::Rack::SITE]
+      end
     end
 
     autoload :Assets,               'spontaneous/rack/assets'

data/lib/spontaneous/rack/back.rb

@@ -27,16 +27,9 @@ module Spontaneous
       include Spontaneous::Rack::Constants
       include Spontaneous::Rack::Middleware
 
-      def self.make_controller(controller_class)
-        controller_class.helpers Helpers
-        ::Rack::Builder.app do
-          use Scope::Edit
-          use Authenticate::Init
-          use Authenticate::Edit
-          use CSRF::Header
-          use CSRF::Verification
-          run controller_class
-        end
+      def self.make_controller(app, site)
+        app.helpers Helpers if app.respond_to?(:helpers)
+        app
       end
 
       def self.api_handlers
@@ -53,80 +46,93 @@ module Spontaneous
          ["/shard", File::Sharded]]
       end
 
-      def self.editing_app
+      def self.editing_app(site)
         ::Rack::Builder.app do
-          use Scope::Edit
+          use Scope::Edit, site
           use ApplicationAssets
           use UnsupportedBrowser
-          use Authenticate::Init
+          use Authenticate::Init, site
           use Login
-          # Everything after this handler requires authentication
-          use Authenticate::Edit
+          use Authenticate::Edit # Everything after this handler requires authentication
           use CSRF::Header
           # Schema has to come before Reloader because we need to be able to
           # present the conflict resolution interface without running through
           # the schema validation step
           map("/schema")  { run Schema }
-          use Reloader
+          use Reloader, site
           use Index
-          # Everything after this middleware requires a valid CSRF token
-          use CSRF::Verification
-
+          use CSRF::Verification # Everything after this middleware requires a valid CSRF token
           Back.api_handlers.each do |path, app|
-            map(path)  { run app }
+            map(path) { run app }
           end
           run lambda { |env| [ 404, {}, ["Not Found"] ] }
         end
       end
 
 
-      def self.preview_app
+      def self.preview_app(site)
         ::Rack::Builder.app do
           use ::Rack::Lint if Spontaneous.development?
-          use Scope::Preview
-          use Authenticate::Init
+          use Scope::Preview, site
+          use Authenticate::Init, site
           # Preview authentication redirects to /@spontaneous rather than
-          # showing a login screen. This way if you go to rhe root of the site
+          # showing a login screen. This way if you go to the root of the site
           # as an unauthorised user (say for the first time) you will get sent
           # to the editing interface wrapper rather than being presented with
           # the preview site.
           use Authenticate::Preview
           use CSRF::Header
           map("/assets") { run SiteAssets.new }
-          use Spontaneous::Rack::Static, :root => Spontaneous.root / "public",
-            :urls => %w[/],
-            :try => ['.html', 'index.html', '/index.html']
-          use Reloader
+          use Spontaneous::Rack::Static, root: Spontaneous.root / "public", urls: %w[/], try: ['.html', 'index.html', '/index.html']
+          use Reloader, site
+          # inject the front controllers into the preview so that this is a
+          # full duplicate of the live site
+          site.front.middleware.each do |args, block|
+            use *args, &block
+          end
+          site.front_controllers.each do |namespace, controller_class|
+            map namespace do
+              run controller_class
+            end
+          end
           run Preview
         end
       end
 
-      def self.application
+      def self.application(site)
         app = ::Rack::Builder.new do
-          Spontaneous.instance.back_controllers.each do |namespace, controller_class|
-            map(namespace) { run controller_class }
-          end if Spontaneous.instance
+          site.back_controllers.each do |namespace, controller|
+            map(namespace) do
+              use Scope::Edit, site
+              use Authenticate::Init, site
+              use Authenticate::Edit
+              use CSRF::Header
+              use CSRF::Verification
+              run controller
+            end
+          end
 
           # Make all the files available under plugin_name/public/**
           # available under the URL /plugin_name/**
           # This needs to be handled by the asset system
           # so that /assets/<plugin_name>/file.css is properly found
           # and processed through sprockets
-          Spontaneous.instance.plugins.each do |plugin|
+          site.plugins.each do |plugin|
             root = plugin.paths.expanded(:public)
+
             map "/#{plugin.file_namespace}" do
-              use Spontaneous::Rack::CSS, :root => root
+              use Spontaneous::Rack::CSS, root: root
               run ::Rack::File.new(root)
             end
-          end if Spontaneous.instance
+          end if site
 
           map "/media" do
             use ::Rack::Lint
             run Spontaneous::Rack::CacheableFile.new(Spontaneous.media_dir)
           end
 
-          map(NAMESPACE) { run Spontaneous::Rack::Back.editing_app }
-          map("/")       { run Spontaneous::Rack::Back.preview_app }
+          map(NAMESPACE) { run Spontaneous::Rack::Back.editing_app(site) }
+          map("/")       { run Spontaneous::Rack::Back.preview_app(site) }
         end
       end
     end

data/lib/spontaneous/rack/back/base.rb

@@ -6,13 +6,13 @@ module Spontaneous::Rack
       set :views, Proc.new { Spontaneous.application_dir + '/views' }
 
       def content_model
-        Spontaneous::Content
+        site.model
       end
 
-      def update_fields(model, field_data)
+      def update_fields(content, field_data)
         return unless field_data
-        Spontaneous::Field.update_asynchronously(model, field_data, user)
-        json(model)
+        Spontaneous::Field.update_asynchronously(site, content, field_data, user)
+        json(content)
       end
 
       def content_for_request(lock = false)

data/lib/spontaneous/rack/back/changes.rb

@@ -5,14 +5,14 @@ module Spontaneous::Rack::Back
     end
 
     get '/?' do
-      json(Spontaneous::Change)
+      json(Spontaneous::Change.export(site))
     end
 
     post '/?' do
       ids = params[:page_ids]
       halt 400 if ids.blank? || ids.empty?
       pages = ids.map(&:to_i)
-      Spontaneous::Site.publish_pages(pages)
+      site.publish_pages(pages)
       json({})
     end
   end

data/lib/spontaneous/rack/back/file.rb

@@ -9,7 +9,7 @@ module Spontaneous::Rack::Back
           forbidden! unless target.field_writable?(user, field.name)
           # version = params[:version].to_i
           # if version == field.version
-          Spontaneous::Field.set_asynchronously(field, file, user)
+          Spontaneous::Field.set_asynchronously(site, field, file, user)
           json(field.export(user))
           # else
           #   errors = [[field.schema_id.to_s, [field.version, field.conflicted_value]]]
@@ -28,7 +28,7 @@ module Spontaneous::Rack::Back
             instance = type.new
             box.insert(position, instance)
             field = instance.field_for_mime_type(file[:type])
-            Spontaneous::Field.set_asynchronously(field, file, user)
+            Spontaneous::Field.set_asynchronously(site, field, file, user)
             content.save
             json({
               :position => position,
@@ -71,20 +71,6 @@ module Spontaneous::Rack::Back
         end
       end
 
-      def replace_with_shard(target, target_id)
-        field = target.fields.sid(params[:field])
-        forbidden! unless target.field_writable?(user, field.name)
-        # version = params[:version].to_i
-        # if version == field.version
-        Spontaneous::Media.combine_shards(params[:shards]) do |combined|
-          Spontaneous::Field.set_asynchronously(field, {
-            :filename => params[:filename],
-            :tempfile => combined
-          }, user)
-        end
-        json(field.export(user))
-      end
-
       # TODO: remove duplication here
       post '/:id/:box_id' do
         content_for_request(true) do |content, box|
@@ -96,15 +82,9 @@ module Spontaneous::Rack::Back
             box.insert(position, instance)
             field = instance.field_for_mime_type(params[:mime_type])
             Spontaneous::Media.combine_shards(params[:shards]) do |combined|
-              Spontaneous::Field.set_asynchronously(field, {
-                :filename => params[:filename],
-                :tempfile => combined
-              }, user)
+              tempfile = { :filename => params[:filename], :tempfile => combined }
+              Spontaneous::Field.set_asynchronously(site, field, tempfile, user)
               content.save
-              # field.value = {
-              #   :filename => params[:filename],
-              #   :tempfile => combined
-              # }
             end
             json({
               :position => position,
@@ -113,6 +93,18 @@ module Spontaneous::Rack::Back
           end
         end
       end
+
+      def replace_with_shard(target, target_id)
+        field = target.fields.sid(params[:field])
+        forbidden! unless target.field_writable?(user, field.name)
+        # version = params[:version].to_i
+        # if version == field.version
+        Spontaneous::Media.combine_shards(params[:shards]) do |combined|
+          tempfile = { :filename => params[:filename], :tempfile => combined }
+          Spontaneous::Field.set_asynchronously(site, field, tempfile, user)
+        end
+        json(field.export(user))
+      end
     end
   end
 end

data/lib/spontaneous/rack/back/map.rb

@@ -1,8 +1,8 @@
 module Spontaneous::Rack::Back
   class Map < Base
     get '/?:id?' do
-      last_modified(Spontaneous::Site.modified_at)
-      map = Spontaneous::Site.map(params[:id])
+      last_modified(site.modified_at)
+      map = site.map(params[:id])
       if map
         json(map)
       else
@@ -11,13 +11,13 @@ module Spontaneous::Rack::Back
     end
 
     get '/path*' do
-      last_modified(Spontaneous::Site.modified_at)
+      last_modified(site.modified_at)
       if content_model::Page.count == 0
         406
       else
         path = params[:splat].first
-        page = Spontaneous::Site[path]
-        json Spontaneous::Site.map(page.id)
+        page = site[path]
+        json site.map(page.id)
       end
     end
   end

data/lib/spontaneous/rack/back/preview.rb

@@ -2,19 +2,18 @@ module Spontaneous::Rack::Back
   class Preview < Base
     include Spontaneous::Rack::Public
 
-
     # In preview mode we want to find pages even if they're
     # invisible.
     def find_page_by_path(path)
-      Spontaneous::Content.scope do
-        Spontaneous::Site.by_path(path)
+      site.model.scope do
+        site.by_path(path)
       end
     end
 
     # Redirect to the edit UI if a preview page is being accessed directly
     def ensure_edit_preview(path)
       referer = env['HTTP_REFERER']
-      development_preview = Spontaneous.development? && Content::Page.has_root?
+      development_preview = Spontaneous.development? && site.model::Page.has_root?
       return true if development_preview || referer || params.key?('preview')
       home = find_page_by_path(path)
       # Need to handle the site initialisation where there is no homepage

data/lib/spontaneous/rack/back/schema.rb

@@ -8,7 +8,7 @@ module Spontaneous::Rack::Back
     use Spontaneous::Rack::Middleware::CSRF::Verification
 
     def schema
-      Spontaneous.schema
+      site.schema
     end
 
     post "/delete" do

data/lib/spontaneous/rack/back/site.rb

@@ -1,22 +1,21 @@
 module Spontaneous::Rack::Back
   class Site < Base
-    SS = Spontaneous::Site
 
     get '/?' do
       json({
-        :types => SS.schema.export(user),
-        :roots => SS.roots(user, content_model),
-        :user  => user.export,
-        :services => (SS.config.services || [])
+        types: site.schema.export(user),
+        roots: site.roots(user),
+        user: user.export,
+        services: (site.config.services || [])
       })
     end
 
     get '/home' do
-      json SS.root
+      json site.home
     end
 
     post '/home' do
-      forbidden! unless SS.root.nil?
+      forbidden! unless site.home.nil?
       type = content_model.schema.to_class(params[:type])
       root = type.create(:title => "Home")
       json({:id => root.id})

data/lib/spontaneous/rack/front.rb

@@ -7,41 +7,40 @@ module Spontaneous
     module Front
       include Spontaneous::Rack::Middleware
 
-      def self.make_controller(controller_class)
-        ::Rack::Builder.app do
-          use Scope::Front
-          run controller_class
-        end
+      def self.make_controller(controller_class, site)
+        controller_class
       end
 
-      def self.front_app
+      def self.front_app(site)
         ::Rack::Builder.app do
-          use Scope::Front
-          use Reloader if Spontaneous.development?
+          use Scope::Front, site
+          use Reloader, site if Spontaneous.development?
           run Server.new
         end
       end
 
-      def self.application
+      def self.application(site)
         app = ::Rack::Builder.new do
-          use Spontaneous::Rack::Static, :root => Spontaneous.revision_dir / "public",
-            :urls => %w[/],
-            :try => ['.html', 'index.html', '/index.html']
+          use Spontaneous::Rack::Static, root: Spontaneous.revision_dir / "public", urls: %w[/], try: ['.html', 'index.html', '/index.html']
+
+          Spontaneous.instance.front.middleware.each do |args, block|
+            use *args, &block
+          end
 
           Spontaneous.instance.front_controllers.each do |namespace, controller_class|
             map namespace do
               run controller_class
             end
-          end if Spontaneous.instance
+          end
 
           # Make all the files available under plugin_name/public/**
           # available under the URL /plugin_name/**
           # Only used in preview mode
-          Spontaneous.instance.plugins.each do |plugin|
+          site.plugins.each do |plugin|
             map "/#{plugin.name}" do
               run ::Rack::File.new(plugin.paths.expanded(:public))
             end
-          end if Spontaneous.instance
+          end
 
           map "/rev" do
             run Spontaneous::Rack::CacheableFile.new(Spontaneous.revision_dir / "rev")
@@ -56,7 +55,7 @@ module Spontaneous
           end
 
           map "/" do
-            run Spontaneous::Rack::Front.front_app
+            run Spontaneous::Rack::Front.front_app(site)
           end
         end
       end
@@ -72,6 +71,10 @@ module Spontaneous
 
           render_path(@request.path_info)
         end
+
+        def site
+          @site ||= env[Spontaneous::Rack::SITE]
+        end
       end
     end
   end