serif 0.5 → 0.5.1

data/README.md

@@ -6,7 +6,7 @@ Serif is a static site generator and blogging system powered by markdown files a
 
 Serif releases you from managing a file system so you can focus on writing content.
 
-Having problems with Serif? [Open an issue on GitHub](https://github.com/aprescott/serif/issues), use the [Serif Google Group](https://groups.google.com/forum/#!forum/serif-rb), or [join the Freenode#serif IRC channel](irc://irc.freenode.net/serif).
+Having problems with Serif? [Open an issue on GitHub](https://github.com/aprescott/serif/issues), use the [Serif Google Group](https://groups.google.com/forum/#!forum/serif-rb), or join the Freenode#serif IRC channel at irc://irc.freenode.net/serif.
 
 ## First time use
 

data/lib/serif/commands.rb

@@ -83,6 +83,7 @@ class Commands
     files.each do |f|
       FileUtils.cp_r(f, dir, verbose: true)
     end
+    FileUtils.mkdir(File.join(dir, "_posts"))
 
     generate_site(dir)
 

data/lib/serif/content_file.rb

@@ -51,12 +51,14 @@ class ContentFile
     @cached_headers = nil
   end
   
+  # Returns true if the file is in the directory for draft content.
   def draft?
-    !published?
+    File.dirname(path) == File.join(site.directory, Draft.dirname)
   end
 
+  # Returns true if the file is in the directory for published posts.
   def published?
-    headers.key?(:created)
+    File.dirname(path) == File.join(site.directory, Post.dirname)
   end
   
   def content(include_headers = false)

data/lib/serif/draft.rb

@@ -41,6 +41,8 @@ class Draft < ContentFile
     publish_time = Time.now
     date = Time.now.strftime("%Y-%m-%d")
     filename = "#{date}-#{slug}"
+
+    FileUtils.mkdir_p("#{site.directory}/#{Post.dirname}")
     full_published_path = File.expand_path("#{site.directory}/#{Post.dirname}/#{filename}")
 
     raise "conflict, post exists already" if File.exist?(full_published_path)

data/serif.gemspec

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

data/test/content_file_spec.rb

@@ -36,6 +36,34 @@ describe Serif::ContentFile do
     end
   end
 
+  describe "draft?" do
+    it "is true if the file is in the _drafts directory" do
+      subject.drafts.each do |d|
+        d.draft?.should be_true
+        d.published?.should be_false
+      end
+
+      d = subject.drafts.sample
+      orig_path = d.path
+      d.stub(:path) { orig_path.gsub(/^#{Regexp.quote(testing_dir("_drafts"))}/, testing_dir("_anything")) }
+      d.draft?.should be_false
+    end
+  end
+
+  describe "published?" do
+    it "is true if the file is in the _posts directory" do
+      subject.posts.each do |p|
+        p.published?.should be_true
+        p.draft?.should be_false
+      end
+
+      p = subject.posts.sample
+      orig_path = p.path
+      p.stub(:path) { orig_path.gsub(/^#{Regexp.quote(testing_dir("_posts"))}/, testing_dir("_anything")) }
+      p.published?.should be_false
+    end
+  end
+
   describe "#title=" do
     it "sets the underlying header value to the assigned title" do
       (subject.drafts + subject.posts).each do |content_file|

data/test/draft_spec.rb

@@ -115,6 +115,21 @@ describe Serif::Draft do
       FileUtils.rm_f(published_path)
     end
 
+    it "creates the posts directory if it doens't already exist" do
+      draft = D.new(@site)
+      draft.slug = "test-draft"
+      draft.title = "Some draft title"
+      draft.save("some content")
+
+      FileUtils.should_receive(:mkdir_p).with(testing_dir("_posts")).and_call_original
+
+      begin
+        draft.publish!
+      ensure
+        FileUtils.rm(draft.path)
+      end
+    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"

data/test/site_dir/_trash/{1364747613-test-draft → 1365433969-test-draft}

@@ -1,4 +1,4 @@
 title: Some draft title
-Updated: 2013-03-31T17:33:33+01:00
+Updated: 2013-04-08T16:12:49+01:00
 
 some content

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

@@ -0,0 +1,5 @@
+title: Some draft title
+Updated: 2013-04-08T16:12:50+01:00
+Created: 2013-04-08T16:12:50+01:00
+
+some content

data/test/site_dir/_trash/1365433970-test-draft

@@ -0,0 +1,4 @@
+title: Some draft title
+Updated: 2013-04-08T16:12:50+01:00
+
+some content

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: serif
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-31 00:00:00.000000000 Z
+date: 2013-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -260,90 +260,91 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/serif/admin_server.rb
+- lib/serif/commands.rb
+- lib/serif/config.rb
 - lib/serif/content_file.rb
-- lib/serif/server.rb
+- lib/serif/draft.rb
+- lib/serif/errors.rb
 - lib/serif/markup_renderer.rb
 - lib/serif/post.rb
-- lib/serif/errors.rb
-- lib/serif/config.rb
-- lib/serif/admin_server.rb
-- lib/serif/draft.rb
-- lib/serif/commands.rb
+- lib/serif/server.rb
 - lib/serif/site.rb
 - lib/serif.rb
-- statics/templates/admin/new_draft.liquid
-- statics/templates/admin/edit_draft.liquid
-- statics/templates/admin/layout.liquid
-- statics/templates/admin/index.liquid
-- statics/templates/admin/bookmarks.liquid
-- statics/templates/admin/edit_post.liquid
-- statics/skeleton/index.html
-- statics/skeleton/_templates/archive_page.html
-- statics/skeleton/_templates/post.html
-- statics/skeleton/_drafts/sample-draft
-- statics/skeleton/_config.yml
-- 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
+- statics/assets/js/jquery.insert.js
+- statics/assets/js/mousetrap.min.js
+- statics/skeleton/_config.yml
+- statics/skeleton/_drafts/sample-draft
+- statics/skeleton/_layouts/default.html
+- statics/skeleton/_templates/archive_page.html
+- statics/skeleton/_templates/post.html
+- statics/skeleton/archive.html
+- statics/skeleton/index.html
+- statics/templates/admin/bookmarks.liquid
+- statics/templates/admin/edit_draft.liquid
+- statics/templates/admin/edit_post.liquid
+- statics/templates/admin/index.liquid
+- statics/templates/admin/layout.liquid
+- statics/templates/admin/new_draft.liquid
 - bin/serif
-- test/test_helper.rb
-- test/filters_spec.rb
+- test/commands_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/file_digest_tag_spec.rb
+- test/filters_spec.rb
+- test/liquid_filter_date_extension_spec.rb
 - test/markup_renderer_spec.rb
-- test/site_dir/index.html
-- test/site_dir/_templates/archive_page.html
-- test/site_dir/_templates/post.html
+- test/post_spec.rb
+- test/site_dir/_config.yml
 - test/site_dir/_drafts/another-sample-draft
 - test/site_dir/_drafts/sample-draft
-- test/site_dir/file-digest-test.html
-- test/site_dir/page-alt-layout.html
-- test/site_dir/page-header-but-no-layout.html
-- test/site_dir/test-stylesheet.css
-- test/site_dir/_config.yml
-- test/site_dir/_site/test-archive/2013/01.html
-- test/site_dir/_site/test-archive/2013/03.html
-- test/site_dir/_site/test-archive/2012/12.html
-- test/site_dir/_site/test-archive/2012/11.html
-- test/site_dir/_site/test-archive/2400/01.html
-- test/site_dir/_site/test-archive/2399/01.html
-- test/site_dir/_site/drafts/another-sample-draft/add25848a94509103cb492c47e3a04b7b2a56299de207155fbffec42dc4b.html
-- test/site_dir/_site/drafts/sample-draft/0b6fc164b8534d5d5a9fcfc5c709265d33f1577cd0fe2f4e23042e92f0c1.html
-- test/site_dir/_site/index.html
+- test/site_dir/_layouts/alt-layout.html
+- test/site_dir/_layouts/default.html
+- test/site_dir/_posts/2012-01-05-sample-post
+- test/site_dir/_posts/2013-01-01-second-post
+- test/site_dir/_posts/2013-03-07-post-with-custom-layout
+- test/site_dir/_posts/2399-01-01-penultimate-post
+- test/site_dir/_posts/2400-01-01-final-post
+- test/site_dir/_site/archive.html
+- test/site_dir/_site/drafts/another-sample-draft/893209b2ce83164321ca8f311a32a3c87399498377e1229e7ecc26ff850f.html
+- test/site_dir/_site/drafts/sample-draft/1b015cdf8a931d05f12b95c6a9ea308c6e006596d6ccae5849935e7aaf24.html
 - test/site_dir/_site/file-digest-test.html
+- test/site_dir/_site/index.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-archive/2012/11.html
+- test/site_dir/_site/test-archive/2012/12.html
+- test/site_dir/_site/test-archive/2013/01.html
+- test/site_dir/_site/test-archive/2013/03.html
+- test/site_dir/_site/test-archive/2399/01.html
+- test/site_dir/_site/test-archive/2400/01.html
 - test/site_dir/_site/test-blog/final-post.html
+- test/site_dir/_site/test-blog/penultimate-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-blog/second-post.html
 - test/site_dir/_site/test-smarty-filter.html
-- test/site_dir/_site/archive.html
-- test/site_dir/_trash/1364747613-autopublish-draft
-- test/site_dir/_trash/1364747613-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
-- test/site_dir/_layouts/default.html
+- test/site_dir/_site/test-stylesheet.css
+- test/site_dir/_templates/archive_page.html
+- test/site_dir/_templates/post.html
+- test/site_dir/_trash/1365433969-test-draft
+- test/site_dir/_trash/1365433970-autopublish-draft
+- test/site_dir/_trash/1365433970-test-draft
 - test/site_dir/archive.html
-- test/file_digest_tag_spec.rb
+- test/site_dir/file-digest-test.html
+- test/site_dir/index.html
+- test/site_dir/page-alt-layout.html
+- test/site_dir/page-header-but-no-layout.html
+- test/site_dir/test-smarty-filter.html
+- test/site_dir/test-stylesheet.css
 - test/site_generation_spec.rb
-- test/post_spec.rb
-- test/commands_spec.rb
+- test/site_spec.rb
+- test/test_helper.rb
 - serif.gemspec
 - rakefile
 - LICENSE
@@ -376,15 +377,15 @@ specification_version: 3
 summary: Static site generator and markdown-based blogging with an optional admin
   interface complete with drag-and-drop image uploading.
 test_files:
-- test/test_helper.rb
-- test/filters_spec.rb
+- test/commands_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/file_digest_tag_spec.rb
-- test/site_generation_spec.rb
+- test/filters_spec.rb
+- test/liquid_filter_date_extension_spec.rb
+- test/markup_renderer_spec.rb
 - test/post_spec.rb
-- test/commands_spec.rb
+- test/site_generation_spec.rb
+- test/site_spec.rb
+- test/test_helper.rb

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

@@ -1,5 +0,0 @@
-title: Some draft title
-Updated: 2013-03-31T17:33:33+01:00
-Created: 2013-03-31T17:33:33+01:00
-
-some content