inst-jobs 0.15.4 → 0.15.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f57ce391944d07cd3f415023ea4ad614e94c34c4bac595b020ba5756c1b104
-  data.tar.gz: ea2255af9d5d1773263c19734f5d6b4731690846dc32a6a739ea902452721c85
+  metadata.gz: ec568aafa04aa958061f78e677b5db73d5053d251f18b2cd6ffc87e032c3c656
+  data.tar.gz: e42b99cfa96f1eba59e86589ad05db68b1ae5be18c90caf2baa1ec4f878b5ff1
 SHA512:
-  metadata.gz: 27a4b477c84a5ab4800ac722f7a41d5952f11723770308075cd214034375497cfe4b96ab6cc0e3811f631698b5d0c6ada8741ce355d150bea6facf14f733d070
-  data.tar.gz: a7ba37a1efa1e7b7f25316fa84d0a619913ec3a676c389c1f7279f60d2b34b62d2f3703f563c768b447a1cc4160987976e992c26d0df80204a52c479d275a96a
+  metadata.gz: 4d7d973fac64918cea16eb1a7b21009f39910bb87d2fb848014f6c9cf53effe439a1aa0d13cab62518f0239481e440fc92c7bc3f4246454ecb155e939517f50c
+  data.tar.gz: 565e5474ed3825f3c2f152ed46674c0c346fbeae73c0a5ebec1d6b0041a95973ed07f348d8f8aec8484bb8525e97c5b683df13fb2fa82a8fce72071ed04d0d83

data/lib/delayed/batch.rb

@@ -30,7 +30,7 @@ module Delayed
       private
       def prepare_batches(mode, opts)
         raise "nested batching is not supported" if Delayed::Job.batches
-        Delayed::Job.batches = Hash.new { |h,k| h[k] = [] }
+        Delayed::Job.batches = Hash.new { |h,k| h[k] = Set.new }
         batch_enqueue_args = [:queue]
         batch_enqueue_args << :priority unless opts[:priority]
         Delayed::Job.batch_enqueue_args = batch_enqueue_args

data/lib/delayed/version.rb

@@ -1,3 +1,3 @@
 module Delayed
-  VERSION = "0.15.4"
+  VERSION = "0.15.5"
 end

data/spec/shared/delayed_batch.rb

@@ -81,5 +81,16 @@ shared_examples_for 'Delayed::Batch' do
       Delayed::Job.find_available(1).first.tag.should == "String#size"
       Delayed::Job.find_available(1).first.priority.should == 11
     end
+
+    it "should list a job only once when the same call is made multiple times" do
+      Delayed::Batch.serial_batch(:priority => 11) {
+        "string".send_later_enqueue_args(:size, no_delay: true)
+        "string".send_later_enqueue_args(:gsub, { no_delay: true }, /./, "!")
+        "string".send_later_enqueue_args(:size, no_delay: true)
+      }
+      batch_job = Delayed::Job.find_available(1).first
+      jobs = batch_job.payload_object.jobs
+      jobs.size.should == 2
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Tobias Luetke
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-19 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -407,9 +407,7 @@ files:
 - spec/delayed/worker/health_check_spec.rb
 - spec/delayed/worker_spec.rb
 - spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
 - spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
 - spec/gemfiles/51.gemfile
 - spec/gemfiles/52.gemfile
 - spec/migrate/20140924140513_add_story_table.rb
@@ -447,32 +445,30 @@ signing_key:
 specification_version: 4
 summary: Instructure-maintained fork of delayed_job
 test_files:
-- spec/active_record_job_spec.rb
+- spec/sample_jobs.rb
+- spec/spec_helper.rb
+- spec/redis_job_spec.rb
+- spec/gemfiles/42.gemfile
+- spec/gemfiles/52.gemfile
+- spec/gemfiles/50.gemfile
+- spec/gemfiles/51.gemfile
+- spec/shared_jobs_specs.rb
+- spec/shared/performable_method.rb
+- spec/shared/testing.rb
+- spec/shared/delayed_batch.rb
+- spec/shared/worker.rb
+- spec/shared/delayed_method.rb
+- spec/shared/shared_backend.rb
+- spec/migrate/20140924140513_add_story_table.rb
+- spec/delayed/server_spec.rb
 - spec/delayed/cli_spec.rb
 - spec/delayed/daemon_spec.rb
-- spec/delayed/server_spec.rb
+- spec/delayed/worker_spec.rb
 - spec/delayed/settings_spec.rb
 - spec/delayed/work_queue/in_process_spec.rb
+- spec/delayed/work_queue/parent_process_spec.rb
 - spec/delayed/work_queue/parent_process/client_spec.rb
 - spec/delayed/work_queue/parent_process/server_spec.rb
-- spec/delayed/work_queue/parent_process_spec.rb
-- spec/delayed/worker/consul_health_check_spec.rb
 - spec/delayed/worker/health_check_spec.rb
-- spec/delayed/worker_spec.rb
-- spec/gemfiles/42.gemfile
-- spec/gemfiles/42.gemfile.lock
-- spec/gemfiles/50.gemfile
-- spec/gemfiles/50.gemfile.lock
-- spec/gemfiles/51.gemfile
-- spec/gemfiles/52.gemfile
-- spec/migrate/20140924140513_add_story_table.rb
-- spec/redis_job_spec.rb
-- spec/sample_jobs.rb
-- spec/shared/delayed_batch.rb
-- spec/shared/delayed_method.rb
-- spec/shared/performable_method.rb
-- spec/shared/shared_backend.rb
-- spec/shared/testing.rb
-- spec/shared/worker.rb
-- spec/shared_jobs_specs.rb
-- spec/spec_helper.rb
+- spec/delayed/worker/consul_health_check_spec.rb
+- spec/active_record_job_spec.rb

data/spec/gemfiles/42.gemfile.lock

@@ -1,190 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    inst-jobs (0.14.2)
-      after_transaction_commit (>= 1.0, < 3)
-      rails (>= 4.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.4)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionmailer (4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.8)
-      actionview (= 4.2.8)
-      activesupport (= 4.2.8)
-      rack (~> 1.6)
-      rack-test (~> 0.6.2)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (4.2.8)
-      activesupport (= 4.2.8)
-      globalid (>= 0.3.0)
-    activemodel (4.2.8)
-      activesupport (= 4.2.8)
-      builder (~> 3.1)
-    activerecord (4.2.8)
-      activemodel (= 4.2.8)
-      activesupport (= 4.2.8)
-      arel (~> 6.0)
-    activesupport (4.2.8)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    after_transaction_commit (1.1.1)
-      activerecord (>= 4.0)
-    arel (6.0.4)
-    backports (3.7.0)
-    builder (3.2.3)
-    bump (0.5.3)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.6.1)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    et-orbi (1.0.9)
-      tzinfo
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    httpclient (2.8.3)
-    i18n (0.8.1)
-    imperium (0.2.4)
-      addressable (~> 2.5.0)
-      httpclient (~> 2.8)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.20.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (3.0.1)
-    rack (1.6.5)
-    rack-protection (1.5.3)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.2.8)
-      actionmailer (= 4.2.8)
-      actionpack (= 4.2.8)
-      actionview (= 4.2.8)
-      activejob (= 4.2.8)
-      activemodel (= 4.2.8)
-      activerecord (= 4.2.8)
-      activesupport (= 4.2.8)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.8)
-      sprockets-rails
-    rails-deprecated_sanitizer (1.0.3)
-      activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.8)
-      activesupport (>= 4.2.0.beta, < 5.0)
-      nokogiri (~> 1.6)
-      rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (4.2.8)
-      actionpack (= 4.2.8)
-      activesupport (= 4.2.8)
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (4.0.1)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rufus-scheduler (3.4.2)
-      et-orbi (~> 1.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
-    sinatra-contrib (1.4.7)
-      backports (>= 2.0)
-      multi_json
-      rack-protection
-      rack-test
-      sinatra (~> 1.4.0)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.7)
-    timecop (0.7.1)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  after_transaction_commit (< 2)
-  bump
-  byebug
-  database_cleaner (= 1.6.1)
-  imperium (>= 0.2.3)
-  inst-jobs!
-  pg
-  pry
-  rack-test
-  rails (~> 4.2.5)
-  rake
-  rspec (= 3.4.0)
-  sinatra
-  sinatra-contrib
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.3.0)
-
-BUNDLED WITH
-   1.16.1

data/spec/gemfiles/50.gemfile.lock

@@ -1,188 +0,0 @@
-PATH
-  remote: ../..
-  specs:
-    inst-jobs (0.12.3)
-      after_transaction_commit (~> 1.0)
-      rails (>= 4.2)
-      redis (> 3.0)
-      redis-scripting (~> 1.0.1)
-      rufus-scheduler (~> 3.3.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actioncable (5.0.2)
-      actionpack (= 5.0.2)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.0.2)
-      actionview (= 5.0.2)
-      activesupport (= 5.0.2)
-      rack (~> 2.0)
-      rack-test (~> 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.2)
-      activesupport (= 5.0.2)
-      builder (~> 3.1)
-      erubis (~> 2.7.0)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.2)
-      activesupport (= 5.0.2)
-      globalid (>= 0.3.6)
-    activemodel (5.0.2)
-      activesupport (= 5.0.2)
-    activerecord (5.0.2)
-      activemodel (= 5.0.2)
-      activesupport (= 5.0.2)
-      arel (~> 7.0)
-    activesupport (5.0.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    after_transaction_commit (1.1.1)
-      activerecord (>= 4.0)
-    arel (7.1.4)
-    backports (3.7.0)
-    builder (3.2.3)
-    bump (0.5.3)
-    byebug (9.0.6)
-    coderay (1.1.1)
-    concurrent-ruby (1.0.5)
-    database_cleaner (1.3.0)
-    diff-lcs (1.3)
-    erubis (2.7.0)
-    globalid (0.4.0)
-      activesupport (>= 4.2.0)
-    i18n (0.8.1)
-    loofah (2.0.3)
-      nokogiri (>= 1.5.9)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.1)
-    multi_json (1.12.1)
-    mustermann (1.0.0.beta2)
-    nio4r (2.0.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    pg (0.20.0)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rack (2.0.1)
-    rack-protection (2.0.0.beta2)
-      rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.2)
-      actioncable (= 5.0.2)
-      actionmailer (= 5.0.2)
-      actionpack (= 5.0.2)
-      actionview (= 5.0.2)
-      activejob (= 5.0.2)
-      activemodel (= 5.0.2)
-      activerecord (= 5.0.2)
-      activesupport (= 5.0.2)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.2)
-      sprockets-rails (>= 2.0.0)
-    rails-dom-testing (2.0.2)
-      activesupport (>= 4.2.0, < 6.0)
-      nokogiri (~> 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.2)
-      actionpack (= 5.0.2)
-      activesupport (= 5.0.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.18.1, < 2.0)
-    rake (12.0.0)
-    redis (3.3.3)
-    redis-scripting (1.0.1)
-      redis (>= 3.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rufus-scheduler (3.3.4)
-      tzinfo
-    sinatra (2.0.0.beta2)
-      mustermann (= 1.0.0.beta2)
-      rack (~> 2.0)
-      rack-protection (= 2.0.0.beta2)
-      tilt (~> 2.0)
-    sinatra-contrib (2.0.0.beta2)
-      backports (>= 2.0)
-      multi_json
-      mustermann (= 1.0.0.beta2)
-      rack-protection (= 2.0.0.beta2)
-      rack-test
-      sinatra (= 2.0.0.beta2)
-      tilt (>= 1.3, < 3)
-    slop (3.6.0)
-    sprockets (3.7.1)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.0)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    test_after_commit (0.4.1)
-      activerecord (>= 3.2)
-    thor (0.19.4)
-    thread_safe (0.3.6)
-    tilt (2.0.7)
-    timecop (0.7.1)
-    tzinfo (1.2.3)
-      thread_safe (~> 0.1)
-    websocket-driver (0.6.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    wwtd (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bump
-  byebug
-  database_cleaner (= 1.3.0)
-  inst-jobs!
-  pg
-  pry
-  rack-test
-  rails (~> 5.0.0)
-  rake
-  rspec (= 3.4.0)
-  sinatra (= 2.0.0.beta2)
-  sinatra-contrib (= 2.0.0.beta2)
-  test_after_commit (= 0.4.1)
-  timecop (= 0.7.1)
-  wwtd (~> 1.3.0)
-
-BUNDLED WITH
-   1.14.6