Make error module available in operation helper

akash-akya · Dec 14, 2023 · cfc68a3 · cfc68a3
1 parent ca185dd
commit cfc68a3
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 14 deletions.
diff --git a/lib/vix/vips/image.ex b/lib/vix/vips/image.ex
@@ -380,7 +380,7 @@ defmodule Vix.Vips.Image do
   @spec new_from_buffer(binary(), keyword()) :: {:ok, t()} | {:error, term()}
   def new_from_buffer(bin, opts \\ []) do
     with {:ok, loader} <- Vix.Vips.Foreign.find_load_buffer(bin),
-         {:ok, {ref, _optional}} <- Vix.Vips.OperationHelper.operation_call(loader, [bin], opts) do
+         {:ok, {ref, _optional}} <- Vix.Vips.Operation.Helper.operation_call(loader, [bin], opts) do
       {:ok, wrap_type(ref)}
     end
   end

diff --git a/lib/vix/vips/mutable_operation.ex b/lib/vix/vips/mutable_operation.ex
@@ -3,11 +3,9 @@ defmodule Vix.Vips.MutableOperation do
   Module for Vix.Vips.MutableOperation.
   """
 
-  import Vix.Vips.OperationHelper
+  import Vix.Vips.Operation.Helper
 
-  defmodule Error do
-    defexception [:message]
-  end
+  alias Vix.Vips.Operation.Error
 
   # define typespec for enums
   Enum.map(vips_enum_list(), fn {name, enum} ->

diff --git a/lib/vix/vips/operation.ex b/lib/vix/vips/operation.ex
@@ -11,11 +11,9 @@ defmodule Vix.Vips.Operation do
   hexdocs might *not* match for you.
   """
 
-  import Vix.Vips.OperationHelper
+  import Vix.Vips.Operation.Helper
 
-  defmodule Error do
-    defexception [:message]
-  end
+  alias Vix.Vips.Operation.Error
 
   # define typespec for enums
   Enum.map(vips_enum_list(), fn {name, enum} ->

diff --git a/lib/vix/vips/operation/error.ex b/lib/vix/vips/operation/error.ex
@@ -0,0 +1,5 @@
+defmodule Vix.Vips.Operation.Error do
+  @moduledoc false
+
+  defexception [:message]
+end
diff --git a/lib/vix/vips/operation_helper.ex → lib/vix/vips/operation/helper.ex b/lib/vix/vips/operation_helper.ex → lib/vix/vips/operation/helper.ex
@@ -1,9 +1,10 @@
-defmodule Vix.Vips.OperationHelper do
+defmodule Vix.Vips.Operation.Helper do
   @moduledoc false
 
   alias Vix.GObject.GParamSpec
   alias Vix.Nif
   alias Vix.Type
+  alias Vix.Vips.Operation.Error
 
   def input_to_nif_terms(args, in_pspec) do
     args
@@ -60,7 +61,7 @@ defmodule Vix.Vips.OperationHelper do
             {required, [{String.to_atom(param), value} | optional]}
 
           true ->
-            raise Vix.Vips.Operation.Error, message: "Invalid operation output field: #{param}"
+            raise Error, message: "Invalid operation output field: #{param}"
         end
       end)
 

diff --git a/test/vix/vips/operation_helper_test.exs → test/vix/vips/operation/helper_test.exs b/test/vix/vips/operation_helper_test.exs → test/vix/vips/operation/helper_test.exs
@@ -1,8 +1,8 @@
-defmodule Vix.Vips.OperationHelperTest do
+defmodule Vix.Vips.Operation.HelperTest do
   use ExUnit.Case, async: true
 
   alias Vix.Vips.Image
-  alias Vix.Vips.OperationHelper
+  alias Vix.Vips.Operation.Helper
 
   import Vix.Support.Images
 
@@ -16,7 +16,7 @@ defmodule Vix.Vips.OperationHelperTest do
     {:ok, im} = Image.new_from_file(img_path("puppies.jpg"))
 
     assert {:ok, out} =
-             OperationHelper.operation_call(
+             Helper.operation_call(
                "gravity",
                [im, :VIPS_COMPASS_DIRECTION_CENTRE, 650, 500],
                extend: :VIPS_EXTEND_COPY