delayed_job 4.1.3 → 4.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e2fe748c9a94faf96700fa8f87466b6fe7fd079
-  data.tar.gz: 21d55a1f49084db05123ad5573711ef7a52f7c29
+  metadata.gz: eb308cfa2fde622a63bd400463d5f5b700fe56a2
+  data.tar.gz: df36c80e1fc931bb667dafcd7f9710417069c3ab
 SHA512:
-  metadata.gz: cadfae1e2a548b451dc336f033ae671bd005c5b17fa311c5af3a306851b6d5642fcc88bee79ebbc9826032e9dccdf5f58eb0315de63e3357106987f496009f69
-  data.tar.gz: 2a07509ecd676d248ca983a3ba87062cf1b11a8bdc67f0cd63ab91a2c975e8f840b323bba8ae9596aa15db2435702484763acd7688adaf39b492910fffead165
+  metadata.gz: 50954c0e738fd55e38a2c571e6dee55364bee0669d7297ca02f59dff135625ecf13653456a340c5a4e43b2ce24b3875198cb58cb3209c2659adf7494618fd8cd
+  data.tar.gz: 8c6269d5cbc2185cfdfd88796df32ffa42c13e6f3db5fbe9f5cf4ea5a7c1b668cb2129a4dcade0701e5960566448f4641ad4c3119c3591f274ef5fb85455cd3a

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+4.1.4 - 2017-12-29
+=================
+* Use `yaml_tag` instead of deprecated `yaml_as` (#996)
+* Support ruby 2.5.0
+
 4.1.3 - 2017-05-26
 =================
 * Don't mutate the options hash (#877)

data/README.md

@@ -1,7 +1,7 @@
 **If you're viewing this at https://github.com/collectiveidea/delayed_job,
 you're reading the documentation for the master branch.
 [View documentation for the latest release
-(4.1.3).](https://github.com/collectiveidea/delayed_job/tree/v4.1.3)**
+(4.1.4).](https://github.com/collectiveidea/delayed_job/tree/v4.1.4)**
 
 Delayed::Job
 ============
@@ -222,7 +222,7 @@ object.delay(:queue => 'high_priority', priority: 0).method
 You can start processes to only work certain queues with the `queue` and `queues`
 options defined below. Processes started without specifying a queue will run jobs
 from **any** queue. To effectively have a process that runs jobs where a queue is not
-specified, set a default queue name with `Delayed::Worker.default_queue_name` and 
+specified, set a default queue name with `Delayed::Worker.default_queue_name` and
 have the processes run that queue.
 
 Running Jobs

data/delayed_job.gemspec

@@ -13,5 +13,5 @@ Gem::Specification.new do |spec|
   spec.require_paths  = ['lib']
   spec.summary        = 'Database-backed asynchronous priority queue system -- Extracted from Shopify'
   spec.test_files     = Dir.glob('spec/**/*')
-  spec.version        = '4.1.3'
+  spec.version        = '4.1.4'
 end

data/lib/delayed/psych_ext.rb

@@ -33,7 +33,7 @@ module Delayed
         case object.tag
         when %r{^!ruby/object}
           result = super
-          if defined?(ActiveRecord::Base) && result.is_a?(ActiveRecord::Base)
+          if jruby_is_seriously_borked && result.is_a?(ActiveRecord::Base)
             klass = result.class
             id = result[klass.primary_key]
             begin
@@ -78,6 +78,13 @@ module Delayed
         end
       end
 
+      # defined? is triggering something really messed up in
+      # jruby causing both the if AND else clauses to execute,
+      # however if the check is run here, everything is fine
+      def jruby_is_seriously_borked
+        defined?(ActiveRecord::Base)
+      end
+
       def resolve_class(klass_name)
         return nil if !klass_name || klass_name.empty?
         klass_name.constantize

data/lib/delayed/serialization/active_record.rb

@@ -1,7 +1,7 @@
 if defined?(ActiveRecord)
   module ActiveRecord
     class Base
-      yaml_as 'tag:ruby.yaml.org,2002:ActiveRecord'
+      yaml_tag 'tag:ruby.yaml.org,2002:ActiveRecord'
 
       def self.yaml_new(klass, _tag, val)
         klass.unscoped.find(val['attributes'][klass.primary_key])

data/lib/delayed/syck_ext.rb

@@ -1,5 +1,5 @@
 class Module
-  yaml_as 'tag:ruby.yaml.org,2002:module'
+  yaml_tag 'tag:ruby.yaml.org,2002:module'
 
   def self.yaml_new(_klass, _tag, val)
     val.constantize
@@ -20,7 +20,7 @@ class Module
 end
 
 class Class
-  yaml_as 'tag:ruby.yaml.org,2002:class'
+  yaml_tag 'tag:ruby.yaml.org,2002:class'
   remove_method :to_yaml if respond_to?(:to_yaml) && method(:to_yaml).owner == Class # use Module's to_yaml
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job
 version: !ruby/object:Gem::Version
-  version: 4.1.3
+  version: 4.1.4
 platform: ruby
 authors:
 - Brandon Keepers
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -119,26 +119,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Database-backed asynchronous priority queue system -- Extracted from Shopify
 test_files:
+- spec/sample_jobs.rb
+- spec/lifecycle_spec.rb
+- spec/performable_method_spec.rb
+- spec/helper.rb
+- spec/psych_ext_spec.rb
+- spec/worker_spec.rb
+- spec/autoloaded/struct.rb
 - spec/autoloaded/clazz.rb
 - spec/autoloaded/instance_clazz.rb
 - spec/autoloaded/instance_struct.rb
-- spec/autoloaded/struct.rb
-- spec/daemons.rb
+- spec/test_backend_spec.rb
+- spec/delayed/serialization/test.rb
 - spec/delayed/backend/test.rb
 - spec/delayed/command_spec.rb
-- spec/delayed/serialization/test.rb
-- spec/helper.rb
-- spec/lifecycle_spec.rb
 - spec/message_sending_spec.rb
 - spec/performable_mailer_spec.rb
-- spec/performable_method_spec.rb
-- spec/psych_ext_spec.rb
-- spec/sample_jobs.rb
-- spec/test_backend_spec.rb
-- spec/worker_spec.rb
 - spec/yaml_ext_spec.rb
+- spec/daemons.rb