Merge branch 'milmazz-more_cleanup'

Author: boydm

lib/scenic/cache.ex

@@ -302,16 +302,14 @@ defmodule Scenic.Cache do
 
   # --------------------------------------------------------
   defp do_keys(scope) do
-    :ets.match(@scope_table, {scope, :"$2", :_})
+    @scope_table
+    |> :ets.match({scope, :"$2", :_})
     |> List.flatten()
   end
 
   # --------------------------------------------------------
   defp key_in_scope?(scope, key) do
-    case :ets.match(@scope_table, {scope, key, :_}) do
-      [] -> false
-      _ -> true
-    end
+    :ets.match(@scope_table, {scope, key, :_}) != []
   end
 
   # ============================================================================

lib/scenic/cache/hash.ex

@@ -17,10 +17,13 @@ defmodule Scenic.Cache.Hash do
   end
 
   # --------------------------------------------------------
+  @spec valid_hash_types() :: [:ripemd160 | :sha | :sha224 | :sha256 | :sha384 | :sha512, ...]
   def valid_hash_types(), do: @hash_types
   # --------------------------------------------------------
+  @spec valid_hash_type?(any()) :: boolean()
   def valid_hash_type?(hash_type), do: Enum.member?(@hash_types, hash_type)
   # --------------------------------------------------------
+  @spec valid_hash_type!(any()) :: any() | no_return
   def valid_hash_type!(hash_type) do
     case Enum.member?(@hash_types, hash_type) do
       true ->
@@ -33,9 +36,10 @@ defmodule Scenic.Cache.Hash do
   end
 
   # --------------------------------------------------------
+  @spec binary(any(), any()) :: {:error, :invalid_hash_type} | {:ok, binary()}
   def binary(data, hash_type) do
     case valid_hash_type?(hash_type) do
-      true -> {:ok, :crypto.hash(hash_type, data) |> Base.url_encode64(padding: false)}
+      true -> {:ok, hash_type |> :crypto.hash(data) |> Base.url_encode64(padding: false)}
       false -> {:error, :invalid_hash_type}
     end
   end
@@ -127,7 +131,7 @@ defmodule Scenic.Cache.Hash do
     end
   end
 
-  # -------------------------------------------------------- 
+  # --------------------------------------------------------
   def verify_file!(path_data), do: path_params(path_data) |> do_verify_file!()
 
   defp do_verify_file!({path, hash, hash_type}) do
@@ -139,7 +143,8 @@ defmodule Scenic.Cache.Hash do
 
   # --------------------------------------------------------
   def from_path(path) do
-    String.split(path, ".")
+    path
+    |> String.split(".")
     |> List.last()
   end
 

lib/scenic/cache/supervisor.ex

@@ -17,15 +17,12 @@ defmodule Scenic.Cache.Supervisor do
 
   #  import IEx
 
-  #  @name       :scenic_cache_supervisor
-
   @cache_registry :scenic_cache_registry
 
   # ============================================================================
   # setup the viewport supervisor
 
   def start_link() do
-    #    Supervisor.start_link(__MODULE__, :ok, name: @name)
     Supervisor.start_link(__MODULE__, :ok)
   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

lib/scenic/graph.ex

@@ -17,7 +17,7 @@ defmodule Scenic.Graph do
 
   @root_id :_root_
 
-  # defstruct primitives: %{}, ids: %{}, next_uid: 1, add_to: 0    
+  # defstruct primitives: %{}, ids: %{}, next_uid: 1, add_to: 0
   defstruct primitives: %{}, ids: %{}, next_uid: 1, add_to: 0
 
   @type t :: %Graph{
@@ -74,9 +74,10 @@ defmodule Scenic.Graph do
         graph
 
       max ->
-        cond do
-          is_integer(max) && max > 0 -> Map.put(graph, :max_depth, max)
-          true -> raise Error, message: @err_msg_depth_option
+        if is_integer(max) && max > 0 do
+          Map.put(graph, :max_depth, max)
+        else
+          raise Error, message: @err_msg_depth_option
         end
     end
   end
@@ -369,8 +370,8 @@ defmodule Scenic.Graph do
   # In case I want to reintroduce templates.
   #   #--------------------------------------------------------
   #   # insert a template, which is a graph that has relative uids
-  #   # can't just merge the various maps. map the incoming graph into an id space that 
-  #   # starts with next_uid, then bump up next_uid to account for everything in the updated graph 
+  #   # can't just merge the various maps. map the incoming graph into an id space that
+  #   # starts with next_uid, then bump up next_uid to account for everything in the updated graph
   #   defp insert_at({%Graph{primitives: p_map, ids: ids, next_uid: next_uid} = graph, parent_uid},
   #       index,
   #       %Graph{primitives: t_p_map, ids: t_ids, next_uid: t_next_uid} = t_graph,

lib/scenic/primitive/triangle.ex

@@ -67,9 +67,9 @@ defmodule Scenic.Primitive.Triangle do
       dot12 = Math.Vector2.dot(v1, v2)
 
       # Compute barycentric coordinates
-      invDenom = 1.0 / (dot00 * dot11 - dot01 * dot01)
-      u = (dot11 * dot02 - dot01 * dot12) * invDenom
-      v = (dot00 * dot12 - dot01 * dot02) * invDenom
+      inv_denom = 1.0 / (dot00 * dot11 - dot01 * dot01)
+      u = (dot11 * dot02 - dot01 * dot12) * inv_denom
+      v = (dot00 * dot12 - dot01 * dot02) * inv_denom
 
       # Check if point is in triangle
       u >= 0 && v >= 0 && u + v < 1

lib/scenic/view_port/input.ex

@@ -11,8 +11,6 @@
 defmodule Scenic.ViewPort.Input do
   @moduledoc false
   alias Scenic.Scene
-  #  alias Scenic.Utilities
-  #  alias Scenic.Graph
   alias Scenic.ViewPort.Context
   alias Scenic.ViewPort
   alias Scenic.Primitive
@@ -32,17 +30,14 @@ defmodule Scenic.ViewPort.Input do
           | {:cursor_scroll, {offset :: Math.point(), position :: Math.point()}}
           | {:cursor_pos, position :: Math.point()}
           | {:viewport_enter, position :: Math.point()}
-          # |
           | {:viewport_exit, position :: Math.point()}
-  # {:viewport_reshape, size :: Math.point}
 
   @type class ::
           :codepoint
           | :key
           | :cursor_button
           | :cursor_scroll
           | :cursor_pos
-          # | :viewport_reshape
           | :viewport_enter
           | :viewport_exit
 
@@ -86,7 +81,7 @@ defmodule Scenic.ViewPort.Input do
 
   # #--------------------------------------------------------
   # # do nothing if the size isn't actually changing
-  # def handle_cast( {:input, {:viewport_reshape, new_size}}, %{size: old_size} = state ) 
+  # def handle_cast( {:input, {:viewport_reshape, new_size}}, %{size: old_size} = state )
   # when new_size == old_size do
   #   {:noreply, state}
   # end
@@ -583,18 +578,17 @@ defmodule Scenic.ViewPort.Input do
     point = Matrix.project_vector(context.inverse_tx, point)
 
     with {:ok, graph} <- ViewPort.Tables.get_graph(context.graph_key) do
-      do_find_by_captured_point(
-        point,
-        0,
-        graph,
-        Matrix.identity(),
-        Matrix.identity(),
-        max_depth
-      )
-      |> case do
-        nil -> {nil, nil, point}
-        out -> out
-      end
+      point =
+        do_find_by_captured_point(
+          point,
+          0,
+          graph,
+          Matrix.identity(),
+          Matrix.identity(),
+          max_depth
+        )
+
+      if point, do: point, else: {nil, nil, point}
     else
       _ -> {nil, nil, point}
     end
@@ -637,12 +631,8 @@ defmodule Scenic.ViewPort.Input do
         local_point = Matrix.project_vector(inv_tx, point)
 
         # test if the point is in the primitive
-        case mod.contains_point?(data, local_point) do
-          true ->
-            {uid, p[:id], point}
-
-          false ->
-            nil
+        if mod.contains_point?(data, local_point) do
+          {uid, p[:id], point}
         end
     end
   end
@@ -651,7 +641,7 @@ defmodule Scenic.ViewPort.Input do
   # find the indicated primitive in the graph given a point in screen coordinates.
   # to do this, we need to project the point into primitive local coordinates by
   # projecting it with the primitive's inverse final matrix.
-  # 
+  #
   # Since the last primitive drawn is always on top, we should walk the tree
   # backwards and return the first hit we find. We could just reduct the whole
   # thing and return the last one found (that was my first try), but this is
@@ -729,16 +719,12 @@ defmodule Scenic.ViewPort.Input do
         local_point = Matrix.project_vector(inv_tx, {x, y})
 
         # test if the point is in the primitive
-        case mod.contains_point?(data, local_point) do
-          true ->
-            id = p[:id]
-            # Return the point in graph coordinates. Local was good for the hit test
-            # but graph coords makes more sense for the graph_key logic
-            graph_point = Matrix.project_vector(graph_inv_tx, {x, y})
-            {graph_point, {uid, id, graph_key}, {graph_tx, graph_inv_tx}}
-
-          false ->
-            nil
+        if mod.contains_point?(data, local_point) do
+          id = p[:id]
+          # Return the point in graph coordinates. Local was good for the hit test
+          # but graph coords makes more sense for the graph_key logic
+          graph_point = Matrix.project_vector(graph_inv_tx, {x, y})
+          {graph_point, {uid, id, graph_key}, {graph_tx, graph_inv_tx}}
         end
     end
   end

test/scenic/primitive/group_test.exs

@@ -33,40 +33,42 @@ defmodule Scenic.Primitive.GroupTest do
     assert Primitive.get(g) == [1234]
 
     g =
-      Group.insert_at(group, -1, 1234)
-      |> Group.insert_at(-1, 12345)
+      group
+      |> Group.insert_at(-1, 1234)
+      |> Group.insert_at(-1, 12_345)
 
-    assert Primitive.get(g) == [1234, 12345]
+    assert Primitive.get(g) == [1234, 12_345]
 
     g =
-      Group.insert_at(group, -1, 1234)
-      |> Group.insert_at(0, 12345)
+      group
+      |> Group.insert_at(-1, 1234)
+      |> Group.insert_at(0, 12_345)
 
-    assert Primitive.get(g) == [12345, 1234]
+    assert Primitive.get(g) == [12_345, 1234]
   end
 
   test "delete works" do
     g =
       Group.build()
       |> Group.insert_at(-1, 1234)
-      |> Group.insert_at(-1, 12345)
+      |> Group.insert_at(-1, 12_345)
 
-    assert Primitive.get(g) == [1234, 12345]
+    assert Primitive.get(g) == [1234, 12_345]
 
     g = Group.delete(g, 1234)
-    assert Primitive.get(g) == [12345]
+    assert Primitive.get(g) == [12_345]
   end
 
   test "increment_data adds a constant to the child ids" do
     g =
       Group.build()
       |> Group.insert_at(-1, 1234)
-      |> Group.insert_at(-1, 12345)
+      |> Group.insert_at(-1, 12_345)
 
-    assert Primitive.get(g) == [1234, 12345]
+    assert Primitive.get(g) == [1234, 12_345]
 
     g = Group.increment(g, 10)
-    assert Primitive.get(g) == [1244, 12355]
+    assert Primitive.get(g) == [1244, 12_355]
   end
 
   # ============================================================================