resque-aps 0.9.14 → 0.9.15

data/HISTORY.md

@@ -1,3 +1,9 @@
+## 0.9.15 (2010-10-18)
+
+* Move the application enqueue/dequeue methods to the Application class
+* Fixed incr/decr issues around application (de-)queuing
+* Fixed the page size issue on application view
+
 ## 0.9.14 (2010-09-1)
 
 * Corrected path issues

data/Rakefile

@@ -23,7 +23,7 @@ begin
     puts "gem install jeweler"
   end
 
-  require 'resque_aps/version'
+  require 'resque/plugins/aps/version'
 
   Jeweler::Tasks.new do |gemspec|
     gemspec.name = "resque-aps"
@@ -36,8 +36,8 @@ begin
     gemspec.authors = ["Ashley Martens"]
     gemspec.version = Resque::Plugins::Aps::Version
 
-    gemspec.add_dependency "redis", ">= 1.0.7"
-    gemspec.add_dependency "resque", ">= 1.5.0"
+    # gemspec.add_dependency "redis", ">= 1.0.7"
+    # gemspec.add_dependency "resque", ">= 1.5.0"
     gemspec.add_development_dependency "jeweler"
     gemspec.add_development_dependency "mocha"
     gemspec.add_development_dependency "rack-test"

data/lib/resque/plugins/aps.rb

@@ -61,34 +61,16 @@ module Resque
       def aps_application_job_limit
         @aps_application_job_limit ||= 5
       end
-  
-      def aps_applications_queued_count(application_name)
-        redis.get(aps_application_queued_key(application_name)) || 0
-      end
-  
-      def enqueue_aps_application(application_name, override = false)
-        count_apps = aps_applications_queued_count(application_name).to_i
-        count_not  = aps_notification_count_for_application(application_name)
-        if override || count_apps <= 0 || (count_apps < aps_application_job_limit && (count_not > aps_queue_size_upper && count_not % (aps_queue_size_upper / 10) == 0))
-          enqueue(Resque::Plugins::Aps::Application, application_name)
-          redis.incr(aps_application_queued_key(application_name))
-        end
-      end
-      
-      def dequeue_aps_application(application_name)
-        redis.decr(aps_application_queued_key(application_name)) if aps_applications_queued_count(application_name).to_i > 0
-      end
-      
+        
       def enqueue_aps(application_name, notification)
         redis.rpush(aps_application_queue_key(application_name), encode(notification.to_hash))
-        enqueue_aps_application(application_name)
+        Resque::Plugins::Aps::Application.new('name' => application_name).enqueue
         true
       end
 
       def dequeue_aps(application_name)
         h = decode(redis.lpop(aps_application_queue_key(application_name)))
-        return Resque::Plugins::Aps::Notification.new(h) if h
-        nil
+        h ? Resque::Plugins::Aps::Notification.new(h) : nil
       end
   
       # Returns the number of queued notifications for a given application
@@ -99,11 +81,7 @@ module Resque
       # Returns an array of queued notifications for the given application
       def aps_notifications_for_application(application_name, start = 0, count = 1)
         r = redis.lrange(aps_application_queue_key(application_name), start, count)
-        if r 
-          r.map { |h| Resque::Plugins::Aps::Notification.new(decode(h)) }
-        else
-          []
-        end
+        r ? r.map { |h| Resque::Plugins::Aps::Notification.new(decode(h)) } : []
       end
 
       def create_aps_application(name, cert_file, cert_passwd = nil)
@@ -113,17 +91,14 @@ module Resque
   
       def aps_application(name)
         h = decode(redis.get(aps_application_key(name)))
-        return Resque::Plugins::Aps::Application.new(h) if h
-        nil
+        h ? Resque::Plugins::Aps::Application.new(h) : nil
       end
   
       # Returns an array of applications based on start and count
       def aps_application_names(start = 0, count = 1)
         a = redis.smembers(:aps_applications)
         return a if count == 0
-        ret = a[start..(start + count)]
-        return [] unless ret
-        ret
+        a[start..(start + count)] || []
       end
 
       # Returns the number of application queues

data/lib/resque/plugins/aps/application.rb

@@ -177,6 +177,63 @@ module Resque
           logger.error("ResqueAps[read_failed]: Bad data on the socket (#{name})") if logger
         end
 
+
+
+
+
+        def queued_count
+          (redis.get(Resque.aps_application_queued_key(name)) || 0).to_i
+        end
+
+        def lock_key
+          @lock_key ||= "#{Resque.aps_application_key(name)}:lock"
+        end
+        
+        def redis
+          Resque.redis
+        end
+        
+        def acquire_lock
+          if redis.setnx(lock_key, Time.now.utc.to_i + 1)
+            true
+          elsif Time.at(redis.get(lock_key).to_i) > Time.now
+            delete_lock
+            acquire_lock
+          else
+            false
+          end
+        end
+
+        def delete_lock
+          redis.del(lock_key)
+        end
+
+        def enqueue(override = false)
+          count_apps = 0
+          count_not  = 0
+          locked     = false
+
+          unless override
+            count_apps = queued_count
+            if count_apps == 0
+              locked     = acquire_lock
+              return unless locked
+              count_apps = queued_count
+            end
+            count_not  = Resque.aps_notification_count_for_application(name)
+          end
+
+          if count_apps <= 0 || (count_apps < Resque.aps_application_job_limit && (count_not > Resque.aps_queue_size_upper && count_not % (Resque.aps_queue_size_upper / 10) == 0))
+            enqueue(Resque::Plugins::Aps::Application, name)
+            redis.incr(Resque.aps_application_queued_key(name))
+            delete_lock if locked
+          end
+        end
+
+        def dequeue
+          redis.decr(Resque.aps_application_queued_key(name))
+        end
+
       end
     end
   end

data/lib/resque/plugins/aps/server/views/aps_applications.erb

@@ -14,7 +14,7 @@
     <th>Notification Count</th>
     <th></th>
   </tr>
-  <% resque.aps_application_names(start, start+20).each do |application_name| %>
+  <% resque.aps_application_names(start, 20).each do |application_name| %>
     <tr>
       <td><a href="<%= url "aps/#{application_name}" %>"><%= application_name %></a></td>
       <td><%= resque.aps_notification_count_for_application(application_name) %></td>

data/lib/resque/plugins/aps/version.rb

@@ -1,7 +1,7 @@
 module Resque
   module Plugins
     module Aps
-      Version = '0.9.14'
+      Version = '0.9.15'
     end
   end
 end

data/test/resque-web_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 # Pull in the server test_helper from resque
-require 'resque_aps/server/test_helper.rb'
+require 'resque/plugins/aps/server/test_helper.rb'
 
 context "on GET to /aps" do
   setup { get "/aps" }

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: resque-aps
 version: !ruby/object:Gem::Version 
-  version: 0.9.14
+  hash: 37
+  prerelease: false
+  segments: 
+  - 0
+  - 9
+  - 15
+  version: 0.9.15
 platform: ruby
 authors: 
 - Ashley Martens
@@ -9,59 +15,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -07:00
+date: 2010-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: redis
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.0.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: resque
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.5.0
-    version: 
 - !ruby/object:Gem::Dependency 
   name: jeweler
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id003
 description: |-
   Queuing system for Apple's Push Service on top of Resque.
     Adds methods enqueue_aps to queue a notification message.
@@ -111,21 +109,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Queuing system for Apple's Push Service on top of Resque