serif 0.3.1 → 0.3.2

data/README.md

@@ -6,7 +6,16 @@ Serif is a file-based blogging engine intended for simple sites. It compiles Mar
 
 # Changes and what's new
 
-## Latest release (v0.3)
+## Latest release (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)
@@ -15,14 +24,6 @@ Serif is a file-based blogging engine intended for simple sites. It compiles Mar
 * Add a `smarty` filter to do smarty processing without full Markdown. (#28)
 * Fix broken URL renames for drafts in the admin interface. (#31)
 
-## v0.2.3
-
-* 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
@@ -177,7 +178,7 @@ This is where generated content gets saved. You should serve files out of here,
 
 ## `_layouts`
 
-This is where layouts for the site go. The file `default.html` is used by default, and any file outside of `_posts` can override this by setting a `Layout: foo` header, which will use `_layouts/foo.html` instead.
+This is where layouts for the site go. The file `default.html` is used by default, and individual files can override this by setting a `Layout: foo` header, which will use `_layouts/foo.html` instead.
 
 ## `_drafts` and `_posts`
 

data/lib/serif/site.rb

@@ -230,7 +230,7 @@ class Site
   end
 
   def to_liquid
-    @liquid_cache_store ||= TimeoutCache.new
+    @liquid_cache_store ||= TimeoutCache.new(1)
 
     cached_value = @liquid_cache_store[:liquid]
     return cached_value if cached_value

data/serif.gemspec

@@ -1,11 +1,11 @@
 Gem::Specification.new do |s|
   s.name         = "serif"
-  s.version      = "0.3.1"
+  s.version      = "0.3.2"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/serif"
-  s.summary      = "Simple file-based blogging system."
-  s.description  = "Serif is a simple file-based blogging system which generates static content and allows dynamic editing through an interface."
+  s.summary      = "Markdown-powered blogging with an optional admin interface with drag-and-drop image uploading."
+  s.description  = "Serif is a blogging system powered by markdown files and an optional admin interface complete with drag-and-drop image uploading."
   s.files        = Dir["{lib/**/*,statics/**/*,bin/*,test/**/*}"] + %w[serif.gemspec rakefile LICENSE Gemfile Gemfile.lock README.md]
   s.require_path = "lib"
   s.bindir       = "bin"

data/test/draft_spec.rb

@@ -78,6 +78,27 @@ describe Serif::Draft do
       FileUtils.rm_f(published_path)
     end
 
+    it "makes the post available in Site#posts and Site#to_liquid even straight after a generate" do
+      draft = D.new(@site)
+      draft.slug = "test-draft-to-go-into-liquid"
+      draft.title = "Some draft title"
+      draft.save("some content")
+      published_path = testing_dir("_posts/#{Date.today.to_s}-#{draft.slug}")
+
+      begin
+        @site.generate
+        @site.posts.first.slug.should_not == draft.slug
+        @site.to_liquid["posts"].first.slug.should_not == draft.slug
+        draft.publish!
+        @site.generate
+        @site.posts.first.slug.should == draft.slug
+        @site.to_liquid["posts"].first.slug.should == draft.slug
+      rescue
+        # clean up
+        FileUtils.rm_f(published_path)
+      end
+    end
+
     it "changes the #path to be _posts not _drafts" do
       draft = D.new(@site)
       draft.slug = "test-draft"

data/test/site_dir/_site/archive.html

@@ -5,6 +5,22 @@
 
 
 	
+		<h1>
+			<a href="/test-archive/2400/01">January 2400</a>
+		</h1>
+	
+
+	
+		<h1>
+			<a href="/test-archive/2399/01">January 2399</a>
+		</h1>
+	
+
+	
+		<h1>
+			<a href="/test-archive/2013/03">March 2013</a>
+		</h1>
+	
 		<h1>
 			<a href="/test-archive/2013/01">January 2013</a>
 		</h1>

data/test/site_dir/_site/index.html

@@ -5,10 +5,16 @@
 
 <h2>Posts</h2>
 
-<p>There are 3 posts:</p>
+<p>There are 6 posts:</p>
 
 <ul>
 	
+		<li><a href="/test-blog/final-post">Final post</a> (posted 2400-01-01T00:00:00Z)</li>
+	
+		<li><a href="/test-blog/penultimate-post">Penultimate post</a> (posted 2399-01-01T00:00:00Z)</li>
+	
+		<li><a href="/test-blog/post-with-custom-layout">Custom layout</a> (posted 2013-03-07T00:00:00Z)</li>
+	
 		<li><a href="/test-blog/second-post">Second post</a> (posted 2013-01-01T00:00:00Z)</li>
 	
 		<li><a href="/test-blog/post-to-be-published-on-generate">Some draft title</a> (posted 2012-12-21T15:30:00Z)</li>

data/test/site_dir/_site/test-archive/2013/03/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: </title>
+<h1>mysite.com</h1>
+
+<h1>Mar 2013 (1)</h1>
+
+<ul>
+	
+		<li>
+			<a href="/test-blog/post-with-custom-layout">Custom layout</a>
+		</li>
+	
+</ul>

data/test/site_dir/_site/test-archive/2399/01/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: </title>
+<h1>mysite.com</h1>
+
+<h1>Jan 2399 (1)</h1>
+
+<ul>
+	
+		<li>
+			<a href="/test-blog/penultimate-post">Penultimate post</a>
+		</li>
+	
+</ul>

data/test/site_dir/_site/test-archive/2400/01/index.html

@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: </title>
+<h1>mysite.com</h1>
+
+<h1>Jan 2400 (1)</h1>
+
+<ul>
+	
+		<li>
+			<a href="/test-blog/final-post">Final post</a>
+		</li>
+	
+</ul>

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

@@ -0,0 +1,13 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: Posts - Final post</title>
+<h1>mysite.com</h1>
+
+
+<h2>Final post</h2>
+
+<p>The final post in the blog</p>
+
+<p><a href="http://twitter.com/share?text=Final+post&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Ffinal-post">Submit this to Twitter.</p>
+
+Previous post: Penultimate post

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

@@ -0,0 +1,14 @@
+<!doctype html>
+<meta charset="UTF-8">
+<title>My site: Posts - Penultimate post</title>
+<h1>mysite.com</h1>
+
+
+<h2>Penultimate post</h2>
+
+<p>Penultimate post</p>
+
+<p><a href="http://twitter.com/share?text=Penultimate+post&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Fpenultimate-post">Submit this to Twitter.</p>
+
+Previous post: Custom layout
+Next post: Final post

data/test/site_dir/_site/test-blog/post-with-custom-layout.html

@@ -0,0 +1,11 @@
+<h1 id="layout" data-name="alternate-layout">Alternate layout</h1>
+
+
+<h2>Custom layout</h2>
+
+<p>Second post.</p>
+
+<p><a href="http://twitter.com/share?text=Custom+layout&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Fpost-with-custom-layout">Submit this to Twitter.</p>
+
+Previous post: Second post
+Next post: Penultimate post

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

@@ -11,3 +11,4 @@
 <p><a href="http://twitter.com/share?text=Second+post&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Fsecond-post">Submit this to Twitter.</p>
 
 Previous post: Some draft title
+Next post: Custom layout

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

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

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

@@ -1,4 +1,4 @@
 title: Some draft title
-Updated: 2013-03-03T03:19:04+00:00
+Updated: 2013-03-09T14:57:09+00:00
 
 some content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -219,8 +219,8 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-description: Serif is a simple file-based blogging system which generates static content
-  and allows dynamic editing through an interface.
+description: Serif is a blogging system powered by markdown files and an optional
+  admin interface complete with drag-and-drop image uploading.
 email:
 - adam@aprescott.com
 executables:
@@ -275,22 +275,28 @@ files:
 - test/site_dir/test-stylesheet.css
 - test/site_dir/_config.yml
 - test/site_dir/_site/test-archive/2013/01/index.html
+- test/site_dir/_site/test-archive/2013/03/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/5d169443ff5dbaf4a7514382e2c71464053230c7c42b96abbe2005e8a731.html
-- test/site_dir/_site/drafts/sample-draft/8877b6abe287fd4492604cc67c6d138f02edb0e05f32b0c95c0521055dc2.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/index.html
 - test/site_dir/_site/file-digest-test.html
 - test/site_dir/_site/page-alt-layout.html
 - test/site_dir/_site/page-header-but-no-layout.html
 - test/site_dir/_site/test-stylesheet.css
+- test/site_dir/_site/test-blog/final-post.html
 - test/site_dir/_site/test-blog/post-to-be-published-on-generate.html
 - test/site_dir/_site/test-blog/second-post.html
+- test/site_dir/_site/test-blog/post-with-custom-layout.html
 - test/site_dir/_site/test-blog/sample-post.html
+- 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/1362280744-autopublish-draft
-- test/site_dir/_trash/1362280744-test-draft
+- test/site_dir/_trash/1362841029-test-draft
+- test/site_dir/_trash/1362841029-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
@@ -332,7 +338,8 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Simple file-based blogging system.
+summary: Markdown-powered blogging with an optional admin interface with drag-and-drop
+  image uploading.
 test_files:
 - test/test_helper.rb
 - test/filters_spec.rb

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

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