talentbox-delayed_job_sequel 0.1.0 → 0.1.1

data/README.md

@@ -1,21 +1,43 @@
 # DelayedJob Sequel Backend
 
+## Compatibility
+
+This gem works on Ruby (MRI/CRuby) 1.8.x, 1.9.x and Rubinius (1.8 and 1.9 mode).
+
+But beware, if you're running it on Ruby (MRI/CRuby) 1.8.x or Rubinius in 1.8 mode you need
+to use a version of Sequel <= 3.28.0.
+
+It's strongly recommended to use a Ruby 1.9.x version.
+
 ## Installation
 
 Add the gem to your Gemfile:
 
-    gem 'delayed_job_sequel'
+    gem 'talentbox-delayed_job_sequel'
 
 Run `bundle install`.
 
-If you're using Rails, run the generator to create the migration for the delayed_job table.
-
-    rails g delayed_job:sequel
-    rake db:migrate
+Create the table (using the sequel migration syntax):
+
+    create_table :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
 
 ## Build Status
 
-[![Build Status](http://travis-ci.org/TalentBox/delayed_job_sequel.png)](https://travis-ci.org/TalentBox/delayed_job_sequel)
+[![Build Status](https://secure.travis-ci.org/TalentBox/delayed_job_sequel.png?branch=master)](http://travis-ci.org/TalentBox/delayed_job_sequel)
 
 ## How to contribute
 

data/lib/delayed/backend/sequel.rb

@@ -117,7 +117,15 @@ module Delayed
             yield
           end
         end
-  
+
+        def self.count(attrs={})
+          if attrs.respond_to?(:has_key?) && attrs.has_key?(:conditions)
+            self.where(attrs[:conditions]).count
+          else
+            super()
+          end
+        end
+
         # The default behaviour for sequel on #==/#eql? is to check if all 
         # values are matching.
         # This differs from ActiveRecord which checks class and id only.
@@ -125,6 +133,7 @@ module Delayed
         def eql?(obj)
           (obj.class == model) && (obj.pk == pk)
         end
+
       end
     end
   end

data/lib/delayed/serialization/sequel.rb

@@ -1,15 +1,14 @@
 require "sequel/model"
-
 module Delayed
   module Serialization
     module Sequel
       def self.configure(klass)
         klass.class_eval do
-          def self.inherited(child)
-            super
-            if YAML.parser.class.name =~ /syck/i
-              child.yaml_as "tag:ruby.yaml.org,2002:#{child.name}"
-            else
+          if YAML.parser.class.name =~ /syck/i
+            yaml_as "tag:ruby.yaml.org,2002:Sequel"
+          else
+            def self.inherited(child)
+              super
               child.yaml_as ['!ruby/Sequel', child.name].join(':')
             end
           end
@@ -19,8 +18,9 @@ module Delayed
       if YAML.parser.class.name =~ /syck/i
         module ClassMethods
           def yaml_new(klass, tag, val)
-            klass[val['values'][klass.primary_key]] ||
-            raise(Delayed::DeserializationError, "Sequel Record not found, class: #{klass} , primary key: #{val['values'][klass.primary_key]}")
+            pk = val["values"][klass.primary_key]
+            klass[pk] ||
+            raise(Delayed::DeserializationError, "Sequel Record not found, class: #{klass} , primary key: #{pk}")
           end
         end
       end
@@ -28,7 +28,7 @@ module Delayed
       module InstanceMethods
         if YAML.parser.class.name =~ /syck/i
           def to_yaml_properties
-            ['@values']
+            ["@values"]
           end
         else
           def encode_with(coder)

data/spec/delayed/backend/sequel_spec.rb

@@ -8,6 +8,15 @@ describe Delayed::Backend::Sequel::Job do
 
   it_should_behave_like "a delayed_job backend"
 
+  context ".count" do
+    it "allow using ActiveRecord like count for NewRelic sampler" do
+      expect do
+        Delayed::Job.count(:conditions => "failed_at is not NULL")
+        Delayed::Job.count(:conditions => "locked_by is not NULL")
+      end.to_not raise_error
+    end
+  end
+
   context "db_time_now" do
     it "should return time in current time zone if set" do
       Time.zone = "Eastern Time (US & Canada)"

data/spec/spec_helper.rb

@@ -1,47 +1,59 @@
 $:.unshift(File.dirname(__FILE__) + "/../lib")
+ENV["RAILS_ENV"] = "test"
 
 require "rubygems"
 require "bundler/setup"
 require "rspec"
 require "logger"
-require "sqlite3"
 require "sequel"
 
-config = YAML.load(File.read("spec/database.yml"))
-DB = Sequel.connect config["sqlite"]
+DB = case ENV["DB"]
+when "mysql"
+  begin
+    Sequel.connect :adapter => "mysql2", :database => "delayed_jobs", :test => true
+  rescue Sequel::DatabaseConnectionError
+    system "mysql -e 'CREATE DATABASE IF NOT EXISTS `delayed_jobs` DEFAULT CHARACTER SET utf8 DEFAULT COLLATE utf8_unicode_ci'"
+    retry
+  end
+when "postgres"
+  begin
+    Sequel.connect :adapter => "postgres", :database => "delayed_jobs", :test => true
+  rescue Sequel::DatabaseConnectionError
+    system "createdb --encoding=UTF8 delayed_jobs"
+    retry
+  end
+else
+  Sequel.sqlite
+end
 
-Sequel.extension :migration
-Class.new(Sequel::Migration) do
-  def up
-    create_table :delayed_jobs do
-      primary_key :id
-      Integer :priority, :default => 0
-      Integer :attempts, :default => 0
-      String  :handler, :text => true
-      String  :last_error, :text => true
-      column  :run_at,    :datetime#"timestamp(0)"
-      column  :locked_at, :datetime#"timestamp(0)"
-      column  :failed_at, :datetime#"timestamp(0)"
-      String  :locked_by
-      String  :queue
-      Time    :created_at
-      Time    :updated_at
-      index   [:priority, :run_at]
-    end
+DB.drop_table :delayed_jobs rescue Sequel::DatabaseError
+DB.drop_table :stories rescue Sequel::DatabaseError
 
-    create_table :stories do
-      primary_key :story_id
-      String      :text
-      TrueClass   :scoped, :default => true
-    end
-  end
-end.apply(DB, :up)
+DB.create_table :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
+DB.create_table :stories do
+  primary_key :story_id
+  String      :text
+  TrueClass   :scoped, :default => true
+end
 
 require "delayed_job_sequel"
 require "delayed/backend/shared_spec"
 
 Delayed::Worker.logger = Logger.new("/tmp/dj.log")
-ENV["RAILS_ENV"] = "test"
 DB.logger = Delayed::Worker.logger
 
 # Purely useful for test cases...
@@ -53,6 +65,3 @@ class Story < Sequel::Model
   end
   handle_asynchronously :whatever
 end
-
-# Add this directory so the ActiveSupport autoloading works
-# ActiveSupport::Dependencies.autoload_paths << File.dirname(__FILE__)

metadata

@@ -1,82 +1,96 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-delayed_job_sequel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
   prerelease: 
+  version: 0.1.1
 platform: ruby
 authors:
 - Jonathan Tron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2013-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sequel
-  requirement: &2161185360 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.28'
     none: false
+  prerelease: false
+  name: sequel
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.28'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2161185360
 - !ruby/object:Gem::Dependency
-  name: delayed_job
-  requirement: &2160614300 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     none: false
+  prerelease: false
+  name: delayed_job
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.0
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2160614300
 - !ruby/object:Gem::Dependency
-  name: tzinfo
-  requirement: &2160611720 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
     none: false
+  prerelease: false
+  name: tzinfo
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
   type: :runtime
-  prerelease: false
-  version_requirements: *2160611720
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &2160609540 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
     none: false
+  prerelease: false
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2160609540
 - !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &2161543600 !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
-  type: :development
-  prerelease: false
-  version_requirements: *2161543600
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2161541640 !ruby/object:Gem::Requirement
     none: false
+  prerelease: false
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.8'
+    none: false
   type: :development
-  prerelease: false
-  version_requirements: *2161541640
 description: Sequel backend for DelayedJob, originally authored by Tobias Luetke
 email:
 - jonathan@tron.name
@@ -90,7 +104,6 @@ files:
 - lib/delayed_job_sequel.rb
 - lib/generators/delayed_job/sequel_generator.rb
 - lib/generators/delayed_job/templates/migration.rb
-- spec/database.yml
 - spec/delayed/backend/sequel_spec.rb
 - spec/delayed/serialization/sequel_spec.rb
 - spec/spec_helper.rb
@@ -107,31 +120,30 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -179484122693818536
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 906385450237190959
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
       segments:
       - 0
-      hash: -179484122693818536
+      hash: 906385450237190959
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Sequel backend for DelayedJob
 test_files:
-- spec/database.yml
 - spec/delayed/backend/sequel_spec.rb
 - spec/delayed/serialization/sequel_spec.rb
 - spec/spec_helper.rb

data/spec/database.yml

@@ -1,4 +0,0 @@
-sqlite:
-  adapter: sqlite
-  database: ":memory:"
-