From 1e0d9f899b5f81da7e2dbe7c324e34352dba4fd9 Mon Sep 17 00:00:00 2001
From: Anatol Broder <anatol@penibelst.de>
Date: Tue, 6 May 2014 22:49:49 +0200
Subject: [PATCH] Follow Ruby Styleguide

---
 lib/jekyll/filters.rb | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/lib/jekyll/filters.rb b/lib/jekyll/filters.rb
index fe438834..10c1aa41 100644
--- a/lib/jekyll/filters.rb
+++ b/lib/jekyll/filters.rb
@@ -197,15 +197,26 @@ module Jekyll
     # nils ('first' | 'last') - nils appear before or after non-nil values
     #
     # Returns the filtered array of objects
-    def sort(input, key = nil, nils = 'first')
+    def sort(input, key = nil, nils = "first")
       if key.nil?
         input.sort
       else
+        case
+        when nils == "first"
+          order = - 1
+        when nils == "last"
+          order = + 1
+        else
+          Jekyll.logger.error "Invalid nils order:",
+            "'#{nils}' is not a valid nils order. It must be 'first' or 'last'."
+          exit(1)
+        end
+
         input.sort { |a, b|
-          if a[key].nil? and !b[key].nil?
-            nils == 'first' ? -1 : +1
-          elsif !a[key].nil? and b[key].nil?
-            nils == 'first' ? +1 : -1
+          if !a[key].nil? && b[key].nil?
+            - order
+          elsif a[key].nil? && !b[key].nil?
+            + order
           else
             a[key] <=> b[key]
           end