dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2986 from tamagokun/where_filters_enumerable

This commit is contained in:
Parker Moore 2014-10-20 20:09:21 -07:00
parent a64e7e8814 56ac50c568
commit 5ed4638400
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/jekyll/filters.rb
View File

@ -219,7 +219,8 @@ module Jekyll
# #
# Returns the filtered array of objects # Returns the filtered array of objects
def where(input, property, value) def where(input, property, value)
return input unless input.is_a?(Array) return input unless input.is_a?(Enumerable)
input = input.values if input.is_a?(Hash)
input.select { |object| item_property(object, property) == value } input.select { |object| item_property(object, property) == value }
end end

7
test/test_filters.rb
View File

@ -172,10 +172,15 @@ class TestFilters < Test::Unit::TestCase
context "where filter" do context "where filter" do
should "return any input that is not an array" do should "return any input that is not an array" do
assert_equal Hash.new, @filter.where(Hash.new, nil, nil)
assert_equal "some string", @filter.where("some string", "la", "le") assert_equal "some string", @filter.where("some string", "la", "le")
end end
should "filter objects in a hash appropriately" do
hash = {"a"=>{"color"=>"red"}, "b"=>{"color"=>"blue"}}
assert_equal 1, @filter.where(hash, "color", "red").length
assert_equal [{"color"=>"red"}], @filter.where(hash, "color", "red")
end
should "filter objects appropriately" do should "filter objects appropriately" do
assert_equal 2, @filter.where(@array_of_objects, "color", "red").length assert_equal 2, @filter.where(@array_of_objects, "color", "red").length
end end