houston 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5aecadd372ded4ba46d1ae9eca31fbcab168644
-  data.tar.gz: f39b14600dbfe3610cc3b6d6024b5cdee0941471
+  metadata.gz: 2779c81aef10465328535550a02a23fd203ffa76
+  data.tar.gz: 1bd1a54558740b30391811d0741a08954bb081c1
 SHA512:
-  metadata.gz: 22539e7ac680df2138dc00a1e1688dbeb1e7c7c0973687f6c1bad64b1e64676cf7b8ecf88e3b209fcc49f743b7acc778c23d5a8e470d72d877815d86e7a55c3a
-  data.tar.gz: f95928800e51dda1313e1df4aeec8da7a1b0fb8543e6d124e7ff162dd01f7dfbd0307ede39ea56b6eff4c3ae2c2677dab98e891cbd52d00517a632506ece07cf
+  metadata.gz: d09615023d3d9fcb563eae42b3c716e77d21be746d3c491a1a6e5286fc5415cb212fbe27ac07a3e3269a7612e551b808d8b126079cd8838a6c59048e452b541e
+  data.tar.gz: accfa444cdd9b3adf3f998274350429b1823bdcef5dca4b20c6e214eff9ff656db327c65dfcac677dbe952ebf49d1d9d36aef5c712856e4593b1c744302c645c

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    houston (0.2.4)
+    houston (0.3.0)
       commander (~> 4.1)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    commander (4.1.3)
+    commander (4.1.4)
       highline (~> 1.6.11)
     highline (1.6.19)
     json (1.8.0)

data/lib/houston.rb

@@ -1,5 +1,5 @@
 module Houston
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end
 
 require 'houston/client'

data/lib/houston/client.rb

@@ -6,7 +6,7 @@ module Houston
   APPLE_DEVELOPMENT_FEEDBACK_URI = "apn://feedback.sandbox.push.apple.com:2196"
 
   class Client
-    attr_accessor :gateway_uri, :feedback_uri, :certificate, :passphrase
+    attr_accessor :gateway_uri, :feedback_uri, :certificate, :passphrase, :timeout
 
     class << self
       def development
@@ -29,19 +29,51 @@ module Houston
       @feedback_uri = ENV['APN_FEEDBACK_URI']
       @certificate = ENV['APN_CERTIFICATE']
       @passphrase = ENV['APN_CERTIFICATE_PASSPHRASE']
+      @timeout = ENV['APN_TIMEOUT'] || 0.5
     end
 
     def push(*notifications)
       return if notifications.empty?
 
+      notifications.flatten!
+      error = nil
+
       Connection.open(@gateway_uri, @certificate, @passphrase) do |connection|
-        notifications.flatten.each do |notification|
+        ssl = connection.ssl
+
+        notifications.each_with_index do |notification, index|
           next unless notification.kind_of?(Notification)
           next if notification.sent?
 
+          notification.id = index
+
           connection.write(notification.message)
           notification.mark_as_sent!
+
+          break if notifications.count == 1 || notification == notifications.last
+
+          read_socket, write_socket = IO.select([ssl], [ssl], [ssl], nil)
+          if (read_socket && read_socket[0])
+            error = connection.read(6)
+            break
+          end
         end
+
+        return if notifications.count == 1
+
+        unless error
+          read_socket, write_socket = IO.select([ssl], nil, [ssl], timeout)
+          if (read_socket && read_socket[0])
+            error = connection.read(6)
+          end
+        end
+      end
+
+      if error
+        command, status, index = error.unpack("cci")
+        notifications.slice!(0..index)
+        notifications.each(&:mark_as_unsent!)
+        push(*notifications)
       end
     end
 

data/lib/houston/notification.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Houston
   class Notification
-    attr_accessor :token, :alert, :badge, :sound, :content_available, :custom_data
+    attr_accessor :token, :alert, :badge, :sound, :content_available, :custom_data, :id, :expiry
     attr_reader :sent_at
 
     alias :device :token
@@ -13,6 +13,8 @@ module Houston
       @alert = options.delete(:alert)
       @badge = options.delete(:badge)
       @sound = options.delete(:sound)
+      @expiry = options.delete(:expiry)
+      @id = options.delete(:id)
       @content_available = options.delete(:content_available)
 
       @custom_data = options
@@ -31,15 +33,21 @@ module Houston
 
     def message
       json = payload.to_json
-      hex_token = [@token.gsub(/[<\s>]/, '')].pack('H*')
+      device_token = [@token.gsub(/[<\s>]/, '')].pack('H*')
+      @expiry ||= Time.now + 86400
+      @id ||= 0
 
-      [0, 0, 32, hex_token, 0, json.bytes.count, json].pack('ccca*cca*')
+      [1, @id, @expiry.to_i, 0, 32, device_token, 0, json.bytes.count, json].pack('ciicca*cca*')
     end
 
     def mark_as_sent!
       @sent_at = Time.now
     end
 
+    def mark_as_unsent!
+      @sent_at = nil
+    end
+
     def sent?
       !!@sent_at
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -28,14 +28,14 @@ dependencies:
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -77,6 +77,7 @@ files:
 - ./apple_push_notification_production.pem
 - ./Gemfile
 - ./Gemfile.lock
+- ./houston-0.2.4.gem
 - ./houston.gemspec
 - ./lib/houston/client.rb
 - ./lib/houston/connection.rb
@@ -96,12 +97,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []