spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/lib/spontaneous/search/index.rb

@@ -32,6 +32,7 @@ module Spontaneous::Search
     def exclude_types(*types)
       @search_types -= resolve_type_list(types)
     end
+
     # end Index DSL methods
 
     def create_db(revision)
@@ -61,25 +62,52 @@ module Spontaneous::Search
       @stopper
     end
 
+    def weights(page)
+      weights = {}
+      each_field(page) do |field, prototype, id|
+        weights[id] = prototype.options_for_index(self)[:weight]
+      end
+      weights
+    end
+
     # Extract all indexable content from a page. Values are grouped across fields
     # or across field index groups
     def indexable_content(page)
       values = Hash.new { |h, k| h[k] = [] }
+      each_indexable(page) do |content|
+        content.fields.each do |field|
+          prototype = field.prototype
+          if prototype.in_index?(self)
+            values[prototype.index_id(self)] << field.indexable_value
+          end
+        end
+        insert_additional_indexable_values(content, values)
+      end
+      result = Hash[ values.map { |id, values| [id, values.join("\n")] } ]
+      result[:id] = page.id
+      result
+    end
+
+    def each_indexable(page)
+      indexable = [page]
       # not sure that I need the include? test here as page.content only returns Pieces
       # and I'm not sure that there is a particular need to exclude Pieces from indexes
-      indexable = [page]
       indexable.concat(page.pieces.select { |content| include?(content) })
       indexable += page.boxes.select { |box| include?(box) }
       indexable.each do |content|
+        yield content
+      end
+    end
+
+    def each_field(page)
+      each_indexable(page) do |content|
         content.fields.each do |field|
           prototype = field.prototype
-          values[prototype.index_id(self)] << field.indexable_value if prototype.in_index?(self)
+          if prototype.in_index?(self)
+            yield field, prototype, prototype.index_id(self)
+          end
         end
-        insert_additional_indexable_values(content, values)
       end
-      result = Hash[ values.map { |id, values| [id, values.join("\n")] } ]
-      result[:id] = page.id
-      result
     end
 
     def insert_additional_indexable_values(content, values)

data/lib/spontaneous/search/results.rb

@@ -28,7 +28,7 @@ module Spontaneous::Search
     end
 
     def pages
-      @page_list ||= @results.map { |doc| Spontaneous::Content.first(:id => doc.id) }
+      @page_list ||= Spontaneous::Content.get(@results.map { |doc| doc.id })
     end
   end # Results
 end

data/lib/spontaneous/server.rb

@@ -13,9 +13,9 @@ module Spontaneous
 
 
     def self.run!(options={})
-      host = options["host"] || Site.config.host || "0.0.0.0"
-      port = options["port"] || Site.config.port || 2012
-      adapter = options["adapter"] || Site.config.adapter
+      host = options["host"] || Spontaneous::Site.config.host || "0.0.0.0"
+      port = options["port"] || Spontaneous::Site.config.port || 2012
+      adapter = options["adapter"] || Spontaneous::Site.config.adapter
 
       handler = nil
 

data/lib/spontaneous/simultaneous.rb

@@ -0,0 +1,53 @@
+require 'simultaneous'
+
+module Spontaneous
+  module Simultaneous
+
+    class Error < Spontaneous::Error; end
+
+    module ModuleMethods
+      def simultaneous_setup
+        ::Simultaneous.client_mode  = :async
+        ::Simultaneous.connection   = ::Spontaneous.config.simultaneous_connection
+        ::Simultaneous.domain       = ::Spontaneous.config.site_domain
+      end
+
+      def register(task_name, task, options = {}, params = {}, env = {})
+        options.update({
+          :pwd => root
+        })
+        params.update({
+          "site" => root,
+          "environment" => Spontaneous.env
+        })
+        ::Simultaneous.add_task(task_name, binary(task), options, params, env)
+      end
+
+      def fire(task_name, params = {})
+        ::Simultaneous.fire(task_name, params)
+      rescue Exception => e
+        raise Error, e
+      end
+
+      def spot_binary
+        ::Spontaneous.config.spontaneous_binary || default_spot_binary
+      end
+
+      def default_spot_binary
+        (Pathname.new(Spontaneous.gem_dir) + "bin/spot").expand_path.to_s
+      end
+
+      def binary(task)
+        [spot_binary, task].join(" ")
+      end
+
+      def root
+        Pathname.new(Spontaneous.root).expand_path.to_s
+      end
+    end
+
+    extend ModuleMethods
+
+    simultaneous_setup
+  end
+end

data/lib/spontaneous/{plugins/site → site}/features.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Features
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     # InstanceMethods
     def back_controllers

data/lib/spontaneous/{plugins/site → site}/helpers.rb

@@ -1,9 +1,8 @@
 # encoding: UTF-8
 
-
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Helpers
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def helper(*formats, &block)

data/lib/spontaneous/{plugins/site → site}/hooks.rb

@@ -1,7 +1,7 @@
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Hooks
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     HOOKS = [:after_publish]
 

data/lib/spontaneous/{plugins/site → site}/instance.rb

@@ -1,20 +1,18 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Instance
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       extend Forwardable
 
-      @@instance = nil
-
       def instantiate(root, env, mode)
-        @@instance = Spontaneous::Site.new(root, env, mode)
+        Thread.current[:spontaneous_site_instance] = Spontaneous::Site.new(root, env, mode)
       end
 
       def instance
-        @@instance
+        Thread.current[:spontaneous_site_instance]
       end
 
       def_delegators :instance, :config, :database, :database=

data/lib/spontaneous/{plugins/site → site}/level.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Level
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def at_depth(level)

data/lib/spontaneous/{plugins/site → site}/map.rb

@@ -1,16 +1,16 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Map
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def map(root_id=nil)
         page = \
           if root_id.nil?
-            Spontaneous::Page.root
+            content_model::Page.root
           else
-            Spontaneous::Content.first :id => root_id
+            content_model.get root_id
           end
         return nil unless page
         page.map_entry

data/lib/spontaneous/{plugins/site → site}/paths.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Paths
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def paths(group)

data/lib/spontaneous/site/publishing.rb

@@ -0,0 +1,89 @@
+# encoding: UTF-8
+
+class Spontaneous::Site
+  module Publishing
+    extend Spontaneous::Concern
+
+    module ClassMethods
+      def content_model
+        Spontaneous::Content
+      end
+
+      def background_mode
+        @background_mode ||= (Spontaneous::Site.config.background_mode || :immediate)
+      end
+
+      def background_mode=(method)
+        @background_mode = method
+      end
+
+      def resolve_background_mode(mod)
+        klass_name = background_mode.to_s.camelize
+        begin
+          mod.const_get(klass_name)
+        rescue NameError => e
+          puts "Unknown method #{method} (#{mod}::#{klass_name})"
+          mod::Immediate
+        rescue NameError => e
+          raise "Illegal background mode #{mod}::Immediate"
+        end
+      end
+
+      def publishing_method
+        resolve_background_mode(Spontaneous::Publishing)
+      end
+
+      def publish_pages(page_list=nil)
+        publishing_method.new(self.revision, content_model).publish_pages(page_list)
+      end
+
+      def publish_all
+        publishing_method.new(self.revision, content_model).publish_all
+      end
+
+      def rerender
+        publishing_method.new(self.published_revision, content_model).rerender_revision
+      end
+
+      def publishing_status
+        status = rest = nil
+        # if r = S::Site.pending_revision
+        status, *rest = publishing_method.status.split(':')
+        rest = rest.join(':')
+        # end
+        Hash[[:status, :progress].zip([status, rest])] rescue ""
+      end
+
+      def publishing_status=(status)
+        publishing_method.status = status
+      end
+
+      def with_published(&block)
+        Spontaneous::Content.scope(published_revision, true, &block)
+      end
+
+      def with_editable(&block)
+        Spontaneous::Content.scope(nil, false, &block)
+      end
+
+      def with_preview(&block)
+        Spontaneous::Content.scope(nil, true, &block)
+      end
+
+      protected
+
+      def set_published_revision(revision)
+        instance = S::State.instance
+        instance.published_revision = revision
+        instance.revision = revision + 1
+        instance.save
+      end
+
+      def pending_revision=(revision)
+        instance = S::State.instance
+        instance.pending_revision = revision
+        instance.save
+      end
+    end # ClassMethods
+  end # Publishing
+end # Spontaneous::Plugins::Site

data/lib/spontaneous/{plugins/site → site}/schema.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Schema
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def schema
@@ -15,7 +15,7 @@ module Spontaneous::Plugins::Site
     end
 
     def schema_id(obj)
-      schema.schema_id(obj)
+      schema.to_id(obj)
     end
 
     def schema
@@ -27,7 +27,7 @@ module Spontaneous::Plugins::Site
     end
 
     def schema_loader_class=(loader_class)
-      @schema_loader_class = loader_class
+      schema.schema_loader_class = (@schema_loader_class = loader_class)
     end
   end
 end

data/lib/spontaneous/{plugins/site → site}/search.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Search
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def index(name, &definition)

data/lib/spontaneous/{plugins/site → site}/selectors.rb

@@ -1,12 +1,20 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Selectors
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
-      def root
-        Spontaneous::Page.root
+      def root(content_model = Spontaneous::Content)
+        content_model.root
+      end
+
+      def pages(content_model = Spontaneous::Content)
+        pages_dataset(content_model).all
+      end
+
+      def pages_dataset(content_model = Spontaneous::Content)
+        content_model::Page.order(:depth)
       end
 
       def [](path_or_uid)
@@ -23,15 +31,15 @@ module Spontaneous::Plugins::Site
       end
 
       def by_id(id)
-        Spontaneous::Page[id]
+        Spontaneous::Content[id]
       end
 
       def by_path(path)
-        Spontaneous::Page.path(path)
+        Spontaneous::Content.path(path)
       end
 
       def by_uid(uid)
-        Spontaneous::Page.uid(uid)
+        Spontaneous::Content.uid(uid)
       end
 
       def method_missing(method, *args)

data/lib/spontaneous/{plugins/site → site}/state.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module State
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def working_revision

data/lib/spontaneous/{plugins/site → site}/storage.rb

@@ -16,9 +16,9 @@
 #   })
 # end
 
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module Storage
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def storage(mimetype = nil)

data/lib/spontaneous/{plugins/site → site}/url.rb

@@ -1,6 +1,6 @@
-module Spontaneous::Plugins::Site
+class Spontaneous::Site
   module URL
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def public_url(path = "/")

data/lib/spontaneous/site.rb

@@ -1,21 +1,38 @@
 # encoding: UTF-8
 
+
 module Spontaneous
+
   class Site < Spontaneous::Facet
-    include Plugins::Site::Instance
-    include Plugins::Site::Publishing
-    include Plugins::Site::State
-    include Plugins::Site::Selectors
-    include Plugins::Site::Map
-    include Plugins::Site::Search
-    include Plugins::Site::Features
-    include Plugins::Site::Schema
-    include Plugins::Site::Level
-    include Plugins::Site::Storage
-    include Plugins::Site::URL
-    include Plugins::Site::Hooks
-    include Plugins::Site::Paths
-    include Plugins::Site::Helpers
+    require "spontaneous/site/features"
+    require "spontaneous/site/helpers"
+    require "spontaneous/site/hooks"
+    require "spontaneous/site/instance"
+    require "spontaneous/site/level"
+    require "spontaneous/site/map"
+    require "spontaneous/site/paths"
+    require "spontaneous/site/publishing"
+    require "spontaneous/site/schema"
+    require "spontaneous/site/search"
+    require "spontaneous/site/selectors"
+    require "spontaneous/site/state"
+    require "spontaneous/site/storage"
+    require "spontaneous/site/url"
+
+    include Features
+    include Helpers
+    include Hooks
+    include Instance
+    include Level
+    include Map
+    include Paths
+    include Publishing
+    include Schema
+    include Search
+    include Selectors
+    include State
+    include Storage
+    include URL
 
     attr_accessor :database
     attr_reader :environment, :mode

data/lib/spontaneous/state.rb

@@ -8,12 +8,11 @@ module Spontaneous
     end
 
 
-    @@instance = nil
-
     class << self
 
       def instance
-        return @@instance if @@instance
+        current = Thread.current[:spontaneous_state_instance]
+        return current if current
         unless instance = self.first
           instance = State.create(:revision => 1, :published_revision => 0)
         end
@@ -21,11 +20,11 @@ module Spontaneous
       end
 
       # def with_cache(&block)
-      #   yield if @@instance
-      #   @@instance = self.instance
+      #   yield if Thread.current[:spontaneous_state_instance]
+      #   Thread.current[:spontaneous_state_instance] = self.instance
       #   yield
       # ensure
-      #   @@instance = nil
+      #   Thread.current[:spontaneous_state_instance] = nil
       # end
 
       def working_revision

data/lib/spontaneous/style.rb

@@ -40,7 +40,7 @@ module Spontaneous
 
     def local_template(format)
       template_path = nil
-      Site.paths(:templates).each do |template_root|
+      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
@@ -83,6 +83,7 @@ module Spontaneous
     end
 
     def name
+      return "<default>" if prototype.nil?
       prototype.name
     end
 
@@ -96,7 +97,7 @@ module Spontaneous
     end
 
     def owner_directory_names
-      classes = [owner].concat(owner.ancestors.take_while { |klass| klass < Spontaneous::Page or klass < Spontaneous::Piece })
+      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) }
     end
 

data/lib/spontaneous/utils/database/mysql_dumper.rb

@@ -3,6 +3,7 @@ module Spontaneous
   module Utils
     module Database
       class MySQLDumper
+
         def initialize(database)
           @database = database
         end
@@ -39,6 +40,7 @@ module Spontaneous
             option(:password),
             option(:user),
             option(:default_character_set),
+            option(:ignore_table),
             database_name
           ]
           unless tables.nil?
@@ -49,6 +51,7 @@ module Spontaneous
 
           command = %(mysqldump #{options.join(" ")} > #{path} )
         end
+
         def database_name
           @database.opts[:database]
         end
@@ -65,6 +68,16 @@ module Spontaneous
           "UTF8"
         end
 
+        def ignore_table
+          [database_name, revision_archive_table].join(".")
+        end
+
+        # The whole point of this table's existance is to reduce the
+        # size of the db dump for syncing
+        def revision_archive_table
+          Spontaneous::Content.revision_archive_dataset.first_source.to_s
+        end
+
         def option(option, add_if_nil=false)
           value = self.send(option)
           if !value.nil? or add_if_nil

data/lib/spontaneous/utils/database/postgres_dumper.rb

@@ -45,6 +45,7 @@ module Spontaneous
             option(:password),
             option(:username),
             option(:encoding),
+            option(:exclude_table),
             database_name
           ]
           unless tables.nil?
@@ -71,6 +72,10 @@ module Spontaneous
         def encoding
           "UTF8"
         end
+
+        def exclude_table
+          revision_archive_table
+        end
       end
     end
   end

data/lib/spontaneous/version.rb

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