apns_simple 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 885ffeb9c1c47bc2dbdce4e9544583333805c6eb
-  data.tar.gz: 224b07b0dc020a6f6728713018f0c771f2ec5710
+  metadata.gz: c1df2a3e93672f23f6ba436092935d6c98a92216
+  data.tar.gz: b930413426fa2205811741e42c08d644e7b2c24d
 SHA512:
-  metadata.gz: 87420a1bcd041e9edb43b3ae76a89a5a328cb36f56f19326bdf0b1fa01e15229e5e4fe9261e34d2d3e795f4763c010b3162362d48ea73972087bd00eaad3eb8b
-  data.tar.gz: c96326ca6e2dac6a58a24bd583a2d6fab6b99922318382d32108350beadd6ffab934e5cfa72f4e5d6af305cb2216ca3e09fc818b2f1788ebebd8a99217c28786
+  metadata.gz: 910cc4063645c9bde49f41ea840e775299ded66d502c4f9deadc807307b68f2f21f362a703bd6119968de3c3aed20fe6d901c2c3de2bf915c772530ad52b58ec
+  data.tar.gz: b269f36995255422b1c1df4852b3da6044af36500b02c82a6996b45ac6e19b6c53d66273d2fdbc88421eab032b77200537835bae654c7e8b9ff350f1c18edf1d

data/lib/apns_simple/client.rb

@@ -46,29 +46,32 @@ module ApnsSimple
     end
 
     def push(notification)
-      sock = TCPSocket.new(host, port)
-      ssl = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
-      ssl.sync = true
-      ssl.connect
-      ssl.write(notification.payload)
+      unless notification.error
+        begin
+          sock = TCPSocket.new(host, port)
+          ssl = OpenSSL::SSL::SSLSocket.new(sock, ssl_context)
+          ssl.sync = true
+          ssl.connect
+          ssl.write(notification.payload)
 
-      if (ready = IO.select([ssl], [], [], TIMEOUT))
-        readable_ssl_socket = ready.first.first
-        if (error = readable_ssl_socket.read(ERROR_BYTES_COUNT))
-          command, code, _index = error.unpack('ccN')
-          notification.error = true
-          if command == COMMAND
-            notification.error_code = code
-            notification.error_message = "CODE: #{code}, DESCRIPTION: #{CODES[code]}"
-          else
-            notification.error_message = "Unknown command received from APNS server: #{command}"
+          if (ready = IO.select([ssl], [], [], TIMEOUT))
+            readable_ssl_socket = ready.first.first
+            if (error = readable_ssl_socket.read(ERROR_BYTES_COUNT))
+              command, code, _index = error.unpack('ccN')
+              notification.error = true
+              if command == COMMAND
+                notification.error_code = code
+                notification.error_message = "CODE: #{code}, DESCRIPTION: #{CODES[code]}"
+              else
+                notification.error_message = "Unknown command received from APNS server: #{command}"
+              end
+            end
           end
+        ensure
+          ssl.close if ssl
+          sock.close if sock
         end
       end
-
-    ensure
-      ssl.close if ssl
-      sock.close if sock
     end
 
     private

data/lib/apns_simple/notification.rb

@@ -3,29 +3,35 @@ require 'json'
 module ApnsSimple
   class Notification
 
-    attr_reader :token, :alert, :badge, :sound, :content_available, :custom_payload
+    PAYLOAD_MAX_BYTESIZE = 2048
+
+    attr_reader :payload
     attr_accessor :error, :error_message, :error_code
 
     def initialize(options, custom_payload = {})
-      @token = options.fetch(:token)
-      @alert = options[:alert]
-      @badge = options[:badge]
-      @sound = options[:sound] || 'default'
-      @content_available = options[:content_available]
-      @custom_payload = custom_payload
-    end
+      token = options.fetch(:token)
+      alert = options[:alert]
+      badge = options[:badge]
+      sound = options[:sound] || 'default'
+      content_available = options[:content_available]
+
+      payload_hash = { aps: {} }
+      payload_hash[:aps][:alert] = alert if alert
+      payload_hash[:aps][:badge] = badge if badge
+      payload_hash[:aps][:sound] = sound if sound
+      payload_hash[:aps]['content-available'] = 1 if content_available
+      payload_hash.merge! custom_payload
+
+      packed_token = [token.gsub(/[<\s>]/,'')].pack('H*')
+      packed_message = payload_hash.to_json.gsub(/\\u([\da-fA-F]{4})/) {|m| [$1].pack("H*").unpack("n*").pack("U*")}
+      payload_size = packed_message.bytesize
+
+      if payload_size > PAYLOAD_MAX_BYTESIZE
+        self.error = true
+        self.error_message = "Payload size is #{payload_size} bytes but maximum #{PAYLOAD_MAX_BYTESIZE} bytes allowed."
+      end
 
-    def payload
-      payload = { aps: {} }
-      payload[:aps][:alert] = alert if alert
-      payload[:aps][:badge] = badge if badge
-      payload[:aps][:sound] = sound if sound
-      payload[:aps]['content-available'] = 1 if content_available
-      payload.merge! custom_payload
-
-      packed_message = payload.to_json.gsub(/\\u([\da-fA-F]{4})/) {|m| [$1].pack("H*").unpack("n*").pack("U*")}
-      packed_token = [token.gsub(/[\s|<|>]/,'')].pack('H*')
-      [0, 0, 32, packed_token, 0, packed_message.bytesize, packed_message].pack("ccca*cca*")
+      self.payload = [0, 0, 32, packed_token, 0, payload_size, packed_message].pack("ccca*cca*")
     end
 
   end

data/lib/apns_simple/version.rb

@@ -1,3 +1,3 @@
 module ApnsSimple
-  VERSION = '1.1.1'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: apns_simple
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Andrey Voronkov