Labyricorn/liquid
1
0
Fork 0
mirror of https://github.com/Shopify/liquid.git synced 2026-09-12 23:40:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ndwebgroup/liquid into ndwebgroup-master

Browse Source
This commit is contained in:
Florian Weingarten
2013-06-18 04:13:49 +02:00
parent f92da6948d 740cd6e762
commit 8ca4868bff
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/liquid/standardfilters.rb
+10 -1
View File
@@ -180,7 +180,16 @@ module Liquid
input = Time.at(input.to_i)
end
date = input.is_a?(String) ? Time.parse(input) : input
date = if input.is_a?(String)
case input.downcase
when 'now', 'today'
Time.now
else
Time.parse(input)
end
else
input
end
if date.respond_to?(:strftime)
date.strftime(format.to_s)
test/liquid/standard_filter_test.rb
+2
View File
@@ -114,6 +114,8 @@ class StandardFiltersTest < Test::Unit::TestCase
assert_equal '07/05/2006', @filters.date("2006-07-05 10:00:00", "%m/%d/%Y")
assert_equal "07/16/2004", @filters.date("Fri Jul 16 01:00:00 2004", "%m/%d/%Y")
assert_equal "#{Date.today.year}", @filters.date('now', '%Y')
assert_equal "#{Date.today.year}", @filters.date('today', '%Y')
assert_equal nil, @filters.date(nil, "%B")