spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/lib/spontaneous/collections/box_set.rb

@@ -33,6 +33,10 @@ module Spontaneous::Collections
       self.map { |item| item.export }
     end
 
+    def group(group_name)
+      self.select { |box| box._prototype.group == group_name }
+    end
+
     protected
 
     def get_single(index)
@@ -51,6 +55,20 @@ module Spontaneous::Collections
         define_method(getter_name) { |*args| box.tap { |b| b.template_params = args } }
       end
     end
+
+    def box_groups
+      owner.class.box_prototypes.map { |prototype| prototype.group }.compact
+    end
+
+
+    def method_missing(method, *args)
+      # allow access by group name e.g. instance.boxes.group_name
+      if box_groups.include?(method)
+        group(method)
+        # self.select { |box| box._prototype.group == method }
+      else
+        super
+      end
+    end
   end
 end
-

data/lib/spontaneous/collections/entry_set.rb

@@ -2,39 +2,61 @@
 
 
 module Spontaneous::Collections
-  class EntrySet < Array
-    alias_method :array_insert, :insert
-    alias_method :array_push,   :push
-    alias_method :array_delete, :delete
+  class EntrySet
+    include Enumerable
 
-    attr_reader :owner
+    attr_reader  :owner, :store, :length
 
-    def initialize(owner, piece_store)
+    def initialize(owner, piece_store = [])
       @owner = owner
+      @store = Hash.new { |hash, key| hash[key] = [] }
       (piece_store || []).each do |data|
         id = data[0]
         entry = \
           if data.length == 2
             page = @owner._pieces.detect { |piece| piece.id == id }
-            Spontaneous::PagePiece.new(@owner, page, data[1])
+            if page
+              Spontaneous::PagePiece.new(@owner, page, data[1])
+            else
+              nil
+            end
           else
             @owner._pieces.detect { |piece| piece.id == id }
           end
         # if the piece/page has been deleted or is invisible
         # then we just want to silently skip it
-        array_push(entry) if entry
+        if entry
+          box_id =  entry.box_sid.to_s
+          @store[box_id] << entry
+        end
       end
     end
 
+    def each(&block)
+      owner.boxes.each do |box|
+        store[box.schema_id.to_s].each(&block)
+      end
+    end
+
+    def last
+      owner.boxes.last.last
+    end
+
+    def length
+      store.values.inject(0) { |sum, e| sum += e.length }
+    end
+
+    alias_method :size, :length
+
     def for_box(box)
-      sid = box.schema_id
-      self.select { |e| e.box_sid == sid }
+      sid = box.schema_id.to_s
+      store[sid]
     end
 
-    def insert(index, piece)
-      # piece.piece_store = self
-      array_insert(index, piece)
-      owner.entry_modified!(piece)
+    def insert(index, box, entry)
+      box_id = box.schema_id.to_s
+      store[box_id].insert(index, entry)
+      owner.entry_modified!(entry)
     end
 
 
@@ -44,7 +66,9 @@ module Spontaneous::Collections
     end
 
     def destroy
-      self.dup.each { |e| e.destroy(false) }
+      store.each do |box_id, entries|
+        entries.dup.each { |e| e.destroy(false) }
+      end
     end
 
     def remove(piece)
@@ -52,8 +76,9 @@ module Spontaneous::Collections
     end
 
 
-    def delete(piece)
-      e = array_delete(piece)
+    def delete(entry)
+      box_id = entry.box_sid.to_s
+      e = store[box_id].delete(entry)
       owner.entry_modified!(nil)
     end
 
@@ -63,21 +88,44 @@ module Spontaneous::Collections
 
 
     def set_position(content, position)
-      piece = self.detect {|e| e.id == content.id }
-      self.array_delete(piece)
-      self.insert(position, piece)
+      entries = store[content.box_sid.to_s]
+      piece = entries.detect {|e| e.id == content.id }
+      entries.delete(piece)
+      entries.insert(position, piece)
       owner.entry_modified!(piece)
     end
 
     def export
-      map do | piece |
+      self.map do | piece |
         piece.export
       end
     end
 
+    def freeze
+      super
+      store.values.each { |entries| entries.freeze }
+      self
+    end
+
+    # Returns a frozen version of this set containing only entries that are visible
     def visible!
-      self.dup.reject { |e| e.nil? or e.hidden? }.freeze
+      set = EntrySet.new(owner)
+      store.each do |box_id, entries|
+        visible = entries.reject { |e|  e.nil? || e.hidden? }
+        set.concat(box_id, visible)
+      end
+      set.freeze
     end
 
+    def ==(set)
+      super or entries == set
+    end
+
+    protected
+
+    def concat(box_id, entries)
+      store[box_id].concat(entries)
+      self
+    end
   end
 end

data/lib/spontaneous/collections/field_set.rb

@@ -14,7 +14,7 @@ module Spontaneous::Collections
     def initialize_from_prototypes(initial_values)
       values = (initial_values || []).map do |value|
         value = S::FieldTypes.deserialize_field(value)
-        [Spontaneous::Schema::UID[value[:id]], value]
+        [Spontaneous.schema.uids[value[:id]], value]
       end
       values = Hash[values]
       owner.field_prototypes.each do |field_prototype|
@@ -27,9 +27,9 @@ module Spontaneous::Collections
       self.map { |field| field.serialize_db }
     end
 
-    def export
+    def export(user)
       owner.class.field_names.map do |name|
-        self[name].export
+        self[name].export(user)
       end
     end
 

data/lib/spontaneous/collections/prototype_set.rb

@@ -48,6 +48,30 @@ module Spontaneous::Collections
       named(order.last)
     end
 
+    def local_first
+      if (key = @order.first)
+        named(key)
+      else
+        superset? ? superset.local_first : nil
+      end
+    end
+
+    def hierarchy_detect(&block)
+      if (found = local_detect(&block))
+        found
+      else
+        superset? ? superset.hierarchy_detect(&block) : nil
+      end
+    end
+
+    def local_detect(&block)
+      local_values.detect(&block)
+    end
+
+    def local_values
+      @order.map { |name| named(name) }
+    end
+
     def sid(schema_id)
       values.detect { |e| e.schema_id == schema_id }
     end
@@ -108,6 +132,10 @@ module Spontaneous::Collections
       @store[name.to_sym] || (superset? ? superset.named(name) : nil)
     end
 
+    def index(entry)
+      order.index(entry.name)
+    end
+
     def superset?
       @has_superset
     end

data/lib/spontaneous/config.rb

@@ -4,17 +4,18 @@ module Spontaneous
   class Config
 
     class Loader
+      attr_reader :settings
 
       def self.read(settings, file, mode)
         self.new(settings, file, mode).load
       end
 
-      def initialize(settings, file, mode)
+      def initialize(settings, file = nil, mode = nil)
         @settings, @file, @mode = settings, file, mode
       end
 
       def load
-        instance_eval(File.read(@file))
+        instance_eval(File.read(@file)) if @file
         @settings
       end
 
@@ -33,11 +34,19 @@ module Spontaneous
         end
       end
 
-      def method_missing(parameter, *args)
+      def method_missing(parameter, *args, &block)
+        setting = args
         if args.length == 1
-          args = args[0]
+          setting = args[0]
+          if block_given?
+            key_name = setting
+            setting = @settings[parameter] || {}
+            values = setting[key_name] || {}
+            block.call(values)
+            setting.update({ key_name => values })
+          end
         end
-        @settings[parameter] = args
+        @settings[parameter] = setting
       end
     end
 

data/lib/spontaneous/content.rb

@@ -1,7 +1,5 @@
 # encoding: UTF-8
 
-
-require File.expand_path("../../sequel/plugins/yajl_serialization", __FILE__)
 require File.expand_path("../../sequel/plugins/content_table_inheritance", __FILE__)
 
 module Spontaneous
@@ -13,16 +11,17 @@ module Spontaneous
     alias_method :each_attribute, :each
 
     # need to load this first because it's used by the ContentTableInheritance plugin
-    plugin Plugins::SchemaId
+    include Plugins::SchemaId
 
     sequel_plugin :content_table_inheritance, :type_sid
-    sequel_plugin :yajl_serialization, :field_store, :entry_store, :box_store
+    sequel_plugin :serialization, :yajl, :field_store, :entry_store, :box_store
     sequel_plugin :instance_hooks
     sequel_plugin :skip_create_refresh
     sequel_plugin :timestamps, :create=>:created_at, :update=>:modified_at
     sequel_plugin :identity_map
     sequel_plugin :association_dependencies
     sequel_plugin :defaults_setter
+    sequel_plugin :scoped_table_name
 
     # overwrite the sequel version defined in IdentityMap to support
     # revisions
@@ -39,29 +38,28 @@ module Spontaneous
       page?
     end
 
-    many_to_one :container, :key => :container_id, :class => self, :reciprocal => :_pieces
-    one_to_many :_pieces,    :key => :container_id, :class => self, :reciprocal => :container
-    many_to_one :page, :class => Content, :key => :page_id, :reciprocal => :content
+    many_to_one :owner,   :key => :owner_id, :class => Content, :reciprocal => :_pieces
+    one_to_many :_pieces, :key => :owner_id, :class => Content, :reciprocal => :owner
+    many_to_one :page,    :key => :page_id,  :class => Content, :reciprocal => :content
 
-    extend Plugins
     include Enumerable
 
-    plugin Plugins::Entry
-    plugin Plugins::Boxes
-    plugin Plugins::Fields
-    plugin Plugins::Entries
-    plugin Plugins::Styles
-    plugin Plugins::SchemaTitle
-    plugin Plugins::Render
-    plugin Plugins::SchemaHierarchy
-    plugin Plugins::InstanceCode
-    plugin Plugins::Serialisation
-    plugin Plugins::Media
-    plugin Plugins::Publishing
-    plugin Plugins::Aliases
-    plugin Plugins::Visibility
-    plugin Plugins::Prototypes
-    plugin Plugins::Permissions
+    include Plugins::Entry
+    include Plugins::Boxes
+    include Plugins::Fields
+    include Plugins::Entries
+    include Plugins::Styles
+    include Plugins::SchemaTitle
+    include Plugins::Render
+    include Plugins::SchemaHierarchy
+    include Plugins::InstanceCode
+    include Plugins::Serialisation
+    include Plugins::Media
+    include Plugins::Publishing
+    include Plugins::Aliases
+    include Plugins::Visibility
+    include Plugins::Prototypes
+    include Plugins::Permissions
 
     # marker method enabling a simple test for "cms content" vs "everything else"
     def spontaneous_content?
@@ -78,6 +76,7 @@ module Spontaneous
     alias_method :is_page?, :page?
 
 
+
     # terminate the supertype chain here
     def self.supertype
       nil

data/lib/spontaneous/errors.rb

@@ -1,9 +1,22 @@
 # encoding: UTF-8
 
-require 'forwardable'
+require "forwardable"
+
 module Spontaneous
   class Error < StandardError; end
 
+  class UnknownTypeException < Error
+    def initialize(parent, type)
+      super("Unknown content type '#{type}' requested in class #{parent}")
+    end
+  end
+
+  class UnknownStyleException < Error
+    def initialize(style_name, klass)
+      super("Unknown style '#{style_name}' for class #{klass}")
+    end
+  end
+
   # raised when trying to show something that is not showable due to
   # ancestor being hidden
   class NotShowable < Error
@@ -24,12 +37,15 @@ module Spontaneous
       super("Format '#{unsupported_format}' has no matching mime type")
     end
   end
+
   class UnsupportedFormatException < Error
     def initialize(style, unsupported_format)
       super("'#{unsupported_format}' format not supported by style '#{style.name}'.\nTemplate path: #{style.directory}\n")
     end
   end
 
+  class InvalidPrototypeDefinitionError < Error; end
+
   class SchemaModificationError < Error
     extend Forwardable
 
@@ -40,9 +56,9 @@ module Spontaneous
     end
 
     def_delegators :@modification, :added_classes, :removed_classes
-    def_delegators :@modification, :added_fields, :removed_fields
-    def_delegators :@modification, :added_boxes, :removed_boxes
-    def_delegators :@modification, :added_styles, :removed_styles
+    def_delegators :@modification, :added_fields,  :removed_fields
+    def_delegators :@modification, :added_boxes,   :removed_boxes
+    def_delegators :@modification, :added_styles,  :removed_styles
     def_delegators :@modification, :added_layouts, :removed_layouts
   end
 end

data/lib/spontaneous/extensions/array.rb

@@ -3,8 +3,8 @@
 module Spontaneous
   module Extensions
     module Array
-      def render(format = :html)
-        self.map { |e| e.respond_to?(:render) ? e.render(format) : nil }.join
+      def render(*args)
+        self.map { |e| e.respond_to?(:render) ? e.render(*args) : e }.join
       end
     end
   end

data/lib/spontaneous/extensions/json.rb

@@ -7,7 +7,7 @@ module Spontaneous
       def to_json
         Spontaneous::JSON.encode(self)
       end
-      def serialise_http
+      def serialise_http(user)
         Spontaneous.serialise_http(self)
       end
     end