spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/lib/spontaneous/paths.rb

@@ -25,6 +25,5 @@ module Spontaneous
         end
       end.compact
     end
-
   end # Paths
 end # Spontaneous

data/lib/spontaneous/permissions.rb

@@ -22,34 +22,16 @@ module Spontaneous
         UserLevel.root
       end
 
-      def has_level?(level)
-        return true unless active_user
-        active_user.level >= level
+      def has_level?(user, level)
+        return true unless user
+        user.level >= level
       end
 
-      def with_user(user)
-        self.active_user = user
-        yield if block_given?
-      ensure
-        self.active_user = nil
-      end
-
-      def active_user
-        Thread.current[:_permissions_active_user]
-      end
-
-      def active_user=(user)
-        Thread.current[:_permissions_active_user] = user
-      end
-
-      protected(:active_user=)
-
       def random_string(length)
         bytes = ((length * Math.log10(58))/(8 * Math.log10(2))).ceil + 2
         string = Base58.encode(OpenSSL::Random.random_bytes(bytes).unpack("h*").first.to_i(16))
         string[0...(length)]
       end
-
     end
   end
 end

data/lib/spontaneous/permissions/user.rb

@@ -45,6 +45,10 @@ module Spontaneous::Permissions
 
     def logged_in!
       self.last_login_at = Time.now
+      generate_access_key
+    end
+
+    def generate_access_key
       key = AccessKey.new
       self.add_access_key(key)
       self.save
@@ -106,7 +110,7 @@ module Spontaneous::Permissions
       }
     end
 
-    def serialise_http
+    def serialise_http(user)
       Spontaneous.serialise_http(export)
     end
 

data/lib/spontaneous/permissions/user_level.rb

@@ -1,6 +1,5 @@
 # encoding: UTF-8
 
-require 'hwia'
 require 'yaml'
 
 module Spontaneous::Permissions
@@ -107,7 +106,7 @@ module Spontaneous::Permissions
       end
 
       def get(level)
-        store[level]
+        store[level.to_sym]
       end
 
       def all(base_level = nil)
@@ -125,12 +124,12 @@ module Spontaneous::Permissions
       end
 
       def level_file
-        @level_file ||= 'config/user_levels.yml'
+        Spontaneous.root / 'config/user_levels.yml'
       end
 
-      def level_file=(file)
-        @level_file = file
-      end
+      # def level_file=(file)
+      #   @level_file = file
+      # end
 
       def reset!
         @initialised = false
@@ -158,7 +157,7 @@ module Spontaneous::Permissions
 
       def store
         if !@store
-          @store = StrHash.new
+          @store = Hash.new
           init!
         end
         @store

data/lib/spontaneous/piece.rb

@@ -3,18 +3,24 @@
 
 module Spontaneous
   class Piece < Content
-    plugin Plugins::Supertype
+    include Plugins::Supertype
+
+    # Public: for Pieces #parent is the same as the #owner
+    # whereas for pages, parent is the next page up in the
+    # page hierarchy.
+    #
+    # Returns: Content node one up in the page hierarchy
+    alias_method :parent,     :owner
 
     set_inheritance_root
 
-    def export
-      super.merge(export_styles)
+    def export(user = nil)
+      super(user).merge(export_styles)
     end
 
+
     def export_styles
-      h = {
-        :style => style_sid.to_s,
-      }
+      h = { :style => style_sid.to_s }
       if container
         h.merge!({
           :styles => container.available_styles(self).map { |s| s.schema_id.to_s }
@@ -25,6 +31,5 @@ module Spontaneous
         })
       end
     end
-
   end
 end

data/lib/spontaneous/plugins/aliases.rb

@@ -3,53 +3,76 @@
 
 module Spontaneous::Plugins
   module Aliases
+    extend ActiveSupport::Concern
 
-    def self.configure(base)
-      base.many_to_one :target, :class => base, :reciprocal => :aliases
-      base.one_to_many :aliases, :class => base, :key => :target_id, :reciprocal => :target
-      base.add_association_dependencies :aliases => :destroy
+    included do
+      many_to_one :target, :class => self, :reciprocal => :aliases
+      one_to_many :aliases, :class => self, :key => :target_id, :reciprocal => :target
+      add_association_dependencies :aliases => :destroy
     end
+    # def self.configure(base)
+    # end
 
     module ClassMethods
-      def alias_of(*class_list)
+      def alias_of(*args)
+        options_list, class_list = args.partition { |e| e.is_a?(Hash) }
+        @alias_options = options_list.first || {}
         @alias_classes = class_list
         extend  ClassAliasMethods
         include AliasMethods
+        include PieceAliasMethods unless page?
         include PageAliasMethods if page?
       end
 
       alias_method :aliases, :alias_of
 
-      def targets
+      def targets(owner = nil, box = nil)
         targets = []
-        target_classes.each do |target_class|
-          targets += target_class.sti_subclasses_array
+        classes = []
+        proc_args = [owner, box].compact
+        @alias_classes.each do |source|
+          case source
+          when Proc
+            targets.concat(source[*proc_args])
+          else
+            classes.concat(source.to_s.constantize.sti_subclasses_array)
+          end
+        end
+        query = S::Content.filter(sti_key => classes.map { |c| c.to_s })
+        if container_procs = @alias_options[:container]
+          containers = [container_procs].flatten.map { |p| p[*proc_args] }.flatten
+          params = []
+          containers.each do |container|
+            if container.is_page?
+              params << Sequel::SQL::BooleanExpression.new(:'=', :page_id, container.id)
+            else
+              box_params = [
+                [:box_sid, container.id],
+                [:owner_id, container.owner.id]
+              ]
+              params << Sequel::SQL::BooleanExpression.from_value_pairs(box_params, :AND)
+            end
+          end
+          container_query = params[1..-1].inject(params.first) { |q, expr| q = q | expr; q }
+          query = query.and(container_query)
+        end
+        targets.concat(query.all)
+        if filter = @alias_options[:filter] and filter.is_a?(Proc)
+          targets.select(&filter)
+        else
+          targets
         end
-        S::Content.filter(sti_key => targets.map { |t| t.to_s }).all
       end
 
-      def target_classes
-        @target_classes ||= @alias_classes.map { |c| c.to_s.constantize }
+      def target_class(class_definition)
+
       end
 
       def alias?
         false
       end
-    end
-
-    module InstanceMethods
-      def alias_title
-        fields[:title].to_s
-      end
+    end # ClassMethods
 
-      def alias_icon_field
-        if field = fields.detect { |f| f.image? }
-          field
-        else
-          nil
-        end
-      end
-    end
 
     module ClassAliasMethods
       def alias?
@@ -96,18 +119,21 @@ module Spontaneous::Plugins
         @styles ||= Spontaneous::Collections::PrototypeSet.new(target, :styles)
       end
 
-      def export
-        super.merge(:target => target.shallow_export, :alias_title => target.alias_title, :alias_icon => target.alias_icon_field.export)
+      def export(user = nil)
+        super.merge(:target => target.shallow_export(user), :alias_title => target.alias_title, :alias_icon => target.exported_alias_icon)
       end
+
     end
 
-    module PageAliasMethods
+    module PieceAliasMethods
       def path
-        @_path ||= [parent.path, target.slug].join(S::SLASH)
+        target.path
       end
+    end
 
-      def calculate_path
-        ""
+    module PageAliasMethods
+      def slug
+        target.slug
       end
 
       def layout
@@ -124,5 +150,24 @@ module Spontaneous::Plugins
         super or target.find_named_layout(layout_name)
       end
     end
+
+    # InstanceMethods
+
+    def alias_title
+      fields[:title].to_s
+    end
+
+    def alias_icon_field
+      if field = fields.detect { |f| f.image? }
+        field
+      else
+        nil
+      end
+    end
+
+    def exported_alias_icon
+      return nil unless alias_icon_field
+      alias_icon_field.export
+    end
   end
 end

data/lib/spontaneous/plugins/allowed_types.rb

@@ -1,16 +1,15 @@
 # encoding: UTF-8
 
-
 module Spontaneous::Plugins
   module AllowedTypes
+    extend ActiveSupport::Concern
+
     class AllowedType
       attr_accessor :allow_subclasses
 
       def initialize(type, options={})
         @type = type
         @options = options
-        # check_instance_class
-        # check_styles
       end
 
       def check_instance_class
@@ -81,8 +80,8 @@ module Spontaneous::Plugins
         Spontaneous::Permissions[level]
       end
 
-      def readable?
-        Spontaneous::Permissions.has_level?(user_level)
+      def readable?(user)
+        Spontaneous::Permissions.has_level?(user, user_level)
       end
       alias_method :addable?, :readable?
     end
@@ -122,52 +121,52 @@ module Spontaneous::Plugins
       def allowed
         (supertype ? supertype.allowed : []).concat(allowed_types_config)
       end
+
       def allowed_types
         types = []
         allowed.each { |a| types.concat(a.instance_classes) }
         types
       end
-    end
+    end # ClassMethods
 
-    module InstanceMethods
-      def allowed
-        self.class.allowed
-      end
+    # InstanceMethods
 
-      def allowed_types
-        self.class.allowed_types
-      end
+    def allowed
+      self.class.allowed
+    end
 
-      def allowed_type(content)
-        klass = content.is_a?(Class) ? content : content.class
-        self.class.allowed.find { |a| a.includes?(klass) }
-      end
+    def allowed_types
+      self.class.allowed_types
+    end
 
-      def prototype_for_content(content, box = nil)
-        if allowed = allowed_type(content)
-          allowed.prototype
-        else
-          nil
-        end
+    def allowed_type(content)
+      klass = content.is_a?(Class) ? content : content.class
+      self.class.allowed.find { |a| a.includes?(klass) }
+    end
+
+    def prototype_for_content(content, box = nil)
+      if allowed = allowed_type(content)
+        allowed.prototype
+      else
+        nil
       end
+    end
 
-      # TODO: BOXES remove box reference here
-      def style_for_content(content, box = nil)
-        if allowed = allowed_type(content)
-          allowed.default_style
-        else
-          content.default_style
-        end
+    # TODO: BOXES remove box reference here
+    def style_for_content(content, box = nil)
+      if allowed = allowed_type(content)
+        allowed.default_style
+      else
+        content.default_style
       end
+    end
 
-      def available_styles(content)
-        if allowed = allowed_type(content)
-          allowed.styles
-        else
-          super
-        end
+    def available_styles(content)
+      if allowed = allowed_type(content)
+        allowed.styles
+      else
+        content.class.styles
       end
     end
   end
 end
-

data/lib/spontaneous/plugins/application/facets.rb

@@ -1,25 +1,22 @@
 # encoding: UTF-8
 
-
 module Spontaneous::Plugins::Application
   module Facets
+    extend ActiveSupport::Concern
+
     module ClassMethods
       def instance
-        @instance ||= nil
+        Spontaneous::Site.instance
       end
 
-      def instance=(instance)
-        # unless @instance
-        @instance = instance
-          # facets << instance
-        # end
+      def facets
+        instance.facets
       end
 
-      def facets
-        Spontaneous::Site.instance.facets
+      def schema
+        instance.schema
       end
 
     end
   end
 end
-