refactoring

Author: mtumilowicz

src/main/scala/app/Main.scala

@@ -2,37 +2,16 @@ package app
 
 import zio._
 
-import java.io.IOException
-
 object Main extends ZIOAppDefault {
-  def program(queue: Queue[String]) = {
-    def loop(sayingBackgroundFiber: Ref[Fiber.Runtime[IOException, Long]]): Task[Unit] = for {
-      read <- queue.take
-      _ <- sayingBackgroundFiber.get.flatMap(_.interrupt)
-      fork <- sayPlease.delay(Duration.fromSeconds(5)).fork
-      _ <- sayingBackgroundFiber.set(fork)
-      _ <- Console.printLine(s"wrote: $read")
-      _ <- loop(sayingBackgroundFiber)
-    } yield ()
-
-    for {
-      fiber2 <- sayPlease.fork
-      _ <- ZIO.sleep(100.millis)
-      ref <- Ref.make(fiber2)
-      _ <- loop(ref)
-    } yield ()
-  }
+  override def run: ZIO[Environment with ZIOAppArgs with Scope, Any, Any] = for {
+    queue <- Queue.bounded[String](100)
+    _ <- offerReadLine(queue).forever.fork
+    _ <- Program(queue).run
+  } yield ()
 
-  val sayPlease = Console.printLine("say sth plz").repeat(Schedule.spaced(Duration.fromSeconds(1)))
-  def say(queue: Queue[String]) = for {
+  private def offerReadLine(queue: Queue[String]) = for {
     read <- Console.readLine
     _ <- queue.offer(read)
   } yield ()
 
-
-  override def run: ZIO[Environment with ZIOAppArgs with Scope, Any, Any] = for {
-    queue <- Queue.bounded[String](100)
-    _ <- say(queue).forever.fork
-    _ <- program(queue)
-  } yield ()
 }

src/main/scala/app/Program.scala

@@ -0,0 +1,30 @@
+package app
+
+import zio.{Console, Queue, _}
+
+import java.io.IOException
+
+case class Program(queue: Queue[String]) {
+
+  private val ticker = Console.printLine("say sth plz")
+    .repeat(Schedule.spaced(Duration.fromSeconds(1)))
+
+  def run: ZIO[Any, Throwable, Unit] = {
+    def loop(sayingBackgroundFiber: Ref[Fiber.Runtime[IOException, Long]]): Task[Unit] = for {
+      read <- queue.take
+      _ <- sayingBackgroundFiber.get.flatMap(_.interrupt)
+      fork <- ticker.delay(Duration.fromSeconds(5)).fork
+      _ <- sayingBackgroundFiber.set(fork)
+      _ <- Console.printLine(s"wrote: $read")
+      _ <- loop(sayingBackgroundFiber)
+    } yield ()
+
+    for {
+      fiber2 <- ticker.fork
+      _ <- ZIO.sleep(100.millis)
+      ref <- Ref.make(fiber2)
+      _ <- loop(ref)
+    } yield ()
+  }
+
+}

src/test/scala/app/MainSpec.scala

@@ -5,32 +5,29 @@ import zio.test.{Spec, TestClock, TestConsole, TestEnvironment, ZIOSpecDefault,
 import zio.{Queue, Scope, durationInt}
 
 object MainSpec extends ZIOSpecDefault {
-  override def spec: Spec[TestEnvironment with Scope, Any] = suite("a")(
-    test("b") {
-      assertTrue("a" == "a")
-    },
-    test("c") {
+  override def spec: Spec[TestEnvironment with Scope, Any] = suite("Program")(
+    test("non empty queue and less than 5s -> no ticker message") {
       for {
         queue <- Queue.bounded[String](100)
         _ <- queue.offer("a")
-        _ <- Main.program(queue).fork
+        _ <- Program(queue).run.fork
         _ <- TestClock.adjust(4.seconds)
         output <- TestConsole.output
       } yield assertTrue (output == Vector("say sth plz\n", "wrote: a\n"))
     },
-    test("d") {
+    test("non empty queue and more than 5s -> one ticker message") {
       for {
         queue <- Queue.bounded[String](100)
         _ <- queue.offer("a")
-        _ <- Main.program(queue).fork
+        _ <- Program(queue).run.fork
         _ <- TestClock.adjust(6.seconds)
         output <- TestConsole.output
       } yield assertTrue(output == Vector("say sth plz\n", "wrote: a\n", "say sth plz\n"))
     },
-    test("d") {
+    test("empty queue => ticker message multiplied by number of seconds + 1") {
       for {
         queue <- Queue.bounded[String](100)
-        _ <- Main.program(queue).fork
+        _ <- Program(queue).run.fork
         _ <- TestClock.adjust(9.seconds)
         output <- TestConsole.output
       } yield assertTrue(output.count(_ == "say sth plz\n") == 10)