Skip to content

Parse date from unix time #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
khedaywi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Parse date from unix time #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6aa8a26
Update slice function to allow string params for indices
Mar 28, 2020
79229b3
Add ability for date filter to convert from unix time
Mar 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions lib/liquid/filters.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,9 @@ defmodule Liquid.Filters do
end

def slice(<<string::binary>>, from, to) do
string |> String.slice(from, to)
{from_int, _from_len} = from |> get_int_and_counter
{to_int, _to_len} = to |> get_int_and_counter
string |> String.slice(from_int, to_int)
end

def slice(list, 0) when is_list(list), do: list
Expand Down Expand Up @@ -432,6 +434,10 @@ defmodule Liquid.Filters do
input |> date
end

def date(input, format) when is_integer(input) do
input |> Timex.from_unix() |> date(format)
end

def date("now", format), do: Timex.now() |> date(format)

def date("today", format), do: Timex.now() |> date(format)
Expand All @@ -441,8 +447,13 @@ defmodule Liquid.Filters do
input_date |> date(format)
else
{:error, :invalid_format} ->
with {:ok, input_date} <- Timex.parse(input, "%a %b %d %T %Y", :strftime),
do: input_date |> date(format)
with {:ok, input_date} <- Timex.parse(input, "%a %b %d %T %Y", :strftime) do
input_date |> date(format)
else
_ ->
with {integer, _rem} <- Integer.parse(input),
do: integer |> Timex.from_unix() |> date(format)
end
end
end

Expand Down
8 changes: 8 additions & 0 deletions test/liquid/filter_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ defmodule Liquid.FilterTest do

test :slice do
assert "oob" == Functions.slice("foobar", 1, 3)
assert "oob" == Functions.slice("foobar", "1", "3")
assert "oob" == Functions.slice("foobar", "1", 3)
assert "oob" == Functions.slice("foobar", 1, "3")
assert "oobar" == Functions.slice("foobar", 1, 1000)
assert "" == Functions.slice("foobar", 1, 0)
assert "o" == Functions.slice("foobar", 1, 1)
Expand Down Expand Up @@ -244,6 +247,11 @@ defmodule Liquid.FilterTest do
assert "June" == Functions.date(Timex.parse!("2006-06-05 10:00:00", "%F %T", :strftime), "%B")
assert "July" == Functions.date(~N[2006-07-05 10:00:00], "%B")

assert "July" == Functions.date(1152093600, "%B")
assert "July" == Functions.date("1152093600", "%B")
assert "2006-07-05 10:00:00" == Functions.date(1152093600, "")
assert "2006-07-05 10:00:00" == Functions.date("1152093600", "")

assert "May" == Functions.date("2006-05-05 10:00:00", "%B")
assert "June" == Functions.date("2006-06-05 10:00:00", "%B")
assert "July" == Functions.date("2006-07-05 10:00:00", "%B")
Expand Down