spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/lib/spontaneous/rack/back.rb

@@ -10,14 +10,21 @@ module Spontaneous
       include Assets
 
       def self.messenger
-        @messenger ||= ::Spontaneous::Rack::EventSource.new
+        @messenger ||= event_source
+      end
+
+      def self.event_source
+        messenger = ::Spontaneous::Rack::EventSource.new
         # Find a way to move this into a more de-centralised place
         # at some point we are going to want to have some configurable, extendable
         # list of event handlers
-        Simultaneous.on_event("publish_progress") { |event|
-          @messenger.deliver_event(event)
+        ::Simultaneous.on_event("publish_progress") { |event|
+          messenger.deliver_event(event)
+        }
+        ::Simultaneous.on_event("page_lock_status") { |event|
+          messenger.deliver_event(event)
         }
-        @messenger
+        messenger
       end
 
       class EventSource < ServerBase
@@ -36,7 +43,6 @@ module Spontaneous
 
       def self.editing_app
         ::Rack::Builder.app do
-          use Spontaneous::Rack::FiberPool, :size => 15
           use ::Rack::Lint
           use Spontaneous::Rack::Static, :root => Spontaneous.application_dir, :urls => %W(/static)
           use Spontaneous::Rack::Static, :root => Spontaneous.root / "public/@spontaneous", :urls => %W(/assets)
@@ -216,53 +222,63 @@ module Spontaneous
       end
 
       class EditingInterface < AuthenticatedHandler
-        use Reloader if Site.config.reload_classes
+        use Reloader if Spontaneous::Site.config.reload_classes
 
         set :views, Proc.new { Spontaneous.application_dir + '/views' }
 
 
         def update_fields(model, field_data)
-          conflicts = []
-          if field_data
-            field_data.each do |id, values|
-              field = model.fields.sid(id)
-              if model.field_writable?(user, field.name.to_sym)
-                # version = values.delete("version").to_i
-                # if version == field.version
-                field.update(values)
-                # else
-                #   conflicts << [field, values]
-                # end
-              else
-                unauthorised!
-              end
-            end
-          end
-          if conflicts.empty?
-            if model.save
-              json(model)
-            end
-          else
-            errors = conflicts.map  do |field, new_value|
-              [field.schema_id.to_s, [field.version, field.conflicted_value, new_value["unprocessed_value"]]]
-            end
-            [409, json(Hash[errors])]
-          end
+          return unless field_data
+          Spontaneous::Field.update_asynchronously(model, field_data, user)
+          json(model)
+        end
+
+        # def update_fields(model, field_data)
+        #   conflicts = []
+        #   if field_data
+        #     field_data.each do |id, values|
+        #       field = model.fields.sid(id)
+        #       if model.field_writable?(user, field.name.to_sym)
+        #         # version = values.delete("version").to_i
+        #         # if version == field.version
+        #         field.update(values)
+        #         # else
+        #         #   conflicts << [field, values]
+        #         # end
+        #       else
+        #         unauthorised!
+        #       end
+        #     end
+        #   end
+        #   if conflicts.empty?
+        #     if model.save
+        #       json(model)
+        #     end
+        #   else
+        #     errors = conflicts.map  do |field, new_value|
+        #       [field.schema_id.to_s, [field.version, field.conflicted_value, new_value["unprocessed_value"]]]
+        #     end
+        #     [409, json(Hash[errors])]
+        #   end
+        # end
+
+        def content_model
+          Spontaneous::Content
         end
 
         def content_for_request(lock = false)
-          Content.db.transaction {
-            dataset = lock ? Content.for_update : Content
-            content = dataset.first(:id => params[:id])
+          content_model.db.transaction do
+            dataset = lock ? content_model.for_update : content_model
+            content = dataset.get(params[:id])
             halt 404 if content.nil?
             content.current_editor = user
-            if box_id = Spontaneous.schema.uids[params[:box_id]]
+            if box_id = content_model.schema.uids[params[:box_id]]
               box = content.boxes.detect { |b| b.schema_id == box_id }
               yield(content, box)
             else
               yield(content)
             end
-          }
+          end
         end
 
         def set_authentication_cookie(key)
@@ -325,7 +341,7 @@ module Spontaneous
         end
 
         get '/root' do
-          json Site.root
+          json Spontaneous::Site.root
         end
 
         get '/page/:id' do
@@ -334,15 +350,15 @@ module Spontaneous
 
         get '/metadata' do
           json({
-            :types => Site.schema.export(user),
+            :types => Spontaneous::Site.schema.export(user),
             :user  => user.export,
-            :services => (Site.config.services || [])
+            :services => (Spontaneous::Site.config.services || [])
           })
         end
 
         get '/map/?:id?' do
-          last_modified(Site.modified_at)
-          map = Site.map(params[:id])
+          last_modified(Spontaneous::Site.modified_at)
+          map = Spontaneous::Site.map(params[:id])
           if map
             json(map)
           else
@@ -351,19 +367,19 @@ module Spontaneous
         end
 
         get '/location*' do
-          last_modified(Site.modified_at)
-          if Page.count == 0
+          last_modified(Spontaneous::Site.modified_at)
+          if content_model::Page.count == 0
             406
           else
             path = params[:splat].first
-            page = Site[path]
-            json Site.map(page.id)
+            page = Spontaneous::Site[path]
+            json Spontaneous::Site.map(page.id)
           end
         end
 
         post '/root' do
-          if Site.root.nil?
-            type = Spontaneous.schema[params[:type]]
+          if Spontaneous::Site.root.nil?
+            type = content_model.schema.to_class(params[:type])
             root = type.create(:title => "Home")
             json({:id => root.id})
           else
@@ -389,7 +405,7 @@ module Spontaneous
           conflicts = []
           field_versions.each do |schema_id, version|
             field = content.fields.sid(schema_id)
-            unless field.version == version.to_i
+            if field.matches_version?(version.to_i)
               conflicts << field
             end
           end
@@ -450,8 +466,7 @@ module Spontaneous
             if target.field_writable?(user, field.name)
               # version = params[:version].to_i
               # if version == field.version
-              field.value = file
-              content.save
+              Spontaneous::Field.set_asynchronously(field, file, user)
               json(field.export(user))
               # else
               #   errors = [[field.schema_id.to_s, [field.version, field.conflicted_value]]]
@@ -474,8 +489,7 @@ module Spontaneous
                 instance = type.new
                 box.insert(position, instance)
                 field = instance.field_for_mime_type(file[:type])
-                field.value = file
-                instance.save
+                Spontaneous::Field.set_asynchronously(field, file, user)
                 content.save
                 json({
                   :position => position,
@@ -491,7 +505,7 @@ module Spontaneous
         post '/add/:id/:box_id/:type_name' do
           content_for_request(true) do |content, box|
             position = (params[:position] || 0).to_i
-            type = Spontaneous.schema[params[:type_name]]#.constantize
+            type = content_model.schema.to_class(params[:type_name])#.constantize
 
             if box.writable?(user, type)
               instance = type.new(:created_by => user)
@@ -561,7 +575,7 @@ module Spontaneous
         end
 
         get '/targets/:schema_id/:id/:box_id' do
-          klass = Spontaneous.schema[params[:schema_id]]
+          klass = content_model.schema.to_class(params[:schema_id])
           if klass.alias?
             content_for_request do |content, box|
               options = {}
@@ -585,7 +599,7 @@ module Spontaneous
 
         post '/alias/:id/:box_id' do
           content_for_request(true) do |content, box|
-            type = Spontaneous.schema[params[:alias_id]]
+            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])
@@ -619,7 +633,7 @@ module Spontaneous
             400
           else
             if user.level.can_publish?
-              Site.publish_pages(pages)
+              Spontaneous::Site.publish_pages(pages)
               json({})
             else
               unauthorised!
@@ -664,11 +678,10 @@ module Spontaneous
             # version = params[:version].to_i
             # if version == field.version
             Spontaneous::Media.combine_shards(params[:shards]) do |combined|
-              field.value = {
+              Spontaneous::Field.set_asynchronously(field, {
                 :filename => params[:filename],
                 :tempfile => combined
-              }
-              target.save
+              }, user)
             end
             json(field.export(user))
             # else
@@ -691,11 +704,15 @@ module Spontaneous
                 box.insert(position, instance)
                 field = instance.field_for_mime_type(params[:mime_type])
                 Spontaneous::Media.combine_shards(params[:shards]) do |combined|
-                  field.value = {
+                  Spontaneous::Field.set_asynchronously(field, {
                     :filename => params[:filename],
                     :tempfile => combined
-                  }
+                  }, user)
                   content.save
+                  # field.value = {
+                  #   :filename => params[:filename],
+                  #   :tempfile => combined
+                  # }
                 end
                 json({
                   :position => position,
@@ -757,7 +774,7 @@ module Spontaneous
       class Preview < Sinatra::Base
         use CookieAuthentication
         use AroundPreview
-        use Reloader if Site.config.reload_classes
+        use Reloader if Spontaneous::Site.config.reload_classes
         include Spontaneous::Rack::Public
         helpers Spontaneous::Rack::UserHelpers
 

data/lib/spontaneous/rack/cacheable_file.rb

@@ -3,7 +3,7 @@ module Spontaneous::Rack
   class CacheableFile < ::Rack::File
     include HTTP
 
-    TEN_YEARS = 10*365*24*3600
+    TEN_YEARS = 10*365.25*24*3600
     MAX_AGE =  "max-age=#{TEN_YEARS}, public".freeze
 
     def initialize(file_root)
@@ -20,7 +20,7 @@ module Spontaneous::Rack
     def caching_headers(headers)
       headers.merge({
         HTTP_CACHE_CONTROL => MAX_AGE,
-        HTTP_EXPIRES => (Time.now + TEN_YEARS).httpdate
+        HTTP_EXPIRES => (Time.now.advance(:years => 10)).httpdate
       })
     end
   end

data/lib/spontaneous/rack/cookie_authentication.rb

@@ -9,7 +9,7 @@ module Spontaneous
 
       def access_key(env)
         if login = Site.config.auto_login
-          user = Spontaneous::Permissions::User[:login => login]
+          user = Spontaneous::Permissions::User.login(login)
           if user.access_keys.empty?
             user.generate_access_key(env["REMOTE_ADDR"])
           else

data/lib/spontaneous/rack/front.rb

@@ -8,7 +8,7 @@ module Spontaneous
       def self.front_app
         ::Rack::Builder.app do
           use AroundFront
-          use Reloader if Site.config.reload_classes
+          use Reloader if Spontaneous::Site.config.reload_classes
           run Server.new
         end
       end

data/lib/spontaneous/rack/helpers.rb

@@ -15,22 +15,21 @@ module Spontaneous
       end
 
       def style_url(style)
-        style = "#{style}.css" unless style =~ /\.css$/
-        if (compiled_asset = application_assets.manifest.assets[style])
-          return "#{NAMESPACE}/assets/#{compiled_asset}"
-        end
-        # TODO: use the sprockets environment to append a modification time to the non-compiled URL
-        "#{NAMESPACE}/css/#{style}"
+        asset_url(style, "css")
       end
 
       def script_url(script)
-        script = "#{script}.js" unless script =~ /\.js$/
+        asset_url(script, "js")
+      end
+
+      def asset_url(file, type)
+        file = "#{file}.#{type}" unless file =~ /\.#{type}$/
 
-        if (compiled_asset = application_assets.manifest.assets[script])
+        if (compiled_asset = application_assets.manifest.assets[file])
           return "#{NAMESPACE}/assets/#{compiled_asset}"
         end
         # TODO: use the sprockets environment to append a modification time to the non-compiled URL
-        "#{NAMESPACE}/js/#{script}"
+        "#{NAMESPACE}/#{type}/#{file}"
       end
 
       def script_list(scripts)

data/lib/spontaneous/{page_controller.rb → rack/page_controller.rb}

@@ -2,7 +2,7 @@
 
 require 'sinatra/base'
 
-module Spontaneous
+module Spontaneous::Rack
   class PageController < Sinatra::Base
     attr_reader :content, :format
 

data/lib/spontaneous/rack/public.rb

@@ -81,7 +81,7 @@ module Spontaneous
       end
 
       DOT = '.'.freeze
-      ACTION = "/#{S::Plugins::Controllers::ACTION_SEPARATOR}".freeze
+      ACTION = "/#{S::Model::Page::Controllers::ACTION_SEPARATOR}".freeze
 
       def show(page, status=200)
         page = Spontaneous::Site[page] if String === page
@@ -101,7 +101,7 @@ module Spontaneous
 
       def redirect(location, redirect_code=:temporary)
         if String === location
-          destination = Site[location]
+          destination = Spontaneous::Site[location]
           location = destination.path if destination and destination.respond_to?(:path)
         else
           location = location.path if location.respond_to?(:path)
@@ -129,7 +129,7 @@ module Spontaneous
 
       def find_page!(path)
         @path, @output, @action = parse_path(path)
-        @page = Site[@path]
+        @page = Spontaneous::Site[@path]
       end
 
       def output

data/lib/spontaneous/rack.rb

@@ -45,27 +45,27 @@ module Spontaneous
       set :environment, Proc.new { Spontaneous.environment }
     end
 
-    autoload :HTTP,                 'spontaneous/rack/http'
+    autoload :AroundBack,           'spontaneous/rack/around_back'
+    autoload :AroundFront,          'spontaneous/rack/around_front'
+    autoload :AroundPreview,        'spontaneous/rack/around_preview'
     autoload :Assets,               'spontaneous/rack/assets'
-    autoload :Back,                 'spontaneous/rack/back'
-    autoload :Front,                'spontaneous/rack/front'
-    autoload :Public,               'spontaneous/rack/public'
     autoload :Authentication,       'spontaneous/rack/authentication'
+    autoload :Back,                 'spontaneous/rack/back'
+    autoload :CSS,                  'spontaneous/rack/css'
     autoload :CacheableFile,        'spontaneous/rack/cacheable_file'
-    autoload :Static,               'spontaneous/rack/static'
-    autoload :UserHelpers,          'spontaneous/rack/user_helpers'
-    autoload :UserAdmin,            'spontaneous/rack/user_admin'
-    autoload :Helpers,              'spontaneous/rack/helpers'
     autoload :CookieAuthentication, 'spontaneous/rack/cookie_authentication'
-    autoload :QueryAuthentication,  'spontaneous/rack/query_authentication'
-    autoload :AroundBack,           'spontaneous/rack/around_back'
-    autoload :AroundFront,          'spontaneous/rack/around_front'
-    autoload :AroundPreview,        'spontaneous/rack/around_preview'
-    autoload :Reloader,             'spontaneous/rack/reloader'
     autoload :EventSource,          'spontaneous/rack/event_source'
-    autoload :CSS,                  'spontaneous/rack/css'
+    autoload :Front,                'spontaneous/rack/front'
+    autoload :HTTP,                 'spontaneous/rack/http'
+    autoload :Helpers,              'spontaneous/rack/helpers'
     autoload :JS,                   'spontaneous/rack/js'
+    autoload :PageController,       "spontaneous/rack/page_controller"
+    autoload :Public,               'spontaneous/rack/public'
+    autoload :QueryAuthentication,  'spontaneous/rack/query_authentication'
+    autoload :Reloader,             'spontaneous/rack/reloader'
     autoload :SSE,                  'spontaneous/rack/sse'
-    autoload :FiberPool,            'spontaneous/rack/fiber_pool'
+    autoload :Static,               'spontaneous/rack/static'
+    autoload :UserAdmin,            'spontaneous/rack/user_admin'
+    autoload :UserHelpers,          'spontaneous/rack/user_helpers'
   end
 end

data/lib/spontaneous/schema/uid.rb

@@ -124,6 +124,10 @@ module Spontaneous
         @id
       end
 
+      def sql_literal(dataset)
+        dataset.literal @id
+      end
+
       def <=>(other)
         self.to_s <=> other.to_s
       end
@@ -132,6 +136,5 @@ module Spontaneous
         %(#<#{self.class}:"#{@id}" => "#{reference}">)
       end
     end
-
   end
 end

data/lib/spontaneous/schema.rb

@@ -16,7 +16,7 @@ module Spontaneous
         load_map
       end
 
-      def schema_id(obj)
+      def to_id(obj)
         reference_to_id(obj.schema_name)
       end
 
@@ -24,7 +24,7 @@ module Spontaneous
         uids.get_id(reference)
       end
 
-      def [](id)
+      def to_class(id)
         if uid = uids[id]
           uid.target
         else
@@ -78,7 +78,7 @@ module Spontaneous
         @uids = uids
       end
 
-      def schema_id(obj)
+      def to_id(obj)
         if id = super
           id
         else
@@ -99,12 +99,18 @@ module Spontaneous
       end
     end
 
+    def self.new(root, schema_loader_class = Spontaneous::Schema::PersistentMap)
+      Schema.new(root, schema_loader_class)
+    end
+
     class Schema
-      attr_reader :schema_loader_class, :uids
+      attr_accessor :schema_loader_class
+      attr_reader   :uids
 
       def initialize(root, schema_loader_class = Spontaneous::Schema::PersistentMap)
         @root = root
         @schema_loader_class = schema_loader_class
+        @subclass_map = Hash.new { |h, k| h[k] = [] }
         initialize_uid_map
       end
 
@@ -250,38 +256,53 @@ module Spontaneous
         Spontaneous.serialise_http(export(user))
       end
 
+      def unfiltered_classes
+        @classes ||= []
+      end
+
       # all classes including boxes
       def classes
-        @classes ||= []
+        unfiltered_classes.reject { |c| is_excluded_type?(c) }
       end
 
-      def add_class(supertype, type)
+      def inherited(supertype, type)
         inheritance_map[supertype.to_s] << type
-        classes << type unless classes.include?(type)
+        unfiltered_classes << type
+      end
+
+      def is_excluded_type?(type)
+        excluded_types.include?(type)
+      end
+
+      def excluded_types
+        [Spontaneous::Content, Spontaneous::Content::Page, Spontaneous::Content::Piece]
       end
 
       def inheritance_map
-        @inheritance_map ||= Hash.new { |h, k| h[k] = [] }
+        @inheritance_map ||= empty_inheritance_map
       end
 
+      def empty_inheritance_map
+        Hash.new { |h, k| h[k] = [] }
+      end
 
       def subclasses_of(type)
         inheritance_map[type.to_s].map { |subclass| subclass }
       end
 
       def descendents_of(type)
-        subclasses_of(type).map{ |x| [x] + descendents_of(x) }.flatten
+        subclasses_of(type).flat_map{ |x| [x] + descendents_of(x) }
       end
 
+      alias_method :subclasses, :descendents_of
+
       # just subclasses of Content (excluding boxes)
       # only need this for the serialisation (which doesn't include boxes)
+      #
+      # TODO: Find a way to filter out the top-level classes without hard-coding
+      # them here.
       def content_classes
-        classes = []
-        self.classes.reject { |k| k.is_box? }.each do |klass|
-          classes << klass unless [Spontaneous::Page, Spontaneous::Piece].include?(klass)
-          # recurse_classes(klass, classes)
-        end
-        classes.uniq
+        classes.reject { |k| k.is_box? }.uniq
       end
 
       def recurse_classes(root_class, list)
@@ -291,16 +312,14 @@ module Spontaneous
         end
       end
 
-      # should only be used in tests
       def reset!
-        Content.schema_reset!
-        @classes = []
+        @classes         = []
         @inheritance_map = nil
         reload!
       end
 
       def reload!
-        @map = nil
+        @map             = nil
         initialize_uid_map
       end
 
@@ -308,8 +327,22 @@ module Spontaneous
         @uids = Spontaneous::Schema::UIDMap.new
       end
 
+      # It's obvious from this method that schema classes are
+      # stored in too many ways
       def delete(klass)
-        classes.delete(klass)
+        constants_of(klass).each { |const| delete(const) }
+        unfiltered_classes.delete(klass)
+        remove_group_members(klass)
+        inheritance_map.delete(klass.to_s)
+        inheritance_map.each do |supertype, subtypes|
+          subtypes.delete(klass)
+        end
+      end
+
+      def constants_of(klass)
+        klass.constants.
+          select { |c| klass.const_defined?(c, false) }.
+          map { |c| klass.const_get(c) }
       end
 
       def schema_map_file
@@ -326,12 +359,12 @@ module Spontaneous
         @map ||= self.schema_loader_class.new(@uids, schema_map_file)
       end
 
-      def schema_id(obj)
-        map.schema_id(obj)
+      def to_id(obj)
+        map.to_id(obj)
       end
 
-      def [](schema_id)
-        map[schema_id]
+      def to_class(id)
+        map.to_class(id)
       end
 
       def groups

data/lib/spontaneous/search/database.rb

@@ -26,12 +26,22 @@ module Spontaneous::Search
       options = { :dir => directory,
         :language => @index.language,
         :fields => @index.fields,
-        :spelling => true }
+        :spelling => true,
+        :weights => weighting_proc
+      }
       options[:stemmer] = @index.stemmer unless @index.stemmer.nil?
       options[:stopper] = @index.stopper unless @index.stopper.nil?
       options
     end
 
+    def weighting_proc
+      Proc.new { |key, value, fields| field_weighting(key, fields) }
+    end
+
+    def field_weighting(key, fields)
+      @weights[key]
+    end
+
     def database
       @database ||= open_database
     end
@@ -42,6 +52,7 @@ module Spontaneous::Search
 
     def add(page)
       if @index.include?(page)
+        @weights = @index.weights(page)
         database << @index.indexable_content(page)
       end
     end