spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/lib/spontaneous/rack/static.rb

@@ -7,9 +7,8 @@ module Spontaneous
       def initialize(app, options)
         @app = app
         @try = ['', *options.delete(:try)].compact
-        @static = ::Rack::Static.new(
-          lambda { |env| [404, {}, []] },
-          options)
+        fallback_app = lambda { |env| [404, {}, []] }
+        @static = ::Rack::Static.new(fallback_app, options)
       end
 
       def call(env)

data/lib/spontaneous/schema.rb

@@ -99,16 +99,16 @@ module Spontaneous
       end
     end
 
-    def self.new(root, schema_loader_class = Spontaneous::Schema::PersistentMap)
-      Schema.new(root, schema_loader_class)
+    def self.new(site, root, schema_loader_class = Spontaneous::Schema::PersistentMap)
+      Schema.new(site, root, schema_loader_class)
     end
 
     class Schema
       attr_accessor :schema_loader_class
       attr_reader   :uids
 
-      def initialize(root, schema_loader_class = Spontaneous::Schema::PersistentMap)
-        @root = root
+      def initialize(site, root, schema_loader_class = Spontaneous::Schema::PersistentMap)
+        @site, @root = site, root
         @schema_loader_class = schema_loader_class
         @subclass_map = Hash.new { |h, k| h[k] = [] }
         initialize_uid_map
@@ -163,6 +163,7 @@ module Spontaneous
         case action
         when :delete
           uids.destroy(uid)
+          after_delete(uid)
         when :rename
           uid.rewrite!(dest)
         end
@@ -172,6 +173,17 @@ module Spontaneous
         logger.info("✓ Schema updated successfully")
       end
 
+      # now I want to clean up the content, removing any types associated with UIDs
+      # that no longer exist and then cleaning up after that by looking for any
+      # instances with an invalid content path. This can happen because when a
+      # type is removed it becomes difficult to instantiate any entries that remain
+      # in the db
+      def after_delete(uid)
+        result = Spontaneous::Model::Action::Clean.run(@site)
+        logger.warn("Deleted #{result[:invalid]} invalid and #{result[:orphans]} orphaned content instances.")
+        logger.warn("Site must_publish_all flag has been set") if result[:publish]
+      end
+
       def generate_new_schema
         logger.info("Generating new schema map at #{schema_map_file}")
         self.schema_loader_class = TransientMap
@@ -275,7 +287,8 @@ module Spontaneous
       end
 
       def excluded_types
-        [Spontaneous::Content, Spontaneous::Content::Page, Spontaneous::Content::Piece]
+        model = @site.model
+        [model, model::Page, model::Piece]
       end
 
       def inheritance_map
@@ -302,7 +315,11 @@ module Spontaneous
       # TODO: Find a way to filter out the top-level classes without hard-coding
       # them here.
       def content_classes
-        classes.reject { |k| k.is_box? }.uniq
+        classes.select { |k| k.is_a?(Spontaneous::DataMapper::ContentModel) }.uniq
+      end
+
+      def types
+        content_classes
       end
 
       def recurse_classes(root_class, list)
@@ -314,17 +331,18 @@ module Spontaneous
 
       def reset!
         @classes         = []
+        @types           = []
         @inheritance_map = nil
         reload!
       end
 
       def reload!
-        @map             = nil
+        @map = nil
         initialize_uid_map
       end
 
       def initialize_uid_map
-        @uids = Spontaneous::Schema::UIDMap.new
+        @uids = Spontaneous::Schema::UIDMap.new(@site)
       end
 
       # It's obvious from this method that schema classes are
@@ -341,6 +359,7 @@ module Spontaneous
 
       def constants_of(klass)
         return [] unless klass.respond_to?(:constants)
+        return [] if klass == ::BasicObject
         klass.constants.
           select { |c| klass.const_defined?(c, false) }.
           map { |c| klass.const_get(c) }

data/lib/spontaneous/schema/schema_modification.rb

@@ -67,7 +67,7 @@ module Spontaneous
       end
 
       def simple_change?
-        only_removed_items? or only_added_items?
+        only_removed_fields? or only_added_items?
       end
 
       def only_added_items?
@@ -78,6 +78,14 @@ module Spontaneous
         end
       end
 
+      def only_removed_fields?
+        if removed_items.empty?
+          false
+        else
+          added_items.empty? && removed_items.all? { |uid| uid.category == :field }
+        end
+      end
+
       def only_removed_items?
         if removed_items.empty?
           false

data/lib/spontaneous/schema/uid.rb

@@ -26,10 +26,10 @@ module Spontaneous
         map.destroy(self)
       end
 
-      def after_destroy
+      def after_destroy(site)
         case @category
         when :box
-          Spontaneous::Content.filter(:box_sid  => @id).delete
+          site.model.filter(:box_sid  => @id).delete
         end
       end
 

data/lib/spontaneous/schema/uid_map.rb

@@ -25,7 +25,8 @@ module Spontaneous::Schema
 
     include Enumerable
 
-    def initialize
+    def initialize(site)
+      @site = site
       @instance_lock  = Mutex.new
       @instances = {}
     end
@@ -66,7 +67,7 @@ module Spontaneous::Schema
     def destroy(uid)
       @instance_lock.synchronize do
         @instances.delete(uid.to_s)
-        uid.after_destroy
+        uid.after_destroy(@site)
       end
     end
 

data/lib/spontaneous/search/database.rb

@@ -79,13 +79,13 @@ module Spontaneous::Search
       if autocorrect and xapian_results.empty? and !corrected_query.blank?
         xapian_results = database.search(corrected_query, options)
       end
-      Results.new(xapian_results, corrected_query)
+      Results.new(@index.model, xapian_results, corrected_query)
     end
 
     alias_method :<<, :add
 
     def directory
-      S::Site.revision_dir(@revision) / "indexes" / @index.name
+      @index.site.revision_dir(@revision) / "indexes" / @index.name
     end
   end # Database
 end

data/lib/spontaneous/search/field.rb

@@ -4,7 +4,9 @@ module Spontaneous::Search
   class Field
     attr_reader :prototype, :options
 
-    def initialize(prototype, options)
+    # TODO: options seems redundant as its available as prototype.options
+    def initialize(site, prototype, options)
+      @site = site
       @prototype = prototype
       @options = options
     end
@@ -58,7 +60,7 @@ module Spontaneous::Search
     # options. Each entry contains the index to which it pertains and then
     # the options that should be applied to this field within that index
     def parse_indexes(opts)
-      all_indexes = S::Site.indexes.values
+      all_indexes = @site.indexes.values
       case opts
       when  true
         all_indexes.map { |index| default_index_options(index) }
@@ -87,7 +89,7 @@ module Spontaneous::Search
     end
 
     def find_index(name)
-      index = S::Site.indexes[name]
+      index = @site.indexes[name]
       logger.warn("Invalid index :#{name} for field #{@prototype.owner}.#{@prototype.name}") unless index
       index
     end

data/lib/spontaneous/search/index.rb

@@ -5,9 +5,10 @@ require 'xapian-fu'
 module Spontaneous::Search
   class Index
 
-    attr_reader :name, :search_types
+    attr_reader :name, :search_types, :site
 
-    def initialize(name, &definition)
+    def initialize(site, name, &definition)
+      @site = site
       @name = name
       @search_types = base_search_types
       @include_pages = nil
@@ -43,7 +44,7 @@ module Spontaneous::Search
       database.search(query, options)
     end
 
-    def database(revision = Spontaneous::Site.published_revision)
+    def database(revision = @site.published_revision)
       Database.new(self, revision)
     end
 
@@ -156,6 +157,10 @@ module Spontaneous::Search
       include_type?(content.class) and include_page?(content.page)
     end
 
+    def model
+      @site.model
+    end
+
   protected
 
     def include_type?(type)
@@ -185,7 +190,7 @@ module Spontaneous::Search
       when /\A[\/#]/
         page.path == selector
       when /\A(>=?)\s+(.+)\z/
-        rule, root = $1, S::Site[$2]
+        rule, root = $1, @site[$2]
         root.send(rule, page)
       else
         false
@@ -193,7 +198,7 @@ module Spontaneous::Search
     end
 
     def resolve_page_list(pages)
-      pages.map { |p| S::Site[p] }
+      pages.map { |p| @site[p] }
     end
 
     def base_search_types
@@ -216,11 +221,11 @@ module Spontaneous::Search
     end
 
     def all_types
-      S.schema.classes
+      @site.schema.classes
     end
 
     def all_page_types
-      S.schema.classes.select { |klass| klass.page? }
+      @site.schema.classes.select { |klass| klass.page? }
     end
   end # Index
 end # Spontaneous

data/lib/spontaneous/search/results.rb

@@ -11,8 +11,10 @@ module Spontaneous::Search
 
     def_delegators :@results, :current_page, :per_page, :total_pages, :next_page, :offset, :previous_page, :total_entries
 
-    def initialize(result_set, corrected_query = nil)
-      @results, @corrected_query = result_set, corrected_query
+    def initialize(model, result_set, corrected_query = nil)
+      @model = model
+      @results = result_set
+      @corrected_query = corrected_query
     end
 
     def corrected_query
@@ -28,7 +30,7 @@ module Spontaneous::Search
     end
 
     def pages
-      @page_list ||= Spontaneous::Content.get(@results.map { |doc| doc.id })
+      @page_list ||= @model.get(@results.map { |doc| doc.id })
     end
   end # Results
 end

data/lib/spontaneous/server.rb

@@ -12,7 +12,7 @@ module Spontaneous
     Handlers = %w[thin] unless const_defined?(:Handlers)
 
 
-    def self.run!(options={})
+    def self.run!(site, options={})
       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
@@ -33,7 +33,7 @@ module Spontaneous
       end
       puts "=> Spontaneous:#{Spontaneous.mode.to_s.ljust(5, " ")} running on port #{host}:#{port} (PID #{$$})"
 
-      handler.run Spontaneous::Rack.application.to_app, :Host => host, :Port => port do |server|
+      handler.run Spontaneous::Rack.application(site).to_app, :Host => host, :Port => port do |server|
         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

@@ -35,13 +35,17 @@ module Spontaneous
     include URL
 
     attr_accessor :database
-    attr_reader :environment, :mode
+    attr_reader :environment, :mode, :model
 
     def initialize(root, env, mode)
       super(root)
       @environment, @mode = env, mode
     end
 
+    def model=(content_model)
+      @model = content_model
+    end
+
     def initialize!
       load_config!
       connect_to_database!
@@ -79,8 +83,11 @@ module Spontaneous
 
 
     def connect_to_database!
-      self.database = Sequel.connect(db_settings)
-      self.database.logger = logger if config.log_queries
+      db = Sequel.connect(db_settings)
+      db.logger = logger if config.log_queries
+      # Improve performance for postgres
+      db.optimize_model_load = true if db.respond_to?(:optimize_model_load)
+      self.database = db
     end
 
     def db_settings

data/lib/spontaneous/site/features.rb

@@ -5,6 +5,16 @@ class Spontaneous::Site
   module Features
     extend Spontaneous::Concern
 
+    class Middleware
+      def use(*args, &block)
+        middleware << [args, block]
+      end
+
+      def middleware
+        @middleware ||= []
+      end
+    end
+
     # InstanceMethods
     def back_controllers
       @back_controllers ||= []
@@ -14,14 +24,24 @@ class Spontaneous::Site
       @front_controllers ||= []
     end
 
-    def register_back_controller(namespace, controller_class)
-      app = Spontaneous::Rack.make_back_controller(controller_class)
-      back_controllers << [namespace_url(namespace), app]
+    # Mounts an app into the authenticated CMS application
+    #   namespace: the namespace of the app. A namespace of `moderation` will be mounted
+    #              inside the CMS as /@moderation
+    #   app: A Rack compatible class or Proc
+    def register_back_controller(namespace, app, opts = {})
+      app = Spontaneous::Rack.make_back_controller(app, self)
+      path_prefix = opts.fetch(:path_prefix, namespace_url(namespace))
+      back_controllers << [path_prefix, app]
+    end
+
+    def register_front_controller(namespace, app, opts = {})
+      app = Spontaneous::Rack.make_front_controller(app, self)
+      path_prefix = opts.fetch(:path_prefix, namespace_url(namespace))
+      front_controllers << [path_prefix, app]
     end
 
-    def register_front_controller(namespace, controller_class)
-      app = Spontaneous::Rack.make_front_controller(controller_class)
-      front_controllers << [namespace_url(namespace), app]
+    def front
+      @front_middleware ||= Middleware.new
     end
 
     def namespace_url(namespace)

data/lib/spontaneous/site/helpers.rb

@@ -4,7 +4,7 @@ class Spontaneous::Site
   module Helpers
     extend Spontaneous::Concern
 
-    module ClassMethods
+    # module ClassMethods
       def helper(*formats, &block)
         helper_module = Module.new(&block)
         register_helper(helper_module, helper_module_name(caller), *formats.flatten)
@@ -12,7 +12,8 @@ class Spontaneous::Site
       end
 
       def helper_module_name(_caller)
-        path = _caller.first.split(':').first.split('/')[-5..-1]
+        parts = _caller.first.split(':').first.split('/')
+        path = parts[-([5, parts.length].min)..-1]
         path.join('_').gsub(/[^A-Za-z_]/, '_').gsub(/_+/, '_').gsub(/^_+/, '').capitalize
       end
 
@@ -25,7 +26,7 @@ class Spontaneous::Site
             helper_module.send :include, mod
             helper_module.send :extend,  mod
           end
-          Spontaneous::Site.registered_helpers[format].each do |mod|
+          registered_helpers[format].each do |mod|
             helper_module.send :include, mod
             helper_module.send :extend,  mod
           end
@@ -34,8 +35,8 @@ class Spontaneous::Site
       end
 
       def register_helper(helper_module, module_name, *formats)
-        site    = instance
-        helpers = site.registered_helpers
+        site = self
+        helpers = registered_helpers
         if formats.empty?
            helpers[:*] << helper_module
         else
@@ -43,23 +44,19 @@ class Spontaneous::Site
             helpers[format.to_sym] << helper_module
           end
         end
-        # Spontaneous::Site::Helpers.const_set(module_name, helper_module)
         def helper_module.__finalize
-          Spontaneous::Site.unregister_helper(self)
+          site.unregister_helper(self)
         end
       end
 
       def unregister_helper(helper_module)
-        helpers = instance.registered_helpers
+        helpers = registered_helpers
         helpers.each do |format, helpers|
           helpers.delete(helper_module)
         end
       end
 
-      def registered_helpers
-        instance.registered_helpers
-      end
-    end
+    # end
 
     def registered_helpers
       @registered_helpers ||= Hash.new { |hash, key| hash[key] = [] }