Merge pull request #202 from boydm/clean_up_warnings

Clean up warnings

Author: boydm

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.10.4
+* Can pass in a :name option to scenes/components @am-kantox
+* Clean up warnings under Elixir 1.11
+* Tell git not to mangle line endings on test data - part of getting Windows support working. @trejkaz
+
+
 ## 0.10.3
 * Fix bug allowing handle_continue to be overridden by scene. Thank you @lmarlow
 * Fix bug where font in a style map wasn't being honored during graph build

lib/scenic.ex

@@ -85,7 +85,7 @@ defmodule Scenic do
   defp do_init([]) do
     [
       {Scenic.ViewPort.Tables, nil},
-      supervisor(Scenic.Cache.Support.Supervisor, []),
+      {Scenic.Cache.Support.Supervisor, [nil]},
       {DynamicSupervisor, name: @viewports, strategy: :one_for_one}
     ]
     |> Supervisor.init(strategy: :one_for_one)
@@ -96,8 +96,8 @@ defmodule Scenic do
   defp do_init(viewports) do
     [
       {Scenic.ViewPort.Tables, nil},
-      supervisor(Scenic.Cache.Support.Supervisor, []),
-      supervisor(Scenic.ViewPort.SupervisorTop, [viewports]),
+      {Scenic.Cache.Support.Supervisor, [nil]},
+      {Scenic.ViewPort.SupervisorTop, [viewports]},
       {DynamicSupervisor, name: @viewports, strategy: :one_for_one}
     ]
     |> Supervisor.init(strategy: :one_for_one)

lib/scenic/cache/base.ex

@@ -1121,7 +1121,7 @@ defmodule Scenic.Cache.Base do
         GenServer.cast(pid, {module, type, target})
       catch
         kind, reason ->
-          formatted = Exception.format(kind, reason, System.stacktrace())
+          formatted = Exception.format(kind, reason, __STACKTRACE__)
           IO.puts("dispatch_notification/3 failed with #{formatted}")
       end
     end

lib/scenic/cache/support/supervisor.ex

@@ -11,10 +11,20 @@ defmodule Scenic.Cache.Support.Supervisor do
 
   #  import IEx
 
+  def child_spec() do
+    %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, nil},
+      type: :supervisor,
+      restart: :permanent,
+      shutdown: 500
+    }
+  end
+
   # ============================================================================
   # setup the viewport supervisor
 
-  def start_link() do
+  def start_link(_) do
     Supervisor.start_link(__MODULE__, :ok)
   end
 

lib/scenic/view_port/supervisor_top.ex

@@ -17,6 +17,16 @@ defmodule Scenic.ViewPort.SupervisorTop do
   # ============================================================================
   # setup the viewport supervisor
 
+  def child_spec(viewports) do
+    %{
+      id: __MODULE__,
+      start: {__MODULE__, :start_link, viewports},
+      type: :supervisor,
+      restart: :permanent,
+      shutdown: 500
+    }
+  end
+
   def start_link(viewports) do
     Supervisor.start_link(__MODULE__, viewports)
   end

mix.exs

@@ -36,10 +36,7 @@ defmodule Scenic.Mixfile do
   end
 
   def application do
-    [
-      # mod: {Scenic, []},
-      extra_applications: [:logger]
-    ]
+    [extra_applications: [:logger, :crypto, :iex]]
   end
 
   defp deps do

test/scenic/cache/support/supervisor_test.exs

@@ -0,0 +1,26 @@
+#
+#  Created by Boyd Multerer on 2020-11-02.
+#  Copyright © 2020 Kry10 Limited. All rights reserved.
+#
+
+# putting read and load in separate modules (both in this file)
+# because load needs the cache to be set up and read doesn't.
+
+defmodule Scenic.Cache.Support.SupervisorTest do
+  use ExUnit.Case, async: true
+  doctest Scenic.Cache.Support.Supervisor
+
+  alias Scenic.Cache.Support.Supervisor, as: Super
+
+  # ============================================================================
+
+  test "child_spec is as expected" do
+    assert Super.child_spec() == %{
+             id: Super,
+             start: {Super, :start_link, nil},
+             type: :supervisor,
+             restart: :permanent,
+             shutdown: 500
+           }
+  end
+end

test/scenic/view_port/input_test.exs

@@ -415,7 +415,7 @@ defmodule Scenic.ViewPort.InputTest do
         }
       )
 
-    assert_received({:"$gen_cast", {:input, {:viewport_enter, :viewport_enter_input}, context}})
+    assert_received({:"$gen_cast", {:input, {:viewport_enter, :viewport_enter_input}, _}})
   end
 
   test "input viewport_exit", %{graph_key: graph_key} do
@@ -429,7 +429,7 @@ defmodule Scenic.ViewPort.InputTest do
         }
       )
 
-    assert_received({:"$gen_cast", {:input, {:viewport_exit, :viewport_exit_input}, context}})
+    assert_received({:"$gen_cast", {:input, {:viewport_exit, :viewport_exit_input}, _}})
   end
 
   test "input other", %{graph_key: graph_key} do
@@ -443,7 +443,7 @@ defmodule Scenic.ViewPort.InputTest do
         }
       )
 
-    assert_received({:"$gen_cast", {:input, {:other, 123}, context}})
+    assert_received({:"$gen_cast", {:input, {:other, 123}, _}})
   end
 
   # ============================================================================
@@ -727,7 +727,7 @@ defmodule Scenic.ViewPort.InputTest do
         }
       )
 
-    assert_received({:"$gen_cast", {:input, {:cursor_pos, {1.0, 1.0}}, context}})
+    assert_received({:"$gen_cast", {:input, {:cursor_pos, {1.0, 1.0}}, _}})
     assert_received({:"$gen_cast", {:input, {:cursor_exit, 1}, _}})
     refute_received({:"$gen_cast", {:input, {:cursor_enter, _}, _}})
   end

test/scenic/view_port/supervisor_top_test.exs

@@ -0,0 +1,28 @@
+#
+#  Created by Boyd Multerer on 2020-11-02.
+#  Copyright © 2020 Kry10 Limited. All rights reserved.
+#
+
+# putting read and load in separate modules (both in this file)
+# because load needs the cache to be set up and read doesn't.
+
+defmodule Scenic.ViewPort.SupervisorTopTest do
+  use ExUnit.Case, async: true
+  doctest Scenic.ViewPort.SupervisorTop
+
+  alias Scenic.ViewPort.SupervisorTop, as: Super
+
+  # ============================================================================
+
+  test "child_spec is as expected" do
+    list = [1, 2, 3]
+
+    assert Super.child_spec(list) == %{
+             id: Super,
+             start: {Super, :start_link, list},
+             type: :supervisor,
+             restart: :permanent,
+             shutdown: 500
+           }
+  end
+end

test/test_helper.exs

@@ -1,5 +1,5 @@
 Registry.start_link(keys: :duplicate, name: :viewport_registry)
 Registry.start_link(keys: :duplicate, name: :input_registry)
 Registry.start_link(keys: :duplicate, name: :driver_registry)
-Scenic.Cache.Support.Supervisor.start_link()
+Scenic.Cache.Support.Supervisor.start_link(nil)
 ExUnit.start()