Merge pull request #50 from boydm/boyd

Add Component tests

Author: boydm

lib/scenic/component/button.ex

@@ -57,18 +57,30 @@ defmodule Scenic.Component.Button do
           |> text(text,
             fill: theme.text,
             translate: {width / 2, height * 0.7},
-            text_align: :center
+            text_align: :center,
+            id: :title
           )
 
         :left ->
           Graph.build(font: font, font_size: font_size)
           |> rrect({width, height, radius}, fill: theme.background, id: :btn)
-          |> text(text, fill: theme.text, translate: {8, height * 0.7}, text_align: :left)
+          |> text(
+            text,
+            fill: theme.text,
+            translate: {8, height * 0.7},
+            text_align: :left,
+            id: :title
+          )
 
         :right ->
           Graph.build(font: font, font_size: font_size)
           |> rrect({width, height, radius}, fill: theme.background, id: :btn)
-          |> text(text, fill: theme.text, translate: {width - 8, height * 0.7}, text_align: :right)
+          |> text(text,
+            fill: theme.text,
+            translate: {width - 8, height * 0.7},
+            text_align: :right,
+            id: :title
+          )
       end
 
     # special case the dark and light themes to show an outline

lib/scenic/component/input/caret.ex

@@ -18,9 +18,9 @@ defmodule Scenic.Component.Input.Caret do
   @width 2
   @inset_v 4
 
-  # carat blink speed in hertz
-  @carat_hz 1.5
-  @carat_ms trunc(@carat_hz * 500)
+  # caret blink speed in hertz
+  @caret_hz 1.5
+  @caret_ms trunc(@caret_hz * 500)
 
   # ============================================================================
   # setup
@@ -70,22 +70,22 @@ defmodule Scenic.Component.Input.Caret do
   end
 
   # --------------------------------------------------------
-  def handle_cast(:gain_focus, %{graph: graph, timer: nil} = state) do
-    # turn on the carat
+  def handle_cast(:start_caret, %{graph: graph, timer: nil} = state) do
+    # turn on the caret
     graph =
       graph
       |> Graph.modify(:caret, &update_opts(&1, hidden: false))
       |> push_graph()
 
     # start the timer
-    {:ok, timer} = :timer.send_interval(@carat_ms, :blink)
+    {:ok, timer} = :timer.send_interval(@caret_ms, :blink)
 
     {:noreply, %{state | graph: graph, hidden: false, timer: timer, focused: true}}
   end
 
   # --------------------------------------------------------
-  def handle_cast(:lose_focus, %{graph: graph, timer: timer} = state) do
-    # hide the carat
+  def handle_cast(:stop_caret, %{graph: graph, timer: timer} = state) do
+    # hide the caret
     graph =
       graph
       |> Graph.modify(:caret, &update_opts(&1, hidden: true))
@@ -102,10 +102,10 @@ defmodule Scenic.Component.Input.Caret do
 
   # --------------------------------------------------------
   def handle_cast(
-        :reset_carat,
+        :reset_caret,
         %{graph: graph, timer: timer, focused: true} = state
       ) do
-    # show the carat
+    # show the caret
     graph =
       graph
       |> Graph.modify(:caret, &update_opts(&1, hidden: false))
@@ -115,7 +115,7 @@ defmodule Scenic.Component.Input.Caret do
     if timer, do: :timer.cancel(timer)
 
     # restart the timer
-    {:ok, timer} = :timer.send_interval(@carat_ms, :blink)
+    {:ok, timer} = :timer.send_interval(@caret_ms, :blink)
 
     {:noreply, %{state | graph: graph, hidden: false, timer: timer}}
   end

lib/scenic/component/input/dropdown.ex

@@ -11,7 +11,7 @@ defmodule Scenic.Component.Input.Dropdown do
   alias Scenic.Primitive.Style.Theme
   import Scenic.Primitives
 
-  # import IEx
+  import IEx
 
   @default_width 160
   @default_height 30
@@ -43,12 +43,12 @@ defmodule Scenic.Component.Input.Dropdown do
 
   # --------------------------------------------------------
   def verify({items, initial} = data) when is_list(items) do
-    Enum.all?(items, &verify_item(&1)) &&
-      Enum.find_value(items, false, fn {_, id} -> id == initial end)
-      |> case do
-        true -> {:ok, data}
-        _ -> :invalid_data
-      end
+    (Enum.all?(items, &verify_item(&1)) &&
+       Enum.find_value(items, false, fn {_, id} -> id == initial end))
+    |> case do
+      true -> {:ok, data}
+      _ -> :invalid_data
+    end
   end
 
   def verify(_), do: :invalid_data
@@ -269,7 +269,7 @@ defmodule Scenic.Component.Input.Dropdown do
       # push to the viewport
       |> push_graph()
 
-    {:continue, %{state | down: false, graph: graph}}
+    {:noreply, %{state | down: false, graph: graph}}
   end
 
   # --------------------------------------------------------

lib/scenic/component/input/radio_button.ex

@@ -67,12 +67,12 @@ defmodule Scenic.Component.Input.RadioButton do
     {:ok, state}
   end
 
-  # --------------------------------------------------------
-  def handle_cast({:set_value, new_value}, state) do
-    state = Map.put(state, :checked, new_value)
-    graph = update_graph(state)
-    {:noreply, %{state | graph: graph}}
-  end
+  # # --------------------------------------------------------
+  # def handle_cast({:set_value, new_value}, state) do
+  #   state = Map.put(state, :checked, new_value)
+  #   graph = update_graph(state)
+  #   {:noreply, %{state | graph: graph}}
+  # end
 
   # --------------------------------------------------------
   def handle_cast({:set_to_msg, set_id}, %{id: id} = state) do

lib/scenic/component/input/radio_group.ex

@@ -90,10 +90,10 @@ defmodule Scenic.Component.Input.RadioGroup do
     {:ok, state}
   end
 
-  # --------------------------------------------------------
-  def handle_cast({:set_value, new_value}, state) do
-    {:noreply, %{state | value: new_value}}
-  end
+  # # --------------------------------------------------------
+  # def handle_cast({:set_value, new_value}, state) do
+  #   {:noreply, %{state | value: new_value}}
+  # end
 
   # ============================================================================