Formatting of dates and times in a DRY manner (#60)

Merge pull request 60

lib/jekyll-compose.rb

@@ -13,6 +13,8 @@ module Compose
     DEFAULT_TYPE = "md"
     DEFAULT_LAYOUT = "post"
     DEFAULT_LAYOUT_PAGE = "page"
+    DEFAULT_DATESTAMP_FORMAT = "%Y-%m-%d"
+    DEFAULT_TIMESTAMP_FORMAT = "%Y-%m-%d %H:%M %z"
   end
 end
 

lib/jekyll/commands/post.rb

@@ -56,11 +56,11 @@ def file_name
         end
 
         def _date_stamp
-          @params.date.strftime "%Y-%m-%d"
+          @params.date.strftime Jekyll::Compose::DEFAULT_DATESTAMP_FORMAT
         end
 
         def _time_stamp
-          @params.date.strftime("%Y-%m-%d %H:%M %z")
+          @params.date.strftime Jekyll::Compose::DEFAULT_TIMESTAMP_FORMAT
         end
 
         def content(custom_front_matter = {})

lib/jekyll/commands/publish.rb

@@ -55,7 +55,7 @@ def from
       end
 
       def to
-        date_stamp = params.date.strftime "%Y-%m-%d"
+        date_stamp = params.date.strftime Jekyll::Compose::DEFAULT_DATESTAMP_FORMAT
         "_posts/#{date_stamp}-#{params.name}"
       end
     end

spec/post_spec.rb

@@ -4,8 +4,8 @@
   let(:name) { "A test post" }
   let(:args) { [name] }
   let(:posts_dir) { Pathname.new source_dir("_posts") }
-  let(:datestamp) { Time.now.strftime("%Y-%m-%d") }
-  let(:timestamp) { Time.now.strftime("%Y-%m-%d %H:%M %z") }
+  let(:datestamp) { Time.now.strftime(Jekyll::Compose::DEFAULT_DATESTAMP_FORMAT) }
+  let(:timestamp) { Time.now.strftime(Jekyll::Compose::DEFAULT_TIMESTAMP_FORMAT) }
   let(:filename) { "#{datestamp}-a-test-post.md" }
   let(:path) { posts_dir.join(filename) }
 
@@ -68,7 +68,7 @@
 
   context "when the post already exists" do
     let(:name) { "An existing post" }
-    let(:filename) { "#{Time.now.strftime("%Y-%m-%d")}-an-existing-post.md" }
+    let(:filename) { "#{Time.now.strftime(Jekyll::Compose::DEFAULT_DATESTAMP_FORMAT)}-an-existing-post.md" }
 
     before(:each) do
       FileUtils.touch path

spec/publish_spec.rb

@@ -4,7 +4,7 @@
   let(:drafts_dir) { Pathname.new source_dir("_drafts") }
   let(:posts_dir)  { Pathname.new source_dir("_posts") }
   let(:draft_to_publish) { "a-test-post.md" }
-  let(:datestamp) { Time.now.strftime("%Y-%m-%d") }
+  let(:datestamp) { Time.now.strftime(Jekyll::Compose::DEFAULT_DATESTAMP_FORMAT) }
   let(:post_filename) { "#{datestamp}-#{draft_to_publish}" }
   let(:args) { ["_drafts/#{draft_to_publish}"] }