DRY out insertion of year/month in news plugin

stomar · stomar · commit d3ecf9a3e8c7 · 2013-03-02T12:07:35.000+01:00
diff --git a/_plugins/news.rb b/_plugins/news.rb
@@ -33,6 +33,14 @@ def news_dir
         end
       end
 
+      def insert_date(string, year, month = 0)
+        string.gsub(/%Y|%m|%B/, {
+          '%Y' => year.to_s,
+          '%m' => "%.2d" % month,
+          '%B' => @month_names[month]
+        })
+      end
+
     end
 
     class MonthlyArchive < ArchivePage
@@ -48,11 +56,7 @@ def initialize(site,base,lang,year,month,posts)
 
         title = @locales['monthly_archive_title']
 
-        data['title'] = title.gsub(/%Y|%m|%B/, {
-                          '%Y' => @year.to_s,
-                          '%m' => "%.2d" % @month,
-                          '%B' => @month_names[@month]
-                        })
+        data['title'] = insert_date(title, @year, @month)
         data['year']  = year
       end
 
@@ -71,20 +75,15 @@ def initialize(site,base,lang,year,posts)
         title = @locales['yearly_archive_title']
         month_link_text = @locales['monthly_archive_link']
 
-        data['title'] = title.gsub('%Y', @year.to_s)
+        data['title'] = insert_date(title, @year)
         data['year']   = @year
 
         months = posts.map { |post| post.date.month }.uniq
 
         # hash with url => link_text (including year) elements
         data['months'] = Hash[
           months.map { |month| "%.2d" % month }.zip(
-            months.map { |month| month_link_text.gsub(/%Y|%m|%B/, {
-                                   '%Y' => @year.to_s,
-                                   '%m' => "%.2d" % month,
-                                   '%B' => @month_names[month]
-                                 })
-            }
+            months.map { |month| insert_date(month_link_text, @year, month) }
           )
         ]
       end
@@ -111,7 +110,7 @@ def initialize(site,base,lang,posts)
         # hash with url => link_text elements
         data['years'] = Hash[
           years.map { |year| year.to_s }.zip(
-            years.map { |year| year_link_text.gsub(/%Y/, '%Y' => year.to_s) }
+            years.map { |year| insert_date(year_link_text, year) }
           )
         ]
       end
