apple_shove 1.1.4 → 2.0.0

data/README.md

@@ -60,12 +60,18 @@ Sending a notification request looks like this:
     token    = '[device token string]'
     payload  = { mdm: '[push magic string]' } # this can also be an app notification
 
-    AppleShove.notify(apns_p12, token, payload)
+    AppleShove.notify p12:             apns_p12,
+                      device_token:    token,
+                      payload:         payload,
+                      expiration_date: Time.now + 60*60, # optional expiration timestamp. defaults to one year in the future.
+                      priority:        5                 # optional. defaults to 10.
 
 Need it to be a sandbox notification?
 
-    sandbox = true
-    AppleShove.notify(apns_p12, token, payload, sandbox)
+    AppleShove.notify p12:             apns_p12,
+                      device_token:    token,
+                      payload:         payload,
+                      sandbox:         true
 
 ### Checking the Feedback Service
 
@@ -73,6 +79,10 @@ We also have a feedback mechanism in place:
 
     tokens_array = AppleShove.feedback_tokens(apns_p12)
 
+    # or, for the sandboxed feedback service:
+
+    tokens_array = AppleShove.feedback_tokens(apns_p12, true)
+
 ### Running the Service
 
 	# bundle exec rake -T

data/lib/apple_shove/apns/error_response_packet.rb

@@ -0,0 +1,32 @@
+module AppleShove
+  module APNS
+    class ErrorResponsePacket
+
+      attr_reader :status, :identifier
+
+      STATUS_MESSAGES = { 0   => 'No errors encountered',
+                          1   => 'Processing error',
+                          2   => 'Missing device token',
+                          3   => 'Missing topic',
+                          4   => 'Missing payload',
+                          5   => 'Invalid token size',
+                          6   => 'Invalid topic size',
+                          7   => 'Invalid payload size',
+                          8   => 'Invalid token',
+                          10  => 'Shotdown',
+                          255 => 'None (unknown)' }
+
+      def initialize(binary_response)
+        response = binary_response.unpack('CCA4')
+
+        @status     = response[1]
+        @identifier = response[2]
+      end
+
+      def status_message
+        STATUS_MESSAGES[@status]
+      end
+
+    end
+  end
+end

data/lib/apple_shove/apple_shove.rb

@@ -1,10 +1,7 @@
 module AppleShove
 
-  def self.notify(p12, device_token, payload, sandbox = false)
-    notification  = Notification.new  p12:          p12,
-                                      device_token: device_token,
-                                      payload:      payload,
-                                      sandbox:      sandbox
+  def self.notify(params = {})
+    notification = Notification.new params
 
     queue = NotificationQueue.new(CONFIG[:redis_key])
     queue.add(notification)

data/lib/apple_shove/notification.rb

@@ -1,10 +1,18 @@
 module AppleShove
   class Notification
 
-    attr_accessor :p12, :sandbox, :device_token, :payload
+    attr_accessor :p12, :sandbox, :device_token, :payload, :expiration_date, :priority
     
     def initialize(attributes = {})
-        attributes.each { |k, v| self.send("#{k}=", v) }
+      [:p12, :device_token, :payload].each do |req_attr|
+        raise "#{req_attr} must be specified" unless attributes.keys.collect { |k| k.to_s }.include? req_attr.to_s
+      end
+
+      attributes.each { |k, v| self.send("#{k}=", v) }
+    
+      @sandbox          = false if @sandbox.nil?
+      @expiration_date  ||= Time.now + 60*60*24*365
+      @priority         ||= 10
     end
     
     def self.parse(json)
@@ -20,8 +28,14 @@ module AppleShove
     # Apple APNS format
     def binary_message
       payload_json  = @payload.to_json
-      message       = [0, 32, @device_token, payload_json.length, payload_json]
-      message.pack('CnH*na*')
+
+      frame = [ [ 1, 32,                  @device_token         ].pack('CnH64'),
+                [ 2, payload_json.length, payload_json          ].pack('Cna*'),
+                [ 3, 4,                   ''                    ].pack('CnA4'),
+                [ 4, 4,                   @expiration_date.to_i ].pack('CnN'),
+                [ 5, 1,                   @priority             ].pack('CnC')     ].join
+
+      [ 2, frame.length, frame ].pack('CNa*')
     end
     
     private

data/lib/apple_shove/version.rb

@@ -1,3 +1,3 @@
 module AppleShove
-  VERSION = "1.1.4"
+  VERSION = "2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apple_shove
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-17 00:00:00.000000000 Z
+date: 2013-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,6 +123,7 @@ files:
 - apple_shove.gemspec
 - lib/apple_shove.rb
 - lib/apple_shove/apns/connection.rb
+- lib/apple_shove/apns/error_response_packet.rb
 - lib/apple_shove/apns/feedback_connection.rb
 - lib/apple_shove/apns/notify_connection.rb
 - lib/apple_shove/apple_shove.rb
@@ -156,7 +157,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -381201822391020549
+      hash: 144914022133974576
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -381201822391020549
+      hash: 144914022133974576
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24