activejob 5.0.0.1 → 5.0.1.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11780986d40be2ea5d17720db6795c302bfa7f81
-  data.tar.gz: abd333efce7fd40830c9bb232e24f735bacc8018
+  metadata.gz: c88dc2a35d24fef3beee52a581f7b06115afa3ff
+  data.tar.gz: e4c8a78a5ba7de441196d36ff1885871c4489aec
 SHA512:
-  metadata.gz: d293881a2cd624b3a539738902da169dec408c10699c065796652c0712577ae6ece594d65a9205ae3bffbd9d0a65a6dcb2a3433a44b9e14bcc92c3fdb3ccbd8a
-  data.tar.gz: dd68b8ae60832abcded5fc4316ceaf2d5efa8932b70c3af8b086827838b8db7ced8793901880741d79ae9b1e7eba2ee1c322d4024db04a3076adb253caf72fb7
+  metadata.gz: 9aa3b88ea9bbfb7ab34b6601a60aeac98d3551a0975ada9f35bd330136fa998cdacdbe573507b8ab6f3b097cf2bf64cd2669cefe2aab82b9710e118e40b007d0
+  data.tar.gz: f55b23bcc5abb4adcdcff207664f8f094c9ce667f1e424f443d2861c1cbc32bf502aab2a28e7caa2f17fefd702523862b4cc30238845abcb97e0f9430bbf0d57

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 5.0.1.rc1 (December 01, 2016) ##
+
+*   Added instance variable `@queue` to JobWrapper.
+
+    This will fix issues in [resque-scheduler](https://github.com/resque/resque-scheduler) `#job_to_hash` method,
+    so we can use `#enqueue_delayed_selection`, `#remove_delayed` method in resque-scheduler smoothly.
+
+    *mu29*
+
+
 ## Rails 5.0.0 (June 30, 2016) ##
 
 *   Enable class reloading prior to job dispatch, and ensure Active Record

data/README.md

@@ -102,7 +102,7 @@ The latest version of Active Job can be installed with RubyGems:
 
 Source code can be downloaded as part of the Rails project on GitHub
 
-* https://github.com/rails/rails/tree/master/activejob
+* https://github.com/rails/rails/tree/5-0-stable/activejob
 
 ## License
 

data/lib/active_job/core.rb

@@ -105,6 +105,7 @@ module ActiveJob
     #    end
     def deserialize(job_data)
       self.job_id               = job_data['job_id']
+      self.provider_job_id      = job_data['provider_job_id']
       self.queue_name           = job_data['queue_name']
       self.priority             = job_data['priority']
       self.serialized_arguments = job_data['arguments']

data/lib/active_job/gem_version.rb

@@ -7,8 +7,8 @@ module ActiveJob
   module VERSION
     MAJOR = 5
     MINOR = 0
-    TINY  = 0
-    PRE   = "1"
+    TINY  = 1
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_job/queue_adapters/resque_adapter.rb

@@ -27,6 +27,7 @@ module ActiveJob
     #   Rails.application.config.active_job.queue_adapter = :resque
     class ResqueAdapter
       def enqueue(job) #:nodoc:
+        JobWrapper.instance_variable_set(:@queue, job.queue_name)
         Resque.enqueue_to job.queue_name, JobWrapper, job.serialize
       end
 

data/lib/active_job/queue_adapters/sidekiq_adapter.rb

@@ -37,7 +37,7 @@ module ActiveJob
         include Sidekiq::Worker
 
         def perform(job_data)
-          Base.execute job_data
+          Base.execute job_data.merge('provider_job_id' => jid)
         end
       end
     end

data/lib/active_job/test_case.rb

@@ -3,5 +3,7 @@ require 'active_support/test_case'
 module ActiveJob
   class TestCase < ActiveSupport::TestCase
     include ActiveJob::TestHelper
+
+    ActiveSupport.run_load_hooks(:active_job_test_case, self)
   end
 end

data/lib/active_job/test_helper.rb

@@ -11,7 +11,7 @@ module ActiveJob
     def before_setup # :nodoc:
       test_adapter = queue_adapter_for_test
 
-      @old_queue_adapters = (ActiveJob::Base.subclasses << ActiveJob::Base).select do |klass|
+      @old_queue_adapters = (ActiveJob::Base.descendants << ActiveJob::Base).select do |klass|
         # only override explicitly set adapters, a quirk of `class_attribute`
         klass.singleton_class.public_instance_methods(false).include?(:_queue_adapter)
       end.map do |klass|
@@ -269,6 +269,25 @@ module ActiveJob
       instantiate_job(matching_job)
     end
 
+    # Performs all enqueued jobs in the duration of the block.
+    #
+    #   def test_perform_enqueued_jobs
+    #     perform_enqueued_jobs do
+    #       MyJob.perform_later(1, 2, 3)
+    #     end
+    #     assert_performed_jobs 1
+    #   end
+    #
+    # This method also supports filtering. If the +:only+ option is specified,
+    # then only the listed job(s) will be performed.
+    #
+    #   def test_perform_enqueued_jobs_with_only
+    #     perform_enqueued_jobs(only: MyJob) do
+    #       MyJob.perform_later(1, 2, 3) # will be performed
+    #       HelloJob.perform_later(1, 2, 3) # will not be perfomed
+    #     end
+    #     assert_performed_jobs 1
+    #   end
     def perform_enqueued_jobs(only: nil)
       old_perform_enqueued_jobs = queue_adapter.perform_enqueued_jobs
       old_perform_enqueued_at_jobs = queue_adapter.perform_enqueued_at_jobs
@@ -286,6 +305,11 @@ module ActiveJob
       end
     end
 
+    # Accesses the queue_adapter set by ActiveJob::Base.
+    #
+    #   def test_assert_job_has_custom_queue_adapter_set
+    #     assert_instance_of CustomQueueAdapter, HelloJob.queue_adapter
+    #   end
     def queue_adapter
       ActiveJob::Base.queue_adapter
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.0.0.1
+  version: 5.0.1.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-10 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.1.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.0.1
+        version: 5.0.1.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement
@@ -96,14 +96,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Job framework with pluggable queues.
 test_files: []
-has_rdoc: