delayed_job_ironmq 1.0.2 → 2.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82cb55dc34f6dc0e2110bdca7e4bcd3fdd8affca
-  data.tar.gz: 12cc3347deb24b7fbd95cfe1ff135d995ac60f63
+  metadata.gz: c6aa6fcf508e50c31a9d914116918d3cbc9c393d
+  data.tar.gz: 3ea4085dc5fcaf29c1386a6a2c198a4e9c19d899
 SHA512:
-  metadata.gz: 6d12fce9d30d8bf403d3bdcb9445e69fac5fa7c77b1e7475bdcb29e48615619acbafd7c7573a13dd569d5e160725223bbba048ecc0abcb8fb05f6cf8d8d2da83
-  data.tar.gz: 4c563d142bed4edc8be79078fd544269a81ff6bb3eade695180bc3ce143d534bf946fea95643af47b6f0d9209f7294625e58b20a37ec85e69ae9242754dd3c41
+  metadata.gz: 7d3c01a86a3b1700d4d50be0bfdec61967a2c83bb0863091fa26409c32586e84e431e8a17172220c0d2afb895e405b5e80b85a5599d75237d234c7ff9e73f09e
+  data.tar.gz: e06b1b5e06c2addc0ae81c3c7c48c702fdfa6f16ad9e9acf8c22639a71974d7ee92dd1ecbbacd60457da3d0a116dad05589b916964eb62bf9b49d57c137d896f

data/Gemfile.lock

@@ -1,40 +1,50 @@
 PATH
   remote: .
   specs:
-    delayed_job_ironmq (1.0.2)
-      delayed_job (>= 3.0.0)
-      iron_mq (>= 4.0.0)
+    delayed_job_ironmq (2.0.0.pre1)
+      delayed_job (~> 4.0.6)
+      iron_mq (= 6.0.0.pre1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (3.2.18)
-      i18n (~> 0.6, >= 0.6.4)
-      multi_json (~> 1.0)
-    delayed_job (3.0.5)
-      activesupport (~> 3.0)
+    activesupport (4.2.0)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    delayed_job (4.0.6)
+      activesupport (>= 3.0, < 5.0)
     diff-lcs (1.2.5)
-    i18n (0.6.9)
-    iron_core (1.0.3)
-      rest (>= 2.6.4)
-    iron_mq (5.0.1)
+    i18n (0.7.0)
+    iron_core (1.0.7)
+      rest (>= 3.0.4)
+    iron_mq (6.0.0.pre1)
       iron_core (>= 0.5.1)
-    multi_json (1.10.0)
+    json (1.8.2)
+    minitest (5.5.1)
     net-http-persistent (2.9.4)
-    netrc (0.7.7)
-    rest (2.7.1)
+    netrc (0.10.3)
+    rest (3.0.6)
       net-http-persistent (>= 2.9.1)
-      rest_client (>= 1.7.1)
-    rest_client (1.7.3)
-      netrc (~> 0.7.7)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
+      netrc
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.1)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
+    thread_safe (0.3.4)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -11,15 +11,26 @@ To start using delayed_job_ironmq, you need to sign up for Iron.io and setup you
 
 1. Go to http://iron.io/ and sign up.
 2. Get an Oauth Token at http://hud.iron.io/tokens
-3. Add an iron.json file or setup environment variables for authentication. See http://dev.iron.io/articles/configuration/ for details.
+3. Add an iron.json file or setup environment variables for authentication. See http://dev.iron.io/mq/reference/configuration/ for details.
+
+If you want to set the Host, Post, and Protocol specifically, simply include those keys in that project's iron.json file:
+```json
+{
+    "project_id": "PROJECT ID HERE",
+    "token": "YOUR TOKEN HERE"
+    "port": 443,
+    "protocol": "https",
+    "host":"mq-v3-aws-us-east-1.iron.io"
+}
+```
 
 ## Installation
 
 Add the gems to your `Gemfile:`
 
 ```ruby
-gem 'delayed_job'
-gem 'delayed_job_ironmq'
+gem 'delayed_job', '~> 4.0.6'
+gem 'delayed_job_ironmq', '2.0.0.pre1'
 ```
 
 Optionally: Add an initializer (`config/initializers/delayed_job.rb`):
@@ -32,8 +43,10 @@ Delayed::Worker.configure do |config|
   config.delay = 0  # Time to wait before message will be available on the queue
   config.timeout = 5.minutes # The time in seconds to wait after message is taken off the queue, before it is put back on. Delete before :timeout to ensure it does not go back on the queue.
   config.expires_in = 7.days # After this time, message will be automatically removed from the queue.
+  config.error_queue = 'error_queue' # The failed jobs will be placed into the error queue
 end
 ```
+If you want to keep failed jobs, set `Delayed::Worker.destroy_failed_jobs = false`. The failed jobs will be placed into the error queue if failures exceed `Worker.max_attempts`.
 
 ## Usage
 
@@ -56,6 +69,27 @@ user = User.new
 user.delay.background_stuff
 ```
 
+Or declare a job using activejob like so:
+
+```ruby
+class MyJob < ActiveJob::Base
+  queue_as :default
+  def perform(*args)
+    puts "I run in the background"
+  end
+end
+```
+
+Then enqueue a job:
+
+```ruby
+MyJob.perform_later record  # Enqueue a job to be performed as soon the queueing system is free.
+```
+
+```ruby
+MyJob.set(wait: 1.week).perform_later(record) # Enqueue a job to be performed 1 week from now.
+```
+
 ## Start worker process
 
     rake jobs:work
@@ -64,7 +98,7 @@ That will start pulling jobs off the queue and processing them.
 
 # Demo Rails Application
 
-Here's a demo rails app you can clone and try it out: https://github.com/treeder/delayed_job_with_iron_mq
+Here's a demo rails app you can clone and try it out: https://github.com/treeder/delayed_job_ironmq_example
 
 # Using with Heroku
 

data/delayed_job_ironmq.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
 
   gem.required_rubygems_version = ">= 1.3.6"
   gem.required_ruby_version = Gem::Requirement.new(">= 1.8")
-  gem.add_runtime_dependency "iron_mq", ">= 4.0.0"
-  gem.add_runtime_dependency "delayed_job", ">= 3.0.0"
+  gem.add_runtime_dependency "iron_mq", "6.0.0.pre1"
+  gem.add_runtime_dependency "delayed_job", "~> 4.0.6"
 
   gem.add_development_dependency "rspec"
 end

data/lib/delayed/backend/actions.rb

@@ -31,22 +31,30 @@ module Delayed
 
         def find_available(worker_name, limit = 5, max_run_time = Worker.max_run_time)
           Delayed::Worker.available_priorities.each do |priority|
-            message = ironmq.queue(queue_name(priority)).get
+            message = nil
+            begin
+              message = ironmq.queue(queue_name(priority)).get
+            rescue Exception => e
+              Delayed::Worker.logger.warn(e.message)
+            end
             return [Delayed::Backend::Ironmq::Job.new(message)] if message
           end
           []
         end
 
         def delete_all
-          deleted = 0
           Delayed::Worker.available_priorities.each do |priority|
             loop do
-              msgs = ironmq.queue(queue_name(priority)).get(:n => 1000)
-              break if msgs.blank?
-              msgs.each do |msg|
-                msg.delete
-                deleted += 1
+              msgs = nil
+              queue = queue_name(priority)
+              begin
+                msgs = ironmq.queue(queue).get(:n => 1000)
+              rescue Exception => e
+                Delayed::Worker.logger.warn(e.message)
               end
+
+              break if msgs.blank?
+              ironmq.queue(queue).delete_reserved_messages(msgs)
             end
           end
         end

data/lib/delayed/backend/iron_mq_config.rb

@@ -1,5 +1,6 @@
 class IronMqConfig
     attr_accessor :token, :project_id,
                   :queue_name, :delay, :timeout,
-                  :expires_in, :available_priorities
+                  :expires_in, :available_priorities,
+                  :error_queue, :logger
 end

data/lib/delayed/backend/ironmq.rb

@@ -27,16 +27,17 @@ module Delayed
           data.symbolize_keys!
           payload_obj = data.delete(:payload_object) || data.delete(:handler)
 
-          @queue_name = data[:queue_name] || Delayed::Worker.queue_name
-          @delay      = data[:delay]      || Delayed::Worker.delay
-          @timeout    = data[:timeout]    || Delayed::Worker.timeout
-          @expires_in = data[:expires_in] || Delayed::Worker.expires_in
-          @attributes = data
+          @queue_name  = data[:queue_name]  || Delayed::Worker.queue_name
+          @delay       = data[:delay]       || Delayed::Worker.delay
+          @timeout     = data[:timeout]     || Delayed::Worker.timeout
+          @expires_in  = data[:expires_in]  || Delayed::Worker.expires_in
+          @error_queue = data[:error_queue] || Delayed::Worker.error_queue
+          @attributes  = data
           self.payload_object = payload_obj
         end
 
         def payload_object
-          @payload_object ||= YAML.load(self.handler)
+          @payload_object ||= yaml_load
         rescue TypeError, LoadError, NameError, ArgumentError => e
           raise DeserializationError,
             "Job failed to load: #{e.message}. Handler: #{handler.inspect}"
@@ -44,7 +45,7 @@ module Delayed
 
         def payload_object=(object)
           if object.is_a? String
-            @payload_object = YAML.load(object)
+            @payload_object = yaml_load(object)
             self.handler = object
           else
             @payload_object = object
@@ -58,6 +59,10 @@ module Delayed
           end
           payload = JSON.dump(@attributes)
 
+          if run_at && run_at.utc >= self.class.db_time_now
+            @delay = (run_at.utc - self.class.db_time_now).round
+          end
+
           @msg.delete if @msg
 
           ironmq.queue(queue_name).post(payload,
@@ -78,8 +83,11 @@ module Delayed
         end
 
         def fail!
+          ironmq.queue(@error_queue).post(@msg.body,
+                                          :timeout    => @timeout,
+                                          :delay      => @delay,
+                                          :expires_in => @expires_in)
           destroy
-          # v2: move to separate queue
         end
 
         def update_attributes(attributes)
@@ -116,6 +124,11 @@ module Delayed
         def ironmq
           ::Delayed::Worker.ironmq
         end
+
+        def yaml_load(object)
+          object ||= self.handler
+          YAML.respond_to?(:load_dj) ? YAML.load_dj(object) : YAML.load(object)
+        end
       end
     end
   end

data/lib/delayed/backend/version.rb

@@ -1,7 +1,7 @@
 module Delayed
   module Backend
     module Ironmq
-      VERSION = "1.0.2"
+      VERSION = "2.0.0.pre1"
     end
   end
 end

data/lib/delayed/backend/worker.rb

@@ -3,8 +3,8 @@ require_relative 'iron_mq_config'
 module Delayed
   class Worker
     class << self
-      attr_accessor :config, :ironmq,
-                    :queue_name, :delay, :timeout, :expires_in, :available_priorities
+      attr_accessor :config, :ironmq, :queue_name, :delay, :timeout, :expires_in,
+                    :available_priorities, :error_queue, :logger
 
       def configure
         yield(config)
@@ -12,6 +12,7 @@ module Delayed
         self.delay = config.delay || 0
         self.timeout = config.timeout || 5.minutes
         self.expires_in = config.expires_in || 7.days
+        self.error_queue = config.error_queue || 'error_queue'
 
         priorities = config.available_priorities || [0]
         if priorities.include?(0) && priorities.all? { |p| p.is_a?(Integer) }
@@ -19,6 +20,9 @@ module Delayed
         else
           raise ArgumentError, "available_priorities option has wrong format. Please provide array of Integer values, includes zero. Default is [0]."
         end
+
+        self.logger = config.logger || Logger.new(STDOUT)
+        self.logger.level = Logger::WARN
       end
 
       def config

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: delayed_job_ironmq
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 2.0.0.pre1
 platform: ruby
 authors:
 - Alexander Shapiotko
@@ -9,48 +9,48 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iron_mq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 6.0.0.pre1
 - !ruby/object:Gem::Dependency
   name: delayed_job
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: IronMQ backend for delayed_job
@@ -61,7 +61,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -86,17 +86,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: IronMQ backend for delayed_job