spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/lib/spontaneous/plugins/site/selectors.rb

@@ -1,41 +1,46 @@
 # encoding: UTF-8
 
-module Spontaneous::Plugins
-  module Site
-    module Selectors
-      module ClassMethods
-        def root
-          Spontaneous::Page.root
-        end
+module Spontaneous::Plugins::Site
+  module Selectors
+    extend ActiveSupport::Concern
 
-        def [](path_or_uid)
-          case path_or_uid
-          when /^\//
-            by_path(path_or_uid)
-          when /^#/
-            by_uid(path_or_uid[1..-1])
-          else
-            by_uid(path_or_uid)
-          end
-        end
+    module ClassMethods
+      def root
+        Spontaneous::Page.root
+      end
 
-        def by_path(path)
-          Spontaneous::Page.path(path)
+      def [](path_or_uid)
+        case path_or_uid
+        when Fixnum, /\A\d+\z/o
+          by_id(path_or_uid)
+        when /^\//o
+          by_path(path_or_uid)
+        when /^#/o
+          by_uid(path_or_uid[1..-1])
+        else
+          by_uid(path_or_uid)
         end
+      end
 
-        def by_uid(uid)
-          Spontaneous::Page.uid(uid)
-        end
+      def by_id(id)
+        Spontaneous::Page[id]
+      end
 
-        def method_missing(method, *args)
-          if page = self[method.to_s]
-            page
-          else
-            super
-          end
-        end
+      def by_path(path)
+        Spontaneous::Page.path(path)
+      end
 
+      def by_uid(uid)
+        Spontaneous::Page.uid(uid)
+      end
+
+      def method_missing(method, *args)
+        if page = self[method.to_s]
+          page
+        else
+          super
+        end
       end
-    end
+    end # ClassMethods
   end
 end

data/lib/spontaneous/plugins/site/storage.rb

@@ -0,0 +1,63 @@
+# encoding: UTF-8
+
+
+# storage :s3 do |config|
+#   config[:provider] = "AWS",
+#   config[:aws_access_key_id] = "key",
+#   config[:aws_secret_access_key] = "secret",
+#   config[:region] = 'eu-west-1'
+#   config[:bucket] => "name_of_bucket"
+#   config[:accepts] => "image/*"
+# end
+
+# storage :another_local do |config|
+#   config.update({
+#     :provider => "Local"
+#   })
+# end
+
+module Spontaneous::Plugins::Site
+  module Storage
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def storage(mimetype = nil)
+        instance.storage(mimetype)
+      end
+
+      def local_storage
+        instance.local_storage
+      end
+    end # ClassMethods
+
+    def storage(mimetype = nil)
+      storage_for_mimetype(mimetype)
+    end
+
+    def storage_for_mimetype(mimetype)
+      storage_backends.detect { |storage| storage.accepts?(mimetype) }
+    end
+
+    def local_storage
+      storage_backends.select { |storage| storage.local? }
+    end
+
+    def storage_backends
+      @storage_backends ||= configure_storage
+    end
+
+    def configure_storage
+      storage_backends = []
+      storage_settings = config[:storage] || []
+      storage_settings.each do |name, config|
+        backend = Spontaneous::Storage.create(config)
+        storage_backends << backend
+      end
+      storage_backends << default_storage
+    end
+
+    def default_storage
+      @default_storage ||= Spontaneous::Storage::Local.new(Spontaneous.media_dir, '/media', accepts=nil)
+    end
+  end
+end

data/lib/spontaneous/plugins/site_map.rb

@@ -1,34 +1,32 @@
 # encoding: UTF-8
 
-
 module Spontaneous::Plugins
   module SiteMap
-    module ClassMethods
-    end
+    extend ActiveSupport::Concern
 
-    module InstanceMethods
-      def map_children
-        self.children.map { |c| c.map_entry }
-      end
+    # InstanceMethods
+    def map_children
+      self.children.map { |c| c.map_entry }
+    end
 
-      def map_entry
-        shallow_map_entry.merge({
-          :children => self.children.map {|c| c.shallow_map_entry },
-          :generation => self.generation.map {|c| c.shallow_map_entry },
-          :ancestors => self.ancestors.map {|c| c.shallow_map_entry },
-        })
-      end
-      def shallow_map_entry
-        {
-          :id => id,
-          :title => fields.title.value,
-          :path => path,
-          :type => self.class.ui_class,
-          :type_id => self.class.schema_id,
-          :children => self.children.length,
-          :depth => depth
-        }
-      end
+    def map_entry
+      shallow_map_entry.merge({
+        :children => self.children.map {|c| c.shallow_map_entry },
+        :generation => self.generation.map {|c| c.shallow_map_entry },
+        :ancestors => self.ancestors.map {|c| c.shallow_map_entry },
+      })
+    end
+    def shallow_map_entry
+      {
+        :id => id,
+        :title => fields.title.value,
+        :path => path,
+        :slug => slug,
+        :type => self.class.ui_class,
+        :type_id => self.class.schema_id,
+        :children => self.children.length,
+        :depth => depth
+      }
     end
   end
 end

data/lib/spontaneous/plugins/styles.rb

@@ -2,9 +2,7 @@
 
 module Spontaneous::Plugins
   module Styles
-
-    def self.configure(base)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       def style(name, options={})
@@ -38,7 +36,6 @@ module Spontaneous::Plugins
         Spontaneous::Style
       end
 
-
       def find_style(style_sid)
         if prototype = style_prototypes.sid(style_sid)
           prototype.style(self)
@@ -64,56 +61,51 @@ module Spontaneous::Plugins
       end
     end # ClassMethods
 
-    module InstanceMethods
+    # InstanceMethods
 
-      def style=(style)
-        self.style_sid = style_to_schema_id(style)
-      end
+    def style=(style)
+      self.style_sid = style_to_schema_id(style)
+    end
 
-      # converts a symbol or string into a Schema::UID instance
-      def style_to_schema_id(style)
-        return nil if style.nil?
-        sid = nil
-        if style.respond_to?(:schema_id)
-          sid = style.schema_id
+    # converts a symbol or string into a Schema::UID instance
+    def style_to_schema_id(style)
+      return nil if style.nil?
+      sid = nil
+      if style.respond_to?(:schema_id)
+        sid = style.schema_id
+      else
+        if Spontaneous::Schema::UID === style
+          sid = style
         else
-          if Spontaneous::Schema::UID === style
-            sid = style
-          else
-            if s = self.find_named_style(style)
-              sid = s.schema_id
-            end
+          if s = self.find_named_style(style)
+            sid = s.schema_id
           end
         end
       end
+    end
 
-      def find_named_style(style_name)
-        self.class.find_named_style(style_name)
-      end
-
-      def style
-        resolve_style(self.style_sid)
-      end
-
-      def default_style
-        self.class.default_style
-      end
-
-      def resolve_style(style_sid)
-        self.class.resolve_style(style_sid)
-      end
+    def find_named_style(style_name)
+      self.class.find_named_style(style_name)
+    end
 
-      def styles
-        self.class.styles
-      end
+    def style
+      resolve_style(self.style_sid)
+    end
 
-      def template(format = :html)
-        style.template(format)
-      end
+    def default_style
+      self.class.default_style
+    end
 
+    def resolve_style(style_sid)
+      self.class.resolve_style(style_sid)
+    end
 
-    end # InstanceMethods
+    def styles
+      self.class.styles
+    end
 
+    def template(format = :html)
+      style.template(format)
+    end
   end
 end
-

data/lib/spontaneous/plugins/supertype.rb

@@ -2,10 +2,12 @@
 
 module Spontaneous::Plugins
   module Supertype
+    extend ActiveSupport::Concern
+
     module ClassMethods
       def supertype
         superclass
       end
-    end
+    end # ClassMethods
   end
 end

data/lib/spontaneous/plugins/visibility.rb

@@ -1,12 +1,8 @@
 # encoding: UTF-8
 
-
 module Spontaneous::Plugins
   module Visibility
-    S = Spontaneous unless defined?(S)
-
-    def self.configure(base)
-    end
+    extend ActiveSupport::Concern
 
     module ClassMethods
       @@visible_filter = false
@@ -26,7 +22,7 @@ module Spontaneous::Plugins
       end
 
       def _content_classes
-        [Spontaneous::Content, Spontaneous::Page, Spontaneous::Piece] + Spontaneous::Schema.content_classes
+        [Spontaneous::Content, Spontaneous::Page, Spontaneous::Piece] + Spontaneous.schema.content_classes
       end
 
       def _unfiltered_dataset
@@ -38,12 +34,12 @@ module Spontaneous::Plugins
           yield
         else
           begin
-            _content_classes.each { |content_class| content_class._set_visible_dataset! }
+            Spontaneous::Content._set_visible_dataset!
             @@visible_filter = true
             yield
           ensure
             @@visible_filter = false
-            _content_classes.each { |content_class| content_class._restore_dataset! }
+            Spontaneous::Content._restore_dataset!
           end
         end
       end
@@ -51,101 +47,112 @@ module Spontaneous::Plugins
       def visible_only?
         @@visible_filter
       end
-    end # ClassMethods
 
-    module InstanceMethods
-      def visible?
-        !self.hidden
+      def visible
+        self.dataset.filter(:hidden => false)
       end
+    end # ClassMethods
 
-      def hidden?
-        self.hidden
-      end
+    # InstanceMethods
 
-      def hide!
-        set_visible!(false)
-      end
+    def visible?
+      !self.hidden
+    end
 
-      def show!
-        set_visible!(true)
-      end
+    def hidden?
+      self.hidden
+    end
 
-      def toggle_visibility!
-        if hidden?
-          show!
-        else
-          hide!
-        end
-      end
+    def hide!
+      set_visible!(false)
+    end
 
-      ##
-      # Is true when the current object is hidden independently of its ancestors
-      # and false when hidden because one of its ancestors is hidden (so to show
-      # this you need to show that ancestor)
-      def showable?
-        hidden? && hidden_origin.blank?
-      end
+    def show!
+      set_visible!(true)
+    end
 
-      def visible=(visible)
-        protect_root_visibility!
-        set_visible(visible)
+    def toggle_visibility!
+      if hidden?
+        show!
+      else
+        hide!
       end
+    end
+
+    ##
+    # Is true when the current object is hidden independently of its ancestors
+    # and false when hidden because one of its ancestors is hidden (so to show
+    # this you need to show that ancestor)
+    def showable?
+      hidden? && hidden_origin.blank?
+    end
 
+    def visible=(visible)
+      protect_root_visibility!
+      set_visible(visible)
+    end
 
-      protected
 
-      def set_visible!(state)
-        self.set_visible(state)
-        self.save
-        self
-      end
+    protected
 
-      def set_visible(visible)
-        protect_root_visibility!
-        if self.visible? != visible
-          raise Spontaneous::NotShowable.new(self, hidden_origin) if hidden? && visible && !showable?
-          self[:hidden] = !visible
-          self[:hidden_origin] = nil
-          @_visibility_modified = true
-        end
+    def set_visible!(state)
+      self.set_visible(state)
+      self.save
+      self
+    end
+
+    def set_visible(visible)
+      protect_root_visibility!
+      if self.visible? != visible
+        raise Spontaneous::NotShowable.new(self, hidden_origin) if hidden? && visible && !showable?
+        self[:hidden] = !visible
+        self[:hidden_origin] = nil
+        @_visibility_modified = true
       end
+    end
 
-      def after_save
-        super
-        if @_visibility_modified
-          hide_descendents(self.visible?)
-          @_visibility_modified = false
-        end
+    def after_save
+      super
+      if @_visibility_modified
+        hide_descendents(self.visible?)
+        hide_aliases(self.visible?)
+        @_visibility_modified = false
       end
+    end
 
-      def hide_descendents(visible)
-        path_like = :content_path.like("#{self[:content_path]}.#{self.id}%")
-        origin = visible ? nil : self.id
-        dataset = Spontaneous::Content.filter(path_like).filter(:hidden => visible)
-        # if a child item has been made invisible *before* its parent then it exists
-        # with hidden = true and hidden_origin = nil
-        if visible
-          dataset = dataset.filter(:hidden_origin => self.id)
-        end
-        dataset.update(:hidden => !visible, :hidden_origin => origin)
-
-        ## I'm saving these for posterity: I worked out some Sequel magic and I don't want to lose it
-        #
-        # Spontaneous::Content.from(:content___p).filter(path_like).update(:visible => visible, :hidden_origin => origin)
-        # Spontaneous::Content.filter(:page_id => self.id).set(:visible => visible, :hidden_origin => origin)
-        ## Update with join:
-        # Spontaneous::Content.from(:content___n, :content___p).filter(path_like).filter(:n__page_id => :p__id).set(:n__visible => visible, :n__hidden_origin => origin)
+    def hide_aliases(visible)
+      dataset = Spontaneous::Content.filter(:target_id => self.id)
+      origin = visible ? nil : self.id
+      dataset.update(:hidden => !visible, :hidden_origin => origin)
+    end
+
+    def hide_descendents(visible)
+      path_like = :visibility_path.like("#{self[:visibility_path]}.#{self.id}%")
+      origin = visible ? nil : self.id
+      dataset = Spontaneous::Content.filter(path_like).filter(:hidden => visible)
+      # if a child item has been made invisible *before* its parent then it exists
+      # with hidden = true and hidden_origin = nil
+      if visible
+        dataset = dataset.filter(:hidden_origin => self.id)
       end
+      dataset.update(:hidden => !visible, :hidden_origin => origin)
 
-      def protect_root_visibility!
-        if self.is_page? && self.is_root?
-          raise "Root page is not hidable"
-        end
+      dataset.each do |content|
+        content.aliases.update(:hidden => !visible, :hidden_origin => origin)
       end
-    end # InstanceMethods
 
+      ## I'm saving these for posterity: I worked out some Sequel magic and I don't want to lose it
+      #
+      # Spontaneous::Content.from(:content___p).filter(path_like).update(:visible => visible, :hidden_origin => origin)
+      # Spontaneous::Content.filter(:page_id => self.id).set(:visible => visible, :hidden_origin => origin)
+      ## Update with join:
+      # Spontaneous::Content.from(:content___n, :content___p).filter(path_like).filter(:n__page_id => :p__id).set(:n__visible => visible, :n__hidden_origin => origin)
+    end
+
+    def protect_root_visibility!
+      if self.is_page? && self.is_root?
+        raise "Root page is not hidable"
+      end
+    end
   end
 end
-
-
-