spontaneous 0.2.0.beta1 → 0.2.0.beta2

data/lib/spontaneous/search/index.rb

@@ -90,8 +90,6 @@ module Spontaneous::Search
 
     def each_indexable(page)
       indexable = [page]
-      # not sure that I need the include? test here as page.content only returns Pieces
-      # and I'm not sure that there is a particular need to exclude Pieces from indexes
       indexable.concat(page.pieces.select { |content| include?(content) })
       indexable += page.boxes.select { |box| include?(box) }
       indexable.each do |content|
@@ -182,11 +180,11 @@ module Spontaneous::Search
       case selector
       when Fixnum, /\A\d+\z/
         page.id == selector.to_i
-      when /\A#(.+)\z/
+      when /\A\$?([a-zA-Z].*)\z/
         page.uid == $1
-      when /\A\//
+      when /\A[\/#]/
         page.path == selector
-      when /\A(>=|>)\s+(.+)\z/
+      when /\A(>=?)\s+(.+)\z/
         rule, root = $1, S::Site[$2]
         root.send(rule, page)
       else

data/lib/spontaneous/server.rb

@@ -55,7 +55,7 @@ module Spontaneous
       Handlers.each do |handler_name|
         begin
           return ::Rack::Handler.get(handler_name.downcase)
-        rescue Exception => e
+        rescue => e
           puts e
           puts e.backtrace
         end

data/lib/spontaneous/simultaneous.rb

@@ -25,7 +25,7 @@ module Spontaneous
 
       def fire(task_name, params = {})
         ::Simultaneous.fire(task_name, params)
-      rescue Exception => e
+      rescue => e
         raise Error, e
       end
 

data/lib/spontaneous/site/features.rb

@@ -15,14 +15,13 @@ class Spontaneous::Site
     end
 
     def register_back_controller(namespace, controller_class)
-      Spontaneous::Rack.make_back_controller(controller_class)
-      controller_class.requires_authentication!
-      back_controllers << [namespace_url(namespace), controller_class]
+      app = Spontaneous::Rack.make_back_controller(controller_class)
+      back_controllers << [namespace_url(namespace), app]
     end
 
     def register_front_controller(namespace, controller_class)
-      Spontaneous::Rack.make_front_controller(controller_class)
-      front_controllers << [namespace_url(namespace), controller_class]
+      app = Spontaneous::Rack.make_front_controller(controller_class)
+      front_controllers << [namespace_url(namespace), app]
     end
 
     def namespace_url(namespace)

data/lib/spontaneous/site/helpers.rb

@@ -7,10 +7,15 @@ class Spontaneous::Site
     module ClassMethods
       def helper(*formats, &block)
         helper_module = Module.new(&block)
-        register_helper(helper_module, *formats.flatten)
+        register_helper(helper_module, helper_module_name(caller), *formats.flatten)
         helper_module
       end
 
+      def helper_module_name(_caller)
+        path = _caller.first.split(':').first.split('/')[-5..-1]
+        path.join('_').gsub(/[^A-Za-z_]/, '_').gsub(/_+/, '_').gsub(/^_+/, '').capitalize
+      end
+
       # Private: Generates a module including all helper methods for the requested format(s)
       def context(*formats)
         formats = [:*].concat formats.flatten.map { |f| f.to_sym }
@@ -28,15 +33,27 @@ class Spontaneous::Site
         helper_module
       end
 
-      def register_helper(helper_module, *formats)
-        site = instance
+      def register_helper(helper_module, module_name, *formats)
+        site    = instance
+        helpers = site.registered_helpers
         if formats.empty?
-          site.registered_helpers[:*] << helper_module
+           helpers[:*] << helper_module
         else
           formats.each do |format|
-            site.registered_helpers[format.to_sym] << helper_module
+            helpers[format.to_sym] << helper_module
           end
         end
+        # Spontaneous::Site::Helpers.const_set(module_name, helper_module)
+        def helper_module.__finalize
+          Spontaneous::Site.unregister_helper(self)
+        end
+      end
+
+      def unregister_helper(helper_module)
+        helpers = instance.registered_helpers
+        helpers.each do |format, helpers|
+          helpers.delete(helper_module)
+        end
       end
 
       def registered_helpers

data/lib/spontaneous/site/instance.rb

@@ -8,11 +8,11 @@ class Spontaneous::Site
       extend Forwardable
 
       def instantiate(root, env, mode)
-        Thread.current[:spontaneous_site_instance] = Spontaneous::Site.new(root, env, mode)
+        @__instance__ = Spontaneous::Site.new(root, env, mode)
       end
 
       def instance
-        Thread.current[:spontaneous_site_instance]
+        @__instance__
       end
 
       def_delegators :instance, :config, :database, :database=

data/lib/spontaneous/site/selectors.rb

@@ -9,6 +9,21 @@ class Spontaneous::Site
         content_model.root
       end
 
+      # roots returns the list of top-level pages
+      # Only one of these is publicly visible and this is mapped to the
+      # configured site domain.
+      #
+      # The rest are "hidden" roots.
+      def roots(user = nil, content_model = Spontaneous::Content)
+        domain = config.site_domain
+        roots  = pages_dataset(content_model).where(depth: 0).all
+        pub, hidden = roots.partition { |p| p.root? }
+        map = {}
+        map[domain] = pub.first.id unless pub.empty?
+        hidden.each { |p| map[p.path] = p.id }
+        { "public" => domain, "roots" => map }
+      end
+
       def pages(content_model = Spontaneous::Content)
         pages_dataset(content_model).all
       end
@@ -17,13 +32,17 @@ class Spontaneous::Site
         content_model::Page.order(:depth)
       end
 
+      ID_PATH   = /\A\d+\z/o
+      PATH_PATH = /^[\/#]/o
+      UID_PATH  = /^\$/o
+
       def [](path_or_uid)
         case path_or_uid
-        when Fixnum, /\A\d+\z/o
+        when Fixnum, ID_PATH
           by_id(path_or_uid)
-        when /^\//o
+        when PATH_PATH
           by_path(path_or_uid)
-        when /^#/o
+        when UID_PATH
           by_uid(path_or_uid[1..-1])
         else
           by_uid(path_or_uid)

data/lib/spontaneous/storage/cloud.rb

@@ -46,30 +46,34 @@ module Spontaneous::Storage
       @public_host = @config.delete(:public_host)
     end
 
-    def open(relative_path, mimetype, mode, &block)
+    def open(relative_path, headers, mode, &block)
       Tempfile.open("spontaneous-cloud") do |tempfile|
         tempfile.binmode
         block.call(tempfile)
         tempfile.rewind
-        self.copy(tempfile, relative_path, mimetype)
+        self.copy(tempfile, relative_path, headers)
       end
     end
 
-    def copy(existing_file, media_path, mimetype)
+    def copy(existing_file, media_path, headers = {})
       params = {
         :key => join_path(media_path),
         :idempotent => false,
         :body => existing_file,
         :public => true,
-        :expires => (DateTime.now + 20.years).to_s(:rfc822),
-        :content_type => mimetype
-      }
-      params[:body] = File.open(existing_file) if existing_file.is_a?(String)
-      bucket.files.create(params)
+        :cache_control => "max-age=#{1.year.to_i}, public",
+      }.merge(headers)
+      # Reopen file handles to catch updated contents
+      src_path = existing_file.respond_to?(:read) ? existing_file.path : existing_file
+      File.open(src_path, "rb") do |src|
+        src.binmode
+        params[:body] = src
+        bucket.files.create(params)
+      end
     end
 
     def join_path(path)
-      path.join("-")
+      path.join("/")
     end
 
     def local?

data/lib/spontaneous/storage/local.rb

@@ -8,7 +8,7 @@ module Spontaneous::Storage
       @root, @url_path, @accepts = ::File.expand_path(root_directory), url_path, accepts
     end
 
-    def copy(existing_file, media_path, mimetype)
+    def copy(existing_file, media_path, headers = {})
       dest_path = create_absolute_path(media_path)
       copy_file(existing_file, dest_path)
       set_permissions(dest_path)
@@ -17,10 +17,15 @@ module Spontaneous::Storage
 
     def copy_file(existing_file, dest_path)
       if existing_file.respond_to?(:read)
-        File.open(dest_path, "wb") do |f|
-          f.binmode
-          while chunk = existing_file.read(8192)
-            f.write(chunk)
+        # Re-open the file because it's been modified on disk by the optimisation process
+        # and if we don't re-open it the copy will take the unmodified version
+        File.open(existing_file.path, "rb") do |src|
+          src.binmode
+          File.open(dest_path, "wb") do |f|
+            f.binmode
+            while chunk = src.read(8192)
+              f.write(chunk)
+            end
           end
         end
       else
@@ -28,7 +33,7 @@ module Spontaneous::Storage
       end
     end
 
-    def open(relative_path, mimetype, mode, &block)
+    def open(relative_path, headers, mode, &block)
       dest_path = create_absolute_path(relative_path)
       File.open(dest_path, mode) do |f|
         f.binmode

data/lib/spontaneous/style.rb

@@ -19,23 +19,28 @@ module Spontaneous
     end
 
     def template(format = :html)
-      unless template = inline_template(format)
-        template = find_template(format)
-      end
-      template
+      inline_template(format) || external_template(format)
     end
 
-    def find_template(format = :html)
-      unless template = local_template(format)
-        template = supertype_template(format)
-      end
-      unless template
-        logger.warn("No template file found for style #{owner}/#{name}.#{format}")
+    def external_template(format = :html)
+      unless (template = (file_template(format) || supertype_template(format)))
+        logger.warn("No template file found for style #{owner}:#{name}.#{format}")
         template = anonymous_template
       end
       template
     end
 
+    def file_template(format)
+      local_template(format)
+    end
+
+    # Tests to see if a template file exists for the specified format.
+    # If one doesn't exist then the style would fall back to an
+    # 'anonymous' template.
+    def template?(format = :html)
+      !(inline_template(format) || file_template(format)).nil?
+    end
+
     alias_method :path, :template
 
     def local_template(format)
@@ -59,7 +64,11 @@ module Spontaneous
 
     def try_supertype_styles
       class_ancestors(owner).take_while { |a| a and a < Spontaneous::Content }.
-        map { |s| self.class.new(s, prototype) }
+        map { |s| supertype_style_class.new(s, prototype) }
+    end
+
+    def supertype_style_class
+      self.class
     end
 
     def class_ancestors(klass)
@@ -73,7 +82,7 @@ module Spontaneous
     end
 
     def inline_template(format)
-      if template_string = owner.inline_templates[format.to_sym]
+      if (template_string = owner.inline_templates[format.to_sym])
         Anonymous.new(template_string).template(format)
       end
     end
@@ -113,13 +122,6 @@ module Spontaneous
       Spontaneous::Render.formats(self)
     end
 
-    # def export
-    #   {
-    #     :name => name.to_s,
-    #     :schema_id => schema_id.to_s
-    #   }
-    # end
-
     def ==(other)
       other.class == self.class && other.prototype == self.prototype && other.owner == self.owner
     end
@@ -147,10 +149,6 @@ module Spontaneous
         Proc.new { @template_code }
       end
 
-      def exists?(format = :html)
-        true
-      end
-
       def name
         nil
       end
@@ -159,5 +157,24 @@ module Spontaneous
         nil
       end
     end
+
+    # Aliases are unique in that their style depends on the instance as well
+    # as the class.
+    # This style searches for appropriate templates based on the class of the
+    # instance before falling back to templates for the target.
+    class AliasStyle
+      def initialize(instance)
+        @instance = instance
+      end
+
+      def template(format = :html)
+        target_is_content = @instance.target.respond_to?(:resolve_style)
+        if (style = @instance.resolve_style(@instance.style_sid))
+          return style.template(format) if !target_is_content || style.template?(format)
+        end
+        style = @instance.target.resolve_style(@instance.style_sid)
+        style.template(format)
+      end
+    end
   end
 end

data/lib/spontaneous/utils/database/mysql_dumper.rb

@@ -75,7 +75,7 @@ module Spontaneous
         # The whole point of this table's existance is to reduce the
         # size of the db dump for syncing
         def revision_archive_table
-          Spontaneous::Content.revision_archive_dataset.first_source.to_s
+          Spontaneous::Content.archive_dataset.first_source.to_s
         end
 
         def option(option, add_if_nil=false)

data/lib/spontaneous/utils/smush_it.rb

@@ -49,7 +49,7 @@ module Spontaneous::Utils
           ::FileUtils.cp(temp.path, src_file)
         end
       end
-    rescue Exception => e
+    rescue => e
       logger.error(e)
     ensure
       FileUtils.rm(public_filepath) if public_filepath and File.exist?(public_filepath)

data/lib/spontaneous/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
 module Spontaneous
-  VERSION = "0.2.0.beta1"
+  VERSION = "0.2.0.beta2"
   GEM = false
 end

data/lib/spontaneous.rb

@@ -39,39 +39,39 @@ module Spontaneous
     instance.reload!
   end
 
-  autoload :Application,      "spontaneous/application"
-  autoload :Asset,            "spontaneous/asset"
-  autoload :Box,              "spontaneous/box"
-  autoload :BoxStyle,         "spontaneous/box_style"
-  autoload :Change,           "spontaneous/change"
-  autoload :Cli,              "spontaneous/cli"
-  autoload :Config,           "spontaneous/config"
-  autoload :ContentQuery,     "spontaneous/content_query"
-  autoload :Crypt,            "spontaneous/crypt"
-  autoload :DataMapper,       "spontaneous/data_mapper"
-  autoload :Facet,            "spontaneous/facet"
-  autoload :Field,            "spontaneous/field"
-  autoload :Generators,       "spontaneous/generators"
-  autoload :ImageSize,        "spontaneous/image_size"
-  autoload :Layout,           "spontaneous/layout"
-  autoload :Media,            "spontaneous/media"
-  autoload :Output,           "spontaneous/output"
-  autoload :PagePiece,        "spontaneous/page_piece"
-  autoload :PageLock,         "spontaneous/page_lock"
-  autoload :Paths,            "spontaneous/paths"
-  autoload :Permissions,      "spontaneous/permissions"
-  autoload :Publishing,       "spontaneous/publishing"
-  autoload :Rack,             "spontaneous/rack"
-  autoload :Revision,         "spontaneous/revision"
-  autoload :Schema,           "spontaneous/schema"
-  autoload :Search,           "spontaneous/search"
-  autoload :Server,           "spontaneous/server"
-  autoload :Simultaneous,     "spontaneous/simultaneous"
-  autoload :Site,             "spontaneous/site"
-  autoload :State,            "spontaneous/state"
-  autoload :Storage,          "spontaneous/storage"
-  autoload :Style,            "spontaneous/style"
-  autoload :Utils,            "spontaneous/utils"
+  autoload :Application,        "spontaneous/application"
+  autoload :Asset,              "spontaneous/asset"
+  autoload :Box,                "spontaneous/box"
+  autoload :BoxStyle,           "spontaneous/box_style"
+  autoload :Change,             "spontaneous/change"
+  autoload :Cli,                "spontaneous/cli"
+  autoload :Config,             "spontaneous/config"
+  autoload :ContentQuery,       "spontaneous/content_query"
+  autoload :Crypt,              "spontaneous/crypt"
+  autoload :DataMapper,         "spontaneous/data_mapper"
+  autoload :Facet,              "spontaneous/facet"
+  autoload :Field,              "spontaneous/field"
+  autoload :Generators,         "spontaneous/generators"
+  autoload :Layout,             "spontaneous/layout"
+  autoload :Media,              "spontaneous/media"
+  autoload :Output,             "spontaneous/output"
+  autoload :PagePiece,          "spontaneous/page_piece"
+  autoload :PageLock,           "spontaneous/page_lock"
+  autoload :Paths,              "spontaneous/paths"
+  autoload :Permissions,        "spontaneous/permissions"
+  autoload :PublishedRevision,  "spontaneous/published_revision"
+  autoload :Publishing,         "spontaneous/publishing"
+  autoload :Rack,               "spontaneous/rack"
+  autoload :Revision,           "spontaneous/revision"
+  autoload :Schema,             "spontaneous/schema"
+  autoload :Search,             "spontaneous/search"
+  autoload :Server,             "spontaneous/server"
+  autoload :Simultaneous,       "spontaneous/simultaneous"
+  autoload :Site,               "spontaneous/site"
+  autoload :State,              "spontaneous/state"
+  autoload :Storage,            "spontaneous/storage"
+  autoload :Style,              "spontaneous/style"
+  autoload :Utils,              "spontaneous/utils"
 
   module Prototypes
     autoload :BoxPrototype,     "spontaneous/prototypes/box_prototype"
@@ -85,6 +85,7 @@ module Spontaneous
     autoload :ChangeSet,        "spontaneous/collections/change_set"
     autoload :EntrySet,         "spontaneous/collections/entry_set"
     autoload :FieldSet,         "spontaneous/collections/field_set"
+    autoload :HashWithFallback, "spontaneous/collections/hash_with_fallback"
     autoload :PrototypeSet,     "spontaneous/collections/prototype_set"
     autoload :StyleSet,         "spontaneous/collections/style_set"
   end
@@ -108,6 +109,7 @@ module Spontaneous
   include Plugins::Application::Serialisation
   include Plugins::Application::Features
   include Plugins::Application::System
+  extend  Revision::GlobalMethods
 end
 
 Dir["#{File.expand_path("../spontaneous", __FILE__)}/extensions/*.rb"].each { |file| require file }