soda-core 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5890ee17efa45584d1824c9bb5afb701f1787da78afe0d493fa02ecf2d18d734
-  data.tar.gz: 75be3aff3d00251c90ab6c36f54638e00cc4f5852035a73ec315358f5084bbdd
+  metadata.gz: 88762defaf2339fa04bbe565b9238d6edf1b6a3df2f68bd85c4bee62aa1e5397
+  data.tar.gz: b6b0934e5f9c7038859eed8dc28c8f6280223384e06f640c9ed907d8900f0392
 SHA512:
-  metadata.gz: b46fc65693b7dba0ce1e36da8cd12eef30025b443ac0c028430066d8d2b6e509503c091a5510298530ef04fd567c038ff474a272b77192d4f40d0cb72fef5ac0
-  data.tar.gz: 8c64c47b3c7c9452f002ef36182cf0ce55ba81cd8ae68584fdbf0dc578f268913d4b1d4926492d6d91652d0d6cf4772fec8ecd0bd1b153be98c2d4a4ef4040db
+  metadata.gz: b1ccfad1b68e0f0e63dfd92e625a76896693b77a5314ae557a486af21a31a6f7c48c46f8495a3e8d4d088687bacff85636016181b51a2dcd24c6c29395372e79
+  data.tar.gz: 22a7dc79c110eae266bb0b4323ec474e22cc38ef02dd79bf58c1f9c26233fe0c8a10ace9906ec7bd99e17b3cc00a9fc4e245f6bd103dc2c98bd9d3876e455432

data/lib/soda.rb

@@ -1,8 +1,10 @@
 require "aws-sdk-sqs"
+require "erb"
 require "json"
 require "logger"
 require "securerandom"
 require "set"
+require "yaml"
 
 require "soda/tools"
 
@@ -65,6 +67,40 @@ module Soda
       end
     end
 
+    def queues=(configs)
+      queues do |registry|
+        names = []
+        configs.each do |cfg|
+          # Find or create the queue.
+          queue = registry.select(cfg.delete(:name))
+
+          # Update the attributes
+          name = queue.name
+          url  = cfg.delete(:url) || queue.url
+
+          registry.register(
+            name,
+            url,
+            queue.options.merge(cfg),
+          )
+
+          names << queue.name
+        end
+
+        # For queues that are not included in the command, set their weight to
+        # zero so they can still be accessed.
+        registry.each do |queue|
+          unless names.include?(queue.name)
+            registry.register(
+              queue.name,
+              queue.url,
+              queue.options.merge(weight: 0),
+            )
+          end
+        end
+      end
+    end
+
     def queue(name)
       queues.select(name).tap do |queue|
         yield(queue) if block_given?

data/lib/soda/cli.rb

@@ -12,6 +12,8 @@ module Soda
       INT,
     ].freeze
 
+    DEFAULT_CONFIG = "config/soda.yml"
+
     def self.start
       new.run
     end
@@ -85,12 +87,20 @@ module Soda
       parser  = build_option_parser(opts)
       parser.parse!(argv)
 
+      if File.exists?(default_config = File.expand_path(DEFAULT_CONFIG))
+        opts[:config] ||= default_config
+      end
+
+      if (file = opts.delete(:config_file))
+        parse_config_file(opts, opts.delete(:config))
+      end
+
       if (req = opts.delete(:require))
         require(req)
       end
 
-      if (queues_opt = opts.delete(:queues))
-        parse_queues(queues_opt)
+      if (queues = opts.delete(:queues))
+        Soda.queues = queues
       end
 
       options = Soda.options
@@ -104,7 +114,8 @@ module Soda
         end
 
         o.on("-q", "--queue QUEUE[,WEIGHT]", "Queue to listen to, with optional weights") do |val|
-          opts.merge!(queues: opts.fetch(:queues, []).push(val.split(/\,+/)))
+          name, weight = val.split(/,/)
+          opts.merge!(queues: opts.fetch(:queues, []).push(name: name, weight: weight))
         end
 
         o.on("-c", "--concurrency [INT]", "Number of processor threads") do |val|
@@ -113,36 +124,20 @@ module Soda
       end
     end
 
-    def parse_queues(opt)
-      Soda.queues do |registry|
-        opt.each do |name, weight|
-          # Find or create the queue.
-          queue = registry.select(name)
-
-          if weight
-            # Replace the queue with the same one, except mutate the options to
-            # include the specified weight.
-            registry.register(
-              queue.name,
-              queue.url,
-              queue.options.merge(weight: weight.to_i),
-            )
-          end
-        end
+    def parse_config_file(opts = {}, file)
+      path = File.expand_path(file)
 
-        # For queues that are not included in the command, set their weight to
-        # zero so they can still be accessed.
-        names = opt.map(&:first)
-        registry.each do |queue|
-          unless names.include?(queue.name)
-            registry.register(
-              queue.name,
-              queue.url,
-              queue.options.merge(weight: 0),
-            )
-          end
-        end
+      unless File.exists?(path)
+        raise "File does not exist: %s"
       end
+
+      opts.merge!(
+        deep_symbolize_keys(
+          YAML.load(
+            ERB.new(File.read(path)).result,
+          ),
+        ),
+      )
     end
 
     def rails?

data/lib/soda/client.rb

@@ -9,14 +9,16 @@ module Soda
       def push(*args)
         new.push(*args)
       end
-    end
 
+      def middleware
+        Soda.client_middleware
+      end
+    end
 
     def push(item)
       copy = normalize!(item)
 
-      mw = Soda.client_middleware
-      mw.use(item["klass"], copy, copy["queue"]) do
+      self.class.middleware.use(item["klass"], copy, copy["queue"]) do
         jid = copy["id"]
         jid.tap do
           queue = Soda.queue(copy["queue"])

data/lib/soda/middleware/chain.rb

@@ -45,7 +45,7 @@ module Soda
           yield
         else
           entry = copy.shift
-          inst  = entry.klass.new(*entry.args)
+          inst  = entry.build
 
           inst.call(*args) do
             traverse(copy, args) { yield }

data/lib/soda/processor.rb

@@ -2,6 +2,12 @@ module Soda
   class Processor
     include Tools
 
+    class << self
+      def middleware
+        Soda.server_middleware
+      end
+    end
+
     def initialize(manager)
       @manager      = manager
       @retrier      = Retrier.new
@@ -71,8 +77,7 @@ module Soda
       worker  = constantize(klass)
 
       retrier.retry(job_hash, msg) do
-        middleware = Soda.server_middleware
-        middleware.use(worker, job_hash, queue.name, msg) do
+        self.class.middleware.use(worker, job_hash, queue.name, msg) do
           instance = worker.new(job_hash)
           instance.perform(*job_hash["args"])
         end

data/lib/soda/tools.rb

@@ -19,5 +19,24 @@ module Soda
     def now
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
+
+    def deep_symbolize_keys(hash)
+      transform_value = -> (value) {
+        case value
+        when Hash
+          deep_symbolize_keys(value)
+        when Array
+          value.map { |val| transform_value.call(val) }
+        else
+          value
+        end
+      }
+
+      {}.tap do |memo|
+        hash.each do |key, value|
+          memo.merge!(key.to_sym => transform_value.call(value))
+        end
+      end
+    end
   end
 end

data/lib/soda/version.rb

@@ -1,3 +1,3 @@
 module Soda
-  VERSION = "0.0.7".freeze
+  VERSION = "0.0.8".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soda-core
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Noah Portes Chaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs