more cleanup + fix git dates

2 files changed, 28 insertions, 16 deletions

diff --git a/_plugins/filters.rb b/_plugins/filters.rb
index 9e9b026..95a5c78 100644
--- a/_plugins/filters.rb
+++ b/_plugins/filters.rb
@@ -3,8 +3,8 @@ module Filters
 		return input.strftime("%F")
 	end
 
-	def sentence_join(items)
-		return "" if items == nil or items.length == 0
+	def sentence_join(items, fallback = "")
+		return fallback if items == nil or items.length == 0
 		return "#{items[0]}" if items.length == 1
 		return "#{items[0..-2].join(", ")} and #{items[-1]}"
 	end
diff --git a/_plugins/meta.rb b/_plugins/meta.rb
index 85f3a75..6024cca 100644
--- a/_plugins/meta.rb
+++ b/_plugins/meta.rb
@@ -5,30 +5,42 @@ module Meta
 			site.data = parse_unix_dates(site.data)
 
 			for page in site.collections['items'] do
-				# directly add generated page metadata to `page.meta` in liquid
-				page.data['meta'] = site.data['post'][page.slug]
+				# convert generated page metadata and add directly to `page.meta` in liquid
+				page.data['meta'] = transform_data(site, page.slug)
 
 				# set page.authors to author metadata from git+yaml
-				page.data['authors'] = site.data['authors'].filter { |author|
+				page.data['authors'] = site.data['authors'].filter do |author|
 					author['git'].intersect?(page.data['meta']['authors'])
-				}
+				end
 
 				# set page.date to generated date_initial
-				page.data['date'] = page.data['meta']['date_initial']
+				page.data['date'] = page.data['meta']['date']
 			end
 		end
 
 		def parse_unix_dates(data)
-			for key, value in data do
-				if value.is_a? Hash
-					data[key] = parse_unix_dates(value)
-					next
-				end
-				
-				next unless value.is_a? String
-				next unless value =~ /^@\d+$/
-				data[key] = Time.at(Integer(value[1..]))
+			# recurse deeper
+			return data.transform_values { |val| parse_unix_dates(val) } if data.is_a? Hash
+			return data.map { |val| parse_unix_dates(val) } if data.is_a? Array
+
+			# convert strings matching regex
+			return Time.at(Integer(data[1..])) if data.is_a? String and data =~ /^@\d+$/
+
+			# base case
+			return data
+		end
+
+		def transform_data(site, slug)
+			data = site.data['post'][slug]
+			data['git_log'] = data['git_log'].sort { |c| c['date'].to_i }
+
+			git_log = data['git_log'].filter do |commit|
+				!site.data['git']['ignore_commits'].include?(commit['hash'])
 			end
+
+			data['authors'] = git_log.map{ |c| c['author'] }.uniq
+			data['date_initial'] = git_log.first['date']
+			data['date'] = git_log.last['date']
 			return data
 		end
 	end