talentbox-delayed_job_sequel 4.0.1 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45ac6c7bc184fb66e341cc59236553f1115e6e3
-  data.tar.gz: 970a765aa1627ffe051f5daeb691ebe67f49dd96
+  metadata.gz: 1e533fcbcda3ce78b2c6bad187b62a19e085103b
+  data.tar.gz: 2c40fdc180963165fcc84ea81b3d3c46fc761feb
 SHA512:
-  metadata.gz: 510bb5253ca7c083cdd0106c58f4ded8fc402b7621e9e99d90f33b283937d788cdab16e75bb24eba4aea107fc9e7644b7a84a29454671ca59c52d2974d707de9
-  data.tar.gz: 85e338fcc518bd581abca679b5b8a0eec6e643121aa71eace78b6e81a3818ea0d08f2cd1b88550a884319a8a87875c576ff783f186b373f4b0f3895b0b8129d4
+  metadata.gz: f8ab43e1ceca96e0405cfdbfeab609bc377ac1918081183298fbebfa01e5475ddf1c46b2b6adad2f6d0affafbc090d7d0a282d146661ab49505d998e1822fb70
+  data.tar.gz: e6a47703436a779ba61d764080c6c28a8515da332452845cc5c5cfc81c810859543579c3244c35af847f58be13deb2b22814d3c13747139398e317ed887b9a2c

data/README.md

@@ -17,6 +17,14 @@ Add the gem to your Gemfile:
 
 Run `bundle install`.
 
+Create an initializer to setup the DelayedJob backend:
+
+```ruby
+# config/initializers/delayed_job.rb
+
+::Delayed::Job.backend = :sequel
+```
+
 Create the table (using the sequel migration syntax):
 
     create_table :delayed_jobs do

data/lib/delayed/backend/sequel.rb

@@ -4,7 +4,7 @@ module Delayed
     module Sequel
       # A job object that is persisted to the database.
       # Contains the work object as a YAML field.
-      class Job < ::Sequel::Model(:delayed_jobs)
+      class Job < ::Sequel::Model(::DelayedJobSequel.table_name)
         include Delayed::Backend::Base
         plugin :timestamps
 
@@ -105,7 +105,7 @@ module Delayed
             if attrs.has_key?(:group)
               column = attrs[:group]
               group_and_count(column.to_sym).map do |record|
-                [column, record[:count]]
+                [record[column.to_sym], record[:count]]
               end
             else
               ds.count

data/lib/delayed_job_sequel.rb

@@ -1,6 +1,12 @@
 require 'sequel'
 require 'delayed_job'
-require 'delayed/backend/sequel'
-require 'delayed/serialization/sequel'
 
-Delayed::Worker.backend = :sequel
+module DelayedJobSequel
+  def self.table_name=(table_name)
+    @table_name = table_name
+  end
+
+  def self.table_name
+    @table_name || :delayed_jobs
+  end
+end

data/spec/delayed/backend/sequel_spec.rb

@@ -1,8 +1,12 @@
 require "spec_helper"
-require "delayed/backend/sequel"
 
 describe Delayed::Backend::Sequel::Job do
+  before do
+    SimpleJob.runs = 0
+    described_class.delete_all
+  end
   after do
+    Delayed::Worker.reset
     Time.zone = nil
   end
 
@@ -29,16 +33,19 @@ describe Delayed::Backend::Sequel::Job do
   context ".count" do
     context "NewRelic sampler compat" do
       it "allow count with conditions" do
+        described_class.create(failed_at: Time.now)
         expect do
-          Delayed::Job.count(:conditions => "failed_at is not NULL").should == 1
-          Delayed::Job.count(:conditions => "locked_by is not NULL").should == 0
+          Delayed::Job.count(:conditions => "failed_at is not NULL").should eq 1
+          Delayed::Job.count(:conditions => "locked_by is not NULL").should eq 0
         end.to_not raise_error
       end
 
       it "allow count with group and conditions" do
+        described_class.create(queue: "slow", priority: 2)
+        described_class.create(queue: "important", priority: 1)
         expect do
-          Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["queue", 1]]
-          Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["priority", 1]]
+          Delayed::Job.count(:group => "queue", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [["slow", 1], ["important", 1]]
+          Delayed::Job.count(:group => "priority", :conditions => ['run_at < ? and failed_at is NULL', Time.now]).should =~ [[1, 1], [2, 1]]
         end.to_not raise_error
       end
     end
@@ -77,4 +84,41 @@ describe Delayed::Backend::Sequel::Job do
       Delayed::Backend::Sequel::Job[job.id].run_at.should be_within(1).of(later)
     end
   end
+
+  it "allows to override the table name" do
+    ::Sequel::Model.db.transaction :rollback => :always do
+      begin
+        DB.create_table :another_delayed_jobs do
+          primary_key :id
+          Integer :priority, :default => 0
+          Integer :attempts, :default => 0
+          String  :handler, :text => true
+          String  :last_error, :text => true
+          Time    :run_at
+          Time    :locked_at
+          Time    :failed_at
+          String  :locked_by
+          String  :queue
+          Time    :created_at
+          Time    :updated_at
+          index   [:priority, :run_at]
+        end
+        change_table_name :another_delayed_jobs
+
+        Delayed::Job.table_name.should == :another_delayed_jobs
+      ensure
+        change_table_name nil
+      end
+    end
+  end
+
+  def change_table_name(name)
+    ::DelayedJobSequel.table_name = name
+    ::Delayed::Backend::Sequel.send :remove_const, :Job
+    load File.expand_path(
+      "../../../../lib/delayed/backend/sequel.rb",
+      __FILE__
+    )
+    ::Delayed::Worker.backend = :sequel
+  end
 end

data/spec/spec_helper.rb

@@ -64,6 +64,8 @@ require "delayed/backend/shared_spec"
 Delayed::Worker.logger = Logger.new(ENV["DEBUG"] ? $stdout : "/tmp/dj.log")
 DB.logger = Delayed::Worker.logger
 
+Delayed::Worker.backend = :sequel
+
 # Purely useful for test cases...
 class Story < Sequel::Model
   def tell; text; end
@@ -72,4 +74,5 @@ class Story < Sequel::Model
     update *args
   end
   handle_asynchronously :whatever
+  alias_method :persisted?, :exists?
 end

metadata

@@ -1,91 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  version: 4.0.1
+  version: 4.1.0
 platform: ruby
 authors:
 - Jonathan Tron
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.38'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.38'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: delayed_job
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: tzinfo
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.13'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
-  type: :development
 description: Sequel backend for DelayedJob, originally authored by Tobias Luetke
 email:
 - jonathan@tron.name
@@ -94,44 +94,44 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- lib/delayed_job_sequel.rb
+- LICENSE
+- README.md
 - lib/delayed/backend/sequel.rb
 - lib/delayed/serialization/sequel.rb
+- lib/delayed_job_sequel.rb
 - lib/generators/delayed_job/sequel_generator.rb
 - lib/generators/delayed_job/templates/migration.rb
-- spec/spec_helper.rb
 - spec/delayed/backend/sequel_spec.rb
 - spec/delayed/serialization/sequel_spec.rb
-- LICENSE
-- README.md
+- spec/spec_helper.rb
 homepage: http://github.com/TalentBox/delayed_job_sequel
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.md
-- --inline-source
-- --line-numbers
+- "--inline-source"
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Sequel backend for DelayedJob
 test_files:
-- spec/spec_helper.rb
 - spec/delayed/backend/sequel_spec.rb
 - spec/delayed/serialization/sequel_spec.rb
+- spec/spec_helper.rb