houston 2.2.0 → 2.2.1

data/lib/houston/client.rb

@@ -36,7 +36,6 @@ module Houston
       return if notifications.empty?
 
       notifications.flatten!
-      error = nil
 
       Connection.open(@gateway_uri, @certificate, @passphrase) do |connection|
         ssl = connection.ssl
@@ -51,32 +50,16 @@ module Houston
           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)
+            if error = connection.read(6)
+              command, status, index = error.unpack("ccN")
+              notification.apns_error_code = status
+              notification.mark_as_unsent!
+            end
           end
         end
       end
-
-      if error
-        command, status, index = error.unpack("ccN")
-        notifications[index].apns_error_code = status
-        notifications.slice!(0..index)
-        notifications.each(&:mark_as_unsent!)
-        push(*notifications)
-      end
     end
 
     def unregistered_devices

data/lib/houston/notification.rb

@@ -17,6 +17,14 @@ module Houston
         10 => "Shutdown",
         255 => "Unknown error"
       }
+
+      attr_reader :code
+
+      def initialize(code)
+        raise ArgumentError unless CODES.include?(code)
+        super(CODES[code])
+        @code = code
+      end
     end
 
     MAXIMUM_PAYLOAD_SIZE = 2048
@@ -81,7 +89,7 @@ module Houston
     end
 
     def error
-      APNSError.new(APNSError::CODES[@apns_error_code]) if @apns_error_code.nonzero?
+      APNSError.new(@apns_error_code) if @apns_error_code and @apns_error_code.nonzero?
     end
 
     private

data/lib/houston/version.rb

@@ -1,3 +1,3 @@
 module Houston
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

data/spec/notification_spec.rb

@@ -247,4 +247,31 @@ describe Houston::Notification do
       expect(items.find { |item| item[0] == 5 }).to be_nil
     end
   end
+
+  describe '#error' do
+    context 'a status code has been set' do
+      it 'returns an error object mapped to that status code' do
+        status_code = 1
+        notification = Houston::Notification.new(notification_options)
+        notification.apns_error_code = status_code
+        expect(notification.error.message).to eq(Houston::Notification::APNSError::CODES[status_code])
+      end
+    end
+
+    context 'a status code has been set to 0' do
+      it 'returns nil' do
+        status_code = 0
+        notification = Houston::Notification.new(notification_options)
+        notification.apns_error_code = status_code
+        expect(notification.error).to be_nil
+      end
+    end
+
+    context 'a status code has not been set' do
+      it 'returns nil' do
+        notification = Houston::Notification.new(notification_options)
+        expect(notification.error).to be_nil
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: houston
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Mattt Thompson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
@@ -155,6 +155,7 @@ files:
 - ./coverage/index.html
 - ./Gemfile
 - ./Gemfile.lock
+- ./houston-2.2.0.gem
 - ./houston.gemspec
 - ./lib/houston/client.rb
 - ./lib/houston/connection.rb