allq 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb3d940d62e6d79755efc8fa9741b075fdba20e
-  data.tar.gz: d49aa751daaff07c60be6a1eb4089142a07471b6
+  metadata.gz: 4734e699bb46e5673f0ebbd2767395b3cb6bb486
+  data.tar.gz: 6e203ba2a656726e5e12690a900cee4995512c6e
 SHA512:
-  metadata.gz: 3b65e58efb78d81d2a5a433142fe1b7f43b75ee992b0947c2252cbd1ada29be5be4db977f9659401959d72df72fb20e54668ee61d554838e7655c3bff20acb85
-  data.tar.gz: 6f165465a5205cc565edeee63c1732e02e26c6d6e2cf47c64438d5fa9e67f1f781367393fd1d1d8ef1ec28fbd3ac7a41d704bff1caacf0111a25b1116069f4c3
+  metadata.gz: c0272f731ea498ca15f3a7dc3ad3a0c45fadca88dc5683572f4e0ab8c904c081a525630c5d3e08e95ef6ded91892fa722ac4be11e6b7b7a3c1060fdf76c2078d
+  data.tar.gz: 055dc4c1af3431d540aee4e54d281f2e2d15fc1f1e3bb8d0c2c4c03e0eccc3a59d4a16951ef6f4f0fe5ed021494af72e7d806cd8b51c68129347ae8b1a1c6e8c

data/lib/allq/actions/base.rb

@@ -3,9 +3,11 @@ require 'json'
 class AllQ
   # Base class for handling allq actions
   class Base
+    attr_reader :connection, :client
 
-    def initialize(connection)
+    def initialize(connection, client)
       @connection = connection
+      @client = client
       setup
     end
 
@@ -34,7 +36,7 @@ class AllQ
       job_info = result_hash["job"]
       job_id = job_info["job_id"]
 
-      job = Job.new(job_id)
+      job = Job.new(job_id, @client)
       # -- Optional fields
       job.body = job_info["body"] if job_info["body"]
       job.expireds = job_info["expireds"] if job_info["expireds"]

data/lib/allq/actions/get.rb

@@ -7,7 +7,7 @@ class AllQ
       result = JSON.parse(data)
       if result['job']
         return nil if result['job'].empty?
-        job = Job.new_from_hash(result['job'])
+        job = Job.new_from_hash(result['job'], @client)
         return job
       end
       nil

data/lib/allq/actions/peek.rb

@@ -17,7 +17,7 @@ class AllQ
       result = JSON.parse(data)
       if result['job']
         return nil if result['job'].empty?
-        job = Job.new_from_hash(result['job'])
+        job = Job.new_from_hash(result['job'], @client)
         return job
       end
       nil

data/lib/allq/client.rb

@@ -9,18 +9,18 @@ class AllQ
       url = URL if url.nil?
 
       @connection = AllQ::Connection.new(url)
-      @get_action = AllQ::Get.new(@connection)
-      @put_action = AllQ::Put.new(@connection)
-      @done_action = AllQ::Done.new(@connection)
-      @stats_action = AllQ::Stats.new(@connection)
-      @release_action = AllQ::Release.new(@connection)
-      @touch_action = AllQ::Touch.new(@connection)
-      @kick_action = AllQ::Kick.new(@connection)
-      @bury_action = AllQ::Bury.new(@connection)
-      @clear_action = AllQ::Clear.new(@connection)
-      @peek_action = AllQ::Peek.new(@connection)
-      @delete_action = AllQ::Delete.new(@connection)
-      @parent_job_action = AllQ::ParentJob.new(@connection)
+      @get_action = AllQ::Get.new(@connection, self)
+      @put_action = AllQ::Put.new(@connection, self)
+      @done_action = AllQ::Done.new(@connection, self)
+      @stats_action = AllQ::Stats.new(@connection, self)
+      @release_action = AllQ::Release.new(@connection, self)
+      @touch_action = AllQ::Touch.new(@connection, self)
+      @kick_action = AllQ::Kick.new(@connection, self)
+      @bury_action = AllQ::Bury.new(@connection, self)
+      @clear_action = AllQ::Clear.new(@connection, self)
+      @peek_action = AllQ::Peek.new(@connection, self)
+      @delete_action = AllQ::Delete.new(@connection, self)
+      @parent_job_action = AllQ::ParentJob.new(@connection, self)
     end
 
     def parent_job(tube, body, ttl: 3600, delay: 0, parent_id: nil, priority: 5, limit: nil, noop: false)

data/lib/allq/job.rb

@@ -1,13 +1,14 @@
 class AllQ
 
   class Job
-    attr_accessor :id, :body, :expireds, :releases
-    def initialize(id, tube = nil, body = nil, expireds = nil, releases = nil)
+    attr_accessor :id, :body, :expireds, :releases, :client
+    def initialize(id, client, tube = nil, body = nil, expireds = nil, releases = nil)
       @body = body
       @id = id
       @tube = tube
       @expireds = expireds
       @releases = releases
+      @client = client
     end
 
     def to_hash
@@ -21,23 +22,23 @@ class AllQ
     end
 
     def done
-      AllQ::Client.instance.done(self)
+      @client.done(self)
     end
 
     def delete
-      AllQ::Client.instance.delete(self)
+      @client.delete(self)
     end
 
     def touch
-      AllQ::Client.instance.touch(self)
+      @client.touch(self)
     end
 
     def release(delay = 0)
-      AllQ::Client.instance.release(self, delay)
+      @client.release(self, delay)
     end
 
     def bury
-      AllQ::Client.instance.bury(self)
+      @client.bury(self)
     end
 
     def to_json
@@ -58,14 +59,14 @@ class AllQ
       }
     end
 
-    def self.new_from_hash(hash)
+    def self.new_from_hash(hash, client)
       begin
         id = hash.fetch('job_id')
         body = hash.fetch('body')
         tube = hash.fetch('tube')
         expireds = hash.fetch('expireds')
         releases = hash.fetch('releases')
-        job = Job.new(id, tube, body, expireds, releases)
+        job = Job.new(id, client, tube, body, expireds, releases)
         return job
       rescue => ex
         puts "Server value: #{hash}"

data/lib/allq/version.rb

@@ -1,3 +1,3 @@
 module Allq
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: allq
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jason