serif 0.3.3 → 0.4

data/lib/serif/site.rb

@@ -1,25 +1,9 @@
-class StandardFilterCheck
-  include Liquid::StandardFilters
-
-  def date_supports_now?
-    begin
-      date("now", "%Y") == Time.now.year
-    rescue
-      false
-    end
-  end
-end
 
-if StandardFilterCheck.new.date_supports_now?
-  puts "NOTICE! 'now' is supported by 'date' filter. Remove the patch"
-  sleep 5 # incur a penalty
-else
-  module Liquid::StandardFilters
-    alias_method :date_orig, :date
+module Liquid::StandardFilters
+  alias_method :date_orig, :date
 
-    def date(input, format)
-      input == "now" ? date_orig(Time.now, format) : date_orig(input, format)
-    end
+  def date(input, format)
+    input == "now" ? date_orig(Time.now, format) : date_orig(input, format)
   end
 end
 
@@ -40,7 +24,19 @@ module Filters
   end
 
   def markdown(body)
-    Redcarpet::Markdown.new(Serif::MarkupRenderer, fenced_code_blocks: true).render(body).strip
+    renderer = Redcarpet::Markdown.new(Serif::MarkupRenderer, fenced_code_blocks: true)
+    html = renderer.render(body).strip
+
+    # make sure we aren't overriding unless we need to.
+    # causes the workaround to automatically turn off.
+    if !(renderer.render("a 'quoted' word").include?("’"))
+      # fix the broken single curly quotes by putting them back
+      # as unescaped characters and then re-running the renderer.
+      html.gsub!("'", "'")
+      html = renderer.render(html)
+    end
+
+    html
   end
 
   def xmlschema(input)
@@ -194,7 +190,7 @@ class Site
     year_groups.map! do |year_start_date, posts_by_year|
       {
         :date => year_start_date,
-        :posts => posts_by_year.sort_by { |post| post.created }
+        :posts => posts_by_year.sort_by { |post| post.created }.reverse
       }
     end
 
@@ -211,7 +207,7 @@ class Site
       month_groups.map! do |month_start_date, posts_by_month|
         {
           :date => month_start_date,
-          :posts => posts_by_month.sort_by { |post| post.created },
+          :posts => posts_by_month.sort_by { |post| post.created }.reverse,
           :archive_url => archive_url_for_date(month_start_date)
         }
       end
@@ -257,6 +253,9 @@ class Site
     # to operate on.
     preprocess_autopublish_drafts
 
+    # preprocess any posts that might have had an update flag set in the header
+    preprocess_autoupdate_posts
+
     posts = self.posts
 
     files.each do |path|
@@ -341,7 +340,7 @@ class Site
     generate_archives(default_layout)
 
     if Dir.exist?("_site")
-      FileUtils.mv("_site", "/tmp/_site.#{Time.now.strftime("%Y-%m-%d-%H-%M-%S")}")
+      FileUtils.mv("_site", "/tmp/_site.#{Time.now.strftime("%Y-%m-%d-%H-%M-%S.%6N")}")
     end
 
     FileUtils.mv("tmp/_site", ".") && FileUtils.rm_rf("tmp/_site")
@@ -350,6 +349,15 @@ class Site
 
   private
 
+  def preprocess_autoupdate_posts
+    posts.each do |p|
+      if p.autoupdate?
+        puts "Auto-updating timestamp for: #{p.title} / #{p.slug}"
+        p.update!
+      end
+    end
+  end
+
   # generates draft preview files for any unpublished drafts.
   #
   # uses the same template as live posts.
@@ -418,8 +426,8 @@ class Site
       
       FileUtils.mkdir_p(archive_path)
 
-      File.open(File.join(archive_path, "index.html"), "w") do |f|
-        f.puts layout.render!("site" => self, "content" => template.render!("site" => self, "month" => month, "posts" => posts))
+      File.open(File.join(archive_path + ".html"), "w") do |f|
+        f.puts layout.render!("archive_page" => true, "month" => month, "site" => self, "content" => template.render!("archive_page" => true, "site" => self, "month" => month, "posts" => posts))
       end
     end
   end

data/serif.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name         = "serif"
-  s.version      = "0.3.3"
+  s.version      = "0.4"
   s.authors      = ["Adam Prescott"]
   s.email        = ["adam@aprescott.com"]
   s.homepage     = "https://github.com/aprescott/serif"
@@ -19,7 +19,8 @@ Gem::Specification.new do |s|
     "sinatra", "~> 1.3",
     "redhead", "~> 0.0.8",
     "liquid", "~> 2.4",
-    "slop", "~> 3.3",
+    "reverse_markdown", "~> 0.4.3",
+    "nokogiri", "~> 1.5",
     "timeout_cache"
   ].each_slice(2) do |name, version|
     s.add_runtime_dependency(name, version)
@@ -28,5 +29,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake", "~> 0.9")
   s.add_development_dependency("rspec", "~> 2.5")
   s.add_development_dependency("simplecov", "~> 0.7")
-  s.add_development_dependency("timecop", "~> 0.5.5")
+  s.add_development_dependency("timecop", "~> 0.6.1")
 end

data/statics/skeleton/_config.yml

@@ -1,52 +1,8 @@
-# This is the Serif config file. It must be a valid YAML document.
-#
-# Some configuration options:
-#
-#     admin:
-#       username: [a username for the admin web interface]
-#       password: [a password for the admin web interface]
-#     permalink: [permalink format for generated posts]
-#
-# See the README for information on permalink formats.
-#
-# Image upload path configuration, used for any images added
-# through the admin drag-and-drop interface:
-#
-#     image_upload_path: [/some/absolute/path/:with/:placeholders]
-#
-# This should be an ABSOLUTE PATH and will be relative to your
-# base site (e.g., mysite.com). The value used will have the
-# relevant extension appended AUTOMATICALLY.
-#
-# The default value is: /images/:timestamp_:name
 #
-# Possible placeholders for the image upload path:
-#
-#     :year
-#       current full year, e.g., "2013"
-#
-#     :month
-#       current month as a two digit value, e.g., "02"
-#
-#     :day
-#       current day as a two digit value, e.g., "01"
-#
-#     :timestamp
-#       unix timestamp in seconds, e.g., "1361057832685"
-#
-#     :name
-#       filename of the image being uploaded
-#
-#     :slug
-#       the slug of the post at the time the image is added
-#
-# Any slashes in this string will become directories relative to the
-# base site directory.
+# This is the Serif config file. It must be a valid YAML document.
 #
-# Example:  image_upload_path: /images/:slug/:year_:month_:day_:timestamp
+# For information on which values are available here, see the README.
 #
-#           This would lead to an example path of
-#           /images/sample-post/2013_02_16_1361057832685.png
 admin:
   username: changethisusername
   password: changethispassword

data/statics/templates/admin/bookmarks.liquid

@@ -0,0 +1,56 @@
+{% comment %}
+<!--
+compress me!
+
+(function () {
+	var title, url, selection, container;
+	url = location.href;
+	if (document.getSelection) {
+		selection = document.getSelection();
+
+		if (selection.toString() == '') {
+			selection = '';
+		} else {
+			selection = selection.getRangeAt(0).cloneContents();
+			container = document.createElement('div');
+			container.appendChild(selection);
+			selection = container.innerHTML;
+		}
+	} else {
+		selection = '';
+	};
+	title = document.title;
+	window.location.href = '[BASE_URL]url=' + encodeURIComponent(url) + '&content=' + encodeURIComponent(selection) + '&title=' + encodeURIComponent(title);
+})();
+-->
+{% endcomment %}
+
+{% capture compressed_js %}
+
+(function(){var e,n,t,o;n=location.href,document.getSelection?(t=document.getSelection(),""==""+t?t="":(t=t.getRangeAt(0).cloneContents(),o=document.createElement("div"),o.appendChild(t),t=o.innerHTML)):t="",e=document.title,window.location.href="[BASE_URL]url="+encodeURIComponent(n)+"&content="+encodeURIComponent(t)+"&title="+encodeURIComponent(e)})();
+
+{% endcapture %}
+
+{% assign compressed_js = compressed_js | strip | replace:'"',"'" | prepend: "javascript:" %}
+{% assign non_edit_url = base_url | append:"/admin/quick-draft?" %}
+{% assign edit_now_url = non_edit_url | append:"edit=1&" %}
+{% assign js_later = compressed_js | replace:"[BASE_URL]",non_edit_url %}
+{% assign js_now   = compressed_js | replace:"[BASE_URL]",edit_now_url %}
+
+<section id="bookmarks">
+	<h2>Bookmarks</h2>
+
+	<p>Drag these links to your bookmarks and use them to create new drafts.</p>
+
+	<p>Any selected text will go in as Markdown, ready for editing!</p>
+
+	<hr>
+
+	<p class="bookmark"><a href="{{ js_later }}">Save draft for later</a></p>
+
+	<p>Saves the current page as a draft. Takes you straight back to where you were so you can keep reading.</p>
+
+	<p class="bookmark"><a href="{{ js_now }}">Save draft and edit</a></p>
+
+	<p>Saves the current page as a draft and lets you start editing immediately.</p>
+</section>

data/statics/templates/admin/layout.liquid

@@ -32,10 +32,11 @@ body > nav ul {
 
 body > nav ul li {
 	display: inline;
+	margin-right: 1em;
 }
 
 body > nav ul li:last-child {
-	margin-left: 1em;
+	margin-right: 0;
 }
 
 #edit input[disabled] {
@@ -537,11 +538,12 @@ body > nav ul li:last-child {
 		});
 	</script>
 </head>
-<body>
+<body id="admin">
 	<nav>
 		<ul>
 			<li><a href="/admin">Admin</a></li>
 			<li><a href="/admin/new/draft">New draft</a></li>
+			<li><a href="/admin/bookmarks">Bookmarks</a></li>
 		</ul>
 	</nav>
 

data/test/config_spec.rb

@@ -17,6 +17,13 @@ describe Serif::Config do
     end
   end
 
+  describe "#image_upload_path" do
+    it "defaults to /images/:timestamp/_name" do
+      subject.stub(:yaml) { {} }
+      subject.image_upload_path.should == "/images/:timestamp_:name"
+    end
+  end
+
   describe "#permalink" do
     it "is the permalink format defined in the config file" do
       subject.permalink.should == "/test-blog/:title"

data/test/draft_spec.rb

@@ -152,6 +152,20 @@ describe Serif::Draft do
 
       draft.delete!
     end
+
+    it "carries its value through to #autopublish?" do
+      draft = D.new(@site)
+      draft.slug = "test-draft"
+      draft.title = "Some draft title"
+      draft.autopublish = false
+      draft.autopublish?.should be_false
+
+      draft.autopublish = true
+      draft.autopublish?.should be_true
+
+      draft.autopublish = false
+      draft.autopublish?.should be_false
+    end
   end
 
   describe "#autopublish?" do

data/test/filters_spec.rb

@@ -80,7 +80,11 @@ describe Serif::Filters do
   describe "#markdown" do
     it "processes its input as markdown" do
       # bit of a stub test
-      subject.markdown("# Hi!").should == "<h1>Hi!</h1>"
+      subject.markdown("# Hi!").should == "<h1>Hi!</h1>\n"
+    end
+
+    it "uses curly single quotes properly" do
+      subject.markdown("# something's test").should include("something&rsquo;s")
     end
   end
 end

data/test/markup_renderer_spec.rb

@@ -33,6 +33,10 @@ END_SOURCE
 END_OUTPUT
   end
 
+  # NOTE: The output here is not the desired output.
+  #
+  # See vmg/redcarpet#57 and note that any filters that use this renderer
+  # are tested elsewhere.
   it "renders quote marks properly" do
     subject.render(<<END_SOURCE).should == <<END_OUTPUT
 This "very" sentence's structure "isn't" necessary.

data/test/post_spec.rb

@@ -9,6 +9,21 @@ describe Serif::Post do
     @posts = subject.posts
   end
 
+  around :each do |example|
+    begin
+      d = Serif::Draft.new(subject)
+      d.slug = "foo-bar-bar-temp"
+      d.title = "Testing title"
+      d.save("# some content")
+      d.publish!
+      @temporary_post = Serif::Post.from_slug(subject, d.slug)
+
+      example.run
+    ensure
+      FileUtils.rm(@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
@@ -18,4 +33,78 @@ describe Serif::Post do
       @posts.all? { |p| p.inspect.should include(p.headers.inspect) }
     end
   end
+
+  describe "#autoupdate=" do
+    it "sets the 'update' header to 'now' if truthy assigned value" do
+      @temporary_post.autoupdate = true
+      @temporary_post.headers[:update].should == "now"
+    end
+
+    it "removes the 'update' header entirely if falsey assigned value" do
+      @temporary_post.autoupdate = false
+      @temporary_post.headers.key?(:update).should be_false
+    end
+
+    it "marks the post as autoupdate? == true" do
+      @temporary_post.autoupdate?.should be_false
+      @temporary_post.autoupdate = true
+      @temporary_post.autoupdate?.should be_true
+    end
+  end
+
+  describe "#autoupdate?" do
+    it "returns true if there is an update: now header" do
+      @temporary_post.stub(:headers) { { :update => "foo" } }
+      @temporary_post.autoupdate?.should be_false
+      @temporary_post.stub(:headers) { { :update => "now" } }
+      @temporary_post.autoupdate?.should be_true
+    end
+
+    it "is ignorant of whitespace in the update header value" do
+      @temporary_post.stub(:headers) { { :update => "now" } }
+      @temporary_post.autoupdate?.should be_true
+
+      (1..3).each do |left|
+        (1..3).each do |right|
+          @temporary_post.stub(:headers) { { :update => "#{" " * left}now#{" " * right}"} }
+          @temporary_post.autoupdate?.should be_true
+        end
+      end
+    end
+  end
+
+  describe "#update!" do
+    it "sets the updated header timestamp to the current time" do
+      old_update_time = @temporary_post.updated
+      t = Time.now + 50
+
+      Timecop.freeze(t) do
+        @temporary_post.update!
+        @temporary_post.updated.should_not == old_update_time
+        @temporary_post.updated.to_i.should == t.to_i
+        @temporary_post.headers[:updated].to_i.should == t.to_i
+      end
+    end
+
+    it "calls save and writes out the new timestamp value, without a publish: now header" do
+      @temporary_post.should_receive(:save).once.and_call_original
+
+      t = Time.now + 50
+      Timecop.freeze(t) do
+        @temporary_post.update!
+
+        file_content = Redhead::String[File.read(@temporary_post.path)]
+        Time.parse(file_content.headers[:updated].value).to_i.should == t.to_i
+        file_content.headers[:publish].should be_nil
+      end
+    end
+
+    it "marks the post as no longer auto-updating" do
+      @temporary_post.autoupdate?.should be_false
+      @temporary_post.autoupdate = true
+      @temporary_post.autoupdate?.should be_true
+      @temporary_post.update!
+      @temporary_post.autoupdate?.should be_false
+    end
+  end
 end

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

@@ -8,6 +8,7 @@
 
 <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>
 
 

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

@@ -8,6 +8,7 @@
 
 <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>