kemko/liquid
1
0
Fork 0
mirror of https://github.com/kemko/liquid.git synced 2026-01-06 18:25:41 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #930 from er1/fix-sort-natural-on-nil

Browse Source 
Fix sort and sort_natural on sorting with non-string and nil values
This commit is contained in:
Justin Li
2018-10-04 22:32:37 -04:00
committed by GitHub
parent 53b8babf52 deb10ebc7a
commit cd5a6dd225
2 changed files with 83 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
lib/liquid/standardfilters.rb
View File

@@ -121,17 +121,23 @@ module Liquid
def sort(input, property = nil)
ary = InputIterator.new(input)
if property.nil?
ary.sort
ary.sort do |a, b|
if !a.nil? && !b.nil?
a <=> b
else
a.nil? ? 1 : -1
end
end
elsif ary.empty? # The next two cases assume a non-empty array.
[]
elsif ary.first.respond_to?(:[]) && !ary.first[property].nil?
elsif ary.all? { |el| el.respond_to?(:[]) }
ary.sort do |a, b|
a = a[property]
b = b[property]
if a && b
if !a.nil? && !b.nil?
a <=> b
else
a ? -1 : 1
a.nil? ? 1 : -1
end
end
end
@@ -143,11 +149,25 @@ module Liquid
ary = InputIterator.new(input)
if property.nil?
ary.sort { |a, b| a.casecmp(b) }
ary.sort do |a, b|
if !a.nil? && !b.nil?
a.to_s.casecmp(b.to_s)
else
a.nil? ? 1 : -1
end
end
elsif ary.empty? # The next two cases assume a non-empty array.
[]
elsif ary.first.respond_to?(:[]) && !ary.first[property].nil?
ary.sort { |a, b| a[property].casecmp(b[property]) }
elsif ary.all? { |el| el.respond_to?(:[]) }
ary.sort do |a, b|
a = a[property]
b = b[property]
if !a.nil? && !b.nil?
a.to_s.casecmp(b.to_s)
else
a.nil? ? 1 : -1
end
end
end
end