From c2a68cc2a980506b12b9054d5be8e4806fe79c1c Mon Sep 17 00:00:00 2001
From: Frederic Hemberger <mail@frederic-hemberger.de>
Date: Tue, 18 Oct 2011 17:25:31 +0200
Subject: Make post's date output configurable via _config.yml, closes #164

A new config variable 'date_format' is introduced in _config.yml.
It can either be set to "ordinal" to use the current format or it
can be given a string complying to strftime() format identifiers.
---
 .themes/classic/source/_includes/post/date.html |  3 +-
 _config.yml                                     |  5 ++
 plugins/date.rb                                 | 69 +++++++++++++++++++++++++
 plugins/octopress_filters.rb                    | 30 ++---------
 4 files changed, 79 insertions(+), 28 deletions(-)
 create mode 100644 plugins/date.rb

diff --git a/.themes/classic/source/_includes/post/date.html b/.themes/classic/source/_includes/post/date.html
index dbfa67ae..3fd702d7 100644
--- a/.themes/classic/source/_includes/post/date.html
+++ b/.themes/classic/source/_includes/post/date.html
@@ -1,10 +1,11 @@
 {% capture date %}{{ page.date }}{{ post.date }}{% endcapture %}
+{% capture date_formatted %}{{ page.date_formatted }}{{ post.date_formatted }}{% endcapture %}
 {% capture has_date %}{{ date | size }}{% endcapture %}
 {% capture updated %}{{ page.updated }}{{ post.updated }}{% endcapture %}
 {% capture was_updated %}{{ updated | size }}{% endcapture %}
 
 {% if has_date != '0' %}
-  {% capture time %}<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate {% if updated %} data-updated="true" {% endif %}>{{ date | ordinalize }}</time>{% endcapture %}
+  {% capture time %}<time datetime="{{ date | datetime | date_to_xmlschema }}" pubdate {% if updated %} data-updated="true" {% endif %}>{{ date_formatted }}</time>{% endcapture %}
 {% endif %}
 
 {% if was_updated != '0' %}
diff --git a/_config.yml b/_config.yml
index 9ab83617..fed545c5 100644
--- a/_config.yml
+++ b/_config.yml
@@ -8,6 +8,11 @@ subtitle: A blogging framework for hackers.
 author: Your Name
 simple_search: http://google.com/search
 
+# Default date format is "ordinal" (resulting in "July 22nd 2007")
+# You can customize the format as defined in
+# http://www.ruby-doc.org/core-1.9.2/Time.html#method-i-strftime
+date_format: "ordinal"
+
 # RSS / Email (optional) subscription links (change if using something like Feedburner)
 subscribe_rss: /atom.xml
 subscribe_email:
diff --git a/plugins/date.rb b/plugins/date.rb
new file mode 100644
index 00000000..b3e9e35e
--- /dev/null
+++ b/plugins/date.rb
@@ -0,0 +1,69 @@
+module Octopress
+  module Date
+
+    # Returns a datetime if the input is a string
+    def datetime(date)
+      if date.class == String
+        date = Time.parse(date)
+      end
+      date
+    end
+
+    # Returns an ordidinal date eg July 22 2007 -> July 22nd 2007
+    def ordinalize(date)
+      date = datetime(date)
+      "#{date.strftime('%b')} #{ordinal(date.strftime('%e').to_i)}, #{date.strftime('%Y')}"
+    end
+
+    # Returns an ordinal number. 13 -> 13th, 21 -> 21st etc.
+    def ordinal(number)
+      if (11..13).include?(number.to_i % 100)
+        "#{number}<span>th</span>"
+      else
+        case number.to_i % 10
+        when 1; "#{number}<span>st</span>"
+        when 2; "#{number}<span>nd</span>"
+        when 3; "#{number}<span>rd</span>"
+        else    "#{number}<span>th</span>"
+        end
+      end
+    end
+
+  end
+end
+
+
+module Jekyll
+
+  class Post
+    include Octopress::Date
+
+    attr_accessor :date_formatted
+
+    # Convert this post into a Hash for use in Liquid templates.
+    #
+    # Returns <Hash>
+    def to_liquid
+      format = self.site.config['date_format']
+      if format.nil? || format.empty? || format == "ordinal"
+        date_formatted = ordinalize(self.date)
+      else
+        date_formatted = self.date.strftime(format)
+      end
+
+      self.data.deep_merge({
+        "title"          => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
+        "url"            => self.url,
+        "date"           => self.date,
+        # Monkey patch
+        "date_formatted" => date_formatted,
+        "id"             => self.id,
+        "categories"     => self.categories,
+        "next"           => self.next,
+        "previous"       => self.previous,
+        "tags"           => self.tags,
+        "content"        => self.content })
+    end
+
+  end
+end
\ No newline at end of file
diff --git a/plugins/octopress_filters.rb b/plugins/octopress_filters.rb
index ef8c1fb2..997a740a 100644
--- a/plugins/octopress_filters.rb
+++ b/plugins/octopress_filters.rb
@@ -2,6 +2,7 @@
 require './plugins/backtick_code_block'
 require './plugins/post_filters'
 require './plugins/raw'
+require './plugins/date'
 require 'rubypants'
 
 module OctopressFilters
@@ -33,6 +34,8 @@ end
 
 
 module OctopressLiquidFilters
+  include Octopress::Date
+
   # Used on the blog index to split posts on the <!--more--> marker
   def excerpt(input)
     if input.index(/<!--\s*more\s*-->/i)
@@ -96,33 +99,6 @@ module OctopressLiquidFilters
     input.titlecase
   end
 
-  # Returns a datetime if the input is a string
-  def datetime(date)
-    if date.class == String
-      date = Time.parse(date)
-    end
-    date
-  end
-
-  # Returns an ordidinal date eg July 22 2007 -> July 22nd 2007
-  def ordinalize(date)
-    date = datetime(date)
-    "#{date.strftime('%b')} #{ordinal(date.strftime('%e').to_i)}, #{date.strftime('%Y')}"
-  end
-
-  # Returns an ordinal number. 13 -> 13th, 21 -> 21st etc.
-  def ordinal(number)
-    if (11..13).include?(number.to_i % 100)
-      "#{number}<span>th</span>"
-    else
-      case number.to_i % 10
-      when 1; "#{number}<span>st</span>"
-      when 2; "#{number}<span>nd</span>"
-      when 3; "#{number}<span>rd</span>"
-      else    "#{number}<span>th</span>"
-      end
-    end
-  end
 end
 Liquid::Template.register_filter OctopressLiquidFilters
 
-- 
cgit v1.2.1