serif 0.3 → 0.3.1

data/lib/serif/admin_server.rb

@@ -30,7 +30,7 @@ class AdminServer
 
     get "/admin/?" do
       posts = site.posts.sort_by { |p| p.created }.reverse
-      drafts = site.drafts.sort_by { |p| p.slug }.reverse
+      drafts = site.drafts.sort_by { |p| File.mtime(p.path) }.reverse
 
       liquid :index, locals: { posts: posts, drafts: drafts }
     end
@@ -185,11 +185,18 @@ class AdminServer
       FileUtils.mkdir_p(File.join(site.directory, File.dirname(filename)))
       FileUtils.mkdir_p(File.dirname(site.site_path(filename)))
 
+      source_file = File.join(site.directory, filename)
+      deployed_file = site.site_path(filename)
+
       # move to the source directory
-      FileUtils.mv(tempfile.path, File.join(site.directory, filename))
+      FileUtils.mv(tempfile.path, source_file)
 
       # copy to production to avoid the need to generate right now
-      FileUtils.copy(File.join(site.directory, filename), site.site_path(filename))
+      FileUtils.copy(source_file, deployed_file)
+
+      # no executable permissions, and whatever the umask is
+      perms = 0777 & ~0111 & ~File.umask
+      File.chmod(perms, source_file, deployed_file)
 
       "File uploaded"
     end

data/lib/serif/site.rb

@@ -2,7 +2,11 @@ class StandardFilterCheck
   include Liquid::StandardFilters
 
   def date_supports_now?
-    date("now", "%Y") == Time.now.year
+    begin
+      date("now", "%Y") == Time.now.year
+    rescue
+      false
+    end
   end
 end
 
@@ -305,6 +309,12 @@ class Site
 
       FileUtils.mkdir_p(tmp_path(File.dirname(post.url)))
 
+      post_layout = default_layout
+
+      if post.headers[:layout]
+        post_layout = Liquid::Template.parse(File.read(File.join(self.directory, "_layouts", "#{post.headers[:layout]}.html")))
+      end
+
       File.open(tmp_path(post.url + ".html"), "w") do |f|
         # variables available in the post template
         post_template_variables = {
@@ -313,7 +323,7 @@ class Site
           "next_post" => next_post
         }
 
-        f.puts default_layout.render!(
+        f.puts post_layout.render!(
           "site" => self,
           "page" => { "title" => ["Posts", "#{post.title}"] },
           "content" => Liquid::Template.parse(File.read("_templates/post.html")).render!(post_template_variables)

data/serif.gemspec

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

data/statics/templates/admin/edit_draft.liquid

@@ -15,7 +15,7 @@
 	</h2>
 
 	<h2 id="private-url">
-		<code><span>preview:</span> <a href="{{ private_url }}">{{ private_url | escape }}</a></code>
+		<code><span>preview:</span> <a href="{{ private_url }}">{% assign parts = private_url | split:"/" %}/{{ parts[1] }}/{{ parts[2] }}/{{ parts[3] | truncate: 10, '' }}&hellip;</a></code>
 	</h2>
 
 	<div class="post{% if post.draft %} draft{% endif %}">

data/statics/templates/admin/index.liquid

@@ -1,5 +1,7 @@
 <h1>Drafts</h1>
 
+<p>(Most recently modified first.)</p>
+
 <ul>
 {% for draft in drafts %}
 	<li><a href="/admin/edit/drafts/{{ draft.slug }}">{% if draft.slug != empty %}{{ draft.slug }}{% else %}<em>(untitled)</em>{% endif %}</a></li>
@@ -8,6 +10,8 @@
 
 <h1>Posts</h1>
 
+<p>(Most recently published first.)</p>
+
 <ul>
 {% for post in posts %}
 	<li><a href="/admin/edit/posts/{{ post.slug }}">{% if post.title != empty %}{{ post.title }}{% else %}<em>(untitled)</em>{% endif %}</a></li>

data/statics/templates/admin/layout.liquid

@@ -369,7 +369,7 @@ body > nav ul li:last-child {
 		setDepartureCheck(false);
 
 		$(function() {
-			$("input, textarea").change(function(event) {
+			$("input, textarea").keyup(function(event) {
 				setDepartureCheck(true);
 			});
 		});

data/test/markup_renderer_spec.rb

@@ -30,6 +30,14 @@ END_SOURCE
 <p>foo</p>
 <pre class="highlight"><code><span class="n">foo</span>
 </code></pre>
+END_OUTPUT
+  end
+
+  it "renders quote marks properly" do
+    subject.render(<<END_SOURCE).should == <<END_OUTPUT
+This "very" sentence's structure "isn't" necessary.
+END_SOURCE
+<p>This &ldquo;very&rdquo; sentence&#39;s structure &ldquo;isn&#39;t&rdquo; necessary.</p>
 END_OUTPUT
   end
 end

data/test/site_dir/_posts/2013-03-07-post-with-custom-layout

@@ -0,0 +1,5 @@
+title: Custom layout
+Created: 2013-03-07T00:00:00+00:00
+layout: alt-layout
+
+Second post.

data/test/site_dir/_posts/2399-01-01-penultimate-post

@@ -0,0 +1,4 @@
+title: Penultimate post
+Created: 2399-01-01T00:00:00+00:00
+
+Penultimate post

data/test/site_dir/_posts/2400-01-01-final-post

@@ -0,0 +1,4 @@
+title: Final post
+Created: 2400-01-01T00:00:00+00:00
+
+The final post in the blog

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

@@ -0,0 +1,5 @@
+title: Some draft title
+Updated: 2013-03-03T03:19:04+00:00
+Created: 2013-03-03T03:19:04+00:00
+
+some content

data/test/site_dir/_trash/{1361224983-test-draft → 1362280744-test-draft}

@@ -1,4 +1,4 @@
 title: Some draft title
-Updated: 2013-02-18T22:03:03+00:00
+Updated: 2013-03-03T03:19:04+00:00
 
 some content

data/test/site_generation_spec.rb

@@ -23,6 +23,14 @@ describe Serif::Site do
       File.read("_site/page-alt-layout.html").lines.first.should =~ /<h1.+?>Alternate layout<\/h1>/
     end
 
+    it "reads the layout header for a post file and uses the appropriate layout file" do
+      subject.generate
+
+      # check it actually got generated
+      File.exist?(testing_dir("_site/test-blog/post-with-custom-layout.html")).should be_true
+      File.read("_site/test-blog/post-with-custom-layout.html").lines.first.should =~ /<h1.+?>Alternate layout<\/h1>/
+    end
+
     it "supports a smarty filter" do
       subject.generate
       File.read("_site/test-smarty-filter.html").should =~ /testing&rsquo;s for a &ldquo;heading&rsquo;s&rdquo; `with code` in it&hellip;/
@@ -45,13 +53,13 @@ describe Serif::Site do
       next_title.should_not be_nil
       next_title[/(?<=: ).+/].should == "Second post"
 
-      contents = File.read("_site/test-blog/second-post.html")
+      contents = File.read("_site/test-blog/final-post.html")
       previous_title = contents[/Previous post: .+?$/]
       next_title = contents[/Next post: .+?$/]
       
       previous_title.should_not be_nil
       next_title.should be_nil
-      previous_title[/(?<=: ).+/].should == "Sample post"
+      previous_title[/(?<=: ).+/].should == "Penultimate post"
     end
 
     it "sets a draft_preview flag for preview urls" do

data/test/site_spec.rb

@@ -13,7 +13,7 @@ describe Serif::Site do
 
   describe "#posts" do
     it "is the number of posts in the site" do
-      subject.posts.length.should == 2
+      subject.posts.length.should == 5
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-18 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -277,8 +277,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/f340ff2dd6aa78f819d547ee908fe7410e6153559b47265dcbc58598bb4a.html
-- test/site_dir/_site/drafts/sample-draft/ed883ce827f757888e2900ce0e155a960cb45f832fcc24791c054013b71c.html
+- test/site_dir/_site/drafts/another-sample-draft/5d169443ff5dbaf4a7514382e2c71464053230c7c42b96abbe2005e8a731.html
+- test/site_dir/_site/drafts/sample-draft/8877b6abe287fd4492604cc67c6d138f02edb0e05f32b0c95c0521055dc2.html
 - test/site_dir/_site/index.html
 - test/site_dir/_site/file-digest-test.html
 - test/site_dir/_site/page-alt-layout.html
@@ -289,9 +289,12 @@ files:
 - test/site_dir/_site/test-blog/sample-post.html
 - test/site_dir/_site/test-smarty-filter.html
 - test/site_dir/_site/archive.html
-- test/site_dir/_trash/1361224983-test-draft
-- test/site_dir/_trash/1361224983-autopublish-draft
+- test/site_dir/_trash/1362280744-autopublish-draft
+- test/site_dir/_trash/1362280744-test-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
+- test/site_dir/_posts/2399-01-01-penultimate-post
 - test/site_dir/_posts/2013-01-01-second-post
 - test/site_dir/test-smarty-filter.html
 - test/site_dir/_layouts/alt-layout.html

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

@@ -1,5 +0,0 @@
-title: Some draft title
-Updated: 2013-02-18T22:03:03+00:00
-Created: 2013-02-18T22:03:03+00:00
-
-some content