refactor builder

woylie · Aug 9, 2021 · 862c996 · 862c996
1 parent d490d5e
commit 862c996
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/lib/flop/builder.ex b/lib/flop/builder.ex
@@ -2,6 +2,7 @@ defmodule Flop.Builder do
   @moduledoc false
 
   import Ecto.Query
+  import Flop.Misc
 
   alias Flop.Filter
   alias Flop.Misc
@@ -151,13 +152,7 @@ defmodule Flop.Builder do
       # prevent unused variable warning for operators that don't use value
       _ = value
 
-      unquote(
-        if dynamic_builder do
-          dynamic_builder
-          |> String.replace("<<<binding>>>", "[r]")
-          |> Code.string_to_quoted!()
-        end
-      )
+      unquote(quote_dynamic(dynamic_builder, "[r]"))
 
       unquote(
         quote do
@@ -175,13 +170,7 @@ defmodule Flop.Builder do
       # prevent unused variable warning for operators that don't use value
       _ = value
 
-      unquote(
-        if dynamic_builder do
-          dynamic_builder
-          |> String.replace("<<<binding>>>", "[{^binding, r}]")
-          |> Code.string_to_quoted!()
-        end
-      )
+      unquote(quote_dynamic(dynamic_builder, "[{^binding, r}]"))
 
       unquote(
         quote do

diff --git a/lib/flop/misc.ex b/lib/flop/misc.ex
@@ -4,4 +4,13 @@ defmodule Flop.Misc do
   def add_wildcard(value), do: "%#{value}%"
 
   def split_search_text(s), do: s |> String.split() |> Enum.map(&add_wildcard/1)
+
+  def quote_dynamic(nil, _), do: nil
+
+  def quote_dynamic(dynamic_builder, binding)
+      when is_binary(dynamic_builder) do
+    dynamic_builder
+    |> String.replace("<<<binding>>>", binding)
+    |> Code.string_to_quoted!()
+  end
 end