Skip to content
Permalink
Browse files

Update item_property to recognize integers (#7878)

Merge pull request 7878
  • Loading branch information
summerisgone authored and jekyllbot committed Dec 10, 2019
1 parent 7ad84ef commit eb81dc0e964effd0db03f2dc2f1cd5fe9724b291
Showing with 17 additions and 4 deletions.
  1. +7 −4 lib/jekyll/filters.rb
  2. +10 −0 test/test_filters.rb
@@ -368,15 +368,18 @@ def item_property(item, property)
end
end

# rubocop:disable Performance/RegexpMatch
FLOAT_LIKE = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!.freeze
INTEGER_LIKE = %r!\A\s*-?\d+\s*\Z!.freeze
private_constant :FLOAT_LIKE, :INTEGER_LIKE

# return numeric values as numbers for proper sorting
def parse_sort_input(property)
number_like = %r!\A\s*-?(?:\d+\.?\d*|\.\d+)\s*\Z!
return property.to_f if property.to_s =~ number_like
stringified = property.to_s
return property.to_i if INTEGER_LIKE.match?(stringified)
return property.to_f if FLOAT_LIKE.match?(stringified)

property
end
# rubocop:enable Performance/RegexpMatch

def as_liquid(item)
case item
@@ -831,6 +831,16 @@ def to_liquid
)
end
end

should "should pass integers as is" do
grouping = @filter.group_by([
{ "name" => "Allison", "year" => 2016 },
{ "name" => "Amy", "year" => 2016 },
{ "name" => "George", "year" => 2019 },
], "year")
assert_equal "2016", grouping[0]["name"]
assert_equal "2019", grouping[1]["name"]
end
end

context "where filter" do

0 comments on commit eb81dc0

Please sign in to comment.
You can’t perform that action at this time.