allq 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '089a863cd091965dc37950a0a320af94188e2c28'
-  data.tar.gz: '038c6a4707a94fd07f2dabe30f302efbbe744281'
+  metadata.gz: 5cf263ffd2e2299767088b6584856c8c0a13057c
+  data.tar.gz: df094c015698eb092e289558278dcaaae7533685
 SHA512:
-  metadata.gz: 836ede28d65728ab4b1aa3a3f2cac326ff3a245f7ec8a9897399a6bae0b4d5de2d262b6ca8e97d3321875ab6c83de5004b7d18ab72c7057eefab9745886b4b92
-  data.tar.gz: ac2bac87b73031f2d75ed0e5655f18ade042198d52a52219177a906377d41363be6c354f2621bb145297ff14c05f0adf3e5ad6ff5fb9f8eed2abef83d7b9028d
+  metadata.gz: ffd44c9714deffc0396f697b352718c60f0edad110006bb4c04bf7df83cd320e98a39aca6aecd8bc710e98c9780dc59ea7698e7051c906365cc04966d0f6625d
+  data.tar.gz: c41e7d911f9dd4c0383c6d52f6a0be851ea9d3b4851ba34cd93447479c6fe2362004d0173d245e85110c39b07c4396b5ea08a3d775750f0522fdfcf0d516bd62

data/lib/allq/actions/base.rb

@@ -3,7 +3,6 @@ require 'json'
 class AllQ
   # Base class for handling allq actions
   class Base
-    @requires_q_server = true
 
     def initialize(connection)
       @connection = connection
@@ -24,7 +23,6 @@ class AllQ
     def send_hash_as_json(data_hash)
       if @requires_q_server
         params = data_hash["params"]
-        raise data_hash["action"] + " must have q_server set" unless data_hash["params"]["q_server"]
       end
       transmit_data = data_hash.to_json
       result = nil
@@ -38,9 +36,8 @@ class AllQ
       result_hash = JSON.parse(result)
       job_info = result_hash["job"]
       job_id = job_info["job_id"]
-      q_server = job_info["q_server"]
 
-      job = Job.new(job_id, q_server)
+      job = Job.new(job_id)
       # -- Optional fields
       job.body = job_info["body"] if job_info["body"]
       job.expired_count = job_info["expired_count"] if job_info["expired_count"]

data/lib/allq/actions/delete.rb

@@ -3,9 +3,8 @@ class AllQ
 
    def snd(data)
       job_id = data[:job_id]
-      q_server = data[:q_server]
 
-      send_data = base_send(job_id, q_server)
+      send_data = base_send(job_id)
       response = send_hash_as_json(send_data)
       result = rcv(response)
       return JSON.parse(result)
@@ -15,8 +14,7 @@ class AllQ
       {
         'action' => 'delete',
         'params' => {
-          'job_id' => job_id,
-          'q_server' => q_server
+          'job_id' => job_id
         }
       }
     end

data/lib/allq/actions/done.rb

@@ -3,19 +3,17 @@ class AllQ
 
     def snd(data)
       job_id = data[:job_id]
-      q_server = data[:q_server]
 
-      send_data = base_send(job_id, q_server)
+      send_data = base_send(job_id)
       response = send_hash_as_json(send_data)
       rcv(response)
     end
 
-    def base_send(job_id, q_server)
+    def base_send(job_id)
       {
         'action' => 'done',
         'params' => {
-          'job_id' => job_id,
-          'q_server' => q_server
+          'job_id' => job_id
         }
       }
     end

data/lib/allq/actions/get.rb

@@ -1,14 +1,11 @@
 class AllQ
   class Get < AllQ::Base
 
-    def setup
-      @requires_q_server = false
-    end
-
     def rcv(data)
       return nil if data.to_s == '' || data.to_s.strip == '{}'
 
       result = JSON.parse(data)
+      puts "GET result #{result}"
       if result['job']
         return nil if result['job'].empty?
         job = Job.new_from_hash(result['job'])

data/lib/allq/actions/put.rb

@@ -1,10 +1,6 @@
 class AllQ
   class Put < AllQ::Base
 
-    def setup
-      @requires_q_server = false
-    end
-
     def snd(data)
       result = nil
       tube = data.delete('tube')

data/lib/allq/actions/release.rb

@@ -3,9 +3,7 @@ class AllQ
 
     def snd(data)
       job_id = data[:job_id]
-      q_server = data[:q_server]
-
-      send_data = base_send(job_id, q_server)
+      send_data = base_send(job_id)
       response = send_hash_as_json(send_data)
       result = rcv(response)
       return result["release"] && result["release"]["job_id"]
@@ -16,12 +14,11 @@ class AllQ
       JSON.parse(data)
     end
 
-    def base_send(job_id, q_server)
+    def base_send(job_id)
       {
         'action' => 'release',
         'params' => {
-          'job_id' => job_id,
-          'q_server' => q_server
+          'job_id' => job_id
         }
       }
     end

data/lib/allq/actions/touch.rb

@@ -3,9 +3,8 @@ class AllQ
 
     def snd(data)
       job_id = data[:job_id]
-      q_server = data[:q_server]
 
-      send_data = base_send(job_id, q_server)
+      send_data = base_send(job_id)
       response = send_hash_as_json(send_data)
       result = rcv(response)
       return result["touch"] && result["touch"]["job_id"]
@@ -16,11 +15,10 @@ class AllQ
       JSON.parse(data)
     end
 
-    def base_send(job_id, q_server)
+    def base_send(job_id)
       {
         'action' => 'touch',
         'params' => {
-          'q_server' => q_server,
           'job_id' => job_id
         }
       }

data/lib/allq/client.rb

@@ -33,11 +33,11 @@ class AllQ
 
     def done(job)
       raise "Can't set 'done' on a Job that is nil. Please check for Nil job before setting done." unless job
-      @done_action.snd(job_id: job.id, q_server: job.q_server)
+      @done_action.snd(job_id: job.id)
     end
 
     def touch(job)
-      @touch_action.snd(job_id: job.id, q_server: job.q_server)
+      @touch_action.snd(job_id: job.id)
     end
 
     def stats
@@ -45,7 +45,7 @@ class AllQ
     end
 
     def release(job)
-      @release_action.snd(job_id: job.id, q_server: job.q_server)
+      @release_action.snd(job_id: job.id)
     end
 
     def delete(job)

data/lib/allq/job.rb

@@ -2,9 +2,8 @@ class AllQ
 
   class Job
     attr_accessor :id, :q_server, :body, :expired_count
-    def initialize(id, q_server, tube = nil, body = nil, expired_count = nil)
+    def initialize(id, tube = nil, body = nil, expired_count = nil)
       @body = body
-      @q_server = q_server
       @id = id
       @tube = tube
       @expired_count = expired_count
@@ -12,8 +11,7 @@ class AllQ
 
     def to_hash
       {
-        'id' => @id,
-        'q_server' => @q_server,
+        'job_id' => @id,
         'body' => @body,
         'tube' => @tube,
         'expired_count' => @expired_count
@@ -55,13 +53,11 @@ class AllQ
     def self.new_from_hash(hash)
       puts hash.inspect
       begin
-        id = hash.fetch('id')
+        id = hash.fetch('job_id')
         body = hash.fetch('body')
         tube = hash.fetch('tube')
         expired_count = hash.fetch('expired_count')
-        q_server = hash.fetch('q_server')
-        puts hash.inspect
-        job = Job.new(id, q_server, tube, body, expired_count)
+        job = Job.new(id, tube, body, expired_count)
         return job
       rescue => ex
         puts "Server value: #{hash}"

data/lib/allq/version.rb

@@ -1,3 +1,3 @@
 module Allq
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allq
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Jason
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler