apns_dispatch 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0d071e26d52be96de09f52212d5588701cda108
-  data.tar.gz: 5505c786b788f7850abfd83f15ac0a4c9eb22ce4
+  metadata.gz: 8b358e96c901dfd0757116b623f643fa2a574a9e
+  data.tar.gz: 8f82788c67d2506878938736872e1932d216c9ef
 SHA512:
-  metadata.gz: f9f570296f34712fc5a6d79a383520c4830f56252ede111aff82d14d0b6fb5fd8eb99e335c90c07e35df2e497501b7c9bbb9abef0b1917510df0d6a01937895f
-  data.tar.gz: 6e975388414627716ea0f2542a20e9240c67afda2fad4f127090abfb24bc1cf0bf940d6efdcfb785b6e1254cbb2cbccaf5f554b6e20c63a1a05de40b68869255
+  metadata.gz: 116df1b07cb7a127f40ca8753691e4cf62dd9b27fccf4ef95baa3e93bb06c37d7d99b85c709ee52bf7d20c88da42e6f44b94ec37ad3a99e083aa55bae58dd1c9
+  data.tar.gz: 8623b2e40f3ec19a4339447d3c4be20ede2dec83f46f703952f33878079c4cb147d192c4c9e4b4bf899a965586057a4832464f7fff64d76412ba203503315a76

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    apns_dispatch (1.0.1)
+    apns_dispatch (1.0.2)
       json (~> 1.8.1)
       retryable (~> 1.3.5)
 

data/lib/apns_dispatch/apn_notification.rb

@@ -23,13 +23,14 @@ module ApnsDispatch
       0
     end
 
+    def default_aps_message
+      { alert: @message, sound: 'default' }
+    end
+
     def message_information
-      {
-        aps: {
-          alert: @message,
-          sound: 'default'
-        }
-      }
+      @options.dup.tap do |message|
+        message[:aps] = default_aps_message.merge(message[:aps] || {})
+      end
     end
 
     def notification_packet
@@ -37,7 +38,7 @@ module ApnsDispatch
     end
 
     def payload
-      message_information.merge(@options).to_json
+      message_information.to_json
     end
   end
 end

data/lib/apns_dispatch/version.rb

@@ -1,3 +1,3 @@
 module ApnsDispatch
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/spec/apns_dispatch/apn_notification_spec.rb

@@ -4,11 +4,12 @@ describe ApnsDispatch::ApnNotification do
   before do
     token = '7307dea69c58e9625250aabb040594e1a031f574dba5d97549fbe211327aff4c'
     message = 'test message'
-    options = { order_id: 12345 }
+    options = { aps: { badge: 1 }, order_id: 1 }
     @connection = stub
     @apn_notificiation = ApnsDispatch::ApnNotification.new(@connection, token, message, options)
 
-    payload = { aps: { alert: message, sound: 'default'} }.merge(options).to_json
+    expected_message = { aps: { alert: message, sound: 'default', badge: 1}, order_id: 1}
+    payload = expected_message.to_json
     @packet = [0, 32, [token].pack('H*'), payload.bytesize, payload].pack('cna*na*')
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apns_dispatch
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Costa Walcott
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json