spontaneous 0.2.0.beta4 → 0.2.0.beta5

data/lib/spontaneous/field/webvideo/fallback.rb

@@ -7,8 +7,8 @@ module Spontaneous::Field
         "fallback"
       end
 
-      def to_html(options = {})
-        params = player_attributes(options)
+      def to_html(locals = {})
+        params = player_attributes(locals)
         attributes = hash_to_attributes(params[:attr])
         %(<iframe #{attributes}></iframe>)
       end

data/lib/spontaneous/field/webvideo/vimeo.rb

@@ -25,18 +25,18 @@ module Spontaneous::Field
         response = \
           begin
             open(url).read
-        rescue => e
-          logger.error("Unable to retrieve metadata for video ##{video_id} from Vimeo: '#{e}'")
-          "[{}]"
-        end
+          rescue => e
+            logger.error("Unable to retrieve metadata for video ##{video_id} from Vimeo: '#{e}'")
+            fallback_response
+          end
         metadata = Spontaneous.parse_json(response) rescue [{}]
-        metadata = metadata.first || {}
+        metadata = (metadata || [{}]).first || {}
       end
 
       def to_html(options = {})
         params = player_attributes(options)
         attributes = hash_to_attributes(params[:attr])
-        %(<iframe #{attributes}></iframe>)
+        "<iframe #{attributes}></iframe>"
       end
 
       def as_json(options = {})
@@ -101,7 +101,7 @@ module Spontaneous::Field
           "autoplay" => o[:autoplay],
           "loop" => o[:loop],
           "api" => o[:api],
-          "player_id" => o[:player_id] }
+        "player_id" => o[:player_id] }
         params.update("color" => o[:color]) if o.key?(:color)
         params = ::Rack::Utils.build_query(params)
         "http://player.vimeo.com/video/#{video_id}?#{params}"

data/lib/spontaneous/generators/site.rb

@@ -6,8 +6,8 @@ module Spontaneous
   module Generators
     class Site < Thor::Group
       def self.available_dbs
-        postgres = { :gem => "pg", :adapter => "postgres", :user => nil }
-        { "mysql"      => { :gem => "mysql2", :adapter => "mysql2", :user => "root" },
+        postgres = { :gem => "sequel_pg", :adapter => "postgres", :user => nil }
+        { "mysql"  => { :gem => "mysql2", :adapter => "mysql2", :user => "root" },
           "pg" => postgres,  "postgresql" =>  postgres, "postgres"   =>  postgres }
       end
 

data/lib/spontaneous/generators/site/Gemfile.tt

@@ -5,7 +5,11 @@ gem 'spontaneous', '~> <%= Spontaneous::VERSION %>'
 # Or point it at a git repository to use the cutting edge or your custom version
 # gem 'spontaneous', :git => "https://github.com/SpontaneousCMS/spontaneous.git"
 
-gem '<%= @database[:gem].name %>', '<%= @database[:gem].requirement %>'
+gem '<%= @database[:gem].name %>', '<%= @database[:gem].requirement %>'<%
+  if (requires = @database[:gem].autorequire) && (requires.length > 0)
+    requires = requires.first if requires.length == 1 -%>
+, require: '<%= requires %>'
+<%- end -%>
 
 # Your favorite ExecJS compatible engine
 gem 'therubyracer',    '~> 0.11.1'

data/lib/spontaneous/layout.rb

@@ -11,7 +11,7 @@ module Spontaneous
       # matching the class of our owner, then default to the 'standard'
       # layout.
       def try_paths
-        named_layout = self.class.to_directory_name(owner)
+        named_layout = to_directory_name(owner)
         [["layouts", named_layout], ["layouts", "standard"]]
       end
     end
@@ -21,7 +21,7 @@ module Spontaneous
         @templates = templates
       end
 
-      def template(format = :html)
+      def template(format = :html, renderer)
         template = @templates[format]
         # a layout without a format is used as a fallback
         template ||= @templates[nil]

data/lib/spontaneous/media.rb

@@ -8,6 +8,7 @@ module Spontaneous
     autoload :File,     "spontaneous/media/file"
     autoload :Image,    "spontaneous/media/image"
     autoload :TempFile, "spontaneous/media/temp_file"
+    autoload :Store,    "spontaneous/media/store"
 
     include Spontaneous::Constants
 

data/lib/spontaneous/media/file.rb

@@ -8,9 +8,10 @@ module Spontaneous::Media
 
     attr_reader :filename, :owner, :source
 
-    def initialize(owner, filename, headers = {})
+    def initialize(site, owner, filename, headers = {})
       headers = { content_type: headers } if headers.is_a?(String)
-      @owner, @filename, @headers = owner, Spontaneous::Media.to_filename(filename), headers
+      headers ||= {}
+      @site, @owner, @filename, @headers = site, owner, Spontaneous::Media.to_filename(filename), headers
     end
 
     # Create a new File instance with a new name.
@@ -20,7 +21,7 @@ module Spontaneous::Media
     def rename(new_filename)
       headers = storage_headers
       headers.delete(:content_type)
-      self.class.new(owner, new_filename, headers)
+      self.class.new(@site, owner, new_filename, headers)
     end
 
     def open(mode = 'wb', &block)
@@ -58,7 +59,7 @@ module Spontaneous::Media
     end
 
     def storage
-      @storage ||= Spontaneous::Site.storage(mimetype)
+      @storage ||= @site.storage(mimetype)
     end
 
     def padded_id
@@ -70,7 +71,7 @@ module Spontaneous::Media
     end
 
     def revision
-      Spontaneous::Site.working_revision
+      @site.working_revision
     end
 
     def media_dir

data/lib/spontaneous/media/image/attributes.rb

@@ -28,6 +28,10 @@ module Spontaneous::Media
       end
 
       alias_method :empty?, :blank?
+
+      def value(format = :html)
+        src
+      end
     end
   end
 end

data/lib/spontaneous/media/image/renderable.rb

@@ -3,10 +3,10 @@ module Spontaneous::Media::Image
   module Renderable
     attr_accessor :template_params
 
-    def render(format=:html, *args)
+    def render(format=:html, params = {}, parent_context = nil)
       case format
       when "html", :html
-        to_html(*args)
+        to_html(params)
       else
         value
       end
@@ -19,8 +19,8 @@ module Spontaneous::Media::Image
         :height => height,
         :alt => ""
       }
-      default_attr.delete(:width) if width.nil?
-      default_attr.delete(:height) if height.nil?
+      default_attr.delete(:width) if (width.nil? || width == 0)
+      default_attr.delete(:height) if (height.nil? || height == 0)
       if template_params && template_params.length > 0 && template_params[0].is_a?(Hash)
         attr = template_params[0].merge(attr)
       end

data/lib/spontaneous/media/store.rb

@@ -0,0 +1,22 @@
+# encoding: UTF-8
+
+module Spontaneous::Media
+  module Store
+    autoload :Backend, "spontaneous/media/store/backend"
+    autoload :Local,   "spontaneous/media/store/local"
+    autoload :Cloud,   "spontaneous/media/store/cloud"
+
+    extend self
+
+    def create(config)
+      case config[:provider]
+      when "Local", "local"
+        Local.new(config[:local_root], config[:url], config[:accepts])
+      else
+        bucket =  config.delete(:bucket)
+        accepts = config.delete(:accepts)
+        Cloud.new(config, bucket, accepts)
+      end
+    end
+  end
+end

data/lib/spontaneous/{storage → media/store}/backend.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Spontaneous::Storage
+module Spontaneous::Media::Store
   class Backend
     def accepts?(mimetype)
       return true if @accepts.nil?

data/lib/spontaneous/{storage → media/store}/cloud.rb

@@ -3,7 +3,7 @@
 require 'fog'
 require 'tempfile'
 
-module Spontaneous::Storage
+module Spontaneous::Media::Store
   class Cloud < Backend
     # Thanks thoughtbot (via paperclip)
     # http://rdoc.info/github/thoughtbot/paperclip/Paperclip/Storage/Fog

data/lib/spontaneous/{storage → media/store}/local.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Spontaneous::Storage
+module Spontaneous::Media::Store
   class Local < Backend
     attr_reader :root
 

data/lib/spontaneous/media/temp_file.rb

@@ -9,7 +9,7 @@ module Spontaneous::Media
   class TempFile < File
 
     def storage
-      Spontaneous::Site.default_storage
+      @site.default_storage
     end
 
     def media_dir

data/lib/spontaneous/model.rb

@@ -1,21 +1,22 @@
 module Spontaneous
 
   module Model
-    autoload :Core,  "spontaneous/model/core"
-    autoload :Page,  "spontaneous/model/page"
-    autoload :Piece, "spontaneous/model/piece"
-    autoload :Box,   "spontaneous/model/box"
+    autoload :Core,   "spontaneous/model/core"
+    autoload :Page,   "spontaneous/model/page"
+    autoload :Piece,  "spontaneous/model/piece"
+    autoload :Box,    "spontaneous/model/box"
+    autoload :Action, "spontaneous/model/action"
   end
 
   def self.models
     @models ||= {}
   end
 
-  def self.Model(table_name, database = Spontaneous.database, schema = Site.schema)
-    define_content_model(table_name, database, schema)
+  def self.Model(table_name)
+    Model!(table_name, Spontaneous.database, Spontaneous.instance.schema)
   end
 
-  def self.define_content_model(table_name, database = Spontaneous.database, schema = Site.schema)
+  def self.Model!(table_name, database, schema)
     model = Spontaneous::DataMapper::Model(table_name, database, schema) do
       serialize_columns :field_store, :entry_store, :box_store, :serialized_modifications
       include_all_types
@@ -42,6 +43,8 @@ module Spontaneous
       class_variable_get(:@@content_model)
     end
 
+    alias_method :model, :content_model
+
     # This is fiddly because we want the Content.content_model to refer to the
     # first subclass of the Spontaneous::Content call as that is going to be our
     # ::Content model. In this particular instance I want the behaviour of Ruby's

data/lib/spontaneous/model/action.rb

@@ -0,0 +1,7 @@
+# encoding: UTF-8
+
+module Spontaneous::Model
+  module Action
+    autoload :Clean,     "spontaneous/model/action/clean"
+  end
+end

data/lib/spontaneous/model/action/clean.rb

@@ -0,0 +1,87 @@
+# encoding: UTF-8
+
+require 'set'
+
+module Spontaneous::Model::Action
+  # Designed to be run after any schema modifications that delete types or boxes
+  # this action deletes all instances with invalid type ids and then cleans
+  # up the remaining content by testing the visibility path of each remaining instance
+  # and deletes any that are 'orphaned' i.e. they have a hole in their ancestry.
+  #
+  # This would normally be managed by the recursive destroy but when we're dealing
+  # with content that has no matching schema type it's hard to instantiate them & hence
+  # hard to invoke a destroy (and we resort to db level deletes)
+  #
+  # This is an argument for moving hierarcy maintenance into db level triggers
+  # rather than keeping them at the ORM level.
+  class Clean
+    extend Spontaneous::Concern
+
+    def self.run(site)
+      new(site).run
+    end
+
+    attr_reader :stats
+
+    def initialize(site)
+      @site  = site
+      @model = site.model
+      @dirty = false
+    end
+
+    def run
+      stats = {}
+      @model.db.transaction do
+        stats[:invalid] = delete_invalid_type_instances
+        stats[:orphans] = delete_orphans
+        stats[:publish] = configure_force_publish
+      end
+      stats
+    end
+
+    # Delete all instances whose schema id is invalid
+    def delete_invalid_type_instances
+      invalid = mapper.filter(nil).invert
+      count   = invalid.delete
+      @dirty ||= (count > 0)
+      count
+    end
+
+    # Delete all orphaned content items i.e. entries that have an ancestor
+    # who is missing, probably as a result of a schema type deletion
+    def delete_orphans
+      count = 0
+      mapper.dataset.each do |content|
+        unless valid_path?(content)
+          content.destroy
+          count += 1
+        end
+      end
+      @dirty ||= (count > 0)
+      count
+    end
+
+    # If we've deleted content items at the db level then we need to force
+    # a full publish to reset our change tracking and make sure the live
+    # site is a proper reflection of the edited content
+    def configure_force_publish
+      @site.must_publish_all! if @dirty
+      @site.must_publish_all?
+    end
+
+    # Use our set of existing ids to check that every entry in an instance's
+    # visibility path exists.
+    def valid_path?(content)
+      content.visibility_ancestor_ids.all? { |id| existing_ids.include?(id) }
+    end
+
+    # Get the id of every valid instance in the db
+    def existing_ids
+      @existing_ids ||= Set.new(mapper.select(nil, :id).map{ |row| row[:id] })
+    end
+
+    def mapper
+      @model.mapper
+    end
+  end
+end

data/lib/spontaneous/model/box/allowed_types.rb

@@ -14,6 +14,10 @@ module Spontaneous::Model::Box
         define_instance_class(definition) if definition
       end
 
+      def schema
+        @box_class.mapper.schema
+      end
+
       def check_instance_class
         instance_class
       end
@@ -84,6 +88,17 @@ module Spontaneous::Model::Box
         end
       end
 
+      def export
+        if allow_subclasses
+          # can't configure interface name using allow_subclasses
+          instance_class.subclasses.map { |c| { type: c.ui_class } }
+        else
+          exported = {type: instance_class.ui_class }
+          exported[:as] = @options[:as] if @options.key?(:as)
+          [exported]
+        end
+      end
+
       def prototype
         @options[:prototype]
       end
@@ -120,7 +135,6 @@ module Spontaneous::Model::Box
       end
 
       def instance_classes
-        schema = Spontaneous::Site.schema
         names = groups.flat_map { |name| schema.groups[name] }
         names.map { |name| resolve_instance_class(name) }.uniq
       end

data/lib/spontaneous/model/core.rb

@@ -56,6 +56,16 @@ module Spontaneous::Model
       ensure
         mapper.logger = nil
       end
+
+      # Provide a Content.to_proc implementation to
+      # enable filtering of content lists like so:
+      #
+      #   Content.all.select(&ContentClass)
+      #   => [#<ContentClass...>, #<ContentClass...>]
+      #
+      def to_proc
+        Proc.new { |obj| self === obj }
+      end
     end
 
     include Enumerable

data/lib/spontaneous/model/core/aliases.rb

@@ -167,7 +167,7 @@ module Spontaneous::Model::Core
 
       def exported_target(user = nil)
         case target
-        when Spontaneous::Content
+        when content_model
           target.shallow_export(user)
         else
           target.to_json

data/lib/spontaneous/model/core/content_groups.rb

@@ -9,7 +9,7 @@ module Spontaneous::Model::Core
 
       def group(*group_names)
         @group_memberships = group_names
-        Spontaneous::Site.schema.add_group_member(self, group_names)
+        model.schema.add_group_member(self, group_names)
       end
     end
   end