spontaneous 0.2.0.beta5 → 0.2.0.beta6

data/lib/spontaneous/field/file.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'tempfile'
+require 'digest/md5'
 
 module Spontaneous::Field
   class File < Base
@@ -56,15 +57,27 @@ module Spontaneous::Field
 
     def preprocess(image, site)
       file, filename, mimetype = fileinfo(image)
-      return "" if file.nil?
-      return file unless ::File.exist?(file)
+      if file.nil?
+        set_unprocessed_value(["", ""].to_json)
+        return ""
+      end
+      unless ::File.exist?(file)
+        set_unprocessed_value([file, ""].to_json)
+        return file
+      end
+      set_unprocessed_value([filename, file_digest(file)].to_json)
 
       media_file = site.file(owner, filename, storage_headers(mimetype, filename))
       media_file.copy(file)
-      set_unprocessed_value(media_file.path)
       media_file
     end
 
+    def file_digest(file)
+      Digest::MD5.file(file).hexdigest
+    rescue Errno::ENOENT => e
+      ""
+    end
+
     def fileinfo(fileinfo)
       file = filename = mimetype = nil
       case fileinfo
@@ -108,6 +121,18 @@ module Spontaneous::Field
       })
     end
 
+    def original_filename
+      file_info[0]
+    end
+
+    def file_hash
+      file_info[1]
+    end
+
+    def file_info
+      @file_info ||= Spontaneous::JSON.parse(unprocessed_value)
+    end
+
     def path
       value(:html)
     end

data/lib/spontaneous/field/image.rb

@@ -106,6 +106,8 @@ module Spontaneous::Field
       sizes[:original].src
     end
 
+    alias_method :processed_value, :value
+
     def set_value!(value, process = true, site = nil)
       @sizes = nil
       super

data/lib/spontaneous/field/update.rb

@@ -77,6 +77,12 @@ module Spontaneous::Field
       end
 
       def run
+        @site.transaction do
+          run!
+        end
+      end
+
+      def run!
         @fields.each do |field|
           field.process_pending_value(@site)
         end

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

@@ -33,6 +33,11 @@ module Spontaneous::Field
         metadata = (metadata || [{}]).first || {}
       end
 
+      # TODO: define what's a sensible fallback response
+      def fallback_response
+        {}
+      end
+
       def to_html(options = {})
         params = player_attributes(options)
         attributes = hash_to_attributes(params[:attr])
@@ -104,7 +109,7 @@ module Spontaneous::Field
         "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}"
+        "//player.vimeo.com/video/#{video_id}?#{params}"
       end
     end
 

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

@@ -84,7 +84,7 @@ module Spontaneous::Field
         #   "player_id" => o[:player_id] }
         # params.update("color" => o[:color]) if o.key?(:color)
         # params = ::Rack::Utils.build_query(params)
-        "https://vine.co/v/#{video_id}/card"
+        "//vine.co/v/#{video_id}/card"
       end
     end
 

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

@@ -101,7 +101,7 @@ module Spontaneous::Field
           "autohide" => o[:autohide],
           "rel" => o[:rel],
           "enablejsapi" => o[:api] })
-        "http://www.youtube.com/embed/#{video_id}?#{params}"
+        "//www.youtube.com/embed/#{video_id}?#{params}"
       end
 
       def download_metadata

data/lib/spontaneous/generators/site.rb

@@ -6,9 +6,10 @@ module Spontaneous
   module Generators
     class Site < Thor::Group
       def self.available_dbs
-        postgres = { :gem => "sequel_pg", :adapter => "postgres", :user => nil }
-        { "mysql"  => { :gem => "mysql2", :adapter => "mysql2", :user => "root" },
-          "pg" => postgres,  "postgresql" =>  postgres, "postgres"   =>  postgres }
+        postgres = { :gem => "sequel_pg", :adapter => "postgres", :user => ENV["USER"] }
+        { "sqlite" => { gem: "sqlite3", adapter: "sqlite3" },
+          "mysql"  => { gem: "mysql2", adapter: "mysql2", user: "root" },
+          "pg" => postgres, "postgresql" => postgres, "postgres" =>  postgres }
       end
 
       def self.source_root; File.expand_path(File.dirname(__FILE__) + "/site"); end
@@ -19,7 +20,7 @@ module Spontaneous
       argument :domain, :type => :string, :desc => "The domain name of the site to generate"
 
       class_option :root,     :desc => "The root destination", :aliases => '-r', :default => ".",   :type => :string
-      class_option :database, :desc => "The database to use ('postgres' (default) or 'mysql')", :aliases => %w(-d --db), :default => "postgres",   :type => :string
+      class_option :database, :desc => "The database to use ('sqlite' (default), 'postgres' or 'mysql')", :aliases => %w(-d --db), :default => "sqlite", :type => :string
       class_option :user,     :desc => "The database account to use", :aliases => '-u', :type => :string
       class_option :password, :desc => "The password for the database user", :aliases => %w(-p), :default => "",   :type => :string
       class_option :host,     :desc => "The database host", :aliases => %w(-h),   :type => :string
@@ -59,6 +60,7 @@ module Spontaneous
         template "Gemfile.tt", "Gemfile"
         template "Capfile.tt", "Capfile"
         template "Rakefile.tt", "Rakefile"
+        template "db/#{@database[:adapter]}.yml.tt", "config/database.yml"
         # template "lib/site.rb.tt", "lib/site.rb"
         # empty_directory "lib/tasks"
         empty_directory "log"

data/lib/spontaneous/generators/site/.gitignore

@@ -1,5 +1,6 @@
 log/*
 tmp/*
 cache/*
+assets/tmp/*
 .irb_history
 

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

@@ -3,13 +3,13 @@ source "https://rubygems.org"
 # You can either fix the version of Spontaneous that this site uses
 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 'spontaneous', git: 'https://github.com/SpontaneousCMS/spontaneous.git'
 
 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 -%>
+<%- end %>
 
 # Your favorite ExecJS compatible engine
 gem 'therubyracer',    '~> 0.11.1'
@@ -20,7 +20,7 @@ gem 'capistrano', '~> 2.9'
 # If you want to enable the built in search functionality then you must un-comment
 # the xapian-ruby dependency below. It is not included by default
 # because the xapian library takes a very long time to build.
-#gem 'xapian-ruby', "~> 1.2.12"
+#gem 'xapian-ruby', '~> 1.2.12'
 
 # group :production do
 #   gem 'thin',    '~> 1.3.1'

data/lib/spontaneous/generators/site/config/initializers/publishing.rb.tt

@@ -0,0 +1,78 @@
+# Configure the template filesystem.
+#
+# Spontaneous accepts any Moneta[1] compatible key-value store as a
+# template destination. The arguments to #output_store should be
+# identical to those you would use to configure a Moneta instance,
+# e.g.
+#
+#     Site.output_store(:Memcached, server: 'localhost:11211)
+#
+# [1]: https://github.com/minad/moneta
+
+Site.output_store(:File, dir: Site.revision_root)
+
+# Configure the site publishing pipeline
+#
+# `run` inserts a step in the publishing pipeline.
+
+# The core steps can be referenced by a symbol that is mapped to
+# the corresponding step class.
+#
+# Custom steps *must* respond to `call` with four parameters:
+#
+# site: the current site instance
+# revision: the revision that is being created
+# pages: the list of pages that are being published
+# progress: a progress object
+#
+# `call` can optionally return an object that responds to #rollback
+# which should undo any actions made by the #call method.
+#
+# They can also, optionally, respond to:
+#
+# #count(site, revision, pages, progress): returns the number of
+#     discrete actions that this step comprises. During the #call
+#     the step *must* call progress#step exactly the number of times
+#     returned by this call
+#
+# Examples:
+#
+# Run a proc as part of the publishing process:
+#     run proc { |site, revision, pages, progress| puts "Publishing revision #revision}" }
+#
+# Run a custom publishing step:
+#
+#     class NotifyMe
+#       def initialize(options)
+#         @options = options
+#       end
+#       def count(site, revision, pages, progress)
+#         1
+#       end
+#       def call(site, revision, pages, progress)
+#         # send me a tweet when the site publishes...
+#       end
+#     end
+#
+#     Site.publish do
+#       run NotifyMe.new(handle: "my_twitter_name")
+#     end
+#
+
+# NOTE: Do not remove or re-order the core steps declared below
+# unless you are really sure of what you're doing
+Site.publish do
+  # List of notification targets.
+  # If you remove the :browser target then publishing progress will not
+  # be shown in the browser
+  <%- Spontaneous::Publishing::Steps::CORE_PROGRESS.each do |progress| -%>
+  notify <%= progress.inspect %>
+  <%- end -%>
+  # Start core steps
+  <%- Spontaneous::Publishing::Steps::CORE_STEPS.each do |step| -%>
+  run <%= step.inspect %>
+  <%- end -%>
+  # Finish core steps
+  # At this point the site is published & most probably live to the public
+  # This is a good place to run any notification steps
+end

data/lib/spontaneous/generators/site/{config/database.yml.tt → db/mysql2.yml.tt}

@@ -1,13 +1,17 @@
 ---
-:development: &defaults
-  :adapter:    <%= @database[:adapter] %>
-  :database:   <%= @site_name %>
+:defaults: &defaults
+  :adapter:    mysql2
+  :encoding:   UTF-8
   :user:       <%= @database[:user] %>
   :password:   <%= @database[:password] %>
 <% unless (host = @database[:host]).blank? -%>
   :host:       <%= host %>
 <% end %>
 
+:development:
+  <<:         *defaults
+  :database:   <%= @site_name %>
+
 :test:
   <<:         *defaults
   :database:   <%= @site_name %>_test
@@ -18,7 +22,4 @@
   :user:      <%= @site_name %>
   :password:   <%= @database[:password] %>
 
-:rake:
-  <<:         *defaults
-
 

data/lib/spontaneous/generators/site/db/postgres.yml.tt

@@ -0,0 +1,25 @@
+---
+:defaults: &defaults
+  :adapter:    postgres
+  :encoding:   UTF-8
+  :user:       <%= @database[:user] %>
+  :password:   <%= @database[:password] %>
+<% unless (host = @database[:host]).blank? -%>
+  :host:       <%= host %>
+<% end %>
+
+:development:
+  <<:         *defaults
+  :database:   <%= @site_name %>
+
+:test:
+  <<:         *defaults
+  :database:   <%= @site_name %>_test
+
+:production:
+  <<:         *defaults
+  :database:  <%= @site_name %>
+  :user:      <%= @site_name %>
+  :password:   <%= @database[:password] %>
+
+

data/lib/spontaneous/generators/site/db/sqlite3.yml.tt

@@ -0,0 +1,18 @@
+---
+:default: &default
+  :adapter: sqlite
+
+:development:
+  <<: *default
+  :database: db/development.sqlite3
+
+# Warning: The database defined as "test" will be erased and
+# re-generated from your development database when you run "rake".
+# Do not set this db to the same as development or production.
+:test:
+  <<: *default
+  :database: db/test.sqlite3
+
+:production:
+  <<: *default
+  :database: db/production.sqlite3

data/lib/spontaneous/generators/site/public/humans.txt.tt

@@ -0,0 +1,14 @@
+# humanstxt.org/
+# The humans responsible & technology colophon
+
+# TEAM
+
+    <name> -- <role> -- <twitter>
+
+# THANKS
+
+    <name>
+
+# TECHNOLOGY COLOPHON
+
+    Spontaneous CMS v<%= Spontaneous::VERSION %>, HTML5, CSS3

data/lib/spontaneous/generators/site/templates/layouts/standard.html.cut.tt

@@ -7,15 +7,66 @@
 <head>
 	<meta charset="UTF-8">
 	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  !{
+
+      A quick guide to spontaneous templating:
+
+        ${ ... } inserts a value, e.g. `${ title }` inserts the value of the page's title field
+
+        %{ ... } creates a code block with no output into the template,
+                 e.g. `%{ total_entries = boxes.map { |box| box.length }.sum }`
+
+        !{ ... } inserts a comment, e.g. `!{ this is a comment }`
+
+        Adding a '-' before the closing bracket removes whitespace after the tag, e.g. `${ title -}`
+
+  }
   <title>${ title } ­ <%= @domain %></title>
+
+  !{ inserts a CSS link to assets/css/site.css which is a Sprockets 'manifest' file }
+
 	${ stylesheets 'css/site' }
+
 </head>
 <body>
   %{ block :content }
 		<h2>Welcome to <%= @domain %></h2>
+
+    !{ 'fields' dumps all the page fields into the template with no layout
+       you won't be wanting to do this in your actual templates but its useful
+       for instant feedback in the early stages... }
+
 		${ fields }
+
+    !{  'boxes' is useful however:
+
+        `${ boxes }` is the same as doing
+
+        %{ boxes.each do |box| }
+          ${ box }
+        %{ end }
+
+        Which is different to:
+
+        %{ boxes.each do |box| }
+          %{ box.each do |entry| }
+            ${ entry }
+          %{ end }
+        %{ end }
+
+        because it also renders any template that belongs to the box.
+
+        Since the default template for a box is `${ contents }` you will always get a valid output
+        from `${ box }`.
+    }
+
 		${ boxes  }
+
   %{ endblock :content }
+
+  !{ inserts a script tag pointing to assets/js/site.js which is a Sprockets 'manifest' file }
+
 	${ scripts %w(js/site) }
+
 </body>
 </html>

data/lib/spontaneous/loader.rb

@@ -385,7 +385,7 @@ module Spontaneous
       end
 
       def is_schema_class?(klass)
-        (klass < Spontaneous::Content or klass < Content::Box)
+        (klass < schema.site.model or klass < schema.site.model::Box)
       end
 
       def remove_constant(const)

data/lib/spontaneous/logger.rb

@@ -180,7 +180,7 @@ module Spontaneous
       @log.sync          = true
       @mutex             = @@mutex[@log] ||= Mutex.new
       @format_datetime   = options[:format_datetime] || "%d/%b/%Y %H:%M:%S"
-      @format_message    = options[:format_message]  || "%s - [%s] \"%s\""
+      @format_message    = options[:format_message]  || "%s - [%s] %s"
     end
 
     ##