apn_client 0.0.1 → 0.0.2

data/.rvmrc

@@ -4,7 +4,7 @@
 # development environment upon cd'ing into the directory
 
 # First we specify our desired <ruby>[@<gemset>], the @gemset name is optional.
-environment_id="ruby-1.9.2-p180@apn_client"
+environment_id="ruby-1.9.2-p290@apn_client"
 
 #
 # Uncomment following line if you want options to be set only for given project.

data/README.md

@@ -10,27 +10,7 @@ This is a RubyGem that allows sending of Apple Push Notifications to iOS devices
 
 ## Usage
 
-### 1. Configure the Connection
-
-```
-
-ApnClient::Delivery.connection_config = {
-  :host => 'gateway.push.apple.com', # For sandbox, use: gateway.sandbox.push.apple.com
-  :port => 2195,
-  :certificate => IO.read("my_apn_certificate.pem"),
-  :certificate_passphrase => '',
-}
-
-ApnClient::Feedback.connection_config = {
-  :host => 'feedback.push.apple.com', # For sandbox, use: feedback.sandbox.push.apple.com
-  :port => 2196,
-  :certificate => IO.read("my_apn_certificate.pem"),
-  :certificate_passphrase => '',
-}
-
-```
-
-### 2. Deliver Your Message
+### Delivering Your Messages
 
 ```
 message1 = ApnClient::Message.new(1,
@@ -51,7 +31,13 @@ delivery = ApnClient::Delivery.new([message1, message2],
     :on_error => lambda { |d, message_id, error_code| puts "Received error code #{error_code} from Apple for message #{message_id}" }
   },
   :consecutive_failure_limit => 10, # If more than 10 devices in a row fail, we abort the whole delivery
-  :exception_limit => 3 # If a device raises an exception three times in a row we fail/skip the device and move on
+  :exception_limit => 3, # If a device raises an exception three times in a row we fail/skip the device and move on
+  :connection => {
+  	:host => 'gateway.push.apple.com', # For sandbox, use: gateway.sandbox.push.apple.com
+  	:port => 2195,
+  	:certificate => IO.read("my_apn_certificate.pem"),
+  	:certificate_passphrase => ''
+  }
 )
 delivery.process!
 puts "Delivered successfully to #{delivery.success_count} out of #{delivery.total_count} devices in #{delivery.elapsed} seconds"
@@ -61,7 +47,7 @@ One potential gotcha to watch out for is that the device token for a message is
 that different apps on the same device will have different tokens. The Apple documentation uses phone numbers as an analogy
 to explain what a device token is.
 
-### 3. Check for Feedback
+### Checking for Feedback
 
 TODO
 

data/lib/apn_client/delivery.rb

@@ -4,7 +4,7 @@ require 'apn_client/connection'
 
 module ApnClient
   class Delivery
-    attr_accessor :messages, :callbacks, :consecutive_failure_limit, :exception_limit, :sleep_on_exception,
+    attr_accessor :messages, :callbacks, :consecutive_failure_limit, :exception_limit, :sleep_on_exception, :connection_config,
       :exception_count, :success_count, :failure_count, :consecutive_failure_count,
       :started_at, :finished_at
 
@@ -44,12 +44,15 @@ module ApnClient
     private
 
     def initialize_options(options)
-      NamedArgs.assert_valid!(options, :optional => [:callbacks, :consecutive_failure_limit, :exception_limit, :sleep_on_exception])
+      NamedArgs.assert_valid!(options,
+        :optional => [:callbacks, :consecutive_failure_limit, :exception_limit, :sleep_on_exception],
+        :required => [:connection])
       NamedArgs.assert_valid!(options[:callbacks], :optional => [:on_write, :on_error, :on_nil_select, :on_read_exception, :on_exception, :on_failure])
       self.callbacks = options[:callbacks]
       self.consecutive_failure_limit = options[:consecutive_failure_limit] || 10
       self.exception_limit = options[:exception_limit] || 3
-      self.sleep_on_exception = options[:sleep_on_exception] || 1      
+      self.sleep_on_exception = options[:sleep_on_exception] || 1
+      self.connection_config = options[:connection]
     end
     
     def current_message
@@ -75,7 +78,7 @@ module ApnClient
     end
 
     def connection
-      @connection ||= Connection.new(self.class.connection_config)
+      @connection ||= Connection.new(connection_config)
     end
 
     def close_connection

data/lib/apn_client/version.rb

@@ -1,3 +1,3 @@
 module ApnClient
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/delivery_spec.rb

@@ -18,7 +18,7 @@ describe ApnClient::Delivery do
 
   describe "#initialize" do
     it "initializes counts and other attributes" do
-      delivery = create_delivery([@message1, @message2])
+      delivery = create_delivery([@message1, @message2], :connection => {})
     end
   end
 
@@ -31,7 +31,7 @@ describe ApnClient::Delivery do
           :on_write => lambda { |d, m| written_messages << m },
           :on_nil_select => lambda { |d| nil_selects += 1 }
         }
-      delivery = create_delivery(messages.dup, :callbacks => callbacks)
+      delivery = create_delivery(messages.dup, :callbacks => callbacks, :connection => {})
 
       connection = mock('connection')
       connection.expects(:write).with(@message1)
@@ -60,7 +60,7 @@ describe ApnClient::Delivery do
           :on_failure => lambda { |d, m| failures << m },
           :on_read_exception => lambda { |d, e| read_exceptions << e }
         }
-      delivery = create_delivery(messages.dup, :callbacks => callbacks)
+      delivery = create_delivery(messages.dup, :callbacks => callbacks, :connection => {})
 
       connection = mock('connection')
       connection.expects(:write).with(@message1).times(3).raises(RuntimeError)
@@ -94,7 +94,7 @@ describe ApnClient::Delivery do
           :on_read_exception => lambda { |d, e| read_exceptions << e },
           :on_error => lambda { |d, message_id, error_code| errors << [message_id, error_code] }
         }
-      delivery = create_delivery(messages.dup, :callbacks => callbacks)
+      delivery = create_delivery(messages.dup, :callbacks => callbacks, :connection => {})
 
       connection = mock('connection')
       connection.expects(:write).with(@message1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apn_client
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-05 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70199261615240 !ruby/object:Gem::Requirement
+  requirement: &70265276321200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199261615240
+  version_requirements: *70265276321200
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70199261614820 !ruby/object:Gem::Requirement
+  requirement: &70265276320780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199261614820
+  version_requirements: *70265276320780
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70199261614400 !ruby/object:Gem::Requirement
+  requirement: &70265276320360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199261614400
+  version_requirements: *70265276320360
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70199261613980 !ruby/object:Gem::Requirement
+  requirement: &70265276319940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70199261613980
+  version_requirements: *70265276319940
 description: Uses the "enhanced format" Apple protocol and deals with errors and failures
   when broadcasting to many devices. Includes support for talking to the Apple Push
   Notification Feedback service for dealing with uninstalled apps.