Better Configuration

Author: eliasjpr

README.md

@@ -67,16 +67,15 @@ Defining Queues: Queues are of type `Hash(String, Queue(T))` where the name of t
 
 - **Name:** `queue:email`
 - **Number Workers:** 10
+- **Job Class:** TestJob - a class or union of classes
 
 ### Example
 
 ```crystal
-module JoobQ
-  QUEUES =  {
-    "queue:Email" => JoobQ::Queue(EmailJob).new("queue:Email", 1),
-    "queue:Fail"  => JoobQ::Queue(FailJob).new("queue:Fail", 1),
-    "queue:Test"  => JoobQ::Queue(TestJob).new("queue:Test", 1),
-  }
+JoobQ.configure do
+  queue "queue:Email", 1, EmailJob
+  queue "queue:Fail", 1, FailJob
+  queue "queue:Test", 1, TestJob
 end
 ```
 

shard.yml

@@ -1,5 +1,5 @@
 name: joobq
-version: 0.2.4
+version: 0.2.5
 
 authors:
   - Elias J. Perez <[email protected]>

spec/spec_helper.cr

@@ -42,9 +42,7 @@ struct Job1
   end
 end
 
-module JoobQ
-  QUEUES = {
-    "single"  => Queue(Job1).new("single", 10),
-    "example" => Queue(ExampleJob | FailJob).new("example", 1),
-  }
+JoobQ.configure do
+  queue "single", 10, Job1
+  queue "example", 10, ExampleJob | FailJob
 end

src/joobq.cr

@@ -7,17 +7,16 @@ require "cron_parser"
 require "./joobq/**"
 
 module JoobQ
-  REDIS = Redis::PooledClient.new(
-    host: ENV.fetch("REDIS_HOST", "localhost"),
-    port: ENV.fetch("REDIS_PORT", "6379").to_i,
-    pool_size: ENV.fetch("REDIS_POOL_SIZE", "50").to_i,
-    pool_timeout: ENV.fetch("REDIS_TIMEOUT", "0.2").to_f
-  )
+  REDIS = Configure::INSTANCE.redis
 
   Log.setup_from_env(default_level: :trace)
 
+  def self.configure
+    with Configure::INSTANCE yield
+  end
+
   def self.queues
-    QUEUES
+    Configure::INSTANCE.queues
   end
 
   def self.statistics
@@ -37,7 +36,7 @@ module JoobQ
   end
 
   def self.[](name : String)
-    QUEUES[name]
+    queues[name]
   end
 
   def self.reset

src/joobq/configure.cr

@@ -0,0 +1,20 @@
+module JoobQ
+  class Configure
+    INSTANCE = new
+
+    getter redis : Redis::PooledClient = Redis::PooledClient.new(
+      host: ENV.fetch("REDIS_HOST", "localhost"),
+      port: ENV.fetch("REDIS_PORT", "6379").to_i,
+      pool_size: ENV.fetch("REDIS_POOL_SIZE", "50").to_i,
+      pool_timeout: ENV.fetch("REDIS_TIMEOUT", "0.2").to_f
+    )
+
+    getter queues = {} of String => BaseQueue
+
+    macro queue(name, workers, kind)
+      {% begin %}
+      queues[{{name}}] = JoobQ::Queue({{kind.id}}).new({{name}}, {{workers}})
+      {% end %}
+    end
+  end
+end

src/joobq/queue.cr

@@ -1,5 +1,9 @@
 module JoobQ
-  class Queue(T)
+  abstract class BaseQueue
+    abstract def push(job : String)
+  end
+
+  class Queue(T) < BaseQueue
     private TIMEOUT = 2
 
     getter redis : Redis::PooledClient = JoobQ::REDIS

src/joobq/statistics.cr

@@ -12,13 +12,13 @@ module JoobQ
 
     def self.create_series
       instance.create_key "processing"
-      JoobQ::QUEUES.each do |key, _|
+      JoobQ.queues.each do |key, _|
         instance.create_key key
       end
     end
 
     def queues
-      JoobQ::QUEUES
+      JoobQ.queues
     end
 
     def queue(name)