Add new to sources and sinks

antonmi · Jan 14, 2024 · c3f6f3b · c3f6f3b
1 parent 0e6f054
commit c3f6f3b
Show file tree

Hide file tree

Showing 23 changed files with 4,986 additions and 5,126 deletions.
diff --git a/README.md b/README.md
@@ -92,7 +92,7 @@ alias Strom.Source.ReadLines
 
 source = 
   :lines
-  |> Source.new(%ReadLines{path: "input.txt"})
+  |> Source.new(ReadLines.new("input.txt"))
   |> Source.start() 
 
 %{lines: stream} = Source.call(%{}, source)
@@ -143,7 +143,7 @@ alias Strom.Sink.WriteLines
 
 sink_short = 
   :short
-  |> Sink.new(%WriteLines{path: "short.txt"})
+  |> Sink.new(WriteLines.new("short.txt"))
   |> Sink.start()
 
 sink_long = 

diff --git a/lib/sink/io_puts.ex b/lib/sink/io_puts.ex
@@ -3,6 +3,8 @@ defmodule Strom.Sink.IOPuts do
 
   defstruct line_sep: "", prefix: ""
 
+  def new, do: %__MODULE__{}
+
   @impl true
   def start(%__MODULE__{} = io_puts), do: io_puts
 

diff --git a/lib/sink/null.ex b/lib/sink/null.ex
@@ -3,6 +3,8 @@ defmodule Strom.Sink.Null do
 
   defstruct []
 
+  def new, do: %__MODULE__{}
+
   @impl true
   def start(%__MODULE__{} = null), do: null
 

diff --git a/lib/sink/write_lines.ex b/lib/sink/write_lines.ex
@@ -1,10 +1,14 @@
 defmodule Strom.Sink.WriteLines do
   @behaviour Strom.Sink
 
-  defstruct path: nil, file: nil
-
   @line_sep "\n"
 
+  defstruct path: nil, file: nil, line_sep: @line_sep
+
+  def new(path, line_sep \\ @line_sep) when is_binary(path) and is_binary(line_sep) do
+    %__MODULE__{path: path, line_sep: line_sep}
+  end
+
   @impl true
   def start(%__MODULE__{} = write_lines) do
     file = File.open!(write_lines.path, [:write])
@@ -13,7 +17,7 @@ defmodule Strom.Sink.WriteLines do
 
   @impl true
   def call(%__MODULE__{} = write_lines, data) do
-    :ok = IO.write(write_lines.file, data <> @line_sep)
+    :ok = IO.write(write_lines.file, data <> write_lines.line_sep)
 
     {:ok, {[], write_lines}}
   end

diff --git a/lib/source.ex b/lib/source.ex
@@ -19,7 +19,7 @@ defmodule Strom.Source do
   end
 
   def start(%__MODULE__{origin: list} = source) when is_list(list) do
-    start(%{source | origin: %Strom.Source.Events{events: list}})
+    start(%{source | origin: Strom.Source.Events.new(list)})
   end
 
   def start(%__MODULE__{origin: origin} = source) when is_struct(origin) do

diff --git a/lib/source/events.ex b/lib/source/events.ex
@@ -3,6 +3,8 @@ defmodule Strom.Source.Events do
 
   defstruct infinite: false, events: []
 
+  def new(events) when is_list(events), do: %__MODULE__{events: events}
+
   @impl true
   def start(%__MODULE__{} = state), do: state
 

diff --git a/lib/source/io_gets.ex b/lib/source/io_gets.ex
@@ -3,6 +3,8 @@ defmodule Strom.Source.IOGets do
 
   defstruct infinite: true
 
+  def new, do: %__MODULE__{}
+
   @impl true
   def start(%__MODULE__{} = io_gets), do: io_gets
 

diff --git a/lib/source/read_lines.ex b/lib/source/read_lines.ex
@@ -3,6 +3,8 @@ defmodule Strom.Source.ReadLines do
 
   defstruct path: nil, file: nil, infinite: false
 
+  def new(path) when is_binary(path), do: %__MODULE__{path: path}
+
   @impl true
   def start(%__MODULE__{} = read_lines), do: %{read_lines | file: File.open!(read_lines.path)}
 

diff --git a/test/composite_test.exs b/test/composite_test.exs
@@ -5,7 +5,6 @@ defmodule Strom.CompositeTest do
 
   defmodule MyComposite do
     import Strom.DSL
-    alias Strom.Sink.Null
 
     def components do
       odd_even = %{
@@ -19,7 +18,7 @@ defmodule Strom.CompositeTest do
         mix([:s1, :s2], :s),
         transform(:s, &(&1 + 1)),
         split(:s, odd_even),
-        sink(:odd, %Null{})
+        sink(:odd, Null.new())
       ]
     end
   end
@@ -30,7 +29,7 @@ defmodule Strom.CompositeTest do
     def components do
       [
         split(:numbers, %{more: &(&1 >= 10), less: &(&1 < 10)}),
-        sink(:less, %Null{})
+        sink(:less, Null.new())
       ]
     end
   end
@@ -68,7 +67,7 @@ defmodule Strom.CompositeTest do
         Mixer.new([:s1, :s2], :s),
         Transformer.new(:s, &(&1 + 1)),
         Splitter.new(:s, odd_even),
-        Sink.new(:odd, %Null{})
+        Sink.new(:odd, Null.new())
       ]
 
       composite = Composite.start(components)

diff --git a/test/data/output.csv b/test/data/output.csv
@@ -1,107 +0,0 @@
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2
-ORDER_CREATED,2017-04-18T20:00:00.000Z,111,3
-ORDER_CREATED,2017-04-20T09:00:00.000Z,222,2
-ORDER_CREATED,2017-04-21T09:00:00.000Z,333,2