que 1.0.0.beta → 1.0.0.beta2

data/lib/que/poller.rb

@@ -144,7 +144,7 @@ module Que
 
       return unless should_poll?
 
-      expected_count = priorities.inject(0){|s,(p,c)| s + c}
+      expected_count = priorities.inject(0){|s,(_,c)| s + c}
 
       jobs =
         connection.execute_prepared(

data/lib/que/rails/railtie.rb

@@ -2,12 +2,12 @@
 
 module Que
   module Rails
-    class Railtie < Rails::Railtie
+    class Railtie < ::Rails::Railtie
       config.que = Que
 
-      Que.run_asynchronously = true if Rails.env.test?
+      Que.run_asynchronously = true if ::Rails.env.test?
 
-      Que.logger     = proc { Rails.logger }
+      Que.logger     = proc { ::Rails.logger }
       Que.connection = ::ActiveRecord if defined? ::ActiveRecord
     end
   end

data/lib/que/result_queue.rb

@@ -28,8 +28,8 @@ module Que
 
     private
 
-    def sync
-      @mutex.synchronize { yield }
+    def sync(&block)
+      @mutex.synchronize(&block)
     end
   end
 end

data/lib/que/utils/constantization.rb

@@ -4,7 +4,7 @@ module Que
   module Utils
     module Constantization
       def constantize(string)
-        assert String, string
+        Que.assert String, string
 
         if string.respond_to?(:constantize)
           string.constantize

data/lib/que/utils/logging.rb

@@ -5,7 +5,8 @@
 module Que
   module Utils
     module Logging
-      attr_accessor :logger, :log_formatter, :internal_logger
+      attr_accessor :logger, :internal_logger
+      attr_writer :log_formatter
 
       def log(event:, level: :info, **extra)
         data = _default_log_data

data/lib/que/utils/middleware.rb

@@ -5,27 +5,40 @@
 module Que
   module Utils
     module Middleware
-      def run_middleware(job, &block)
-        invoke_middleware(
-          middleware: middleware.dup,
-          job:        job,
-          block:      block,
-        )
-      end
+      TYPES = [
+        :job,
+        :sql,
+      ].freeze
+
+      TYPES.each do |type|
+        module_eval <<-CODE
+          def #{type}_middleware
+            @#{type}_middleware ||= []
+          end
 
-      def middleware
-        @middleware ||= []
+          def run_#{type}_middleware(*args)
+            m = #{type}_middleware
+
+            if m.empty?
+              yield
+            else
+              invoke_middleware(middleware: m.dup, args: args) { yield }
+            end
+          end
+        CODE
       end
 
       private
 
-      def invoke_middleware(middleware:, job:, block:)
+      def invoke_middleware(middleware:, args:, &block)
         if m = middleware.shift
-          m.call(job) do
-            invoke_middleware(middleware: middleware, job: job, block: block)
+          r = nil
+          m.call(*args) do
+            r = invoke_middleware(middleware: middleware, args: args, &block)
           end
+          r
         else
-          block.call
+          yield
         end
       end
     end

data/lib/que/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Que
-  VERSION = '1.0.0.beta'
+  VERSION = '1.0.0.beta2'
 end

data/lib/que/worker.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Workers wrap threads which continuously pull job pks from JobCache objects,
+# Workers wrap threads which continuously pull job pks from JobBuffer objects,
 # fetch and work those jobs, and export relevant data to ResultQueues.
 
 module Que
@@ -15,20 +15,20 @@ module Que
       }
 
     def initialize(
-      job_cache:,
+      job_buffer:,
       result_queue:,
       priority: nil,
       start_callback: nil
     )
 
       @priority     = Que.assert([NilClass, Integer], priority)
-      @job_cache    = Que.assert(JobCache, job_cache)
+      @job_buffer   = Que.assert(JobBuffer, job_buffer)
       @result_queue = Que.assert(ResultQueue, result_queue)
 
       Que.internal_log(:worker_instantiate, self) do
         {
           priority:     priority,
-          job_cache:    job_cache.object_id,
+          job_buffer:   job_buffer.object_id,
           result_queue: result_queue.object_id,
         }
       end
@@ -80,7 +80,7 @@ module Que
     end
 
     def fetch_next_metajob
-      @job_cache.shift(*priority)
+      @job_buffer.shift(*priority)
     end
 
     def work_job(metajob)
@@ -89,7 +89,7 @@ module Que
       klass    = Que.constantize(job.fetch(:job_class))
       instance = klass.new(job)
 
-      Que.run_middleware(instance) { instance.tap(&:_run) }
+      Que.run_job_middleware(instance) { instance.tap(&:_run) }
 
       log_message = {
         level: :debug,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta
+  version: 1.0.0.beta2
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-25 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -33,6 +33,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CHANGELOG.1.0.beta.md
 - CHANGELOG.md
 - LICENSE.txt
 - README.md
@@ -62,7 +63,7 @@ files:
 - lib/que/connection.rb
 - lib/que/connection_pool.rb
 - lib/que/job.rb
-- lib/que/job_cache.rb
+- lib/que/job_buffer.rb
 - lib/que/job_methods.rb
 - lib/que/listener.rb
 - lib/que/locker.rb
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A PostgreSQL-based Job Queue