spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/lib/spontaneous/site/level.rb

@@ -4,15 +4,13 @@ class Spontaneous::Site
   module Level
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def at_depth(level)
-        case level
-        when 0, :root
-          Spontaneous::Site.root
-        when 1, :section
-          Spontaneous::Site.root.at_depth(1)
-        end
+    def at_depth(level)
+      case level
+      when 0, :root, :home
+        home
+      when 1, :section
+        home.at_depth(1)
       end
-    end # ClassMethods
+    end
   end # Level
 end

data/lib/spontaneous/site/map.rb

@@ -4,17 +4,15 @@ class Spontaneous::Site
   module Map
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def map(root_id=nil)
-        page = \
-          if root_id.nil?
-            content_model::Page.root
-          else
-            content_model.get root_id
-          end
-        return nil unless page
-        page.map_entry
+    def map(root_id=nil)
+      page = \
+      if root_id.nil?
+        model::Page.root
+      else
+        model.get root_id
       end
-    end # ClassMethods
+      return nil unless page
+      page.map_entry
+    end
   end # Map
 end

data/lib/spontaneous/site/paths.rb

@@ -4,10 +4,10 @@ class Spontaneous::Site
   module Paths
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def paths(group)
-        instance.facets.flat_map { |facet| facet.paths.expanded(group) }
-      end
-    end # ClassMethods
+    def paths(*args)
+      return _paths if args.empty?
+      group = args.first
+      facets.flat_map { |facet| facet._paths.expanded(group) }
+    end
   end # Paths
 end

data/lib/spontaneous/site/publishing.rb

@@ -4,86 +4,89 @@ class Spontaneous::Site
   module Publishing
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def content_model
-        Spontaneous::Content
+    def background_mode
+      @background_mode ||= (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
-
-      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
+
+    def publishing_method
+      resolve_background_mode(Spontaneous::Publishing)
+    end
+
+    def output_store(*args)
+      return current_output_store if args.empty?
+      @output_store = Spontaneous::Output::Store.new(*args)
+    end
+
+    def current_output_store
+      @output_store ||= Spontaneous::Output::Store.new(:File, root: revision_root)
+    end
+
+    def publish_pages(page_list=nil)
+      publishing_method.new(self, self.revision).publish_pages(page_list)
+    end
+
+    def publish_all
+      publishing_method.new(self, self.revision).publish_all
+    end
+
+    def rerender
+      publishing_method.new(self, self.published_revision).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 # Publishing
 end # Spontaneous::Plugins::Site

data/lib/spontaneous/site/schema.rb

@@ -4,12 +4,6 @@ class Spontaneous::Site
   module Schema
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def schema
-        instance.schema
-      end
-    end # ClassMethods
-
     def uid
       schema.uids
     end
@@ -19,7 +13,7 @@ class Spontaneous::Site
     end
 
     def schema
-      @schema ||= Spontaneous::Schema::Schema.new(root, schema_loader_class)
+      @schema ||= Spontaneous::Schema::Schema.new(self, root, schema_loader_class)
     end
 
     def schema_loader_class

data/lib/spontaneous/site/search.rb

@@ -4,24 +4,14 @@ class Spontaneous::Site
   module Search
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def index(name, &definition)
-        instance.index(name, &definition)
+    def indexer(revision)
+      indexer = S::Search::CompoundIndexer.new(revision, indexes.values)
+      begin
+        yield(indexer)
+      ensure
+        indexer.close
       end
-
-      def indexes
-        instance.indexes
-      end
-
-      def indexer(revision)
-        indexer = S::Search::CompoundIndexer.new(revision, indexes.values)
-        begin
-          yield(indexer)
-        ensure
-          indexer.close
-        end
-      end
-    end # ClassMethods
+    end
 
     def indexes
       @indexes ||= {}
@@ -36,7 +26,7 @@ class Spontaneous::Site
     end
 
     def index(name, &definition)
-      index = S::Search::Index.new(name, &definition)
+      index = S::Search::Index.new(self, name, &definition)
       self[name] = index
     end
   end

data/lib/spontaneous/site/selectors.rb

@@ -4,70 +4,76 @@ class Spontaneous::Site
   module Selectors
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def root(content_model = Spontaneous::Content)
-        content_model.root
-      end
+    def home
+      model.root
+    end
 
-      # roots returns the list of top-level pages
-      # Only one of these is publicly visible and this is mapped to the
-      # configured site domain.
-      #
-      # The rest are "hidden" roots.
-      def roots(user = nil, content_model = Spontaneous::Content)
-        domain = config.site_domain
-        roots  = pages_dataset(content_model).where(depth: 0).all
-        pub, hidden = roots.partition { |p| p.root? }
-        map = {}
-        map[domain] = pub.first.id unless pub.empty?
-        hidden.each { |p| map[p.path] = p.id }
-        { "public" => domain, "roots" => map }
-      end
+    # roots returns the list of top-level pages
+    # Only one of these is publicly visible and this is mapped to the
+    # configured site domain.
+    #
+    # The rest are "hidden" roots.
+    def roots(user = nil)
+      domain = config.site_domain
+      roots  = pages_dataset.where(depth: 0).all
+      pub, hidden = roots.partition { |p| p.root? }
+      map = {}
+      map[domain] = pub.first.id unless pub.empty?
+      hidden.each { |p| map[p.path] = p.id }
+      { "public" => domain, "roots" => map }
+    end
 
-      def pages(content_model = Spontaneous::Content)
-        pages_dataset(content_model).all
-      end
+    def pages
+      pages_dataset.all
+    end
 
-      def pages_dataset(content_model = Spontaneous::Content)
-        content_model::Page.order(:depth)
-      end
+    def pages_dataset
+      model::Page.order(:depth)
+    end
 
-      ID_PATH   = /\A\d+\z/o
-      PATH_PATH = /^[\/#]/o
-      UID_PATH  = /^\$/o
+    ID_SELECTOR   = /\A\d+\z/o
+    PATH_SELECTOR = /\A[\/#]/o
+    UID_SELECTOR  = /\A\$/o
 
-      def [](path_or_uid)
-        case path_or_uid
-        when Fixnum, ID_PATH
-          by_id(path_or_uid)
-        when PATH_PATH
-          by_path(path_or_uid)
-        when UID_PATH
-          by_uid(path_or_uid[1..-1])
-        else
-          by_uid(path_or_uid)
-        end
-      end
+    def [](selector)
+      fetch(selector)
+    end
 
-      def by_id(id)
-        Spontaneous::Content[id]
+    def fetch(selector)
+      case selector
+      when Symbol
+        by_uid(selector.to_s)
+      when Fixnum
+        by_id(selector)
+      when ID_SELECTOR
+        by_id(selector)
+      when PATH_SELECTOR
+        by_path(selector)
+      when UID_SELECTOR
+        by_uid(selector[1..-1])
+      else
+        by_uid(selector)
       end
+    end
 
-      def by_path(path)
-        Spontaneous::Content.path(path)
-      end
+    def by_id(id)
+      model.id(id)
+    end
 
-      def by_uid(uid)
-        Spontaneous::Content.uid(uid)
-      end
+    def by_path(path)
+      model.path(path)
+    end
+
+    def by_uid(uid)
+      model.uid(uid)
+    end
 
-      def method_missing(method, *args)
-        if page = self[method.to_s]
-          page
-        else
-          super
-        end
+    def method_missing(method, *args)
+      if (page = fetch(method))
+        page
+      else
+        super
       end
-    end # ClassMethods
+    end
   end
 end

data/lib/spontaneous/site/state.rb

@@ -4,34 +4,40 @@ class Spontaneous::Site
   module State
     extend Spontaneous::Concern
 
-    module ClassMethods
-      def working_revision
-        Spontaneous::State.revision
-      end
-
-      def revision
-        Spontaneous::State.revision
-      end
-
-      def published_revision
-        Spontaneous::State.published_revision
-      end
-
-      def pending_revision
-        Spontaneous::State.pending_revision
-      end
-
-      def modified_at
-        Spontaneous::State.modified_at
-      end
-
-      def revision_root(*path)
-        instance.revision_root(*path)
-      end
-
-      def revision_dir(revision=nil, root = nil)
-        instance.revision_dir(revision, root)
-      end
-    end # ClassMethods
-  end # Revisions
+    def working_revision
+      Spontaneous::State.revision
+    end
+
+    def revision
+      Spontaneous::State.revision
+    end
+
+    def published_revision
+      Spontaneous::State.published_revision
+    end
+
+    def pending_revision
+      Spontaneous::State.pending_revision
+    end
+
+    def modified_at
+      Spontaneous::State.modified_at
+    end
+
+    def must_publish_all?
+      Spontaneous::State.must_publish_all?
+    end
+
+    def must_publish_all!(state = true)
+      Spontaneous::State.must_publish_all!(state)
+    end
+
+    def revision_root(*path)
+      instance.revision_root(*path)
+    end
+
+    def revision_dir(revision=nil, root = nil)
+      instance.revision_dir(revision, root)
+    end
+  end
 end