qpush 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4dd90aa194184f401041a0aacdd7f9a2d63615b2
-  data.tar.gz: e4215be59cbe6de524c3b29f9afed23be68c70a5
+  metadata.gz: 5b7af474af17142a61d366bd6f9112b2abede127
+  data.tar.gz: 7ad15b8b50d6a129f5dff7ec7039f554fc7f11d0
 SHA512:
-  metadata.gz: 30432e4910a60a4d82acfec8ba806ba8b1671ac9de0bdad3feff9fb573e87417a90182f51325c1994befb35f6bf709b179e6b2d4ee846088d2c285c8c6238180
-  data.tar.gz: 19de3dfc8b141ce765894b0614994a5db361b268d566e96696373f6223a4e9590a53bcbddea94e04109ec03328f6319e62e4a69461416d1485df3e35c54156da
+  metadata.gz: f85e768b6f01d936fe3a156abee7a815d7a5a9965a970c9d62caffed9ca08262b74410fcef22d91c1f98cfb5b69226f8466d37e52cbae8a4c17fdc32ebb40aca
+  data.tar.gz: 86c720933d37d2bfbd3a9633c07bf5c691e8c85aaceaba3cbe280fd9bc05ec06c63948fdf755a20aa698117897f53d6ea0909acb060a061e60aa7239afb1320a

data/.byebug_history

@@ -1,4 +1,10 @@
 c
+job.valid?
+job.setup
+job
+c
+json
+c
 self.config
 config
 Server.config

data/lib/qpush/base/config.rb

@@ -11,7 +11,7 @@ module QPush
           yield(config)
         end
 
-        def reset_
+        def reset
           @config = nil
           @redis_pool = nil
         end

data/lib/qpush/server/apis.rb

@@ -15,41 +15,37 @@ module QPush
       end
     end
 
-    # The ApiWrapper provides simple wrapper functions for all the API
+    # The ApiWrapper provides simple functions for all the API
     # classes available for jobs. This provides a single entry point to
     # the API's for job objects.
     #
-    class ApiWrapper
-      def initialize(job)
-        @job = job
-      end
-
+    module ApiWrapper
       def queue
-        Apis::Queue.call(@job)
+        Apis::Queue.call(self)
       end
 
       def perform
-        Apis::Perform.call(@job)
+        Apis::Perform.call(self)
       end
 
       def execute
-        Apis::Execute.call(@job)
+        Apis::Execute.call(self)
       end
 
       def delay
-        Apis::Delay.call(@job, :delay)
+        Apis::Delay.call(self, :delay)
       end
 
       def retry
-        Apis::Delay.call(@job, :retry)
+        Apis::Delay.call(self, :retry)
       end
 
       def morgue
-        Apis::Morgue.call(@job)
+        Apis::Morgue.call(self)
       end
 
       def setup
-        Apis::Setup.call(@job)
+        Apis::Setup.call(self)
       end
     end
   end

data/lib/qpush/server/apis/delay.rb

@@ -18,8 +18,8 @@ module QPush
 
         def delay_job
           Server.redis do |conn|
-            conn.hincrby(Server.keys.stats, @stat, 1)
-            conn.zadd(Server.keys.delay, @time, @job.to_json)
+            conn.hincrby(Server.keys[:stats], @stat, 1)
+            conn.zadd(Server.keys[:delay], @time, @job.to_json)
           end
         end
 

data/lib/qpush/server/apis/fail.rb

@@ -23,7 +23,7 @@ module QPush
         end
 
         def stat_increment
-          Server.redis { |c| c.hincrby(Server.keys.stats, 'failed', 1) }
+          Server.redis { |c| c.hincrby(Server.keys[:stats], 'failed', 1) }
         end
 
         def log_error

data/lib/qpush/server/apis/history.rb

@@ -18,8 +18,8 @@ module QPush
 
         def update_history
           Server.redis do |c|
-            c.lpush(Server.keys.history, to_json)
-            c.ltrim(Server.keys.history, 0, 10)
+            c.lpush(Server.keys[:history], to_json)
+            c.ltrim(Server.keys[:history], 0, 10)
           end
         end
 

data/lib/qpush/server/apis/morgue.rb

@@ -10,8 +10,8 @@ module QPush
 
         def send_to_morgue
           Server.redis do |conn|
-            conn.hincrby(Server.keys.stats, 'dead', 1)
-            conn.lpush(Server.keys.morgue, @job.to_json)
+            conn.hincrby(Server.keys[:stats], 'dead', 1)
+            conn.lpush(Server.keys[:morgue], @job.to_json)
           end
         end
       end

data/lib/qpush/server/apis/perform.rb

@@ -10,8 +10,8 @@ module QPush
 
         def perform_job
           Server.redis do |conn|
-            conn.hincrby(Server.keys.stats, 'performed', 1)
-            conn.lpush("#{Server.keys.perform}:#{@job.priority}", @job.to_json)
+            conn.hincrby(Server.keys[:stats], 'performed', 1)
+            conn.lpush("#{Server.keys[:perform]}:#{@job.priority}", @job.to_json)
           end
         end
       end

data/lib/qpush/server/apis/queue.rb

@@ -10,8 +10,8 @@ module QPush
 
         def queue_job
           Server.redis do |conn|
-            conn.hincrby(Server.keys.stats, 'queued', 1)
-            conn.lpush(Server.keys.queue, @job.to_json)
+            conn.hincrby(Server.keys[:stats], 'queued', 1)
+            conn.lpush(Server.keys[:queue], @job.to_json)
           end
         end
       end

data/lib/qpush/server/apis/success.rb

@@ -18,7 +18,7 @@ module QPush
 
         def stat_increment
           Server.redis do |c|
-            c.hincrby(Server.keys.stats, 'success', 1)
+            c.hincrby(Server.keys[:stats], 'success', 1)
           end
         end
 

data/lib/qpush/server/config.rb

@@ -8,6 +8,12 @@ module QPush
       def config
         @config ||= Config.new
       end
+
+      def build_worker
+        worker = WorkerConfig.new
+        yield worker
+        worker
+      end
     end
 
     class WorkerConfig

data/lib/qpush/server/delay.rb

@@ -34,7 +34,7 @@ module QPush
       # If any are found, begin to update them.
       #
       def retrieve_delays
-        delays = @conn.zrangebyscore(Server.keys.delay, 0, Time.now.to_i)
+        delays = @conn.zrangebyscore(Server.keys[:delay], 0, Time.now.to_i)
         delays.any? ? update_delays(delays) : @conn.unwatch
       end
 
@@ -42,7 +42,7 @@ module QPush
       #
       def update_delays(delays)
         @conn.multi do |multi|
-          multi.zrem(Server.keys.delay, delays)
+          multi.zrem(Server.keys[:delay], delays)
           delays.each { |job| perform_job(job) }
         end
       end
@@ -59,7 +59,7 @@ module QPush
       # Performs a watch on our delay list
       #
       def watch_delay
-        @conn.watch(Server.keys.delay) do
+        @conn.watch(Server.keys[:delay]) do
           yield if block_given?
         end
       end

data/lib/qpush/server/heartbeat.rb

@@ -13,7 +13,7 @@ module QPush
       #
       def start
         until @done
-          Server.redis { |c| c.setex(Server.keys.heart, 30, true) }
+          Server.redis { |c| c.setex(Server.keys[:heart], 30, true) }
           sleep 15
         end
       end

data/lib/qpush/server/jobs.rb

@@ -7,12 +7,19 @@ module QPush
         end
 
         def _register_job(base)
-          Server.redis { |c| c.sadd(QPush::Base::KEY + ':jobs', base.name) }
+          Server.redis { |c| c.sadd("#{QPush::Base::KEY}:jobs", base.name) }
         end
       end
     end
 
-    module JobHelpers
+    class Job < QPush::Base::Job
+      include QPush::Server::ApiWrapper
+      include ObjectValidator::Validate
+
+      def initialize(options)
+        super
+      end
+
       def mark_success
         @failed = false
         @total_success += 1
@@ -58,22 +65,6 @@ module QPush
       end
     end
 
-    class Job < QPush::Base::Job
-      extend Forwardable
-
-      include QPush::Server::JobHelpers
-      include ObjectValidator::Validate
-
-
-      def initialize(options)
-        super
-        @api = ApiWrapper.new(self)
-      end
-
-      def_delegators :@api, :queue, :execute, :perform,
-                     :delay, :retry, :morgue, :setup
-    end
-
     class JobValidator
       include ObjectValidator::Validator
 

data/lib/qpush/server/perform.rb

@@ -28,7 +28,7 @@ module QPush
       # Performs a 'blocking pop' on our redis job list.
       #
       def retrieve_job
-        json = Server.redis { |c| c.brpop(Server.keys.perform_list) }
+        json = Server.redis { |c| c.brpop(Server.keys[:perform_list]) }
         Job.new(JSON.parse(json.last))
       rescue => e
         raise ServerError, e.message

data/lib/qpush/server/queue.rb

@@ -29,7 +29,7 @@ module QPush
       # Performs a 'blocking pop' on our redis job list.
       #
       def retrieve_job
-        json = Server.redis { |c| c.brpop(Server.keys.queue) }
+        json = Server.redis { |c| c.brpop(Server.keys[:queue]) }
         Job.new(JSON.parse(json.last))
       rescue => e
         raise ServerError, e.message

data/lib/qpush/server/redis.rb

@@ -13,7 +13,7 @@ module QPush
       end
     end
 
-    class RedisKeys
+    module RedisKeys
       KEYS = [:delay,
               :queue,
               :perform,
@@ -23,25 +23,11 @@ module QPush
               :history,
               :morgue]
 
-      attr_reader :delay, :queue, :perform, :stats, :heart,
-                  :crons, :history, :morgue
-
-      def initialize(options)
-        @namespace = options[:namespace] || 'default'
-        @priorities = options[:priorities] || 5
-        build_keyspaces
-      end
-
-      def perform_list
-        @perform_list ||= (1..@priorities).collect { |num| "#{perform}:#{num}" }
-      end
-
-      private
-
-      def build_keyspaces
-        KEYS.each do |key|
-          instance_variable_set("@#{key}", "#{QPush::Base::KEY}:#{@namespace}:#{key}")
-        end
+      def self.build(namespace, priorities)
+        name = "#{QPush::Base::KEY}:#{namespace}"
+        keys = Hash[KEYS.collect { |key| [key, "#{name}:#{key}"] }]
+        keys[:perform_list] = (1..5).collect { |num| "#{keys[:perform]}:#{num}" }
+        keys
       end
     end
   end

data/lib/qpush/server/worker.rb

@@ -97,7 +97,7 @@ module QPush
       end
 
       def assign_globals
-        Server.keys = RedisKeys.new(@config.for_keys)
+        Server.keys = RedisKeys.build(@config.namespace, @config.priorities)
         Server.worker = self
       end
 

data/lib/qpush/version.rb

@@ -1,4 +1,4 @@
 module QPush
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
   CODENAME = 'Sun Soaked Salamander'
 end

data/lib/qpush/web/apis/crons.rb

@@ -17,7 +17,7 @@ module QPush
 
         def retrieve_delays
           @jobs = Web.redis do |conn|
-            conn.zrange(Web.keys.delay, 0, -1, with_scores: true)
+            conn.zrange(Web.keys[:delay], 0, -1, with_scores: true)
           end
         end
 

data/lib/qpush/web/apis/heart.rb

@@ -3,7 +3,7 @@ module QPush
     module Apis
       class Heart
         def call
-          heart = Web.redis { |c| c.get(Web.keys.heart) }
+          heart = Web.redis { |c| c.get(Web.keys[:heart]) }
           { status: !heart.nil?, namespace: 'default' }
         end
       end

data/lib/qpush/web/apis/history.rb

@@ -15,7 +15,7 @@ module QPush
 
         def retrieve_jobs
           @jobs = Web.redis do |conn|
-            conn.lrange(Web.keys.history, 0, 10)
+            conn.lrange(Web.keys[:history], 0, 10)
           end
         end
 

data/lib/qpush/web/apis/morgue.rb

@@ -17,7 +17,7 @@ module QPush
 
         def retrieve_morgue
           @morgue = Web.redis do |conn|
-            conn.lrange(Web.keys.morgue, @start, @start + @count)
+            conn.lrange(Web.keys[:morgue], @start, @start + @count)
           end
         end
 

data/lib/qpush/web/apis/queue_delayed.rb

@@ -17,13 +17,13 @@ module QPush
         private
 
         def retrieve_delay
-          delays = @conn.zrangebyscore(Web.keys.delay, @score, @score)
+          delays = @conn.zrangebyscore(Web.keys[:delay], @score, @score)
           delays.each
 
         # Performs a watch on our delay list
         #
         def watch_delay
-          @conn.watch(Web.keys.delay) do
+          @conn.watch(Web.keys[:delay]) do
             yield if block_given?
           end
         end

data/lib/qpush/web/apis/retries.rb

@@ -18,7 +18,7 @@ module QPush
 
         def retrieve_jobs
           @jobs = Web.redis do |conn|
-            conn.zrange(Web.keys.delay, 0, -1, with_scores: true)
+            conn.zrange(Web.keys[:delay], 0, -1, with_scores: true)
           end
         end
 

data/lib/qpush/web/apis/stats.rb

@@ -29,7 +29,7 @@ module QPush
 
         def retrieve_stats
           @stats = Web.redis do |conn|
-            conn.hgetall(Web.keys.stats)
+            conn.hgetall(Web.keys[:stats])
           end
         end
 
@@ -49,7 +49,7 @@ module QPush
 
         def calculate_current
           Web.redis do |c|
-            Web.keys.perform_list.collect { |list| c.llen(list) }.reduce(:+)
+            Web.keys[:perform_list].collect { |list| c.llen(list) }.reduce(:+)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: qpush
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Nicholas Sweeting
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-07 00:00:00.000000000 Z
+date: 2016-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -200,6 +200,7 @@ files:
 - bin/qpush-server
 - bin/qpush-web
 - bin/setup
+- dump.rdb
 - jobs/fail_job.rb
 - jobs/test_job.rb
 - lib/qpush.rb
@@ -290,9 +291,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Fast and simple job queue microservice for Ruby.
 test_files: []
-has_rdoc: