soda-core 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32e5b067cc3dfe374112b0eff7e91d3508f993ea58109bcab77f6a257d34513f
-  data.tar.gz: 12d12051cdeb103f889f4c104d68ed2d55818efe41705d18ae26ebbfa5fd98a4
+  metadata.gz: 5890ee17efa45584d1824c9bb5afb701f1787da78afe0d493fa02ecf2d18d734
+  data.tar.gz: 75be3aff3d00251c90ab6c36f54638e00cc4f5852035a73ec315358f5084bbdd
 SHA512:
-  metadata.gz: 98481b769364a4cb9cafd63ae11394e631a97c5c914c94b6b3de380fab9324d6ccac4c8730f7483bb0b0bd0933de4585aa5dbc1650b8b0bf1e445b1fd56a2677
-  data.tar.gz: 1d28e5fbf250aa8c76098c2608a51df7b998369d6b9e738c3baaae06ce53ac27f79f18b3cfa16a62faf7ccc8f7c85db57d2b67e30b18f8561eca8e8d7c87a641
+  metadata.gz: b46fc65693b7dba0ce1e36da8cd12eef30025b443ac0c028430066d8d2b6e509503c091a5510298530ef04fd567c038ff474a272b77192d4f40d0cb72fef5ac0
+  data.tar.gz: 8c64c47b3c7c9452f002ef36182cf0ce55ba81cd8ae68584fdbf0dc578f268913d4b1d4926492d6d91652d0d6cf4772fec8ecd0bd1b153be98c2d4a4ef4040db

data/lib/soda.rb

@@ -18,6 +18,7 @@ require "soda/retrier"
 require "soda/worker"
 
 module Soda
+  NAME = "Soda"
   DEFAULTS = {
     concurrency: 10,
   }

data/lib/soda/cli.rb

@@ -23,10 +23,15 @@ module Soda
     def run
       build_options
 
+      logger.info("🥤  %s v%s" % [Soda::NAME, Soda::VERSION])
+
       if rails?
         if Rails::VERSION::MAJOR >= 5
+          require "./config/application.rb"
           require "./config/environment.rb"
           require "soda/rails"
+          require "soda/extensions/active_job"
+
           logger.info("Loaded Rails v%s application." % ::Rails.version)
         else
           raise "Not compatible with Rails v%s!" % Rails.version
@@ -98,9 +103,13 @@ module Soda
           opts.merge!(require: val)
         end
 
-        o.on("-q", "--queues [PATH]", "Queue to listen to, with optional weights") do |val|
+        o.on("-q", "--queue QUEUE[,WEIGHT]", "Queue to listen to, with optional weights") do |val|
           opts.merge!(queues: opts.fetch(:queues, []).push(val.split(/\,+/)))
         end
+
+        o.on("-c", "--concurrency [INT]", "Number of processor threads") do |val|
+          opts.merge!(concurrency: Integer(val))
+        end
       end
     end
 

data/lib/soda/client.rb

@@ -1,11 +1,25 @@
 module Soda
   class Client
+    DEFAULTS = {
+      "retry" => true,
+      "delay" => 0,
+    }
+
+    class << self
+      def push(*args)
+        new.push(*args)
+      end
+    end
+
+
     def push(item)
-      copy  = normalize!(item)
-      mw    = Soda.client_middleware
+      copy = normalize!(item)
 
+      mw = Soda.client_middleware
       mw.use(item["klass"], copy, copy["queue"]) do
-        Soda.queue(copy["queue"]) do |queue|
+        jid = copy["id"]
+        jid.tap do
+          queue = Soda.queue(copy["queue"])
           queue.push_in(copy["delay"], Soda.dump_json(copy))
         end
       end
@@ -14,19 +28,20 @@ module Soda
     private
 
     def normalize!(item)
-      item.dup.tap do |copy|
-        copy.keys.each do |key|
-          copy.merge!(String(key) => copy[key])
+      item = DEFAULTS.merge(item)
+      item.tap do
+        item.keys.each do |key|
+          item.merge!(String(key) => item.delete(key))
         end
 
         id      = SecureRandom.base64(10)
-        klass   = copy["klass"].to_s
-        delay   = Integer(copy["delay"]) || 0
-        queue   = copy["queue"] || Soda.default_queue!.name
+        klass   = item["klass"].to_s
+        delay   = item["delay"].to_i
+        queue   = item["queue"] || Soda.default_queue!.name
 
         # TODO: add validation
         #
-        copy.merge!(
+        item.merge!(
           "id"    => id,
           "klass" => klass,
           "delay" => delay,

data/lib/soda/extensions/active_job.rb

@@ -0,0 +1,27 @@
+module ActiveJob
+  module QueueAdapters
+    class SodaAdapter
+      def enqueue(job)
+        enqueue_at(job, Time.now)
+      end
+
+      def enqueue_at(job, ts)
+        job.provider_job_id = ::Soda::Client.push(
+          "klass"   => JobWrapper,
+          "wrapped" => job.class,
+          "queue"   => job.queue_name,
+          "delay"   => [0, (ts - Time.now).to_i].max,
+          "args"    => [job.serialize],
+        )
+      end
+
+      class JobWrapper
+        include ::Soda::Worker
+
+        def perform(data = {})
+          Base.execute(data.merge("provider_job_id" => id))
+        end
+      end
+    end
+  end
+end

data/lib/soda/fetcher.rb

@@ -37,7 +37,7 @@ module Soda
       start = now
       logger.debug(%(fetching from "%s") % queue.name)
 
-      queue.pop.tap do |msgs|
+      (queue.pop || []).tap do |msgs|
         logger.debug(%(fetched %d message(s) from "%s" (%fms)) % [msgs.count, queue.name, (now - start)])
       end
     end

data/lib/soda/processor.rb

@@ -31,7 +31,7 @@ module Soda
 
     def run
       until stopped?
-        msgs = fetch
+        msgs = fetch || []
         msgs.each(&method(:process))
       end
     rescue Exception => ex

data/lib/soda/rails.rb

@@ -1,7 +1,6 @@
 module Soda
   module Rails
     class Engine < ::Rails::Engine
-      # TODO: define AJ integration
     end
   end
 end

data/lib/soda/retrier.rb

@@ -24,7 +24,7 @@ module Soda
       if ret.is_a?(Numeric)
         ret < msg.receive_count
       else
-        ret
+        !!ret
       end
     end
 

data/lib/soda/version.rb

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

data/lib/soda/worker.rb

@@ -28,6 +28,7 @@ module Soda
           )
         end
       end
+      alias_method :perform_at, :perform_in
 
       private
 
@@ -70,6 +71,12 @@ module Soda
       @options = options
     end
 
+    %i[id].each do |method|
+      define_method(method) do
+        options.fetch(String(method))
+      end
+    end
+
     private
 
     attr_reader :options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soda-core
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Noah Portes Chaikin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-16 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -63,6 +63,7 @@ files:
 - lib/soda.rb
 - lib/soda/cli.rb
 - lib/soda/client.rb
+- lib/soda/extensions/active_job.rb
 - lib/soda/fetcher.rb
 - lib/soda/logger.rb
 - lib/soda/manager.rb