apns_simple 2.0.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 083a2f6f357cf191171c1fd269dcbe0ddc2a0234
-  data.tar.gz: 3ca55a10969b58b116b27639a1033ca1e0d7c8a8
+  metadata.gz: 8deda36c16dcb9ad3c41e424a1287ff60eb8a697
+  data.tar.gz: c97fb5afd36ac51258a296e92db15fe892f3ef95
 SHA512:
-  metadata.gz: 39468ed65f788b1aad13646a3f0b957902c6d8fadea4df97f31327af86b744b95e00879c1b9716b684d0683ddff4edd95a05f681eb04981bf970c3c2754186e5
-  data.tar.gz: a4311fcd01529137b516fd2007b36075afb17e1af1203a1031fcdafdcee0ee11aa805f2c1b1060a90a6c41c2f47ad13f28ad4fa8215c2c8d66e1a9f0c7631d8a
+  metadata.gz: 74e50f9fc9ec6318efba324e28cb91b516328afc705919fba338ccc53caf8bf87e9654ccf9e9fb9cbb8e13cc483412956646edced509ede5729ef465bb33dd54
+  data.tar.gz: 744fa284a241194ae723b5540088dfbdda41e385dd38fb23447141e1c6aee312e7a9b10aec47ff548234b9636264b242f0cf0bf495c35a01ce74eacfd7db0102

data/lib/apns_simple/notification.rb

@@ -22,17 +22,37 @@ module ApnsSimple
       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
+      token_item = pack_token_item(token)
+      payload_item = pack_payload_item(payload_hash)
+      frame = compose_frame(token_item, payload_item)
+      @payload = pack_frame(frame)
+    end
+
+    private
 
-      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."
+      def pack_frame(frame)
+        [2, frame.bytesize, frame].pack('cNa*')
       end
 
-      @payload = [0, 0, 32, packed_token, 0, payload_size, packed_message].pack("ccca*cca*")
-    end
+      def compose_frame(*args)
+        args.compact.join
+      end
+
+      def pack_token_item(token)
+        [1, 32, token.gsub(/[<\s>]/, '')].pack('cnH64')
+      end
+
+      def pack_payload_item(hash)
+        json = hash.to_json.gsub(/\\u([\da-fA-F]{4})/) { |m| [$1].pack('H*').unpack('n*').pack('U*') }
+        size = json.bytesize
+
+        if size > PAYLOAD_MAX_BYTESIZE
+          self.error = true
+          self.error_message = "Payload size is #{size} bytes but maximum #{PAYLOAD_MAX_BYTESIZE} bytes allowed."
+        end
+
+        [2, size, json].pack('cna*')
+      end
 
   end
 end

data/lib/apns_simple/version.rb

@@ -1,3 +1,3 @@
 module ApnsSimple
-  VERSION = '2.0.1'
+  VERSION = '3.0.0'
 end

metadata

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