serif 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    serif (0.2.1)
+    serif (0.2.3)
       liquid (~> 2.4)
       pygments.rb (~> 0.3)
       rack (~> 1.0)
@@ -14,39 +14,39 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.1.2)
+    diff-lcs (1.1.3)
     liquid (2.4.1)
-    multi_json (1.5.0)
+    multi_json (1.6.1)
     posix-spawn (0.3.6)
     pygments.rb (0.3.7)
       posix-spawn (~> 0.3.6)
       yajl-ruby (~> 1.1.0)
-    rack (1.4.4)
+    rack (1.5.2)
     rack-protection (1.3.2)
       rack
     rack-rewrite (1.3.3)
-    rake (0.9.2.2)
+    rake (0.9.6)
     redcarpet (2.2.2)
     redhead (0.0.8)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.3)
-      rack (~> 1.3, >= 1.3.6)
-      rack-protection (~> 1.2)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     slop (3.4.3)
     tilt (1.3.3)
-    timecop (0.5.5)
+    timecop (0.5.9.2)
     yajl-ruby (1.1.0)
 
 PLATFORMS

data/README.md

@@ -6,7 +6,15 @@ Serif is a file-based blogging engine intended for simple sites. It compiles Mar
 
 # Changes and what's new
 
-See `CHANGELOG` for what's new.
+## Latest release
+
+* Support drag-and-drop image uploading in the admin interface, with customisable paths. (#18)
+* Generate private preview files for drafts, and generate the site on every draft change. (#19, #24)
+* `serif dev` server serves 404s on missing files instead of 500 exceptions. (#22)
+* Warn about _config.yml auth details after `serif new` skeleton (#23)
+* Smarter onbeforeunload warnings that only fire if changes have been made. (#17)
+
+See `CHANGELOG` for more.
 
 # Contents of this README
 
@@ -210,6 +218,7 @@ admin:
   username: username
   password: password
 permalink: /blog/:year/:month/:title
+images_upload_path: /images/:timestamp_:name
 ```
 
 If a permalink setting is not given in the configuration, the default is `/:title`. There are the following options available for permalinks:
@@ -221,9 +230,28 @@ Placeholder | Value
 `:month`    | Month as given in the filename, e.g., "01"
 `:day`      | Day as given in the filename, e.g., "28"
 
+### Admin drag-and-drop upload path
+
+The `images_upload_path` configuration setting is an _absolute path_ and will be relative to the base directory of your site, used in the admin interface to control where files are sent. The default value is `/images/:timestamp_:name`. Similar to permalinks, the following placeholders are available:
+
+Placeholder | Value
+----------- |:-----
+`:slug`     | URL "slug" at the time of upload, e.g., "your-post-title"
+`:year`     | Year at the time of upload, e.g., "2013"
+`:month`    | Month at the time of upload, e.g., "02"
+`:day`      | Day at the time of upload, e.g., "16"
+`:name`     | Original filename string of the image being uploaded
+`:timestamp`| Unix timestamp, e.g., "1361057832685"
+
+Any slashes in `images_upload_path` are converted to directories.
+
 ## Other files
 
-Any other file in the directory's root will be copied over exactly as-is, with two caveats for any file ending in `.html` or `.xml`:
+Any other file in the directory's root will be copied over exactly as-is, with two caveats.
+
+First, `images/` is used for the drag-and-drop file uploads from the admin interface. Files are named with `<unix_timestamp>.<extension>`.
+
+Second, for any file ending in `.html` or `.xml`:
 
 1. These files are assumed to contain [Liquid markup](http://liquidmarkup.org/) and will be processed as such.
 2. Any header data will not be included in the processed output.
@@ -382,7 +410,7 @@ In addition to those mentioned above, such as the archive page variables, there
 
 ## Post template variables
 
-These are available on individual post pages.
+These are available on individual post pages, in `_template/post.html`.
 
 * `{{ post }}` --- the post being processed. Allows access to variables like `post.url`, `post.title`, `post.slug`, `post.created` and `post.content`.
 * `{{ prev_post }}` --- the post published chronologically before `post`.

data/bin/serif

@@ -50,6 +50,12 @@ def produce_skeleton(dir)
   files.each do |f|
     FileUtils.cp_r(f, dir, verbose: true)
   end
+
+  puts
+  puts "*** NOTE ***"
+  puts
+  puts "You should now edit the username and password in _config.yml"
+  puts
 end
 
 commands = Slop::Commands.new do

data/lib/serif/admin_server.rb

@@ -42,7 +42,7 @@ class AdminServer
     get "/admin/new/draft" do
       content = Draft.new(site)
       autofocus = "slug"
-      liquid :new_draft, locals: { post: content, autofocus: autofocus }
+      liquid :new_draft, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: autofocus }
     end
 
     post "/admin/new/draft" do
@@ -61,12 +61,13 @@ class AdminServer
         autofocus = "title" unless params[:title]
         autofocus = "slug" unless params[:slug]
 
-        liquid :new_draft, locals: { error_message: error_message, post: content, autofocus: autofocus }
+        liquid :new_draft, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
       else
         if Draft.exist?(site, params[:slug])
-          liquid :new_draft, locals: { error_message: error_message, post: content, autofocus: autofocus }
+          liquid :new_draft, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, autofocus: autofocus }
         else
           content.save(params[:markdown])
+          site.generate
           redirect to("/admin")
         end
       end
@@ -106,7 +107,7 @@ class AdminServer
           error_message = "You must pick a URL to use"
         end
 
-        liquid :edit_draft, locals: { error_message: error_message, post: content }
+        liquid :edit_draft, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content, private_url: site.private_url(content) }
       else
         content.save(params[:markdown])
 
@@ -114,9 +115,10 @@ class AdminServer
         #       a directory-change-level event.
         if params[:publish] == "yes"
           content.publish!
-          site.generate
         end
 
+        site.generate
+
         redirect to("/admin")
       end
     end
@@ -133,7 +135,7 @@ class AdminServer
         error_message = "Content must not be blank." if params[:markdown].empty?
         error_message = "Title must not be blank." if params[:title].empty?
 
-        liquid :edit_post, locals: { error_message: error_message, post: content }
+        liquid :edit_post, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), error_message: error_message, post: content }
       else
         content.save(params[:markdown])
         site.generate
@@ -147,10 +149,10 @@ class AdminServer
 
       if params[:type] == "posts"
         content = site.posts.find { |p| p.slug == params[:slug] }
-        liquid :edit_post, locals: { post: content, autofocus: "markdown" }
+        liquid :edit_post, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: "markdown" }
       elsif params[:type] == "drafts"
         content = Draft.from_slug(site, params[:slug])
-        liquid :edit_draft, locals: { post: content, autofocus: "markdown" }
+        liquid :edit_draft, locals: { images_path: site.config.image_upload_path.gsub(/"/, '\"'), post: content, autofocus: "markdown", private_url: site.private_url(content) }
       else
         response.status = 404
         return "Nope"
@@ -171,6 +173,26 @@ class AdminServer
         Redcarpet::Markdown.new(Serif::MarkupRenderer, fenced_code_blocks: true).render(content).strip
       end
     end
+
+    post "/admin/attachment" do
+      attachment = params["attachment"]
+      filename = attachment["final_name"]
+      file = attachment["file"]
+      uid = attachment["uid"]
+
+      tempfile = file[:tempfile]
+
+      FileUtils.mkdir_p(File.join(site.directory, File.dirname(filename)))
+      FileUtils.mkdir_p(File.dirname(site.site_path(filename)))
+
+      # move to the source directory
+      FileUtils.mv(tempfile.path, File.join(site.directory, filename))
+
+      # copy to production to avoid the need to generate right now
+      FileUtils.copy(File.join(site.directory, filename), site.site_path(filename))
+
+      "File uploaded"
+    end
   end
 
   def initialize(source_directory)

data/lib/serif/config.rb

@@ -14,6 +14,10 @@ class Config
     yaml["admin"]["password"]
   end
 
+  def image_upload_path
+    yaml["image_upload_path"] || "/images/:timestamp_:name"
+  end
+
   def permalink
     yaml["permalink"] || "/:title"
   end

data/lib/serif/content_file.rb

@@ -51,10 +51,6 @@ class ContentFile
     end
   end
   
-  def modified
-    File.mtime(@path)
-  end
-
   def draft?
     !published?
   end
@@ -104,15 +100,17 @@ class ContentFile
     converted_headers
   end
 
-  def self.rename(original_slug, new_slug)
-    raise if File.exist?("#{dirname}/#{new_slug}")
-    File.rename("#{dirname}/#{original_slug}", "#{dirname}/#{new_slug}")
-  end
-
   def save(markdown = nil)
     markdown ||= content if !new?
     
     save_path = path || "#{self.class.dirname}/#{@slug}"
+
+    if new?
+      set_publish_time(Time.now)
+    else
+      set_updated_time(Time.now)
+    end
+
     File.open(save_path, "w") do |f|
       f.puts %Q{#{raw_headers}
 
@@ -124,24 +122,11 @@ class ContentFile
 
     true # always return true for now
   end
-  
-  def [](header)
-    h = headers[header]
-    if h
-      h
-    else
-      raise "no such header #{header}"
-    end
-  end
     
   def inspect
     %Q{<#{self.class} #{headers.inspect}>}
   end
   
-  def self.all
-    Post.all + Draft.all
-  end
-
   protected
 
   def set_publish_time(time)

data/lib/serif/post.rb

@@ -36,12 +36,6 @@ class Post < ContentFile
     all(site).find { |p| p.slug == slug }
   end
 
-  def save(markdown)
-    # update the timestamp if the content has actually changed
-    set_updated_time(Time.now) unless markdown.strip == content.strip
-    super
-  end
-
   def to_liquid
     h = {
       "title" => title,

data/lib/serif/server.rb

@@ -7,6 +7,8 @@ class DevelopmentServer
   class DevApp < Sinatra::Base
     set :public_folder, Dir.pwd
 
+    not_found { "Resource not found" }
+
     get "/" do
       File.read(File.expand_path("_site/index.html"))
     end
@@ -22,7 +24,7 @@ class DevelopmentServer
       # make a naive assumption that there's a 404 file at 404.html
       file ||= Dir[File.expand_path("_site/404.html")].first
 
-      File.read(file)
+      file ? File.read(file) : 404
     end
   end
 

data/lib/serif/site.rb

@@ -26,6 +26,7 @@ module Filters
   end
 
   def encode_uri_component(string)
+    return "" unless string
     CGI.escape(string)
   end
 
@@ -42,7 +43,7 @@ class FileDigest < Liquid::Tag
   DIGEST_CACHE = {}
 
   # file_digest "file.css" [prefix:.]
-  Syntax = /^\s*(\S+)\s*(?:(prefix\s*:\s*\S+)\s*)?/
+  Syntax = /^\s*(\S+)\s*(?:(prefix\s*:\s*\S+)\s*)?$/
 
   def initialize(tag_name, markup, tokens)
     super
@@ -120,6 +121,18 @@ class Site
     most_recent ? most_recent.updated : Time.now
   end
 
+  # Gives the URL absolute path to a private draft preview.
+  #
+  # If the draft has no such preview available, returns nil.
+  def private_url(draft)
+    private_draft_pattern = site_path("/drafts/#{draft.slug}/*")
+    file = Dir[private_draft_pattern].first
+
+    return nil unless file
+
+    "/drafts/#{draft.slug}/#{File.basename(file, ".html")}"
+  end
+
   def bypass?(filename)
     !%w[.html .xml].include?(File.extname(filename))
   end
@@ -296,6 +309,8 @@ class Site
       next_post = post
     end
 
+    generate_draft_previews(default_layout)
+
     generate_archives(default_layout)
 
     if Dir.exist?("_site")
@@ -308,6 +323,47 @@ class Site
 
   private
 
+  # generates draft preview files for any unpublished drafts.
+  #
+  # uses the same template as live posts.
+  def generate_draft_previews(layout)
+    drafts = self.drafts
+
+    template = Liquid::Template.parse(File.read("_templates/post.html"))
+
+    # publish each draft under a randomly generated name, or use the
+    # existing file if one is present.
+    drafts.each do |draft|
+      url = private_url(draft)
+      if url
+        # take our existing URL like /drafts/foo/<random> (without .html)
+        # and give the filename
+        file = File.basename(url)
+      else
+        # create a new name
+        file = SecureRandom.hex(30)
+      end
+
+      # convert the name into a relative path
+      file = "drafts/#{draft.slug}/#{file}"
+
+      # the absolute path in the site's tmp path, where we create the file
+      # ready to be deployed.
+      live_preview_file = tmp_path(file)
+      FileUtils.mkdir_p(File.dirname(live_preview_file))
+
+      puts "#{url ? "Updating" : "Creating"} draft preview: #{file}"
+
+      File.open(live_preview_file + ".html", "w") do |f|
+        f.puts layout.render!(
+          "draft_preview" => true,
+          "page" => { "title" => [ "Draft Preview", draft.title ] },
+          "content" => template.render!("site" => self, "post" => draft)
+        )
+      end
+    end
+  end
+
   # goes through all draft posts that have "publish: now" headers and
   # calls #publish! on each one
   def preprocess_autopublish_drafts

data/lib/serif.rb

@@ -8,6 +8,8 @@ require "redhead"
 require "cgi"
 require "digest"
 
+require "securerandom"
+
 require "serif/content_file"
 require "serif/post"
 require "serif/draft"

data/serif.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "serif"
-  s.version      = "0.2.2"
+  s.version      = "0.2.3"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/serif"

data/statics/assets/js/attachment.js

@@ -0,0 +1,91 @@
+// Derived by Adam Prescott from a code snippet used
+// with implied permission:
+//
+// http://blog.alexmaccaw.com/svbtle-image-uploading
+
+var createAttachment = function(file, element) {
+	var data = new FormData();
+
+	var d = new Date();
+	var uid = d.getTime();
+
+	var month = d.getMonth().toString();
+	if (month.length < 2) { month = "0" + month; }
+
+	var day = d.getDate().toString();
+	if (day.length < 2) { day = "0" + day; }
+
+	var processedName = file.name.replace(/[^a-zA-Z0-9_]/g, "_").replace(/__+/g, "_");
+
+	var s = Serif.variables["imageUploadPattern"];
+
+	if (/:slug/.test(s) && !(Serif.variables["currentSlug"] && Serif.variables["currentSlug"])) {
+		alert("Your image upload path is set to use a slug, but no such slug exists yet.");
+		return null;
+	}
+
+	var placeholderValues = {
+		":slug": Serif.variables["currentSlug"],
+		":timestamp": uid.toString(),
+		":year": d.getFullYear().toString(),
+		":month": month,
+		":day": day,
+		":name": processedName
+	};
+
+	$.each(placeholderValues, function(placeholder, value) {
+		s = s.replace(placeholder, value);
+	});
+	
+	var extension = file.name.substring(file.name.lastIndexOf('.') + 1);
+
+	var finalName = s;
+
+	// if it doesn't already have the extension in the name, add it,
+	// otherwise, correct the, e.g., _png, to .png.
+	//
+	// this just avoids _png.png noise
+	if (finalName.substring(finalName.length - extension.length - 1) == ("_" + extension)) {
+		finalName = finalName.replace(new RegExp("_" + extension + "$"), "." + extension);
+	} else {
+		finalName = finalName + "." + extension;
+	}
+
+	data.append('attachment[file]', file);
+	data.append('attachment[uid]',  uid);
+	data.append('attachment[final_name]', finalName);
+
+	$.ajax({
+		url: '/admin/attachment',
+		data: data,
+		cache: false,
+		contentType: false,
+		processData: false,
+		type: 'POST',
+	}).error(function() {
+		console.log("error uploading image");
+	});
+
+	var absText = '![' + file.name + '](' + finalName + ')';
+	$(element).insertAtCaret(absText);
+};
+
+$(function() {
+	if ($("[data-attachify]").length > 0) {
+		$(document).dropArea();
+
+		$(document).bind("drop", function(e) {
+			e.preventDefault();
+			e = e.originalEvent;
+
+			var files = e.dataTransfer.files;
+
+			for (var i=0; i < files.length; i++) {
+				// Only upload images
+				if (/image/.test(files[i].type)) {
+					createAttachment(files[i], $("[data-attachify]").first());
+				}
+			};
+		});
+	}
+});

data/statics/assets/js/jquery.drop.js

@@ -0,0 +1,33 @@
+// All credit to Alex MacCaw:
+//
+// https://gist.github.com/maccman/2907187
+
+(function($){
+  function dragEnter(e) {
+    $(e.target).addClass("dragOver");
+    e.stopPropagation();
+    e.preventDefault();
+    return false;
+  };
+ 
+  function dragOver(e) {
+    e.originalEvent.dataTransfer.dropEffect = "copy";
+    e.stopPropagation();
+    e.preventDefault();
+    return false;
+  };
+ 
+  function dragLeave(e) {
+    $(e.target).removeClass("dragOver");
+    e.stopPropagation();
+    e.preventDefault();
+    return false;
+  };
+ 
+  $.fn.dropArea = function(){
+    this.bind("dragenter", dragEnter).
+         bind("dragover",  dragOver).
+         bind("dragleave", dragLeave);
+    return this;
+  };
+})(jQuery);

data/statics/assets/js/jquery.insert.js

@@ -0,0 +1,39 @@
+// All credit to Alex MacCaw
+//
+// https://gist.github.com/maccman/2907189
+
+(function($){
+  var insertAtCaret = function(value) {
+    if (document.selection) { // IE
+      this.focus();
+      sel = document.selection.createRange();
+      sel.text = value;
+      this.focus();
+    }
+    else if (this.selectionStart || this.selectionStart == '0') {
+      var startPos  = this.selectionStart;
+      var endPos    = this.selectionEnd;
+      var scrollTop = this.scrollTop;
+ 
+      this.value = [
+        this.value.substring(0, startPos),
+        value,
+        this.value.substring(endPos, this.value.length)
+      ].join('');
+ 
+      this.focus();
+      this.selectionStart = startPos + value.length;
+      this.selectionEnd   = startPos + value.length;
+      this.scrollTop      = scrollTop;
+ 
+    } else {
+      throw new Error('insertAtCaret not supported');
+    }
+  };
+ 
+  $.fn.insertAtCaret = function(value){
+    $(this).each(function(){
+      insertAtCaret.call(this, value);
+    })
+  };
+})(jQuery);

data/statics/skeleton/_config.yml

@@ -8,7 +8,45 @@
 #     permalink: [permalink format for generated posts]
 #
 # See the README for information on permalink formats.
-
+#
+# Image upload path configuration, used for any images added
+# through the admin drag-and-drop interface:
+#
+#     image_upload_path: [/some/absolute/path/:with/:placeholders]
+#
+# This should be an ABSOLUTE PATH and will be relative to your
+# base site (e.g., mysite.com). The value used will have the
+# relevant extension appended AUTOMATICALLY.
+#
+# The default value is: /images/:timestamp_:name
+#
+# Possible placeholders for the image upload path:
+#
+#     :year
+#       current full year, e.g., "2013"
+#
+#     :month
+#       current month as a two digit value, e.g., "02"
+#
+#     :day
+#       current day as a two digit value, e.g., "01"
+#
+#     :timestamp
+#       unix timestamp in seconds, e.g., "1361057832685"
+#
+#     :name
+#       filename of the image being uploaded
+#
+#     :slug
+#       the slug of the post at the time the image is added
+#
+# Any slashes in this string will become directories relative to the
+# base site directory.
+#
+# Example:  image_upload_path: /images/:slug/:year_:month_:day_:timestamp
+#
+#           This would lead to an example path of
+#           /images/sample-post/2013_02_16_1361057832685.png
 admin:
   username: changethisusername
   password: changethispassword

data/statics/templates/admin/edit_draft.liquid

@@ -14,6 +14,10 @@
 		</code>
 	</h2>
 
+	<h2 id="private-url">
+		<code><span>preview:</span> <a href="{{ private_url }}">{{ private_url | escape }}</a></code>
+	</h2>
+
 	<div class="post{% if post.draft %} draft{% endif %}">
 		<header>
 			<h1 id="heading" class="post">
@@ -28,7 +32,7 @@
 		</header>
 	</div>
 	<div id="content-areas">
-		<textarea spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
+		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
 
 		<article id="entry" class="post" data-state="hidden"></article>
 	</div>
@@ -51,13 +55,8 @@
 	</form>
 {% endif %}
 
-</div>
+<aside>
+	<p>Drag and drop images into the form above to upload them.</p>
+</aside>
 
-
-<script>
-$(function() {
-	window.onbeforeunload = function() {
-		return "You may lose unsaved changes if you leave this page.";
-	}
-});
-</script>
+</div>

data/statics/templates/admin/edit_post.liquid

@@ -17,14 +17,14 @@
 	<div class="post draft">
 		<header>
 			<h1 id="heading" class="post">
-				<textarea spellcheck="false" placeholder="It was a dark and stormy night" name="title" autofocus>{{ post.title | escape }}</textarea>
+				<textarea data-attachify spellcheck="false" placeholder="It was a dark and stormy night" name="title" autofocus>{{ post.title | escape }}</textarea>
 			</h1>
 
 			<time datetime="{{ post.created | date: "%Y-%m-%d" }}">{{ post.created | date: "%B %d %Y" }}</time>
 		</header>
 	</div>
 	<div id="content-areas">
-		<textarea spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown">{{ post.content | strip | escape }}</textarea>
+		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown">{{ post.content | strip | escape }}</textarea>
 
 		<article id="entry" class="post" data-state="hidden"></article>
 	</div>
@@ -33,12 +33,8 @@
 
 	<input type="checkbox" id="render-preview"> <label class="preview" for="render-preview">Preview</label>
 </form>
-</div>
 
-<script>
-$(function() {
-	window.onbeforeunload = function() {
-		return "You may lose unsaved changes if you leave this page.";
-	}
-});
-</script>
+<aside>
+	<p>Drag and drop images into the form above to upload them.</p>
+</aside>
+</div>

data/statics/templates/admin/layout.liquid

@@ -43,7 +43,7 @@ body > nav ul li:last-child {
 	background: none;
 }
 
-#edit #slug {
+#edit #slug, #edit #private-url {
 	color: #aaaaaa;
 	text-transform: lowercase;
 	margin-bottom: 0;
@@ -182,6 +182,12 @@ body > nav ul li:last-child {
 	min-height: 20em;
 }
 
+#edit > aside {
+	opacity: 0.5;
+	position: absolute;
+	bottom: -4em;
+}
+
 #edit #entry {
 	display: none;
 	width: 100%;
@@ -336,11 +342,43 @@ body > nav ul li:last-child {
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
 	<script src="/admin/js/jquery.autosize.js"></script>
 	<script src="/admin/js/mousetrap.min.js"></script>
+	<script src="/admin/js/jquery.drop.js"></script>
+	<script src="/admin/js/jquery.insert.js"></script>
+	<script src="/admin/js/attachment.js"></script>
 
 	<script>
+		var Serif = {
+			"variables": {
+				"imageUploadPattern": "{{ images_path }}",
+				"currentSlug": {% if post.slug %}"{{ post.slug }}"{% else %}null{% endif %}
+			}
+		};
+	</script>
+
+	<script>
+		function setDepartureCheck(enable) {
+			if (enable) {
+				window.onbeforeunload = function() {
+					return "You may lose unsaved changes if you leave this page.";
+				}
+			} else {
+				window.onbeforeunload = null;
+			}
+		}
+
+		setDepartureCheck(false);
+
+		$(function() {
+			$("input, textarea").change(function(event) {
+				setDepartureCheck(true);
+			});
+		});
+
 		$("#edit").ready(function() {
 			$("#slug input").blur(function() {
-				$(this).val($(this).val().trim().replace(/\s+/g, '-').replace(/^-+|-+$/g, '').toLowerCase());
+				$(this).val($(this).val().trim().replace(/\s+/g, '-').replace(/"/g, "-").replace(/^-+|-+$/g, '').toLowerCase());
+
+				Serif.variables["currentSlug"] = $(this).val();
 			});
 
 			$("#slug input").keyup(function(event) {
@@ -356,6 +394,10 @@ body > nav ul li:last-child {
 
 			$("#confirm-delete + label").text("Delete");
 
+			$("#edit form input[type=submit]").click(function(event) {
+				setDepartureCheck(false);
+			});
+
 			$("#delete input[type=submit]").click(function(event) {
 				var el = $(this);
 
@@ -372,6 +414,7 @@ body > nav ul li:last-child {
 
 			$("#confirm-delete + label").click(function(event) {
 				event.preventDefault();
+				setDepartureCheck(false);
 				$(this).parent("form").submit();
 			});
 			
@@ -425,6 +468,7 @@ body > nav ul li:last-child {
 			});
 
 			Mousetrap.bind(["ctrl+s", "command+s"], function(e) {
+				setDepartureCheck(false);
 				$("#edit form input[type=submit]").click();
 				$("#shortcuts").hide();
 				return false;
@@ -445,7 +489,7 @@ body > nav ul li:last-child {
 			});
 
 			Mousetrap.bind(["ctrl+.", "command+."], function(e) {
-				$("#delete, #save, #render-preview + label, #publish + label").fadeToggle();
+				$("#delete, #save, #render-preview + label, #publish + label, #edit > aside, #private-url").fadeToggle();
 				$("#slug, .post > header time").slideToggle();
 				$("#content").focus();
 				$("body > nav").toggleClass("hidden");

data/statics/templates/admin/new_draft.liquid

@@ -22,7 +22,7 @@
 		</header>
 	</div>
 	<div id="content-areas">
-		<textarea spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
+		<textarea data-attachify spellcheck="false" id="content" placeholder="Lorem ipsum dolor sit amet." name="markdown"{% if autofocus == "markdown" %}{{ " autofocus" }}{% endif %}>{{ post.content | strip | escape }}</textarea>
 
 		<article id="entry" class="post" data-state="hidden"></article>
 	</div>
@@ -32,12 +32,8 @@
 	<input type="checkbox" id="render-preview"> <label class="preview" for="render-preview">Preview</label>
 </form>
 
-</div>
+<aside>
+	<p>Drag and drop images into the form above to upload them.</p>
+</aside>
 
-<script>
-$(function() {
-	window.onbeforeunload = function() {
-		return "You may lose unsaved changes if you leave this page.";
-	}
-});
-</script>
+</div>

data/test/content_file_spec.rb

@@ -0,0 +1,39 @@
+require "test_helper"
+
+describe Serif::ContentFile do
+  subject do
+    Serif::Site.new(testing_dir)
+  end
+
+  describe "#title=" do
+    it "sets the underlying header value to the assigned title" do
+      (subject.drafts + subject.posts).each do |content_file|
+        content_file.title = "foobar"
+        content_file.headers[:title].should == "foobar"
+      end
+    end
+  end
+
+  describe "#save(markdown)" do
+    it "sets the underlying updated time value for posts" do
+      draft = Serif::Draft.new(subject)
+      draft.title = "Testing"
+      draft.slug = "hi"
+
+      begin
+        draft.save("# Some content")
+        draft.publish!
+
+        post = Serif::Post.from_slug(subject, draft.slug)
+
+        t = Time.now
+        Timecop.freeze(t + 30) do
+          post.save("# Heading content")
+          post.updated.to_i.should == (t + 30).to_i
+        end
+      ensure
+        FileUtils.rm(post.path)
+      end
+    end
+  end
+end

data/test/file_digest_tag_spec.rb

@@ -30,5 +30,9 @@ describe Serif::FileDigest do
     it "ignores trailing whitespace on the prefix" do
       file_digest("test-stylesheet.css prefix:. ").render(@context).should == ".f8390232f0c354a871f9ba0ed306163c"
     end
+
+    it "raises a SyntaxError on invalid syntax" do
+      expect { file_digest("test-stylesheet.css pefoiejw").render(@context) }.to raise_error(SyntaxError)
+    end
   end
 end

data/test/filters_spec.rb

@@ -43,6 +43,10 @@ describe Serif::Filters do
         subject.encode_uri_component(char).should == enc_char
       end
     end
+
+    it "returns an empty string on nil input" do
+      subject.encode_uri_component(nil).should == ""
+    end
   end
   
   describe "#xmlschema" do

data/test/post_spec.rb

@@ -12,4 +12,10 @@ describe Serif::Post do
   it "uses the config file's permalink value" do
     @posts.all? { |p| p.url == "/test-blog/#{p.slug}" }.should be_true
   end
+
+  describe "#inspect" do
+    it "includes headers" do
+      @posts.all? { |p| p.inspect.should include(p.headers.inspect) }
+    end
+  end
 end

data/test/site_dir/_site/drafts/another-sample-draft/cdc8037ed098e34a19fc6671ab652f908dd94009ff642d4e5ee80fa566fa.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: Draft Preview - another sample draft</title>
+<h1>mysite.com</h1>
+
+
+<h2>another sample draft</h2>
+
+<p>another-sample-draft</p>
+
+<p><a href="http://twitter.com/share?text=another+sample+draft&amp;url=http%3A%2F%2Fwww.mysite.com">Submit this to Twitter.</p>
+
+

data/test/site_dir/_site/drafts/sample-draft/f828e5f22d76b04c586e90680ac814e6b233d3d380f6be6975beba75081b.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: Draft Preview - Sample draft</title>
+<h1>mysite.com</h1>
+
+
+<h2>Sample draft</h2>
+
+<p>Just a sample draft.</p>
+
+<p><a href="http://twitter.com/share?text=Sample+draft&amp;url=http%3A%2F%2Fwww.mysite.com">Submit this to Twitter.</p>
+
+

data/test/site_dir/_site/test-blog/post-to-be-published-on-generate.html

@@ -3,6 +3,7 @@
 <title>My site: Posts - Some draft title</title>
 <h1>mysite.com</h1>
 
+
 <h2>Some draft title</h2>
 
 <p>some content</p>

data/test/site_dir/_site/test-blog/sample-post.html

@@ -3,6 +3,7 @@
 <title>My site: Posts - Sample post</title>
 <h1>mysite.com</h1>
 
+
 <h2>Sample post</h2>
 
 <p>Just a sample post.</p>

data/test/site_dir/_site/test-blog/second-post.html

@@ -3,6 +3,7 @@
 <title>My site: Posts - Second post</title>
 <h1>mysite.com</h1>
 
+
 <h2>Second post</h2>
 
 <p>Second post.</p>

data/test/site_dir/_templates/post.html

@@ -1,3 +1,4 @@
+{% if draft_preview %}<p>draftpreviewflagexists</p>{% endif %}
 <h2>{{ post.title }}</h2>
 
 {{ post.content | markdown }}

data/test/site_dir/_trash/1361047797-autopublish-draft

@@ -0,0 +1,5 @@
+title: Some draft title
+Updated: 2013-02-16T20:49:57+00:00
+Created: 2013-02-16T20:49:57+00:00
+
+some content

data/test/site_dir/_trash/{1360450928-autopublish-draft → 1361047797-test-draft}

@@ -1,4 +1,4 @@
 title: Some draft title
-Created: 2013-02-09T23:02:08+00:00
+Updated: 2013-02-16T20:49:57+00:00
 
 some content

data/test/site_generation_spec.rb

@@ -49,6 +49,42 @@ describe Serif::Site do
       previous_title[/(?<=: ).+/].should == "Sample post"
     end
 
+    it "sets a draft_preview flag for preview urls" do
+      preview_flag_pattern = /draftpreviewflagexists/
+
+      subject.generate
+
+      d = Serif::Draft.from_slug(subject, "sample-draft")
+      preview_contents = File.read(testing_dir("_site/#{subject.private_url(d)}.html"))
+      preview_contents =~ preview_flag_pattern
+
+      # does not exist on live published pages
+      (File.read(testing_dir("_site/test-blog/second-post.html")) =~ preview_flag_pattern).should be_false
+    end
+
+    it "creates draft preview files" do
+      subject.generate
+
+      Dir.exist?(testing_dir("_site/drafts")).should be_true
+      Dir[File.join(testing_dir("_site/drafts/*"))].size.should == subject.drafts.size
+
+      Dir.exist?(testing_dir("_site/drafts/sample-draft")).should be_true
+      Dir[File.join(testing_dir("_site/drafts/sample-draft"), "*.html")].size.should == 1
+
+      d = Serif::Draft.from_slug(subject, "sample-draft")
+      subject.private_url(d).should_not be_nil
+
+      # absolute paths
+      (subject.private_url(d) =~ /\A\/drafts\/#{d.slug}\/.*\z/).should be_true
+
+      # 60 characters long (30 bytes as hex chars)
+      (subject.private_url(d) =~ /\A\/drafts\/#{d.slug}\/[a-z0-9]{60}\z/).should be_true
+
+      # does not create more than one
+      subject.generate
+      Dir[File.join(testing_dir("_site/drafts/sample-draft"), "*.html")].size.should == 1
+    end
+
     context "for drafts with a publish: now header" do
       before :all do
         @time = Time.utc(2012, 12, 21, 15, 30, 00)

data/test/site_spec.rb

@@ -23,6 +23,14 @@ describe Serif::Site do
     end
   end
 
+  describe "#private_url" do
+    it "returns nil for a draft without an existing file" do
+      d = double("")
+      d.stub(:slug) { "foo" }
+      subject.private_url(d).should be_nil
+    end
+  end
+
   describe "#latest_update_time" do
     it "is the latest time that a post was updated" do
       subject.latest_update_time.should == Serif::Post.all(subject).max_by { |p| p.updated }.updated

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -235,13 +235,17 @@ files:
 - statics/skeleton/_layouts/default.html
 - statics/skeleton/archive.html
 - statics/assets/js/mousetrap.min.js
+- statics/assets/js/jquery.insert.js
+- statics/assets/js/attachment.js
 - statics/assets/js/jquery.autosize.js
+- statics/assets/js/jquery.drop.js
 - bin/serif
 - test/test_helper.rb
 - test/filters_spec.rb
 - test/config_spec.rb
 - test/liquid_filter_date_extension_spec.rb
 - test/site_spec.rb
+- test/content_file_spec.rb
 - test/draft_spec.rb
 - test/markup_renderer_spec.rb
 - test/site_dir/index.html
@@ -257,6 +261,8 @@ files:
 - test/site_dir/_site/test-archive/2013/01/index.html
 - test/site_dir/_site/test-archive/2012/12/index.html
 - test/site_dir/_site/test-archive/2012/11/index.html
+- test/site_dir/_site/drafts/another-sample-draft/cdc8037ed098e34a19fc6671ab652f908dd94009ff642d4e5ee80fa566fa.html
+- test/site_dir/_site/drafts/sample-draft/f828e5f22d76b04c586e90680ac814e6b233d3d380f6be6975beba75081b.html
 - test/site_dir/_site/index.html
 - test/site_dir/_site/file-digest-test.html
 - test/site_dir/_site/page-alt-layout.html
@@ -266,8 +272,8 @@ files:
 - test/site_dir/_site/test-blog/second-post.html
 - test/site_dir/_site/test-blog/sample-post.html
 - test/site_dir/_site/archive.html
-- test/site_dir/_trash/1360450928-autopublish-draft
-- test/site_dir/_trash/1360450928-test-draft
+- test/site_dir/_trash/1361047797-test-draft
+- test/site_dir/_trash/1361047797-autopublish-draft
 - test/site_dir/_posts/2012-01-05-sample-post
 - test/site_dir/_posts/2013-01-01-second-post
 - test/site_dir/_layouts/alt-layout.html
@@ -312,6 +318,7 @@ test_files:
 - test/config_spec.rb
 - test/liquid_filter_date_extension_spec.rb
 - test/site_spec.rb
+- test/content_file_spec.rb
 - test/draft_spec.rb
 - test/markup_renderer_spec.rb
 - test/file_digest_tag_spec.rb

data/test/site_dir/_trash/1360450928-test-draft

@@ -1,3 +0,0 @@
-title: Some draft title
-
-some content