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

Update `Utils#pluralized_array_from_hash` and `Utils#value_from_singular_key` per suggestion from @parkr 

Switched to using the `#tap` method for more concise code. Also returning the value from
`value_from_singular_key` instead of returning an array wrapped presentation of the value.
This allows for a one-liner in `pluralized_array_from_hash`.
This commit is contained in:
Terry Schmidt 2014-05-20 12:32:59 -05:00
parent 0371b69952
commit c76e41d157
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/jekyll/utils.rb
View File

@ -35,14 +35,13 @@ module Jekyll
# #
# Returns an array # Returns an array
def pluralized_array_from_hash(hash, singular_key, plural_key) def pluralized_array_from_hash(hash, singular_key, plural_key)
array = [] [].tap do |array|
array << value_from_singular_key(hash, singular_key) array << (value_from_singular_key(hash, singular_key) || value_from_plural_key(hash, plural_key))
array << value_from_plural_key(hash, plural_key) if array.flatten.compact.empty? end.flatten.compact
array.flatten.compact
end end
def value_from_singular_key(hash, key) def value_from_singular_key(hash, key)
[hash[key]] if hash.has_key?(key) || (hash.default_proc && hash[key]) hash[key] if (hash.has_key?(key) || (hash.default_proc && hash[key]))
end end
def value_from_plural_key(hash, key) def value_from_plural_key(hash, key)