Merge pull request quantum-elixir#81 from kaiatgithub/master

modify Quantum.Timer to use correct timezone function. fixes quantum-elixir#73

lib/quantum/timer.ex

@@ -2,17 +2,19 @@ defmodule Quantum.Timer do
 
   @moduledoc false
 
-  now = case Application.get_env(:quantum, :timezone, :utc) do
-    :utc ->
-      &:calendar.now_to_universal_time/1
-    :local ->
-      &:calendar.now_to_local_time/1
-    timezone ->
-      raise "Unsupported timezone: #{timezone}"
+  def timezone_function do
+    case Application.get_env(:quantum, :timezone, :utc) do
+      :utc ->
+        &:calendar.now_to_universal_time/1
+      :local ->
+        &:calendar.now_to_local_time/1
+      timezone ->
+        raise "Unsupported timezone: #{timezone}"
+    end
   end
 
   def tick do
-    {d, {h, m, s}} = unquote(now).(:os.timestamp)
+    {d, {h, m, s}} = timezone_function.(:os.timestamp)
     Process.send_after(self, :tick, (60 - s) * 1000)
     {d, h, m}
   end

test/timer_test.exs

@@ -0,0 +1,31 @@
+defmodule Quantum.TimerTest do
+  use ExUnit.Case
+
+  test "tick function returns correct time when timezone is set" do
+    current_time_zone = Application.get_env(:quantum, :timezone, :utc)
+
+    Application.put_env(:quantum, :timezone, :utc)
+    {d_utc, {h_utc, m_utc, _}} = :calendar.now_to_universal_time(:os.timestamp)
+    assert Quantum.Timer.tick == {d_utc, h_utc, m_utc}
+
+    Application.put_env(:quantum, :timezone, :local)
+    {d_local, {h_local, m_local, _}} = :calendar.now_to_local_time(:os.timestamp)
+    assert Quantum.Timer.tick == {d_local, h_local, m_local}
+
+    Application.put_env(:quantum, :timezone, current_time_zone)
+  end
+
+  test "timezone_function function raises error when timezone is set incorrectly" do
+    current_time_zone = Application.get_env(:quantum, :timezone, :utc)
+
+    try do
+      Application.put_env(:quantum, :timezone, "test-time-zone")
+      assert_raise RuntimeError, "Unsupported timezone: test-time-zone", fn ->
+        Quantum.Timer.timezone_function
+      end
+    after
+      Application.put_env(:quantum, :timezone, current_time_zone)
+    end
+  end
+
+end