queue_dispatcher 2.1.0 → 2.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MzhlMmZkNGQ0MDkxOTY5ZWViMzRlNWQ3YWVjMjY0ZWI0NGZmMDRhOQ==
-  data.tar.gz: !binary |-
-    MWUzNmNhMmQ4OTgzNzJkODBkNTA4MzkyZmNiZTgzYmEyMzE1YTg3Nw==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    OGE1Y2QwOTBmNWNkNjYwZGU2ZTZjNWYxZTNmZDJiMmE2YjJkYmNmZmQxMDJk
-    ODEwM2UwNzIwYzAxMjBiM2VlZTFkOWZjYjY3N2RlZWExM2U1YmFiZjYyMGU4
-    YWRhZDFhNjNiZWYyMTFmZWViYTJjN2NlY2Y5ZGY4ODFhY2NkNDI=
-  data.tar.gz: !binary |-
-    OGRlMDlhMWE1YzZjYTBkMGI2OWIyMWM3NTliMGE4MDE3NTk3ZGY4YmEzMjBi
-    NmUyZGI0ZjNjNGI5MmJjYzRhOGQ2NmE3ODIzODRjNjJlYzEwOTUxODAxNTc3
-    YmFjZmRlMDY3MDE3N2FhZTFkMTk5NDYxY2YxOTM0YWFjYzVlODE=
+SHA1:
+  metadata.gz: f35bcc5afab97bb7da1c28e6c33db73216e8b29e
+  data.tar.gz: cb909b73223caf2192d7f4a437cb2f49be17a97e
+SHA512:
+  metadata.gz: 970e6acfbb9a957ad130615294e5783c60ff2735ca3f96c756a683f8f807a1ac478351df68b8f997459e5251b43afcf5d6d6268e0b454071f0ee47a5e32041df
+  data.tar.gz: 1eeec8fc00fa057ab6fb35856f04e0c578c0798a96832e40fcba76dd71ca65e5f08a4579e233e16fbb0a9778316874d0c262d51444ec05360780bf9f00b63c95

data/lib/queue_dispatcher.rb

@@ -5,6 +5,7 @@ require 'queue_dispatcher/acts_as_task_queue'
 require 'queue_dispatcher/acts_as_task_controller'
 require 'queue_dispatcher/deserialization_error'
 require 'queue_dispatcher/message_sending'
+require 'queue_dispatcher/target_container'
 require 'queue_dispatcher/qd_logger'
 require 'queue_dispatcher/rc_and_msg'
 require 'queue_dispatcher/yaml_ext'

data/lib/queue_dispatcher/acts_as_task.rb

@@ -56,6 +56,15 @@ module QueueDispatcher
       end
 
 
+      def payload
+        if target.is_a?(QueueDispatcher::TargetContainer)
+          target.payload
+        else
+          target
+        end
+      end
+
+
       # Add task_id to the args
       def args
         a = super
@@ -68,7 +77,7 @@ module QueueDispatcher
       def update_state(result, remove_from_queue = false)
         rc = output = error_msg = nil
 
-        if result.methods.include?(:rc) && result.methods.include?(:output) && result.methods.include?(:error_msg)
+        if result.methods.map(&:to_sym).include?(:rc) && result.methods.map(&:to_sym).include?(:output) && result.methods.map(&:to_sym).include?(:error_msg)
           rc        = result.rc
           output    = result.output
           error_msg = result.error_msg
@@ -203,7 +212,8 @@ module QueueDispatcher
 
       # Execute task
       def execute!
-        target.send(method_name, *args)
+        payload.task_id = id if payload.methods.include?(:task_id=)
+        payload.send(method_name, *args)
       end
 
     end

data/lib/queue_dispatcher/acts_as_task_queue.rb

@@ -303,11 +303,11 @@ module QueueDispatcher
               # Start
               task.update_attributes :state => 'acquire_lock', :perc_finished => 0
               get_lock_for task
-              log :msg => "#{name}: Starting task #{task.id} (#{task.target.class.name}.#{task.method_name})...", :print_log => print_log
+              log :msg => "#{name}: Starting task #{task.id} (#{task.payload.class.name}.#{task.method_name})...", :print_log => print_log
               task.update_attributes :state => 'running'
 
               # Execute the method defined in task.method
-              if task.target.methods.include?(task.method_name) || task.target.methods.include?(task.method_name.to_sym)
+              if task.payload.methods.map(&:to_sym).include?(task.method_name.to_sym)
                 if task.dependent_tasks_had_errors
                   error_msg = 'Dependent tasks had errors!'
                   log :msg => error_msg,
@@ -315,12 +315,12 @@ module QueueDispatcher
                       :print_log => print_log
                   result = QueueDispatcher::RcAndMsg.bad_rc error_msg
                 else
-                  target = task.target
-                  target.logger = @logger if target.methods.include?(:logger=) || target.methods.include?('logger=')
+                  payload = task.payload
+                  payload.logger = @logger if payload.methods.include?(:logger=) || payload.methods.include?('logger=')
                   result = task.execute!
                 end
               else
-                error_msg = "unknown method '#{task.method_name}' for #{task.target.class.name}!"
+                error_msg = "unknown method '#{task.method_name}' for #{task.payload.class.name}!"
                 log :msg => error_msg,
                     :sev => :warn,
                     :print_log => print_log
@@ -331,7 +331,7 @@ module QueueDispatcher
               task.update_state result
               cleanup_locks_after_error_for task
               task.update_attribute :task_queue_id, nil unless acts_as_task_queue_config.leave_finished_tasks_in_queue
-              log :msg => "#{name}: Task #{task.id} (#{task.target.class.name}.#{task.method_name}) finished with state '#{task.state}'.", :print_log => print_log
+              log :msg => "#{name}: Task #{task.id} (#{task.payload.class.name}.#{task.method_name}) finished with state '#{task.state}'.", :print_log => print_log
 
               # Wait between tasks
               sleep acts_as_task_queue_config.task_finish_wait_time

data/lib/queue_dispatcher/message_sending.rb

@@ -1,7 +1,10 @@
 module QueueDispatcher
   class QueueDispatcherProxy < ActiveSupport::ProxyObject
     def initialize(target, options = {})
-      @target = target
+      ## Workaround for Rails 4.2: All serialized objects which respond to :id will get typecasted by its id. This
+      ## behaviour doesn't allow to store ActiveRecord objects. We handle this, by encapsulating all objects in
+      ## before storing.
+      @target  = TargetContainer.new(target)
       @options = options
     end
 
@@ -10,7 +13,7 @@ module QueueDispatcher
       terminate_immediately = @options.delete(:terminate_immediately)
       terminate_immediately = terminate_immediately.nil? ? false : terminate_immediately
       terminate_immediately = @options[:queue].nil? ? true : terminate_immediately
-      task_queue_name = @options.delete(:queue) || "#{@target.to_s}_#{::Time.now.to_f}"
+      task_queue_name = @options.delete(:queue) || "#{@target.payload.to_s}_#{::Time.now.to_f}"
       task_queue = ::TaskQueue.find_or_create_by_name task_queue_name, terminate_immediately: terminate_immediately
 
       # Create Task

data/lib/queue_dispatcher/target_container.rb

@@ -0,0 +1,9 @@
+module QueueDispatcher
+  class TargetContainer
+    attr_reader :payload
+
+    def initialize(payload)
+      @payload = payload
+    end
+  end
+end

data/lib/queue_dispatcher/version.rb

@@ -1,3 +1,3 @@
 module QueueDispatcher
-  VERSION = "2.1.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: queue_dispatcher
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Philip Kurmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2015-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: deadlock_retry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spawnling
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Queue_Dispatcher executes asynchronous tasks in the background.
@@ -101,7 +101,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -145,6 +145,7 @@ files:
 - lib/queue_dispatcher/rc_and_msg.rb
 - lib/queue_dispatcher/serialization/active_record.rb
 - lib/queue_dispatcher/syck_ext.rb
+- lib/queue_dispatcher/target_container.rb
 - lib/queue_dispatcher/version.rb
 - lib/queue_dispatcher/yaml_ext.rb
 - lib/tasks/queue_dispatcher.rake
@@ -159,17 +160,17 @@ 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.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: This Gem installs a queue dispatcher for handling asynchronous tasks