que 0.11.5 → 0.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0c2982677c2d3e3149550edd34a8c0740784f87
-  data.tar.gz: 8a7c53ddf56279a7f5eb520af3e8b36492503181
+  metadata.gz: 1d29adfcb566361924bbd594ba6e5c7b93006060
+  data.tar.gz: 65905d420760dcafc00411f895d6140262d9beb1
 SHA512:
-  metadata.gz: 736ef950176ef1ae58317be47d28ce1dda34d7cd8599f517de2b67efcfb7f6987aa5ba0ea680eeeebcc3cf51591763fc5ad39c774500abdc58079f049b88de67
-  data.tar.gz: da960c013f059e71aa1f96c7b1e485002a27719cfcb06966c62a6eeaf8d2837b25a09b02251003ef2c133707a8ef4413a96029b1acfb34ac69cb6e22d37f189a
+  metadata.gz: 729dcc64222ed6c9c1d528e72ad4195a9b66aa2275372143f0add9ad051977e967dad6b5dbced2dec86a714553a2994fe2e12e4a2f03224751e2d9670f97d05b
+  data.tar.gz: 1ffb694bd34229a657e203256e85556b9e84bc293681e71cbb80d98cbf21003651d0d9b80d67f34f0849f2f863743a8d08a5bb24a24e7ae6ed7ec7eaa3f149fb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.11.6 (2016-07-01)
+
+*   Fix for operating in nested transactions in Rails 5.0. (#160) (greysteil)
+
 ### 0.11.5 (2016-05-13)
 
 *   Fix error when running `que -v`. (#154) (hardbap)

data/docs/README.md

@@ -1,33 +1,33 @@
 Docs Index
-==============
+===============
 
-- [Advanced Setup](docs/advanced_setup.md)
-  - Using ActiveRecord Without Rails
-  - Forking Servers
-  - Managing the Jobs Table
-  - Other Setup
-- [Customizing Que](docs/customizing_que.md)
-  - Recurring Jobs
-  - DelayedJob-style Jobs
-  - QueueClassic-style Jobs
-  - Retaining Finished Jobs
-  - Not Retrying Certain Failed Jobs
-- [Error Handling](docs/error_handling.md)
-- [Inspecting the Queue](docs/inspecting_the_queue.md)
-  - Job Stats
-  - Worker States
-  - Custom Queries
-- [Logging](docs/logging.md)
-- [Managing Workers](docs/managing_workers.md)
-  - Working Jobs Via Executable
-  - Thread-Unsafe Application Code
-  - The Wake Interval
-  - Manually Waking Workers
-  - Connection Pool Size
-- [Migrating](docs/migrating.md)
-- [Multiple Queues](docs/multiple_queues.md)
-- [Shutting Down Safely](docs/shutting_down_safely.md)
-- [Using Plain Postgres Connections](docs/using_plain_connections.md)
-- [Using Sequel](docs/using_sequel.md)
-- [Writing Reliable Jobs](docs/writing_reliable_jobs.md)
-  - Timeouts
+- [Advanced Setup](advanced_setup.md#advanced-setup)
+  - [Using ActiveRecord Without Rails](advanced_setup.md#using-activerecord-without-rails)
+  - [Forking Servers](advanced_setup.md#forking-servers)
+  - [Managing the Jobs Table](advanced_setup.md#managing-the-jobs-table)
+  - [Other Setup](advanced_setup.md#other-setup)
+- [Customizing Que](customizing_que.md#customizing-que)
+  - [Recurring Jobs](customizing_que.md#recurring-jobs)
+  - [DelayedJob-style Jobs](customizing_que.md#delayedjob-style-jobs)
+  - [QueueClassic-style Jobs](customizing_que.md#queueclassic-style-jobs)
+  - [Retaining Finished Jobs](customizing_que.md#retaining-finished-jobs)
+  - [Not Retrying Certain Failed Jobs](customizing_que.md#not-retrying-certain-failed-jobs)
+- [Error Handling](error_handling.md#error-handling)
+- [Inspecting the Queue](inspecting_the_queue.md#inspecting-the-queue)
+  - [Job Stats](inspecting_the_queue.md#job-stats)
+  - [Worker States](inspecting_the_queue.md#worker-states)
+  - [Custom Queries](inspecting_the_queue.md#custom-queries)
+- [Logging](logging.md#logging)
+- [Managing Workers](managing_workers.md#managing-workers)
+  - [Working Jobs Via Executable](managing_workers.md#working-jobs-via-executable)
+  - [Thread-Unsafe Application Code](managing_workers.md#thread-unsafe-application-code)
+  - [The Wake Interval](managing_workers.md#the-wake-interval)
+  - [Manually Waking Workers](managing_workers.md#manually-waking-workers)
+  - [Connection Pool Size](managing_workers.md#connection-pool-size)
+- [Migrating](migrating.md#migrating)
+- [Multiple Queues](multiple_queues.md#multiple-queues)
+- [Shutting Down Safely](shutting_down_safely.md#shutting-down-safely)
+- [Using Plain Postgres Connections](using_plain_connections.md#using-plain-postgres-connections)
+- [Using Sequel](using_sequel.md#using-sequel)
+- [Writing Reliable Jobs](writing_reliable_jobs.md#writing-reliable-jobs)
+  - [Timeouts](writing_reliable_jobs.md#timeouts)

data/lib/que/adapters/active_record.rb

@@ -46,6 +46,14 @@ module Que
         def before_committed!(*)
           # no-op
         end
+
+        def add_to_transaction
+          # no-op.
+          #
+          # This is called when we're in a nested transaction. Ideally we would
+          # `wake!` when the outer transaction gets committed, but that would be
+          # a bigger refactor!
+        end
       end
 
       private

data/lib/que/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Que
-  Version = '0.11.5'
+  Version = '0.11.6'
 end

data/spec/adapters/active_record_spec.rb

@@ -6,7 +6,7 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
   require 'spec_helper'
   require 'active_record'
 
-  if ActiveRecord.version.release >= Gem::Version.new('4.2')
+  if ActiveRecord.version.release >= Gem::Version.new('4.2') && ActiveRecord.version.release < Gem::Version.new('5.0')
     ActiveRecord::Base.raise_in_transactional_callbacks = true
   end
   ActiveRecord::Base.establish_connection(QUE_URL)
@@ -103,12 +103,24 @@ unless defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
       Que::Job.enqueue
       sleep_until { Que::Worker.workers.all?(&:sleeping?) && DB[:que_jobs].empty? }
 
+      # Wakes a worker on transaction commit when in a transaction.
       ActiveRecord::Base.transaction do
         Que::Job.enqueue
         Que::Worker.workers.each { |worker| worker.should be_sleeping }
       end
       sleep_until { Que::Worker.workers.all?(&:sleeping?) && DB[:que_jobs].empty? }
 
+      # Does nothing when in a nested transaction.
+      # TODO: ideally this would wake after the outer transaction commits
+      if ActiveRecord.version.release >= Gem::Version.new('5.0')
+        ActiveRecord::Base.transaction do
+          ActiveRecord::Base.transaction(requires_new: true) do
+            Que::Job.enqueue
+            Que::Worker.workers.each { |worker| worker.should be_sleeping }
+          end
+        end
+      end
+
       # Do nothing when queueing with a specific :run_at.
       BlockJob.enqueue :run_at => Time.now
       Que::Worker.workers.each { |worker| worker.should be_sleeping }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: que
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.11.6
 platform: ruby
 authors:
 - Chris Hanks
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler