Merge branch 'master' of github.com:boydm/scenic into boyd

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