spontaneous 0.1.0.alpha1 → 0.2.0.alpha1

data/lib/spontaneous/logger.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 ## Adapted from Padrino::Logger
 #
 # Defines our SPOT_LOG_LEVEL
@@ -223,10 +225,14 @@ module Spontaneous
     #
     def push(message = nil, level = nil)
       unless @silent
-      self << @format_message % [colored_level(level), set_color(Time.now.strftime(@format_datetime), :yellow), message.to_s.strip]
+        message = format_backtrace(message) if message.class < Error
+        self << @format_message % [colored_level(level), set_color(Time.now.strftime(@format_datetime), :yellow), message.to_s.strip]
       end
     end
 
+    def format_backtrace(error)
+      [error.message].concat(error.backtrace).join("\n")
+    end
     ##
     # Directly append message to the log.
     #
@@ -366,4 +372,3 @@ module Kernel #:nodoc:
     Spontaneous.logger
   end
 end # Kernel
-

data/lib/spontaneous/media.rb

@@ -1,84 +1,89 @@
+# encoding: UTF-8
+
 require 'digest/sha1'
 
 module Spontaneous
-  class Media
-    class << self
+  module Media
 
-      include Spontaneous::Constants
+    autoload :File, "spontaneous/media/file"
 
-      def media_path(*args)
-        File.join(Spontaneous.media_dir, *args)
-      end
+    include Spontaneous::Constants
 
-      @@upload_uid_lock  = Mutex.new
-      @@upload_uid_index = 0
+    extend self
 
-      def upload_index
-        @@upload_uid_lock.synchronize do
-          @@upload_uid_index = (@@upload_uid_index + 1) % 0xFFFFFF
-        end
-      end
+    def media_path(*args)
+      ::File.join(Spontaneous.media_dir, *args)
+    end
 
-      def upload_path(filename)
-        time = Time.now.to_i
-        dir = "#{time}.#{upload_index}"
-        Spontaneous.media_path("tmp", dir, filename)
-      end
+    @@upload_uid_lock  = Mutex.new
+    @@upload_uid_index = 0
 
-      def to_urlpath(filepath)
-        filepath.gsub(%r{^#{Spontaneous.media_dir}}, "/media")
+    def upload_index
+      @@upload_uid_lock.synchronize do
+        @@upload_uid_index = (@@upload_uid_index + 1) % 0xFFFFFF
       end
+    end
 
-      def to_filepath(urlpath)
-        parts = urlpath.split("/")
-        parts[1] = Spontaneous.media_dir
-        ::File.join(*parts)
-      end
+    def upload_path(filename)
+      time = Time.now.to_i
+      dir = "#{time}.#{upload_index}"
+      Spontaneous.media_path("tmp", dir, filename)
+    end
 
-      def to_filename(input)
-        parts = input.strip.split(/\./)
-        ext = parts.last
-        name = parts[0..-2].join(DOT)
-        name.gsub!(RE_QUOTES, EMPTY)
-        name.gsub!(/[^\.A-Za-z0-9_-]+/, DASH)
-        name.gsub!(RE_FLATTEN_REPEAT, DASH)
-        name.gsub!(RE_FLATTEN_TRAILING, EMPTY)
-        [name, ext].join(DOT)
-      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
+      ::File.join(*parts)
+    end
 
-      def sha1(filepath)
-        Digest::SHA1.file(filepath).hexdigest
-      end
+    def to_filename(input)
+      parts = input.strip.split(/\./)
+      ext = parts.last
+      name = parts[0..-2].join(DOT)
+      name.gsub!(RE_QUOTES, EMPTY)
+      name.gsub!(/[^\.A-Za-z0-9_-]+/, DASH)
+      name.gsub!(RE_FLATTEN_REPEAT, DASH)
+      name.gsub!(RE_FLATTEN_TRAILING, EMPTY)
+      [name, ext].join(DOT)
+    end
 
-      alias_method :digest, :sha1
 
-      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
+    def sha1(filepath)
+      Digest::SHA1.file(filepath).hexdigest
+    end
+
+    alias_method :digest, :sha1
 
-        shards.each do |shard|
-          File.open(shard, 'rb') do |part|
-            while data = part.read(131072)
-              combined.write(data)
-            end
+    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)
           end
         end
-        combined.close
+      end
+      combined.close
 
-        if block_given?
-          begin
-            yield(combined)
-          ensure
-            combined.close!
-          end
-        else
-          # caller's responsibility to close & delete tempfile
-          combined
+      if block_given?
+        begin
+          yield(combined)
+        ensure
+          combined.close!
         end
+      else
+        # caller's responsibility to close & delete tempfile
+        combined
       end
     end
+
   end
 end

data/lib/spontaneous/media/file.rb

@@ -0,0 +1,74 @@
+# encoding: UTF-8
+
+require 'fileutils'
+
+module Spontaneous::Media
+  class File
+    F = ::File
+
+    attr_reader :filename, :owner, :source
+
+    def initialize(owner, filename, mimetype = nil)
+      @owner, @filename, @mimetype = owner, Spontaneous::Media.to_filename(filename), mimetype
+    end
+
+    def rename(new_filename)
+      self.class.new(owner, new_filename, nil)
+    end
+
+    def open(mode = 'wb', &block)
+      storage.open(storage_path, mimetype, mode, &block)
+    end
+
+    def copy(existing_file)
+      @source = existing_file.respond_to?(:path) ? existing_file.path : existing_file
+      storage.copy(existing_file, storage_path, mimetype)
+    end
+
+    def url
+      storage.public_url(storage_path)
+    end
+
+    def mimetype
+      @mimetype ||= ::Rack::Mime.mime_type(ext)
+    end
+
+    def ext
+      F.extname(filename)
+    end
+
+    def storage
+      @storage ||= Spontaneous::Site.storage(mimetype)
+    end
+
+    def padded_id
+      owner.media_id.to_s.rjust(5, "0")
+    end
+
+    def padded_revision
+      Spontaneous::Site.working_revision.to_s.rjust(4, "0")
+    end
+
+    def media_dir
+      F.join(padded_id, padded_revision)
+    end
+
+    def storage_path
+      [padded_id, padded_revision, filename]
+    end
+
+    def relative_path
+      F.join(*storage_path)
+    end
+
+    def path
+      F.join(storage.root, relative_path)
+    end
+
+    def dirname
+      F.join(storage.root, media_dir)
+    end
+
+    alias_method :filepath, :path
+  end
+end

data/lib/spontaneous/page.rb

@@ -1,22 +1,20 @@
 # encoding: UTF-8
 
-
 module Spontaneous
   class Page < Content
-
-    plugin Plugins::Supertype
-    plugin Plugins::Page::Formats
-    plugin Plugins::Layouts
-    plugin Plugins::Paths
-    plugin Plugins::PageTree
-    plugin Plugins::SiteMap
-    plugin Plugins::PageSearch
-    plugin Plugins::Controllers
-    plugin Plugins::Page::Request
+    include Plugins::Supertype
+    include Plugins::Page::Formats
+    include Plugins::Layouts
+    include Plugins::Paths
+    include Plugins::PageTree
+    include Plugins::SiteMap
+    include Plugins::PageSearch
+    include Plugins::Controllers
+    include Plugins::Page::Request
 
     many_to_one :parent,   :class => Content, :reciprocal => :children
     one_to_many :children, :class => Content, :key => :parent_id, :reciprocal => :parent
-    one_to_many :content,   :class => Content, :key => :page_id, :reciprocal => :page
+    one_to_many :content,  :class => Content, :key => :page_id,   :reciprocal => :page
 
     # field :title, :string, :default => "New Page"
 
@@ -26,8 +24,8 @@ module Spontaneous
       true
     end
 
-    def self.export
-      super.merge(:title_field => self.title_field.to_s)
+    def self.export(user = nil)
+      super(user).merge(:title_field => self.title_field.to_s)
     end
 
     def self.title_field
@@ -40,6 +38,38 @@ module Spontaneous
 
     alias_method :is_page?, :page?
 
+    alias_method :unordered_children, :children
+
+    def children
+      @ordered_children ||= generate_ordered_children(super)
+    end
+
+    def generate_ordered_children(unordered_children)
+      return unordered_children if self.boxes.empty?
+      ordered_pages = unordered_children.sort { |a, b| a.page_order_string <=> b.page_order_string }
+      ordered_pages.freeze
+    end
+
+    def page_order_string
+      @page_order_string ||= (content_ancestors[1..-1].push(self)).map { |a| a.position.to_s.rjust(5, "0") }.join('.')
+    end
+
+    def content_ancestors
+      obj = self
+      ancestors = []
+      begin
+        obj = obj.container
+        ancestors.unshift obj
+      end until obj.nil? or obj.is_page?
+
+      ancestors
+    end
+
+    def reload
+      @ordered_children = @page_order_string = nil
+      super
+    end
+
     def before_save
       if parent
         self.depth = parent.depth+1
@@ -56,7 +86,7 @@ module Spontaneous
     end
 
     def resolve_entry
-      container.all_pieces.find { |e| e.id == self.id }
+      owner.all_pieces.find { |e| e.id == self.id }
     end
 
     def page=(page)
@@ -76,8 +106,8 @@ module Spontaneous
       self.class.title_field
     end
 
-    def shallow_export
-      hash = super.merge({
+    def shallow_export(user)
+      hash = super(user).merge({
         :path => path,
         :title => page_title,
         :slug => slug,
@@ -87,6 +117,5 @@ module Spontaneous
       hash.delete(:name)
       hash
     end
-
   end
 end

data/lib/spontaneous/page_piece.rb

@@ -1,16 +1,29 @@
 # encoding: UTF-8
 
+require 'delegate'
 
 module Spontaneous
-  class PagePiece < ProxyObject
-    extend Plugins
-    plugin Plugins::Render
+  class PagePiece < DelegateClass(Page)
+    include Plugins::Render
 
-    attr_accessor :container
-    attr_reader :target, :style_id
+    attr_accessor :owner
+    attr_reader   :style_id
 
-    def initialize(container, target, style_id)
-      @container, @target, @style_id = container, target, style_id
+    def initialize(owner, target, style_id)
+      super(target)
+      @owner, @style_id = owner, style_id
+    end
+
+    alias_method :target, :__getobj__
+    alias_method :parent, :owner
+
+    # Public: when accessed as inner content, pages return
+    # the page at the top of the inner content tree as their
+    # #page, rather than themselves
+    #
+    # Returns: the owning Page object
+    def page
+      owner.page
     end
 
     def id
@@ -18,7 +31,7 @@ module Spontaneous
     end
 
     def depth
-      container.content_depth + 1
+      owner.content_depth + 1
     end
 
     def style(format = :html)
@@ -29,17 +42,15 @@ module Spontaneous
       self
     end
 
-    def export
-      target.shallow_export.merge(export_styles).merge({
+    def export(user)
+      target.shallow_export(user).merge(export_styles).merge({
         :depth => self.depth
       })
     end
 
     def export_styles
-      {
-        :style => style_id.to_s,
-        :styles => container.available_styles(target).map { |s| s.schema_id.to_s },
-      }
+      { :style => style_id.to_s,
+        :styles => owner.available_styles(target).map { |s| s.schema_id.to_s } }
     end
 
     def serialize_db
@@ -49,12 +60,12 @@ module Spontaneous
     def style=(style)
       @style_id = style_to_schema_id(style)
       # because it's not obvious that a change to an entry
-      # will affect the fields of the container piece
-      # make sure that the container is saved using an instance hook
+      # will affect the fields of the owner piece
+      # make sure that the owner is saved using an instance hook
       target.after_save_hook do
-        container.save
+        owner.save
       end
-      container.entry_modified!(self)
+      owner.entry_modified!(self)
     end
 
     def style
@@ -64,14 +75,5 @@ module Spontaneous
     def template(format = :html)
       style.template(format)
     end
-
-    def method_missing(method, *args)
-      if block_given?
-        self.target.__send__(method, *args, &Proc.new)
-      else
-        self.target.__send__(method, *args)
-      end
-    end
   end
 end
-