resque-priority-jobs 0.2 → 0.2.1

data/lib/resque-priority-jobs/queue.rb

@@ -19,10 +19,31 @@ module Resque
     alias :pop_without_priority :pop
     alias :pop :pop_with_priority
 
-    # not optimial has an extra redis call for priority call. Assumtion is that there are lesser queues using priority
     def length
-      @redis.llen @redis_name rescue @redis.zcard @redis_name
+      @redis.type(@redis_name) == 'list' ? @redis.llen(@redis_name) : @redis.zcard(@redis_name)
     end
+    alias :size :length
+
+    def slice_with_priority(start, length)
+      if @redis.type(@redis_name) == 'zset'
+        if length == 1
+          synchronize do
+            @redis.zrangebyscore(@redis_name, '-inf', '+inf',  :limit =>[0,1] )
+          end
+        else
+          synchronize do
+            Array(@redis.zrangebyscore(@redis_name, '-inf', '+inf', :limit => [0, length])).map do |item|
+              decode item
+            end
+          end
+        end
+      else
+        slice_without_priority(start, length)
+      end
+    end
+
+    alias :slice_without_priority :slice
+    alias :slice :slice_with_priority
 
     # To identify whether a queue is priority queue or not. Empty queues are always non-priority
     # Assumption : Once a queue type is set to be a priority queue, it cannot be changed and vice-versa.
@@ -35,6 +56,5 @@ module Resque
       type = @redis.type(@redis_name)
       type == 'none' ? nil : type
     end
-
   end
 end

data/lib/resque-priority-jobs/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Priority
     module Jobs
-      VERSION = "0.2"
+      VERSION = "0.2.1"
     end
   end
 end

data/lib/resque-priority-jobs.rb

@@ -10,7 +10,7 @@ MAX_PRIORITY = 1
 module Resque
   # Queues which need priority scheduling need to use this method instead of enqueue
   #FIXME: Known issue - If a use is already enqueued without priority and then we do a enqueue with priority we get an error of different datatype from redis.
-  def enqueue_with_priority klass, priority = MIN_PRIORITY, *args
+  def enqueue_with_priority(klass, priority = MIN_PRIORITY, *args)
     queue = queue_from_class(klass)
     before_hooks = Plugin.before_enqueue_hooks(klass).collect do |hook|
       klass.send(hook, *args)
@@ -26,12 +26,12 @@ module Resque
     return true
   end
 
-  def push_with_priority queue, priority, item
+  def push_with_priority(queue, priority, item)
     queue(queue).push_with_priority priority, item
   end
 
   class JobFetch
-    def self.fetch_one_job redis, queue
+    def self.fetch_one_job(redis, queue)
       #lua script to get item with maximum priority
       get_and_rem = "local resp = redis.call('zrangebyscore', KEYS[1], '-inf', '+inf', 'LIMIT', '0', '1');
         if (resp[1] ~= nil) then

metadata

@@ -1,120 +1,108 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: resque-priority-jobs
-version: !ruby/object:Gem::Version
-  version: '0.2'
+version: !ruby/object:Gem::Version 
   prerelease: 
+  version: 0.2.1
 platform: ruby
-authors:
-- rajofchennai
+authors: 
+  - rajofchennai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: resque
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: facets
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: systemtimer
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+
+date: 2012-09-21 00:00:00 Z
+dependencies: 
+  - !ruby/object:Gem::Dependency 
+    name: resque
+    prerelease: false
+    requirement: &id001 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id001
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id002 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id002
+  - !ruby/object:Gem::Dependency 
+    name: facets
+    prerelease: false
+    requirement: &id003 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: systemtimer
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :development
+    version_requirements: *id004
 description: resque plugin to have priority in the queue
-email:
-- rajofchennai@yahoo.com
+email: 
+  - rajofchennai@yahoo.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
-- Gemfile
-- Gemfile.lock
-- LICENSE
-- README.md
-- Rakefile
-- lib/resque-priority-jobs.rb
-- lib/resque-priority-jobs/job.rb
-- lib/resque-priority-jobs/multi_queue.rb
-- lib/resque-priority-jobs/queue.rb
-- lib/resque-priority-jobs/version.rb
-- resque-priority-jobs.gemspec
-homepage: ''
+
+files: 
+  - Gemfile
+  - Gemfile.lock
+  - LICENSE
+  - README.md
+  - Rakefile
+  - lib/resque-priority-jobs.rb
+  - lib/resque-priority-jobs/job.rb
+  - lib/resque-priority-jobs/multi_queue.rb
+  - lib/resque-priority-jobs/queue.rb
+  - lib/resque-priority-jobs/version.rb
+  - resque-priority-jobs.gemspec
+homepage: ""
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement
+
+require_paths: 
+  - lib
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: This plugin can be used to have priority inside a queue for resques
 test_files: []
+