mercurius 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c407384556945caff8534e28bb17bc33eeb1e804
-  data.tar.gz: fb500925edc12008a2cf11653699083f37995d18
+  metadata.gz: 68382188ef199ed571c96140d38fbec9c6e83981
+  data.tar.gz: 9642812648df51e4312892f026ef67475a910e06
 SHA512:
-  metadata.gz: 060ef7919702f1ca15acbb7f501fcaee491da68f5d5a416ecc49e57c84eef62c07abeff7afebacd9d1479ed56e74d270261789622b7cc30ec9f6d36c4c045153
-  data.tar.gz: dd66a90ef1b5a22689bebf352700b4303bbe24993c24119df9b3782af55f3a0acfba3d23e3d5832054237159fd854f2928a9e6b636b019c2e32df4d9d4b7c91b
+  metadata.gz: 091b2149bae4a550f06bfff6192fc6e349c03d15e3029b659f76579c0ad8116fe62808221ee21a25c48ce7441272e2aee79da7d5e2b84533ac740417a50622bd
+  data.tar.gz: e9c41c7b95fc140548ab2cf28176f2db9fb6b07f9f343f5067523cf2785c966dcfa433331a655416be722e4b3fa1c788c925a58a35b0c113a0635248e372a70e

data/lib/mercurius/apns/notification.rb

@@ -7,6 +7,8 @@ module APNS
     attr_accessor :alert, :badge, :sound, :other, :content_available
     attr_reader :attributes
 
+    validate :payload_size_under_limit
+
     def initialize(attributes = {})
       @attributes = attributes
       super
@@ -18,31 +20,37 @@ module APNS
         'badge' => badge,
         'sound' => sound,
         'other' => other,
-        'content-available' => content_available,
+        'content-available' => content_available
       }.compact
     end
 
     def pack(device_token)
-      [0, 0, 32, package_device_token(device_token), 0, packaged_message.bytesize, packaged_message].pack("ccca*cca*")
-    end
-
-    def ==(that)
-      attributes == that.attributes
+      data = [
+        package_device_token(device_token),
+        packaged_payload
+      ].compact.join
+      [2, data.bytes.count, data].pack 'cNa*'
     end
 
-    def valid?
-      packaged_message.bytesize <= MAX_PAYLOAD_BYTES
+    def ==(other)
+      attributes == other.attributes
     end
 
     private
       def package_device_token(device_token)
-        [device_token.gsub(/[\s|<|>]/,'')].pack('H*')
+        [1, 32, device_token.gsub(/[<\s>]/, '')].pack('cnH64')
+      end
+
+      def packaged_payload
+        [2, payload_json.bytes.count, payload_json].pack('cna*')
+      end
+
+      def payload_json
+        payload.to_json
       end
 
-      def packaged_message
-        { aps: payload }.to_json.gsub(/\\u([\da-fA-F]{4})/) do |m|
-          [$1].pack("H*").unpack("n*").pack("U*")
-        end
+      def payload_size_under_limit
+        payload_json.bytesize <= MAX_PAYLOAD_BYTES
       end
   end
 end

data/lib/mercurius/version.rb

@@ -1,3 +1,3 @@
 module Mercurius
-  VERSION = '0.1.9'
+  VERSION = '0.2.0'
 end

data/spec/lib/apns_notification_spec.rb

@@ -1,4 +1,20 @@
 describe APNS::Notification do
+  describe 'validations' do
+    it 'is invalid if the payload JSON is too big' do
+      expect(subject).to receive(:payload) { 'X' * (APNS::Notification::MAX_PAYLOAD_BYTES + 1) }
+      expect(subject).to be_valid
+    end
+
+    it 'is valid if the payload JSON is not too big' do
+      expect(subject).to receive(:payload) { 'X' * (APNS::Notification::MAX_PAYLOAD_BYTES - 1) }
+      expect(subject).to be_valid
+    end
+
+    it 'is valid when the payload is just right' do
+      expect(subject).to receive(:payload) { 'X' * (APNS::Notification::MAX_PAYLOAD_BYTES) }
+      expect(subject).to be_valid
+    end
+  end
 
   describe '#==' do
     it 'doesnt care about object equality' do
@@ -16,5 +32,4 @@ describe APNS::Notification do
       end
     end
   end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mercurius
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - John Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-10 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json