serif 0.4 → 0.5

data/test/content_file_spec.rb

@@ -5,6 +5,37 @@ describe Serif::ContentFile do
     Serif::Site.new(testing_dir)
   end
 
+  describe "#basename" do
+    it "is the basename of the path" do
+      (subject.drafts + subject.posts).each do |content_file|
+        content_file.basename.should == File.basename(content_file.path)
+      end
+
+      draft = Serif::Draft.new(subject)
+      draft.slug = "foo"
+      draft.title = "foo"
+
+      # NOTE! Freezing!
+      Timecop.freeze(Time.parse("2013-04-03"))
+
+      draft.save
+      draft.publish!
+      post = Serif::Post.new(subject, draft.path)
+
+      begin
+        draft.path.should_not be_nil
+        post.should_not be_nil
+        draft.basename.should == post.basename
+
+        # NOTE! Time frozen!
+        post.basename.should == "2013-04-03-foo"
+      ensure
+        Timecop.return
+        FileUtils.rm(post.path)
+      end
+    end
+  end
+
   describe "#title=" do
     it "sets the underlying header value to the assigned title" do
       (subject.drafts + subject.posts).each do |content_file|
@@ -24,7 +55,7 @@ describe Serif::ContentFile do
         draft.save("# Some content")
         draft.publish!
 
-        post = Serif::Post.from_slug(subject, draft.slug)
+        post = Serif::Post.new(subject, draft.path)
 
         t = Time.now
         Timecop.freeze(t + 30) do

data/test/draft_spec.rb

@@ -7,6 +7,43 @@ describe Serif::Draft do
     FileUtils.rm_rf(testing_dir("_trash"))
   end
 
+  describe "#url" do
+    it "uses the current time for its placeholder values" do
+      d = D.new(@site)
+      d.slug = "my-blar-blar"
+      orig_headers = d.headers
+      d.stub(:headers) { orig_headers.merge(:permalink => "/foo/:year/:month/:day/:title") }
+
+      Timecop.freeze(Time.parse("2020-02-09")) do
+        d.url.should == "/foo/2020/02/09/my-blar-blar"
+      end
+    end
+
+    it "can handle nil slug values" do
+      d = D.new(@site)
+      d.slug.should be_nil
+      orig_headers = d.headers
+      d.stub(:headers) { orig_headers.merge(:permalink => "/foo/:year/:month/:day/:title") }
+
+      Timecop.freeze(Time.parse("2020-02-09")) do
+        d.url.should == "/foo/2020/02/09/"
+      end
+    end
+
+    it "defaults to the config file's permalink value" do
+      d = D.new(@site)
+      d.slug = "gablarhgle"
+      d.url.should == "/test-blog/gablarhgle"
+    end
+
+    it "uses its permalink header value" do
+      d = D.new(@site)
+      d.slug = "anything"
+      d.stub(:headers) { { :permalink => "testage" } }
+      d.url.should == "testage"
+    end
+  end
+
   describe ".rename" do
     it "moves the draft to a new file" do
       draft = D.new(@site)
@@ -86,11 +123,11 @@ describe Serif::Draft do
       published_path = testing_dir("_posts/#{Date.today.to_s}-#{draft.slug}")
 
       begin
-        @site.generate
+        capture_stdout { @site.generate }
         @site.posts.first.slug.should_not == draft.slug
         @site.to_liquid["posts"].first.slug.should_not == draft.slug
         draft.publish!
-        @site.generate
+        capture_stdout { @site.generate }
         @site.posts.first.slug.should == draft.slug
         @site.to_liquid["posts"].first.slug.should == draft.slug
       rescue
@@ -122,7 +159,7 @@ describe Serif::Draft do
       draft.autopublish?.should be_false
 
       # check the actual file doesn't have the header
-      Serif::Post.from_slug(@site, draft.slug).headers[:publish].should be_nil
+      Serif::Post.new(@site, draft.path).headers[:publish].should be_nil
 
       draft.delete!
     end
@@ -186,6 +223,16 @@ describe Serif::Draft do
     end
   end
 
+  describe "#to_liquid" do
+    it "contains the relevant keys" do
+      liq = @site.drafts.sample.to_liquid
+
+      ["title", "content", "slug", "type", "draft", "published", "url"].each do |e|
+        liq.key?(e).should be_true
+      end
+    end
+  end
+
   describe "#save" do
     it "saves the file to _drafts" do
       draft = D.new(@site)

data/test/post_spec.rb

@@ -5,7 +5,7 @@ describe Serif::Post do
     Serif::Site.new(testing_dir)
   end
 
-  before :all do
+  before :each do
     @posts = subject.posts
   end
 
@@ -16,7 +16,7 @@ describe Serif::Post do
       d.title = "Testing title"
       d.save("# some content")
       d.publish!
-      @temporary_post = Serif::Post.from_slug(subject, d.slug)
+      @temporary_post = Serif::Post.new(subject, d.path)
 
       example.run
     ensure
@@ -24,6 +24,16 @@ describe Serif::Post do
     end
   end
 
+  describe "#from_basename" do
+    it "is nil if there is nothing found" do
+      Serif::Post.from_basename(subject, "eoijfwoifjweofej").should be_nil
+    end
+
+    it "takes full filename within _posts" do
+      Serif::Post.from_basename(subject, @temporary_post.basename).path.should == @temporary_post.path
+    end
+  end
+
   it "uses the config file's permalink value" do
     @posts.all? { |p| p.url == "/test-blog/#{p.slug}" }.should be_true
   end
@@ -107,4 +117,23 @@ describe Serif::Post do
       @temporary_post.autoupdate?.should be_false
     end
   end
+
+  describe "#to_liquid" do
+    it "contains the relevant keys" do
+      liq = subject.posts.sample.to_liquid
+
+      ["title",
+       "created",
+       "updated",
+       "content",
+       "slug",
+       "url",
+       "type",
+       "draft",
+       "published",
+       "basename"].each do |e|
+        liq.key?(e).should be_true
+      end
+    end
+  end
 end

data/test/site_dir/_layouts/default.html

@@ -3,4 +3,6 @@
 <title>My site: {% if page.title and page.title != empty %}{{ page.title | join:" - " }}{% endif %}</title>
 <h1>mysite.com</h1>
 
+{% if post_page %}<p>post_page flag set for layout</p>{% endif %}
+
 {{ content }}

data/test/site_dir/_site/archive.html

@@ -4,6 +4,8 @@
 <h1>mysite.com</h1>
 
 
+
+
 	
 		<h1>
 			<a href="/test-archive/2400/01">January 2400</a>

data/test/site_dir/_site/drafts/another-sample-draft/{481da12b79709bfa0547fa9b5754c9506fbed29afd0334e07a8c95e76850.html → add25848a94509103cb492c47e3a04b7b2a56299de207155fbffec42dc4b.html}

@@ -1,14 +1,17 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Draft Preview - another sample draft</title>
+<title>My site: another sample draft</title>
 <h1>mysite.com</h1>
 
+
+
 <p>draftpreviewflagexists</p>
+
 <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>
+<p><a href="http://twitter.com/share?text=another+sample+draft&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Fanother-sample-draft">Submit this to Twitter.</p>
 
 

data/test/site_dir/_site/drafts/sample-draft/{a986a62ad5f6edd1fcac3d08f5b461b92bcb667a2af69505230c291d405c.html → 0b6fc164b8534d5d5a9fcfc5c709265d33f1577cd0fe2f4e23042e92f0c1.html}

@@ -1,14 +1,17 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Draft Preview - Sample draft</title>
+<title>My site: Sample draft</title>
 <h1>mysite.com</h1>
 
+
+
 <p>draftpreviewflagexists</p>
+
 <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>
+<p><a href="http://twitter.com/share?text=Sample+draft&amp;url=http%3A%2F%2Fwww.mysite.com%2Ftest-blog%2Fsample-draft">Submit this to Twitter.</p>
 
 

data/test/site_dir/_site/index.html

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h2>Posts</h2>
 
 <p>There are 6 posts:</p>

data/test/site_dir/_site/page-header-but-no-layout.html

@@ -3,4 +3,6 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 file containing headers but no layout option, to test that it still uses the default

data/test/site_dir/_site/test-archive/2012/11.html

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Nov 2012 (1)</h1>
 
 <ul>

data/test/site_dir/_site/test-archive/2012/12.html

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Dec 2012 (1)</h1>
 
 <ul>

data/test/site_dir/_site/test-archive/2013/01.html

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Jan 2013 (1)</h1>
 
 <ul>

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

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Mar 2013 (1)</h1>
 
 <ul>

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

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Jan 2399 (1)</h1>
 
 <ul>

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

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 <h1>Jan 2400 (1)</h1>
 
 <ul>

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

@@ -1,9 +1,12 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Posts - Final post</title>
+<title>My site: Final post</title>
 <h1>mysite.com</h1>
 
+<p>post_page flag set for layout</p>
 
+
+<p>post_page flag set for template</p>
 <h2>Final post</h2>
 
 <p>The final post in the blog</p>

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

@@ -1,9 +1,12 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Posts - Penultimate post</title>
+<title>My site: Penultimate post</title>
 <h1>mysite.com</h1>
 
+<p>post_page flag set for layout</p>
 
+
+<p>post_page flag set for template</p>
 <h2>Penultimate post</h2>
 
 <p>Penultimate post</p>

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

@@ -1,9 +1,12 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Posts - Some draft title</title>
+<title>My site: Some draft title</title>
 <h1>mysite.com</h1>
 
+<p>post_page flag set for layout</p>
 
+
+<p>post_page flag set for template</p>
 <h2>Some draft title</h2>
 
 <p>some content</p>

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

@@ -1,6 +1,7 @@
 <h1 id="layout" data-name="alternate-layout">Alternate layout</h1>
 
 
+<p>post_page flag set for template</p>
 <h2>Custom layout</h2>
 
 <p>Second post.</p>

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

@@ -1,9 +1,12 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Posts - Sample post</title>
+<title>My site: Sample post</title>
 <h1>mysite.com</h1>
 
+<p>post_page flag set for layout</p>
 
+
+<p>post_page flag set for template</p>
 <h2>Sample post</h2>
 
 <p>Just a sample post.</p>

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

@@ -1,9 +1,12 @@
 <!doctype html>
 <meta charset="UTF-8">
-<title>My site: Posts - Second post</title>
+<title>My site: Second post</title>
 <h1>mysite.com</h1>
 
+<p>post_page flag set for layout</p>
 
+
+<p>post_page flag set for template</p>
 <h2>Second post</h2>
 
 <p>Second post.</p>

data/test/site_dir/_site/test-smarty-filter.html

@@ -3,6 +3,8 @@
 <title>My site: </title>
 <h1>mysite.com</h1>
 
+
+
 Some content
 
 testing&rsquo;s for a &ldquo;heading&rsquo;s&rdquo; `with code` in it&hellip;

data/test/site_dir/_templates/post.html

@@ -1,4 +1,5 @@
 {% if draft_preview %}<p>draftpreviewflagexists</p>{% endif %}
+{% if post_page %}<p>post_page flag set for template</p>{% endif %}
 <h2>{{ post.title }}</h2>
 
 {{ post.content | markdown }}

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

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

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

@@ -1,4 +1,4 @@
 title: Some draft title
-Updated: 2013-03-18T18:59:14+00:00
+Updated: 2013-03-31T17:33:33+01:00
 
 some content

data/test/site_generation_spec.rb

@@ -10,6 +10,12 @@ describe Serif::Site do
   end
 
   describe "site generation" do
+    it "raises PostConflictError if there are conflicts" do
+      # not nil, the value is unimportant
+      subject.stub(:conflicts) { [] }
+      expect { capture_stdout { subject.generate } }.to raise_error(Serif::PostConflictError)
+    end
+
     it "uses the permalinks in the config file for site generation" do
       capture_stdout { subject.generate }
       File.exist?(testing_dir("_site/test-blog/sample-post.html")).should be_true
@@ -69,12 +75,35 @@ describe Serif::Site do
 
       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
+      (preview_contents =~ preview_flag_pattern).should be_true
 
       # 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 "sets a post_page flag for regular posts" do
+      capture_stdout { subject.generate }
+      d = Serif::Post.from_basename(subject, "2013-01-01-second-post")
+      d.should_not be_nil
+      contents = File.read(testing_dir("_site#{d.url}.html"))
+
+      # available to the post layout file
+      (contents =~ /post_page flag set for template/).should be_true
+
+      # available in the layout file itself
+      (contents =~ /post_page flag set for layout/).should be_true
+
+      # not set for regular pages
+      (File.read(testing_dir("_site/index.html")) =~ /post_page flag set for template/).should be_false
+      (File.read(testing_dir("_site/index.html")) =~ /post_page flag set for layout/).should be_false
+
+      # not set for drafts
+      d = Serif::Draft.from_slug(subject, "sample-draft")
+      preview_contents = File.read(testing_dir("_site/#{subject.private_url(d)}.html"))
+      (preview_contents =~ /post_page flag set for template/).should be_false
+      (preview_contents =~ /post_page flag set for layout/).should be_false
+    end
+
     it "creates draft preview files" do
       capture_stdout { subject.generate }
 
@@ -107,7 +136,7 @@ describe Serif::Site do
           d.save("# some content")
           d.publish!
           
-          @temporary_post = Serif::Post.from_slug(subject, d.slug)
+          @temporary_post = Serif::Post.new(subject, d.path)
           @temporary_post.autoupdate = true
           @temporary_post.save
 
@@ -121,13 +150,13 @@ describe Serif::Site do
         t = Time.now + 30
         Timecop.freeze(t) do
           capture_stdout { subject.generate }
-          Serif::Post.from_slug(subject, @temporary_post.slug).updated.to_i.should == t.to_i
+          Serif::Post.from_basename(subject, @temporary_post.basename).updated.to_i.should == t.to_i
         end
       end
     end
 
     context "for drafts with a publish: now header" do
-      before :all do
+      before :each do
         @time = Time.utc(2012, 12, 21, 15, 30, 00)
 
         draft = Serif::Draft.new(subject)
@@ -151,12 +180,14 @@ describe Serif::Site do
         Timecop.freeze(@time)
       end
 
-      after :all do
+      after :each do
         Timecop.return
 
-        # the generate processes creates its own set of instances, so the
-        # value of #path here would be stale if we were to call @post.path
-        FileUtils.rm(Serif::Post.from_slug(subject, @post.slug).path)
+        # the generate processes creates its own set of instances, and we're
+        # publishing a draft marked as autopublish, so our @post instance
+        # has a #path value which is for the draft, not for the newly published
+        # post. thus, we need to clobber.
+        FileUtils.rm(*Dir[testing_dir("_posts/*-#{@post.slug}")])
       end
 
       it "places the file in the published posts folder" do
@@ -166,7 +197,7 @@ describe Serif::Site do
 
       it "marks the creation time as the current time" do
         capture_stdout { subject.generate }
-        Serif::Post.from_slug(subject, @post.slug).created.should == @time
+        subject.posts.find { |p| p.slug == @post.slug }.created.to_i.should == @time.to_i
       end
     end
   end