spontaneous 0.2.0.alpha7 → 0.2.0.beta1

data/lib/spontaneous/media.rb

@@ -5,7 +5,8 @@ require 'digest/sha1'
 module Spontaneous
   module Media
 
-    autoload :File, "spontaneous/media/file"
+    autoload :File,     "spontaneous/media/file"
+    autoload :TempFile, "spontaneous/media/temp_file"
 
     include Spontaneous::Constants
 
@@ -15,25 +16,6 @@ module Spontaneous
       ::File.join(Spontaneous.media_dir, *args)
     end
 
-    @@upload_uid_lock  = Mutex.new
-    @@upload_uid_index = 0
-
-    def upload_index
-      @@upload_uid_lock.synchronize do
-        @@upload_uid_index = (@@upload_uid_index + 1) % 0xFFFFFF
-      end
-    end
-
-    def upload_path(filename)
-      time = Time.now.to_i
-      dir = "#{time}.#{upload_index}"
-      Spontaneous.cache_path("tmp", dir, filename)
-    end
-
-    # def to_urlpath(filepath)
-    #   filepath.gsub(%r{^#{Spontaneous.media_dir}}, "/media")
-    # end
-
     def to_filepath(urlpath)
       parts = urlpath.split("/")
       parts[1] = Spontaneous.media_dir
@@ -52,6 +34,14 @@ module Spontaneous
     end
 
 
+    def pad_id(r)
+      r.to_s.rjust(5, "0")
+    end
+
+    def pad_revision(r)
+      r.to_s.rjust(4, "0")
+    end
+
     def sha1(filepath)
       Digest::SHA1.file(filepath).hexdigest
     end
@@ -61,27 +51,18 @@ module Spontaneous
     def combine_shards(hashes, &block)
       hashes = hashes.split(',') unless hashes.is_a?(Array)
       shards = hashes.map { |hash| Spontaneous.shard_path(hash) }
-      combined = Tempfile.new('shard')
-      combined.binmode
-
-      shards.each do |shard|
-        ::File.open(shard, 'rb') do |part|
-          while data = part.read(131072)
-            combined.write(data)
+      Tempfile.open('shard') do |combined|
+        combined.binmode
+        shards.each do |shard|
+          ::File.open(shard, 'rb') do |part|
+            while (data = part.read(131072))
+              combined.write(data)
+            end
           end
         end
-      end
-      combined.close
-
-      if block_given?
-        begin
-          yield(combined)
-        ensure
-          combined.close!
-        end
-      else
-        # caller's responsibility to close & delete tempfile
-        combined
+        combined.flush
+        combined.rewind
+        yield(combined) if block_given?
       end
     end
 

data/lib/spontaneous/{plugins → model/box}/allowed_types.rb

@@ -1,15 +1,17 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Box
   module AllowedTypes
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     class AllowedType
       attr_accessor :allow_subclasses
 
-      def initialize(type, options={})
-        @type = type
-        @options = options
+      def initialize(box, type, options={}, &definition)
+        @box_class  = box
+        @type       = type
+        @options    = options
+        define_instance_class(definition) if definition
       end
 
       def check_instance_class
@@ -31,13 +33,15 @@ module Spontaneous::Plugins
         resolve_instance_class(@type)
       end
 
-      def resolve_instance_class(name)
-        case name
-        when Class
-          name
-        when Symbol, String
-          name.to_s.constantize
-        end
+      def define_instance_class(definition)
+        content_type = Class.new(instance_class_supertype, &definition)
+        @box_class.const_set @type, content_type
+        @type = content_type.name
+      end
+
+      def instance_class_supertype
+        type = @options[:supertype] || (defined?(::Piece) ? ::Piece : Content::Piece)
+        constantize type
       end
 
       def styles(content)
@@ -93,6 +97,21 @@ module Spontaneous::Plugins
         Spontaneous::Permissions.has_level?(user, user_level)
       end
       alias_method :addable?, :readable?
+
+      protected
+
+      def resolve_instance_class(name)
+        constantize(name)
+      end
+
+      def constantize(name)
+        case name
+        when Class
+          name
+        when Symbol, String
+          name.to_s.constantize
+        end
+      end
     end
 
     class AllowedGroup < AllowedType
@@ -102,7 +121,7 @@ module Spontaneous::Plugins
 
       def instance_classes
         schema = Spontaneous::Site.schema
-        names = groups.flat_map { |name| Spontaneous::Site.schema.groups[name] }
+        names = groups.flat_map { |name| schema.groups[name] }
         names.map { |name| resolve_instance_class(name) }.uniq
       end
 
@@ -135,13 +154,15 @@ module Spontaneous::Plugins
       #   :prototype => The name of the prototype to use when creating pieces of this type
       #
       # TODO: finish these!
-      def allow(type, options={})
-        allowed_types_config << AllowedType.new(type, options)
+      def allow(type, options={}, &definition)
+        allowed = AllowedType.new(self, type, options, &definition)
+        allowed_types_config << allowed
+        allowed
       end
 
       # TODO: implement this in a way that doesn't require searching through constants at load-time
       def allow_subclasses(type, options = {})
-        parent_type = AllowedType.new(type)
+        parent_type = AllowedType.new(self, type)
         parent_type.allow_subclasses = true
         allowed_types_config << parent_type
         # parent_type.instance_class.subclasses.each do |subclass|
@@ -151,7 +172,7 @@ module Spontaneous::Plugins
 
       def allow_group(*group_names)
         options = group_names.extract_options!
-        allowed_types_config << AllowedGroup.new(group_names, options)
+        allowed_types_config << AllowedGroup.new(self, group_names, options)
       end
 
       alias_method :allow_groups, :allow_group

data/lib/spontaneous/model/box.rb

@@ -0,0 +1,18 @@
+# encoding: UTF-8
+
+module Spontaneous::Model
+  module Box
+    autoload :AllowedTypes,     "spontaneous/model/box/allowed_types"
+
+    extend Spontaneous::Concern
+
+    module ClassMethods
+
+      def inherited(subclass)
+        subclass.instance_variable_set(:"@mapper", mapper)
+        mapper.schema.inherited(self, subclass)
+        super
+      end
+    end
+  end
+end

data/lib/spontaneous/{plugins → model/core}/aliases.rb

@@ -1,17 +1,9 @@
 # encoding: UTF-8
 
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Aliases
-    extend ActiveSupport::Concern
-
-    included do
-      # '__target' rather than 'target' because we want to override the behaviour of the
-      # Content#target method only on classes that are aliases, and this is defined dynamically
-      many_to_one :__target, :class => self, :key => :target_id, :reciprocal => :aliases
-      one_to_many :aliases, :class => self, :key => :target_id, :reciprocal => :__target
-      add_association_dependencies :aliases => :destroy
-    end
+    extend Spontaneous::Concern
 
     module ClassMethods
       def alias_of(*args)
@@ -38,10 +30,14 @@ module Spontaneous::Plugins
           when Proc
             targets.concat(source[*proc_args])
           else
-            classes.concat(source.to_s.constantize.sti_subclasses_array)
+            type = source.to_s.constantize
+            classes.push(type)
+            classes.concat(type.subclasses)
           end
         end
-        query = S::Content.filter(sti_key => classes.map { |c| c.to_s })
+
+        query = content_model.filter(:type_sid => classes.map { |c| c.schema_id })
+
         if (container_procs = @alias_options[:container])
           containers = [container_procs].flatten.map { |p| p[*proc_args] }.flatten
           params = []
@@ -50,7 +46,7 @@ module Spontaneous::Plugins
               params << Sequel::SQL::BooleanExpression.new(:'=', :page_id, container.id)
             else
               box_params = [
-                [:box_sid, container.id],
+                [:box_sid, container.schema_id],
                 [:owner_id, container.owner.id]
               ]
               params << Sequel::SQL::BooleanExpression.from_value_pairs(box_params, :AND)
@@ -174,7 +170,7 @@ module Spontaneous::Plugins
 
       def exported_target(user = nil)
         case target
-        when S::Content
+        when Spontaneous::Content
           target.shallow_export(user)
         else
           target.to_json

data/lib/spontaneous/{plugins → model/core}/boxes.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Boxes
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def box(name, options = {}, &block)

data/lib/spontaneous/{plugins → model/core}/content_groups.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module ContentGroups
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       attr_reader :group_memberships

data/lib/spontaneous/model/core/editor_class.rb

@@ -0,0 +1,4 @@
+# encoding: UTF-8
+
+module Spontaneous::Model::Core::Field
+end

data/lib/spontaneous/{plugins → model/core}/entries.rb

@@ -1,12 +1,17 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Entries
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
-    included do
-      alias_method :<<, :push
-    end
+    # before_include do
+    #   puts "owner= defined?"
+    #   p method_defined?(:owner=)
+    # end
+
+    # included do
+    #   # alias_method :<<, :push
+    # end
     #
     #     def self.configure(base)
     #       base.__send__(:alias_method,  :<<, :push)
@@ -29,6 +34,10 @@ module Spontaneous::Plugins
       super
     end
 
+    def depth
+      super || 0
+    end
+
     def after_save
       contents.each do |entry|
         entry.save if entry.modified?
@@ -71,7 +80,7 @@ module Spontaneous::Plugins
     end
 
     def contents
-      return visible_contents if Spontaneous::Content.visible_only?
+      return visible_contents if model.visible_only?
       all_contents
     end
 
@@ -106,6 +115,8 @@ module Spontaneous::Plugins
       insert(-1, page_or_piece)
     end
 
+    alias_method :<<, :push
+
     def insert(index, page_or_piece, box)
       save if new?
       if page_or_piece.page?
@@ -135,7 +146,7 @@ module Spontaneous::Plugins
     end
 
     def insert_with_style(type, index, content, box)
-      self._pieces << content
+      self.pieces << content
       entry_style = style_for_content(content, box)
       content.box_sid = box.schema_id if box
       content._prototype = box.prototype_for_content(content) if box
@@ -195,6 +206,7 @@ module Spontaneous::Plugins
       content.class.styles
     end
 
+
     def owner=(owner)
       super
       set_visibility_path

data/lib/spontaneous/{plugins → model/core}/entry.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Entry
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     # InstanceMethods
 
@@ -13,7 +13,7 @@ module Spontaneous::Plugins
     end
 
     def box_sid
-      @box_sid ||= Spontaneous.schema.uids[self[:box_sid]]
+      @box_sid ||= mapper.schema_uid(self[:box_sid])
     end
 
     def box_sid=(sid)

data/lib/spontaneous/{plugins → model/core}/fields.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Fields
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def field(name, type=nil, options={}, &block)
@@ -81,7 +81,7 @@ module Spontaneous::Plugins
     end
 
     def field_versions(field)
-      Spontaneous::FieldVersion.filter(:content_id => self.id, :field_sid => field.schema_id.to_s).order(:created_at.desc)
+      Spontaneous::Field::FieldVersion.filter(:content_id => self.id, :field_sid => field.schema_id.to_s).order(:created_at.desc)
     end
 
     def save_field_versions
@@ -108,8 +108,41 @@ module Spontaneous::Plugins
     end
 
     # TODO: unify the update mechanism for these two stores
-    def field_modified!(modified_field)
-      self.field_store = @field_set.serialize_db
+    def field_modified!(modified_field = nil)
+      serialize_fields
+    end
+
+    def serialize_fields(fields = nil)
+      self.field_store = update_serialized_fields(fields)
+    end
+
+    def update_serialized_fields(fields = nil)
+      if fields.nil?
+        @field_set.serialize_db
+      else
+        field_store = (self.field_store || []).dup
+        fields.each do |field|
+          before_save_field(field)
+          schema_id = field.schema_id.to_s
+          if (index = field_store.index { |f| f[0] == schema_id })
+            field_store[index.to_i] = field.serialize_db
+          else
+            field_store << field.serialize_db
+          end
+        end
+        field_store
+      end
+    end
+
+    def before_save_field(field)
+    end
+
+    # Re-serializes the field store.
+    #
+    # If fields is given then only the fields included in it will be written
+    def save_fields(fields = nil)
+      serialize_fields(fields)
+      save
     end
 
     def type_for_mime_type(mime_type)

data/lib/spontaneous/{plugins → model/core}/instance_code.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module InstanceCode
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     # InstanceMethods
 

data/lib/spontaneous/{plugins → model/core}/media.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Media
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     # InstanceMethods
 
@@ -26,15 +26,5 @@ module Spontaneous::Plugins
     def padded_revision
       Spontaneous::Site.working_revision.to_s.rjust(4, "0")
     end
-
-    # TODO: Is this still used? It shouldn't be
-    def make_media_file(src_file, filename = nil)
-      filename ||= File.basename(src_file)
-      filename = Spontaneous::Media.to_filename(filename)
-      media_filepath = media_filepath(filename)
-      FileUtils.mkdir_p(File.dirname(media_filepath))
-      FileUtils.cp(src_file, media_filepath)
-      media_filepath
-    end
   end
 end

data/lib/spontaneous/{plugins → model/core}/modifications.rb

@@ -1,7 +1,7 @@
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   # Modifications is responsible for tracking changes made to Content items
   module Modifications
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     class SlugModification
       def self.type
@@ -27,7 +27,7 @@ module Spontaneous::Plugins
 
       def dataset
         path_like = :ancestor_path.like("#{owner[:ancestor_path]}.#{owner.id}%")
-        Spontaneous::Content.filter(path_like)
+        owner.content_model.filter(path_like)
       end
 
       def count
@@ -70,14 +70,14 @@ module Spontaneous::Plugins
 
       def apply(revision)
         owner.with_revision(revision) do
-          published = Spontaneous::Content.first :id => owner.id
+          published = owner.content_model.get(owner.id)
           published.set_visible_with_cascade!(!new_value)
         end
       end
 
       def dataset
         path_like = :visibility_path.like("#{owner[:visibility_path]}.#{owner.id}%")
-        Spontaneous::Page.filter(path_like)
+        owner.content_model::Page.filter(path_like)
       end
     end
 
@@ -116,6 +116,7 @@ module Spontaneous::Plugins
       # This is to correctly map changes to a list of pages to publish. In the case of a page
       # addition the change is owned by the new page.
       self.modified_at = Time.now unless @__ignore_page_modification or changed_columns.empty?
+      @__ignore_page_modification = false
       # marks this object as the modified object appending modifications to the list
       # needed in order to know if changes to the modification list will be saved automatically
       # or if we need an explicit call to #save
@@ -150,7 +151,7 @@ module Spontaneous::Plugins
 
     def create_deletion_modifications
       if @child_page_deletion_count && @child_page_deletion_count > 0
-        count = S::Page.count
+        count = content_model::Page.count
         append_modification DeletionModification.new(self, current_editor, Time.now, count + @child_page_deletion_count, count)
       end
     end

data/lib/spontaneous/model/core/page_search.rb

@@ -0,0 +1,36 @@
+# encoding: UTF-8
+
+module Spontaneous::Model::Core
+  module PageSearch
+    extend Spontaneous::Concern
+
+    module ClassMethods
+      # An uncached test for the existance of a site home/root page.
+      def has_root?
+        content_model.filter(:path => Spontaneous::SLASH).count > 0
+      end
+
+      def root
+        path(Spontaneous::SLASH)
+      end
+
+      def uid(uid)
+        first_visible("uid:#{uid}", :uid => uid)
+      end
+
+      def path(path)
+        first_visible("path:#{path}", :path => path)
+      end
+
+      def first_visible(cache_key, params)
+        mapper.with_cache(cache_key) {
+          page = content_model.first(params)
+          # don't want to return nil if a page matching the params exists but is hidden
+          # if we return blank we force searches via other routes (such as aliased pages)
+          return false if page and mapper.visible_only? and page.hidden?
+          page
+        }
+      end
+    end # ClassMethods
+  end
+end

data/lib/spontaneous/{plugins → model/core}/permissions.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Permissions
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     module ClassMethods
       def box_readable?(user, box_name)
@@ -21,7 +21,7 @@ module Spontaneous::Plugins
       end
 
       def field_permission(user, field_name, test)
-        return true unless user# = Spontaneous::Permissions.active_user
+        return true unless user
         if field = field_prototypes[field_name.to_sym]
           user.level >= field.__send__(test)
         else
@@ -30,7 +30,7 @@ module Spontaneous::Plugins
       end
 
       def box_permission(user, box_name, test)
-        return true unless user# = Spontaneous::Permissions.active_user
+        return true unless user
         if box = boxes[box_name.to_sym]
           user.level >= box.__send__(test)
         else

data/lib/spontaneous/{plugins → model/core}/prototypes.rb

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
+module Spontaneous::Model::Core
   module Prototypes
-    extend ActiveSupport::Concern
+    extend Spontaneous::Concern
 
     DEFAULT_PROTOTYPE_NAME = :__default_prototype unless defined?(DEFAULT_PROTOTYPE_NAME)
 
@@ -47,7 +47,7 @@ module Spontaneous::Plugins
       end
 
       def prototype_method_name(name)
-        return Spontaneous::Plugins::Prototypes::DEFAULT_PROTOTYPE_NAME if name.blank?
+        return Spontaneous::Model::Core::Prototypes::DEFAULT_PROTOTYPE_NAME if name.blank?
         "_apply_prototype_#{name}"
       end
     end # ClassMethods
@@ -60,7 +60,7 @@ module Spontaneous::Plugins
     end
 
     # Add in an empty default prototype method for subclasses to override
-    define_method(Spontaneous::Plugins::Prototypes::DEFAULT_PROTOTYPE_NAME) { |instance| }
+    define_method(Spontaneous::Model::Core::Prototypes::DEFAULT_PROTOTYPE_NAME) { |instance| }
 
     protected