resque-aps 0.9.8 → 0.9.9

data/HISTORY.md

@@ -1,3 +1,7 @@
+## 0.9.9 (2010-08-10)
+
+* Changed the module from ResqueAps to Resque::Plugins::Aps, per Resque documentation
+
 ## 0.9.8 (2010-08-08)
 
 * Fix a bug in the aps_read_error logging method.

data/README.markdown

@@ -29,7 +29,7 @@ To extend the system create an initializer:
     Resque.aps_feedback_host = AppConfig.apn_feedback_host
     Resque.aps_feedback_port = AppConfig.apn_feedback_port
 
-    module ResqueAps
+    module Resque::Plugins::Aps
       class Application
         def after_aps_write(notification)
           logger.info("Sent Notification [#{notification.application_name}] [#{notification.device_token}] [#{notification.payload}]") if logger

data/Rakefile

@@ -34,7 +34,7 @@ begin
     gemspec.email = "ashleym1972@gmail.com"
     gemspec.homepage = "http://github.com/ashleym1972/resque-aps"
     gemspec.authors = ["Ashley Martens"]
-    gemspec.version = ResqueAps::Version
+    gemspec.version = Resque::Plugins::Aps::Version
 
     gemspec.add_dependency "redis", ">= 1.0.7"
     gemspec.add_dependency "resque", ">= 1.5.0"
@@ -47,9 +47,9 @@ end
 
 desc "Push a new version to Gemcutter"
 task :publish => [ :test, :gemspec, :build ] do
-  system "git tag v#{ResqueAps::Version}"
-  system "git push origin v#{ResqueAps::Version}"
+  system "git tag v#{Resque::Plugins::Aps::Version}"
+  system "git push origin v#{Resque::Plugins::Aps::Version}"
   system "git push origin master"
-  system "gem push pkg/resque-aps-#{ResqueAps::Version}.gem"
+  system "gem push pkg/resque-aps-#{Resque::Plugins::Aps::Version}.gem"
   system "git clean -fd"
 end

data/lib/resque_aps/application.rb

@@ -1,9 +1,11 @@
 require 'openssl'
 
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   class Application
-    include ResqueAps::Helper
-    extend ResqueAps::Helper
+    include Resque::Plugins::Aps::Helper
+    extend Resque::Plugins::Aps::Helper
 
     attr_accessor :name, :cert_file, :cert_passwd
 
@@ -86,7 +88,7 @@ module ResqueAps
     
     def initialize(attributes)
       attributes.each do |k, v|
-        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(ResqueAps::UnknownAttributeError, "unknown attribute: #{k}")
+        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(Resque::Plugins::Aps::UnknownAttributeError, "unknown attribute: #{k}")
       end
     end
     
@@ -161,6 +163,8 @@ module ResqueAps
     def aps_read_failed
       logger.error("ResqueAps[read_failed]: Bad data on the socket (#{name})") if logger
     end
-    
+
+      end
+    end
   end
 end

data/lib/resque_aps/feedback.rb

@@ -1,9 +1,11 @@
 require 'timeout'
 
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   class Feedback
-    include ResqueAps::Helper
-    extend ResqueAps::Helper
+    include Resque::Plugins::Aps::Helper
+    extend Resque::Plugins::Aps::Helper
 
     @queue = "apple_push_service"
     
@@ -11,7 +13,7 @@ module ResqueAps
 
     def initialize(attributes)
       attributes.each do |k, v|
-        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(ResqueAps::UnknownAttributeError, "unknown attribute: #{k}")
+        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(Resque::Plugins::Aps::UnknownAttributeError, "unknown attribute: #{k}")
       end
     end
         
@@ -67,7 +69,7 @@ module ResqueAps
           timeout(5) do
             until socket.eof?
               app.before_aps_read
-              feedback = read_feedback(ssl_socket, app_name, product_id)
+              feedback = read_feedback(socket, app_name, product_id)
               if feedback
                 count += 1
                 app.after_app_read(feedback)
@@ -85,4 +87,6 @@ module ResqueAps
     end
 
   end
+  end
+end
 end

data/lib/resque_aps/helper.rb

@@ -1,5 +1,7 @@
 
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   module Helper
     extend Resque::Helpers
 
@@ -8,4 +10,6 @@ module ResqueAps
     end
 
   end
+  end
+end
 end

data/lib/resque_aps/notification.rb

@@ -1,13 +1,15 @@
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   class Notification
-    include ResqueAps::Helper
-    extend ResqueAps::Helper
+    include Resque::Plugins::Aps::Helper
+    extend Resque::Plugins::Aps::Helper
 
     attr_accessor :application_name, :device_token, :payload
 
     def initialize(attributes)
       attributes.each do |k, v|
-        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(ResqueAps::UnknownAttributeError, "unknown attribute: #{k}")
+        respond_to?(:"#{k}=") ? send(:"#{k}=", v) : raise(Resque::Plugins::Aps::UnknownAttributeError, "unknown attribute: #{k}")
       end
     end
         
@@ -156,7 +158,7 @@ module ResqueAps
     # The message formatted for sending in binary
     #
     def formatted
-      ResqueAps::Notification.format_message_for_sending(self.device_token, self.payload)
+      Resque::Plugins::Aps::Notification.format_message_for_sending(self.device_token, self.payload)
     end
 
     #
@@ -190,4 +192,6 @@ module ResqueAps
       # "\0\0 #{token_hex}\0#{json.length.chr}#{json}"
   	end
   end
+  end
+end
 end

data/lib/resque_aps/server/test_helper.rb

@@ -1,7 +1,9 @@
 require 'rack/test'
 require 'resque/server'
 
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   module TestHelper
     class Test::Unit::TestCase
       include Rack::Test::Methods
@@ -16,5 +18,7 @@ module ResqueAps
       end
     end
   end
+  end
+end
 end
 

data/lib/resque_aps/server.rb

@@ -1,6 +1,8 @@
 
 # Extend Resque::Server to add tabs
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   
   module Server
 
@@ -19,7 +21,7 @@ module ResqueAps
         end
         
         post "/aps/:application_name" do
-          Resque.enqueue(ResqueAps::Application, params[:application_name])
+          Resque.enqueue(Resque::Plugins::Aps::Application, params[:application_name])
           redirect url("/aps")
         end
       end
@@ -30,4 +32,6 @@ module ResqueAps
 
   end
   
+  end
+end
 end

data/lib/resque_aps/unknown_attribute_error.rb

@@ -1,4 +1,8 @@
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
   class UnknownAttributeError < Exception
   end
+  end
+end
 end

data/lib/resque_aps/version.rb

@@ -1,3 +1,7 @@
-module ResqueAps
-  Version = '0.9.8'
+module Resque
+  module Plugins
+    module Aps
+  Version = '0.9.9'
+    end
+  end
 end

data/lib/resque_aps.rb

@@ -10,7 +10,9 @@ require 'resque_aps/notification'
 require 'resque_aps/feedback'
 require 'resque_aps/unknown_attribute_error'
 
-module ResqueAps
+module Resque
+  module Plugins
+    module Aps
 
   def logger=(logger)
     @logger = logger
@@ -75,13 +77,13 @@ module ResqueAps
   def enqueue_aps(application_name, notification)
     count = aps_notification_count_for_application(application_name)
     redis.rpush(aps_application_queue_key(application_name), encode(notification.to_hash))
-    enqueue(ResqueAps::Application, application_name) if count <= aps_queue_size_lower || count >= aps_queue_size_upper
+    enqueue(Resque::Plugins::Aps::Application, application_name) if count <= aps_queue_size_lower || count >= aps_queue_size_upper
     true
   end
 
   def dequeue_aps(application_name)
     h = decode(redis.lpop(aps_application_queue_key(application_name)))
-    return ResqueAps::Notification.new(h) if h
+    return Resque::Plugins::Aps::Notification.new(h) if h
     nil
   end
   
@@ -94,7 +96,7 @@ module ResqueAps
   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| ResqueAps::Notification.new(decode(h)) }
+      r.map { |h| Resque::Plugins::Aps::Notification.new(decode(h)) }
     else
       []
     end
@@ -107,7 +109,7 @@ module ResqueAps
   
   def aps_application(name)
     h = decode(redis.get(aps_application_key(name)))
-    return ResqueAps::Application.new(h) if h
+    return Resque::Plugins::Aps::Application.new(h) if h
     nil
   end
   
@@ -132,9 +134,11 @@ module ResqueAps
   def aps_application_queue_key(application_name)
     "#{aps_application_key(application_name)}:queue"
   end
+    end
+  end
 end
 
-Resque.extend ResqueAps
+Resque.extend Resque::Plugins::Aps
 Resque::Server.class_eval do
-  include ResqueAps::Server
+  include Resque::Plugins::Aps::Server
 end

data/test/application_test.rb

@@ -1,32 +1,32 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-context "ResqueAps::Application" do
+context "Resque::Plugins::Aps::Application" do
   test "has a nice #inspect" do
-    n = ResqueAps::Application.new('name' => 'SomeApp', 'cert_file' => '/var/apps/certificates/some_app.pem', 'cert_passwd' => 'hello')
-    assert_equal '#<ResqueAps::Application "SomeApp", "hello", "/var/apps/certificates/some_app.pem">', n.inspect
+    n = Resque::Plugins::Aps::Application.new('name' => 'SomeApp', 'cert_file' => '/var/apps/certificates/some_app.pem', 'cert_passwd' => 'hello')
+    assert_equal '#<Resque::Plugins::Aps::Application "SomeApp", "hello", "/var/apps/certificates/some_app.pem">', n.inspect
   end
 
   test "can create and close sockets" do
     cert = File.read(File.dirname(__FILE__) + "/../test-dev.pem")
-    socket, ssl = ResqueAps::Application.create_sockets(cert, nil, Resque.aps_gateway_host, Resque.aps_gateway_port)
-    ResqueAps::Application.close_sockets(socket, ssl)
+    socket, ssl = Resque::Plugins::Aps::Application.create_sockets(cert, nil, Resque.aps_gateway_host, Resque.aps_gateway_port)
+    Resque::Plugins::Aps::Application.close_sockets(socket, ssl)
   end
 
   test "can run socket block" do
-    a = ResqueAps::Application.new(:name => "TestApp", :cert_file => File.dirname(__FILE__) + "/../test-dev.pem")
+    a = Resque::Plugins::Aps::Application.new(:name => "TestApp", :cert_file => File.dirname(__FILE__) + "/../test-dev.pem")
     a.socket do |s, a|
     end
   end
   
   test "can perform" do
-    n = ResqueAps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('TestApp', n)
     Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
-    ResqueAps::Application.perform('TestApp')
+    Resque::Plugins::Aps::Application.perform('TestApp')
   end
 
   context "ApplicationWithHooks" do
-    module ResqueAps
+    module Resque::Plugins::Aps
       class Application
         def before_aps_write(notification)
           logger.debug "before_aps_write #{notification.inspect}"
@@ -52,10 +52,10 @@ context "ResqueAps::Application" do
     end
     
     test "can perform with logging hooks" do
-      n = ResqueAps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+      n = Resque::Plugins::Aps::Notification.new('application_name' => 'TestApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
       assert Resque.enqueue_aps('TestApp', n)
       Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
-      ResqueAps::Application.perform('TestApp')
+      Resque::Plugins::Aps::Application.perform('TestApp')
     end
   end
 end

data/test/feedback_test.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-context "ResqueAps::Application" do
+context "Resque::Plugins::Aps::Application" do
   test "can perform" do
     Resque.create_aps_application('TestApp', File.dirname(__FILE__) + "/../test-dev.pem", nil)
-    ResqueAps::Feedback.perform('TestApp')
+    Resque::Plugins::Aps::Feedback.perform('TestApp')
   end
 end

data/test/notification_test.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-context "ResqueAps::Notification" do
+context "Resque::Plugins::Aps::Notification" do
   test "has a nice #inspect" do
-    n = ResqueAps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
-    assert_equal '#<ResqueAps::Notification "SomeApp", "aihdf08u2402hbdfquhiwr", "{\"aps\": { \"alert\": \"hello\"}}">', n.inspect
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    assert_equal '#<Resque::Plugins::Aps::Notification "SomeApp", "aihdf08u2402hbdfquhiwr", "{\"aps\": { \"alert\": \"hello\"}}">', n.inspect
   end
 end

data/test/resque-web_test.rb

@@ -29,7 +29,7 @@ context "on GET to /aps/some_ivar_application" do
   setup do
     Resque.redis.flushall
     Resque.create_aps_application(:some_ivar_application, nil, nil)
-    n = ResqueAps::Notification.new('application_name' => 'some_ivar_application', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'some_ivar_application', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps(:some_ivar_application, n)
     assert Resque.enqueue_aps(:some_ivar_application, n)
     assert Resque.enqueue_aps(:some_ivar_application, n)

data/test/resque_aps_test.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-context "ResqueAps" do
+context "Resque::Plugins::Aps" do
   setup do
     Resque.redis.flushall
   end
@@ -43,7 +43,7 @@ context "ResqueAps" do
   end
 
   test "can enqueue aps notifications" do
-    n = ResqueAps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('SomeApp', n)
     assert_equal 1, Resque.aps_notification_count_for_application('SomeApp')
     assert Resque.enqueue_aps('SomeApp', n)
@@ -51,21 +51,21 @@ context "ResqueAps" do
   end
 
   test "can dequeue aps notifications" do
-    n = ResqueAps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('SomeApp', n)
     assert_equal 1, Resque.aps_notification_count_for_application('SomeApp')
 
     nn = Resque.dequeue_aps('SomeApp')
 
     assert nn
-    assert_kind_of ResqueAps::Notification, nn
+    assert_kind_of Resque::Plugins::Aps::Notification, nn
     assert_equal n.application_name, nn.application_name
     assert_equal n.device_token,     nn.device_token
     assert_equal n.payload,          nn.payload
   end
 
   test "knows how big the application notification queue is" do
-    n = ResqueAps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('SomeApp', n)
     assert_equal 1, Resque.aps_notification_count_for_application('SomeApp')
 
@@ -74,7 +74,7 @@ context "ResqueAps" do
   end
 
   test "can get a list of application notifications" do
-    n = ResqueAps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
+    n = Resque::Plugins::Aps::Notification.new('application_name' => 'SomeApp', 'device_token' => 'aihdf08u2402hbdfquhiwr', 'payload' => '{"aps": { "alert": "hello"}}')
     assert Resque.enqueue_aps('SomeApp', n)
     assert Resque.enqueue_aps('SomeApp', n)
     assert Resque.enqueue_aps('SomeApp', n)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 9
-  - 8
-  version: 0.9.8
+  - 9
+  version: 0.9.9
 platform: ruby
 authors: 
 - Ashley Martens
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-08 00:00:00 -07:00
+date: 2010-08-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency