serif 0.3.2 → 0.3.3

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    serif (0.2.3)
+    serif (0.3.3)
       liquid (~> 2.4)
-      pygments.rb (~> 0.3)
       rack (~> 1.0)
-      rack-rewrite (~> 1.3.0)
       redcarpet (~> 2.2)
       redhead (~> 0.0.8)
+      rouge (~> 0.3.2)
       sinatra (~> 1.3)
       slop (~> 3.3)
       timeout_cache
@@ -16,19 +15,16 @@ GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.1.3)
-    liquid (2.4.1)
+    liquid (2.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.5.2)
-    rack-protection (1.3.2)
+    rack-protection (1.5.0)
       rack
-    rack-rewrite (1.3.3)
     rake (0.9.6)
     redcarpet (2.2.2)
     redhead (0.0.8)
+    rouge (0.3.2)
+      thor
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
       rspec-expectations (~> 2.12.0)
@@ -41,15 +37,15 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    sinatra (1.3.4)
+    sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
-    slop (3.4.3)
-    tilt (1.3.3)
+    slop (3.4.4)
+    thor (0.17.0)
+    tilt (1.3.5)
     timecop (0.5.9.2)
     timeout_cache (0.0.2)
-    yajl-ruby (1.1.0)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -1,6 +1,6 @@
 (MIT License)
 
-Copyright (c) 2011-2012 Adam Prescott
+Copyright (c) 2011-2013 Adam Prescott
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,25 +4,24 @@
 
 Serif is a file-based blogging engine intended for simple sites. It compiles Markdown content to static files, and there is a web interface for editing and publishing ([simple video demo](https://docs.google.com/open?id=0BxPQpxGSOOyKS1J4MmlnM3JIaXM)), because managing everything with `ssh` and `git` can be a pain, compared to having a more universally accessible editing interface.
 
+Having problems with Serif? [Open an issue on GitHub](https://github.com/aprescott/serif/issues), or use the [Serif Google Group](https://groups.google.com/forum/#!forum/serif-rb)
+
 # Changes and what's new
 
-## Latest release (v0.3.1 and v0.3.2)
+# Latest release (v0.3.3)
+
+* Allow drag-and-drop to work on posts as well as drafts. (9ea3bebf)
+* `serif new` no longer creates a sample published post (#37) and generates immediately. (#39)
+* Pygments.rb is replaced with Rouge for code highlighting. (#34)
+
+## v0.3.1 and v0.3.2
 
 * Be kinder about the space used by the private URL characters. (#32)
 * The keyup event on any input or textarea now marks the page as having changed. Previously only on blur events. (e0df1375dd)
 * Order the list of drafts by most-recently-modified first, clarify draft and post ordering above each list. (#33)
 * Support custom layouts for posts as well as non-post files. (#35)
-* Drag-and-drop image uploads no longer use exclusively rw------- permissions, now rely on umask. (605487d98)
-# (v0.3.2) Fix caching problems caused by #30, allowing the most recently published to appear in files that use `site.posts`. (#36)
-
-## v0.3
-
-* Add some caching to improve performance of post generation. (#29)
-* Remove super-linear performance cost of file_digest, reducing site generation time by > 85% for 50+ posts. (#30 -- charts available in the issue)
-* Make `site` available to both preview templates and archive templates. (c3e2f28)
-* Intelligently add blank lines before the markdown image text strings. (#27)
-* Add a `smarty` filter to do smarty processing without full Markdown. (#28)
-* Fix broken URL renames for drafts in the admin interface. (#31)
+* Drag-and-drop image uploads no longer use exclusively `rw-------` permissions, now rely on umask. (605487d98)
+* (v0.3.2) Fix caching problems caused by #30, allowing the most recently published to appear in files that use `site.posts`. (#36)
 
 See `CHANGELOG` for more.
 
@@ -40,24 +39,16 @@ See `CHANGELOG` for more.
 * [Custom tags](#custom-tags)
 * [Template variables](#template-variables)
 * [Developing Serif](#developing-serif)
+* [Planned features](#planned-features)
 
 # Intro
 
-Serif is a lot like Jekyll with a few extra moving parts, although it didn't start that way. It went through two reworkings before being converted into something based on generated Markdown files. The aim for Serif is to provide two things:
+Serif is a lot like Jekyll with a few extra moving parts. Its main aim is to provide two things:
 
 1. Simplicity: the source and generated content are just files that can be served by any web server.
-2. Ease of publishing, wherever you are: having everything based on files that you edit in a text editor is a nice idea, but what if you're on a machine that doesn't give you ssh access to your server? What if you need to edit creation timestamps? What about editing drafts without having to make commits and push to git repos?
-
-With this in mind, you might think of Serif's aim as to merge Jekyll, [Second Crack](https://github.com/marcoarment/secondcrack) and ideas from [Svbtle](http://dcurt.is/codename-svbtle). There should be many ways of editing and publishing, such as using the web interface, `rsync`ing from a remote machine, or editing a draft file on the remote server and having everything happen for you.
-
-## Planned features
+2. Ease of publishing, wherever you are.
 
-Some things I'm hoping to implement one day:
-
-1. Custom hooks to fire after particular events, such as minifying CSS after publish, or committing changes and pushing to a git repository.
-2. Simple Markdown pages instead of plain HTML for non-post content.
-3. Automatically detecting file changes and regenerating the site.
-4. Adding custom Liquid filters and tags.
+Serif is sort of a blend between Jekyll, [Second Crack](https://github.com/marcoarment/secondcrack) and ideas from [Svbtle](http://dcurt.is/codename-svbtle). There should be flexibility with writing content, such as using the web interface, `rsync`ing from a remote machine, or editing a draft file on the remote server and having everything happen for you.
 
 # License and contributing
 
@@ -370,7 +361,7 @@ error_page 404 @not_found_page;
 location / {
 	index  index.html index.htm;
 
-	try_files $uri.html $uri $uri/ 404;
+	try_files $uri.html $uri $uri/ =404;
 }
 
 location @not_found_page {
@@ -424,6 +415,12 @@ These tags can be used in templates, in addition to the [standard Liquid filters
 
   This runs the given input through a Markdown + SmartyPants renderer, with fenced codeblocks enabled.
 
+* `smarty`
+  
+  e.g., `{{ post.title | smarty }}`.
+
+  This runs the given input through a SmartyPants processor, so quotes, dashes and ellipses come out better. Note that the **`markdown` filter already does SmartyPants** processing.
+
 * `strip`
   
   Strips trailing and leading whitespace.
@@ -459,15 +456,40 @@ These tags can be used in templates, in addition to the [standard Liquid filters
 
 # Template variables
 
-In addition to those mentioned above, such as the archive page variables, there are others. *This is not exhaustive.*
+In addition to those mentioned above, such as the archive page variables, there are others. *This may not be an exhaustive list.*
+
+## General template variables
+
+These should be available in any template:
+
+* `{{ site }}` --- a container for the site itself, containing:
+    * `{{ site.posts }}` --- the published posts of the site
+    * `{{ site.latest_update_time }}` --- a [Ruby `Time`](http://ruby-doc.org/core/Time.html) instance for the latest time that any post was updated. Useful for RSS/Atom feeds.
+    * `{{ site.archives }}` --- a nested hash structure that groups posts by month. See above for how to use it.
+* `{{ draft_preview }}` -- Set to true if this is part of generating a draft preview.
+
+## Post variables
+
+A published post has variables like `post.url` and `post.title`. Here's a list of what's available wherever `{{ post }}` is available. If the variable is, e.g., `post.url`, use as `{{ post.url }}`.
+
+Name           | Value
+------------   |:-----
+`post.title`   | Title of the post
+`post.url`     | Permalink to the post based on the config or any `permalink` header on the post
+`post.slug`    | URL slug of the post. A filename like `2013-06-02-my-post` will correspond to a `{{ post.slug }}` value of `my-post`
+`post.created` | A [Ruby `Time`](http://ruby-doc.org/core/Time.html) instance for the time the post was first published.
+`post.updated` | A [Ruby `Time`](http://ruby-doc.org/core/Time.html) instance for the time the post was last updated.
+`post.content` | The raw post content. Example use: `{{ post.content | markdown }}`.
 
-## Post template variables
+## Variables available within post templates
 
 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`.
-* `{{ next_post }}` --- the post published chronologically after `post`.
+Variable    | Value
+----------- |:----
+`post`      | The post being processed. See above for what values (`post.url`, ...) are available.
+`prev_post` | The post published chronologically before `post`.
+`next_post` | The post published chronologically after `post`.
 
 # Developing Serif
 
@@ -480,4 +502,13 @@ These are available on individual post pages, in `_template/post.html`.
 ## Directory structure
 
 * `lib/serif/` is generally where files go.
-* `test/` contains the test files. Any new files should have `require "test_helper"` at the top of the, which pulls in `test/test_helper.rb`.
+* `test/` contains the test files. Any new files should have `require "test_helper"` at the top of the, which pulls in `test/test_helper.rb`.
+
+# Planned features
+
+Some things I'm hoping to implement one day:
+
+1. Custom hooks to fire after particular events, such as minifying CSS after publish, or committing changes and pushing to a git repository.
+2. Simple Markdown pages instead of plain HTML for non-post content.
+3. Automatically detecting file changes and regenerating the site.
+4. Adding custom Liquid filters and tags.

data/bin/serif

@@ -51,6 +51,8 @@ def produce_skeleton(dir)
     FileUtils.cp_r(f, dir, verbose: true)
   end
 
+  generate_site(dir)
+
   puts
   puts "*** NOTE ***"
   puts

data/lib/serif/markup_renderer.rb

@@ -5,19 +5,14 @@ class MarkupRenderer < Redcarpet::Render::SmartyHTML
     # 
     # note that we add a new line after the initial ``` but not before the closing
     # ``` because otherwise it introduces an extra \n.
-    return Redcarpet::Markdown.new(Redcarpet::Render::SmartyHTML, fenced_code_blocks: true).render(%Q{```
-#{code}```}).strip unless language
+    if !language
+        simple_code = %Q{```\n#{code}```}
+        renderer = Redcarpet::Markdown.new(Redcarpet::Render::SmartyHTML, fenced_code_blocks: true)
+        return renderer.render(simple_code).strip
+    end
 
-    out = Pygments.highlight(code, lexer: language)
-
-    # first, get rid of the div, since we want
-    # to stick the class onto the <pre>, to stay
-    # clean markup-wise.
-    out.sub!(/^<div[^>]*>/, "")
-    out.strip!
-    out.sub!(/<\/div>\z/, "")
-    
-    out.sub!(/^<pre>/, "<pre#{" class=\"highlight\""}><code>")
+    out = Rouge.highlight(code, language, "html")
+    out.sub!(/^(<pre class=\"highlight\">)/, '\1<code>')
     out.sub!(/<\/pre>\z/, "</code></pre>\n")
     
     out

data/lib/serif/server.rb

@@ -1,6 +1,5 @@
 require "sinatra/base"
 require "fileutils"
-require "rack/rewrite"
 
 module Serif
 class DevelopmentServer

data/lib/serif/site.rb

@@ -299,12 +299,17 @@ class Site
       end
     end
 
-    # the posts are iterated over in reverse chrological order
-    next_post = nil
-
     # run through the posts + nil so we can keep |a, b| such that a hits every element
     # while iterating.
-    [*posts, nil].each_cons(2) do |post, prev_post|
+    posts.each.with_index do |post, i|
+      # the posts are iterated over in reverse chrological order, and
+      # next_post here is post published chronologically after than
+      # the post in the iteration.
+      #
+      # if i == 0, we don't want posts.last, so return nil if i - 1 == -1
+      next_post = (i == 0 ? nil : posts[i - 1])
+      prev_post = posts[i + 1]
+
       puts "Processing post: #{post.path}"
 
       FileUtils.mkdir_p(tmp_path(File.dirname(post.url)))
@@ -329,8 +334,6 @@ class Site
           "content" => Liquid::Template.parse(File.read("_templates/post.html")).render!(post_template_variables)
         )
       end
-
-      next_post = post
     end
 
     generate_draft_previews(default_layout)
@@ -383,7 +386,7 @@ class Site
           "site" => self,
           "draft_preview" => true,
           "page" => { "title" => [ "Draft Preview", draft.title ] },
-          "content" => template.render!("site" => self, "post" => draft)
+          "content" => template.render!("site" => self, "post" => draft, "draft_preview" => true)
         )
       end
     end

data/lib/serif.rb

@@ -2,7 +2,7 @@ require "time"
 
 require "liquid"
 require "redcarpet"
-require "pygments.rb"
+require "rouge"
 require "redhead"
 require "timeout_cache"
 

data/serif.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "serif"
-  s.version      = "0.3.2"
+  s.version      = "0.3.3"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/serif"
@@ -14,9 +14,8 @@ Gem::Specification.new do |s|
 
   [
     "rack", "~> 1.0",
-    "rack-rewrite", "~> 1.3.0",
     "redcarpet", "~> 2.2",
-    "pygments.rb", "~> 0.3",
+    "rouge", "~> 0.3.2",
     "sinatra", "~> 1.3",
     "redhead", "~> 0.0.8",
     "liquid", "~> 2.4",

data/statics/templates/admin/edit_post.liquid

@@ -17,7 +17,7 @@
 	<div class="post draft">
 		<header>
 			<h1 id="heading" class="post">
-				<textarea data-attachify spellcheck="false" placeholder="It was a dark and stormy night" name="title" autofocus>{{ post.title | escape }}</textarea>
+				<textarea 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>

data/test/site_dir/_site/drafts/another-sample-draft/{79d6aaed09deaead24960fd3b070d01802b9e1d2a3711dda9f6dbaab26d3.html → 9094f3a34ce2ecfe188ad813e0d3229d2488350fb0c5bca4f8b4bcfe7b11.html}

@@ -3,7 +3,7 @@
 <title>My site: Draft Preview - another sample draft</title>
 <h1>mysite.com</h1>
 
-
+<p>draftpreviewflagexists</p>
 <h2>another sample draft</h2>
 
 <p>another-sample-draft</p>

data/test/site_dir/_site/drafts/sample-draft/{af5fd3ce4acf764fca7fad9bf23b8d83644b2f0b42bd25bcfc1c67213c23.html → 359dca7a7237a1317c5e8ac2d3a01cd29db433f4caeb0b2209484ca09a7a.html}

@@ -3,7 +3,7 @@
 <title>My site: Draft Preview - Sample draft</title>
 <h1>mysite.com</h1>
 
-
+<p>draftpreviewflagexists</p>
 <h2>Sample draft</h2>
 
 <p>Just a sample draft.</p>

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

@@ -0,0 +1,5 @@
+title: Some draft title
+Updated: 2013-03-14T18:16:31+00:00
+Created: 2013-03-14T18:16:31+00:00
+
+some content

data/test/site_dir/_trash/{1362841029-test-draft → 1363284991-test-draft}

@@ -1,4 +1,4 @@
 title: Some draft title
-Updated: 2013-03-09T14:57:09+00:00
+Updated: 2013-03-14T18:16:31+00:00
 
 some content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -27,22 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack-rewrite
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -60,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
-  name: pygments.rb
+  name: rouge
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -247,7 +231,6 @@ files:
 - statics/skeleton/_templates/post.html
 - statics/skeleton/_drafts/sample-draft
 - statics/skeleton/_config.yml
-- statics/skeleton/_posts/2012-01-05-sample-post
 - statics/skeleton/_layouts/default.html
 - statics/skeleton/archive.html
 - statics/assets/js/mousetrap.min.js
@@ -280,8 +263,8 @@ files:
 - test/site_dir/_site/test-archive/2012/11/index.html
 - test/site_dir/_site/test-archive/2400/01/index.html
 - test/site_dir/_site/test-archive/2399/01/index.html
-- test/site_dir/_site/drafts/another-sample-draft/79d6aaed09deaead24960fd3b070d01802b9e1d2a3711dda9f6dbaab26d3.html
-- test/site_dir/_site/drafts/sample-draft/af5fd3ce4acf764fca7fad9bf23b8d83644b2f0b42bd25bcfc1c67213c23.html
+- test/site_dir/_site/drafts/another-sample-draft/9094f3a34ce2ecfe188ad813e0d3229d2488350fb0c5bca4f8b4bcfe7b11.html
+- test/site_dir/_site/drafts/sample-draft/359dca7a7237a1317c5e8ac2d3a01cd29db433f4caeb0b2209484ca09a7a.html
 - test/site_dir/_site/index.html
 - test/site_dir/_site/file-digest-test.html
 - test/site_dir/_site/page-alt-layout.html
@@ -295,8 +278,8 @@ files:
 - test/site_dir/_site/test-blog/penultimate-post.html
 - test/site_dir/_site/test-smarty-filter.html
 - test/site_dir/_site/archive.html
-- test/site_dir/_trash/1362841029-test-draft
-- test/site_dir/_trash/1362841029-autopublish-draft
+- test/site_dir/_trash/1363284991-test-draft
+- test/site_dir/_trash/1363284991-autopublish-draft
 - test/site_dir/_posts/2013-03-07-post-with-custom-layout
 - test/site_dir/_posts/2012-01-05-sample-post
 - test/site_dir/_posts/2400-01-01-final-post

data/statics/skeleton/_posts/2012-01-05-sample-post

@@ -1,4 +0,0 @@
-title: Sample post
-Created: 2012-11-21T17:07:09+00:00
-
-Just a sample post.

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

@@ -1,5 +0,0 @@
-title: Some draft title
-Updated: 2013-03-09T14:57:09+00:00
-Created: 2013-03-09T14:57:09+00:00
-
-some content