spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/lib/spontaneous/publishing/steps/render_revision.rb

@@ -0,0 +1,69 @@
+module Spontaneous::Publishing::Steps
+  class RenderRevision < BaseStep
+
+    # Wrap any exceptions raised during the render with information
+    # about the page+output that raised the error (preserving the
+    # stack trace)
+    class RenderException < Spontaneous::Error
+      def initialize(output, exception)
+        super("Exception rendering page #{output.url_path.inspect}: #{exception}")
+        set_backtrace(exception.backtrace)
+      end
+    end
+
+    def call
+      @progress.stage("rendering")
+      render_pages
+      commit
+    end
+
+    def count
+      renderable_pages.map { |page| page.outputs.length }.inject(0, :+)
+    end
+
+    def rollback
+      render_transaction.rollback if @render_transaction
+      template_revision.delete
+    end
+
+    def render_pages
+      renderable_pages.each do |page|
+        render_page(page)
+      end
+    end
+
+    def commit
+      render_transaction.commit
+      @render_transaction = nil
+    end
+
+    def render_page(page)
+      page.outputs.each do |output|
+        render_output(output)
+      end
+    end
+
+    def render_output(output)
+      output.publish_page(renderer, revision, render_transaction)
+      @progress.step(1, output.url_path.inspect)
+    rescue => e
+      raise RenderException.new(output, e)
+    end
+
+    def renderer
+      @renderer ||= Spontaneous::Output::Template::PublishRenderer.new(@site, true)
+    end
+
+    def render_transaction
+      @render_transaction ||= template_revision.transaction
+    end
+
+    def template_revision
+      @template_revision ||= @site.output_store.revision(@revision)
+    end
+
+    def renderable_pages
+      @site.pages
+    end
+  end
+end

data/lib/spontaneous/publishing/steps/write_revision_file.rb

@@ -0,0 +1,43 @@
+# Should be called *after* the revision
+module Spontaneous::Publishing::Steps
+  class WriteRevisionFile < BaseStep
+
+    def call
+      @progress.stage("writing revision file")
+      save_state
+      padded_revision = Spontaneous::Paths.pad_revision_number(revision)
+      write_revision_file(padded_revision)
+      @progress.step(count, "#{path.inspect} => #{padded_revision.inspect}")
+    end
+
+    def count
+      1
+    end
+
+    def rollback
+      if @previous
+        write_revision_file(@previous)
+      else
+        FileUtils.rm(path)
+      end
+    end
+
+    def write_revision_file(contents)
+      File.open(path, "w:UTF-8") do |file|
+        file.write(contents)
+      end
+    end
+
+    def path
+      @site.revision_root / "REVISION"
+    end
+
+    def save_state
+      @previous = if File.exist?(path)
+        File.read(path)
+      else
+        nil
+      end
+    end
+  end
+end

data/lib/spontaneous/rack/back.rb

@@ -49,6 +49,7 @@ module Spontaneous
       def self.editing_app(site)
         ::Rack::Builder.app do
           use Scope::Edit, site
+          use Transaction, site
           use ApplicationAssets
           use UnsupportedBrowser
           use Authenticate::Init, site
@@ -74,6 +75,7 @@ module Spontaneous
         ::Rack::Builder.app do
           use ::Rack::Lint if Spontaneous.development?
           use Scope::Preview, site
+          use Transaction, site
           use Authenticate::Init, site
           # Preview authentication redirects to /@spontaneous rather than
           # showing a login screen. This way if you go to the root of the site
@@ -99,7 +101,7 @@ module Spontaneous
         end
       end
 
-      def self.application(site)
+      def self.application(site = ::Spontaneous.instance)
         app = ::Rack::Builder.new do
           site.back_controllers.each do |namespace, controller|
             map(namespace) do

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

@@ -28,15 +28,16 @@ module Spontaneous::Rack::Back
         type = content_model.schema.to_class(params[:alias_id])
         position = (params[:position] || 0).to_i
         if box.writable?(user, type)
-          instance = type.for_target(params[:target_id])
-          if instance
-            box.insert(position, instance)
-            content.save
-            json({
-              :position => position,
-              :entry => instance.entry.export(user)
-            })
+          additions = []
+          Array(params[:target_ids]).each_with_index do |target_id, offset|
+            instance = type.for_target(target_id)
+            if instance
+              box.insert(position+offset, instance)
+              content.save
+              additions << { position: position+offset, entry: instance.entry.export(user) }
+            end
           end
+          json(additions)
         else
           forbidden!
         end

data/lib/spontaneous/rack/front.rb

@@ -19,7 +19,7 @@ module Spontaneous
         end
       end
 
-      def self.application(site)
+      def self.application(site = ::Spontaneous.instance)
         app = ::Rack::Builder.new do
           use Spontaneous::Rack::Static, root: Spontaneous.revision_dir / "public", urls: %w[/], try: ['.html', 'index.html', '/index.html']
 

data/lib/spontaneous/rack/middleware.rb

@@ -1,6 +1,9 @@
+
 module Spontaneous::Rack::Middleware
-  autoload :Authenticate, "spontaneous/rack/middleware/authenticate"
-  autoload :CSRF,         "spontaneous/rack/middleware/csrf"
-  autoload :Reloader,     "spontaneous/rack/middleware/reloader"
-  autoload :Scope,        "spontaneous/rack/middleware/scope"
 end
+
+require "spontaneous/rack/middleware/authenticate"
+require "spontaneous/rack/middleware/csrf"
+require "spontaneous/rack/middleware/reloader"
+require "spontaneous/rack/middleware/scope"
+require "spontaneous/rack/middleware/transaction"

data/lib/spontaneous/rack/middleware/transaction.rb

@@ -0,0 +1,14 @@
+module Spontaneous::Rack::Middleware
+  class Transaction
+    def initialize(app, site)
+      @app = app
+      @site = site
+    end
+
+    def call(env)
+      @site.transaction do |conn|
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/spontaneous/rack/page_controller.rb

@@ -50,14 +50,14 @@ module Spontaneous::Rack
     end
 
     # render [instance (Content), output (Symbol), status (Fixnum), locals (Hash)]
-    # render [uid (Symbol), status (Fixnum), locals (Hash)] => [instance, output, status, locals]
-    # render [uid (Symbol)]       => [uid, output, 200, {}]
+    # render [singleton name (Symbol), status (Fixnum), locals (Hash)] => [instance, output, status, locals]
+    # render [singleton name (Symbol)]       => [singleton name, output, 200, {}]
     # render [instance (Content)] => [instance, output, 200, {}]
     # render [locals (Hash)] => [page, output, 200, locals]
     # render [status (Fixnum)] => [page, output, status, {}]
-    # render(:home, :xml, 200, {logged_in: true}) # => :home => uid, :xml => output
-    # render(:home, 200, {logged_in: true}) # => :home => uid
-    # render(:home, {logged_in: true}) # => :home => uid
+    # render(:home, :xml, 200, {logged_in: true}) # => :home => singleton name, :xml => output
+    # render(:home, 200, {logged_in: true}) # => :home => singleton name
+    # render(:home, {logged_in: true}) # => :home => singleton name
     # render(:xml, 200, {logged_in: true}) # NOT ALLOWED: if you want to specify the output then you must also specify the page
     # render(403, {logged_in: false})
     #
@@ -140,9 +140,24 @@ module Spontaneous::Rack
       env[Spontaneous::Rack::RENDERER]
     end
 
-    def fetch_page(page)
-      return @site[page] if (String === page) || (Symbol === page)
-      page
+    def fetch_page(locator)
+      case locator
+      when Class # (singleton) type classes
+        locator.first
+      when Symbol, String
+        fetch_singleton(locator) || fetch_path(locator)
+      else # probably an instance
+        locator
+      end
+    end
+
+    def fetch_path(path)
+      @site[path]
+    end
+
+    def fetch_singleton(page)
+      return @site.send(page) if @site.singleton?(page)
+      nil
     end
 
     def render_body

data/lib/spontaneous/revision.rb

@@ -2,14 +2,15 @@ require 'pathname'
 
 module Spontaneous
   class Revision
-    attr_reader :revision
+    attr_reader :revision, :site
 
-    def initialize(revision)
+    def initialize(revision, site)
       @revision = revision.to_i
+      @site = site
     end
 
     def root
-      ::File.join(Spontaneous::Site.instance.revision_root, padded_revision)
+      ::File.join(site.revision_root, padded_revision)
     end
 
     def path(*path)
@@ -18,17 +19,11 @@ module Spontaneous
     end
 
     def padded_revision
-      Spontaneous::Paths.pad_revision_number(revision)
+      revision.to_s.rjust(5, "0")
     end
 
     def to_i
       @revision
     end
-
-    module GlobalMethods
-      def revision(revision)
-        Revision.new(revision)
-      end
-    end
   end
 end

data/lib/spontaneous/schema.rb

@@ -106,6 +106,7 @@ module Spontaneous
     class Schema
       attr_accessor :schema_loader_class
       attr_reader   :uids
+      attr_reader   :site
 
       def initialize(site, root, schema_loader_class = Spontaneous::Schema::PersistentMap)
         @site, @root = site, root
@@ -413,6 +414,10 @@ module Spontaneous
           members.delete(type)
         end
       end
+
+      def inspect
+        %(#<#{self.class} root="#{@root}">)
+      end
     end
   end
 end

data/lib/spontaneous/server.rb

@@ -33,7 +33,9 @@ module Spontaneous
       end
       puts "=> Spontaneous:#{Spontaneous.mode.to_s.ljust(5, " ")} running on port #{host}:#{port} (PID #{$$})"
 
-      handler.run Spontaneous::Rack.application(site).to_app, :Host => host, :Port => port do |server|
+      handler.run Spontaneous::Rack.application(site).to_app, Host: host, Port: port do |server|
+        # set connection timeout to 0 (infinite) because otherwise we constantly lose our event connection
+        server.timeout = 0 if server.respond_to?(:timeout=)
         term = Proc.new do
           server.respond_to?(:stop!) ? server.stop! : server.stop
           puts "=> Spontaneous:#{Spontaneous.mode.to_s.ljust(5, " ")} exiting..."

data/lib/spontaneous/site.rb

@@ -33,6 +33,7 @@ module Spontaneous
     include State
     include Storage
     include URL
+    include Spontaneous::Model::Page::Singleton::SiteMethods
 
     attr_accessor :database
     attr_reader :environment, :mode, :model
@@ -52,7 +53,7 @@ module Spontaneous
       find_plugins!
       load_facets!
       init_facets!
-      init_indexes!
+      run_initializers!
     end
 
 
@@ -62,9 +63,9 @@ module Spontaneous
       end
     end
 
-    def init_indexes!
+    def run_initializers!
       facets.each do |facet|
-        facet.load_indexes!
+        facet.run_initializers
       end
     end
 
@@ -91,9 +92,15 @@ module Spontaneous
     end
 
     def db_settings
-      config_dir = paths.expanded(:config).first
-      @db_settings = YAML.load_file(File.join(config_dir, "database.yml"))
-      self.config.db = @db_settings[environment]
+      self.config.db = db_config[environment]
+    end
+
+    def db_config
+      @db_config ||= YAML.load_file(File.join(paths.expanded(:config).first, "database.yml"))
+    end
+
+    def transaction(&block)
+      model.db.transaction(&block)
     end
 
     def config
@@ -131,10 +138,10 @@ module Spontaneous
 
     def revision_root
       @revision_dir ||= begin
-                          path = Pathname.new(@root / 'cache/revisions')
-                          path.mkpath unless path.exist?
-                          path.realpath.to_s
-                        end
+        path = Pathname.new(@root / 'cache/revisions')
+        path.mkpath unless path.exist?
+        path.realpath.to_s
+      end
     end
 
     def revision_dir(revision=nil, root = revision_root)

data/lib/spontaneous/site/publishing.rb

@@ -24,6 +24,28 @@ class Spontaneous::Site
       end
     end
 
+    def publish(&block)
+      self.publish_steps = Spontaneous::Publishing::Steps.new(&block)
+    end
+
+    def publish_steps=(steps)
+      @publish_steps = steps
+    end
+
+    def publish_steps
+      @publish_steps || minimal_publish_steps
+    end
+
+    # Provides a fallback publishing pipeline in case none has been defined
+    # used really only in tests
+    def minimal_publish_steps
+      Spontaneous::Publishing::Steps.minimal
+    end
+
+    def rerender_steps
+      Spontaneous::Publishing::Steps.rerender
+    end
+
     def publishing_method
       resolve_background_mode(Spontaneous::Publishing)
     end
@@ -38,15 +60,15 @@ class Spontaneous::Site
     end
 
     def publish_pages(page_list=nil)
-      publishing_method.new(self, self.revision).publish_pages(page_list)
+      publishing_method.new(self, working_revision, publish_steps).publish_pages(page_list)
     end
 
     def publish_all
-      publishing_method.new(self, self.revision).publish_all
+      publishing_method.new(self, working_revision, publish_steps).publish_all
     end
 
     def rerender
-      publishing_method.new(self, self.published_revision).rerender_revision
+      publishing_method.new(self, published_revision, rerender_steps).rerender
     end
 
     def publishing_status

data/lib/spontaneous/site/state.rb

@@ -4,11 +4,15 @@ class Spontaneous::Site
   module State
     extend Spontaneous::Concern
 
-    def working_revision
-      Spontaneous::State.revision
+    def revision(revision)
+      Spontaneous::Revision.new(revision, self)
     end
 
-    def revision
+    def state
+      Spontaneous::State.instance
+    end
+
+    def working_revision
       Spontaneous::State.revision
     end