activejob 5.1.0.beta1 → 5.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f531ce0d6eaf7a50b34ce12d446306d52ee5c1c8
-  data.tar.gz: 75398a20122581b02e422c07798a7770d0481cdf
+  metadata.gz: 67881bc8cb8bcd6a7ad8907b570221f7cc82289d
+  data.tar.gz: 4a6fbe737335457cac2790394d823753bcb11c2b
 SHA512:
-  metadata.gz: d70263baebf9c8476d0a45fe9e0eef753f35baaa221ebce00662971f46a1cc701fd51d9138194d445891954205ed6cfdf66573a6a107cf216ef7b0eaf2c28e70
-  data.tar.gz: f62463ae9aebd79e7933002dd9b2d786b74ca2dc28b94322fd3ea440b68c5c0d4ab0a59967a5f46d6932b869f4c62168878e5a9e48e49e7ea637597201276d85
+  metadata.gz: 567a405191156ab97e81345fc7e101497a55efd6383fb3582a473f351b7233bbcc2783ba769c7b5430c58cc2cd0a6af8d4e187852c65a5d04fe5a075a36391e5
+  data.tar.gz: 9a64d5b9212081f731464b3f9c95e1d7f05f9d66ae3f3b9c5fa23754ad3dd293d4c9c376ebcb05bd6593a476173db6091d794325be59e49e1ccd29be00ddf187

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## Rails 5.1.0.rc1 (March 20, 2017) ##
+
+*   No changes.
+
+
 ## Rails 5.1.0.beta1 (February 23, 2017) ##
 
 *   Correctly set test adapter when configure the queue adapter on a per job.
@@ -6,10 +11,6 @@
 
     *Yuji Yaginuma*
 
-*   Push skipped jobs to `enqueued_jobs` when using `perform_enqueued_jobs` with a `only` filter in tests
-
-    *Alexander Pauly*
-
 *   Removed deprecated support to passing the adapter class to `.queue_adapter`.
 
     *Rafael Mendonça França*

data/lib/active_job/gem_version.rb

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

data/lib/active_job/logging.rb

@@ -69,14 +69,14 @@ module ActiveJob
         def perform_start(event)
           info do
             job = event.payload[:job]
-            "Performing #{job.class.name} from #{queue_name(event)}" + args_info(job)
+            "Performing #{job.class.name} (Job ID: #{job.job_id}) from #{queue_name(event)}" + args_info(job)
           end
         end
 
         def perform(event)
           info do
             job = event.payload[:job]
-            "Performed #{job.class.name} from #{queue_name(event)} in #{event.duration.round(2)}ms"
+            "Performed #{job.class.name} (Job ID: #{job.job_id}) from #{queue_name(event)} in #{event.duration.round(2)}ms"
           end
         end
 

data/lib/active_job/queue_adapters/test_adapter.rb

@@ -24,27 +24,30 @@ module ActiveJob
       end
 
       def enqueue(job) #:nodoc:
+        return if filtered?(job)
+
         job_data = job_to_hash(job)
         enqueue_or_perform(perform_enqueued_jobs, job, job_data)
       end
 
       def enqueue_at(job, timestamp) #:nodoc:
+        return if filtered?(job)
+
         job_data = job_to_hash(job, at: timestamp)
         enqueue_or_perform(perform_enqueued_at_jobs, job, job_data)
       end
 
       private
-
         def job_to_hash(job, extras = {})
           { job: job.class, args: job.serialize.fetch("arguments"), queue: job.queue_name }.merge!(extras)
         end
 
         def enqueue_or_perform(perform, job, job_data)
-          if !perform || filtered?(job)
-            enqueued_jobs << job_data
-          else
+          if perform
             performed_jobs << job_data
             Base.execute job.serialize
+          else
+            enqueued_jobs << job_data
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activejob
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta1
+  version: 5.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-23 00:00:00.000000000 Z
+date: 2017-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta1
+        version: 5.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.0.beta1
+        version: 5.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: globalid
   requirement: !ruby/object:Gem::Requirement