grocer 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d758bbd299d221fe50d6a3b9d736dce0ae5016fb
-  data.tar.gz: f29ab31ea4fd92da51b624c84172578354e96246
+  metadata.gz: c6555a705340dbf836a1e108191917cb6e070cd4
+  data.tar.gz: ff071fb2ba59d97b416843adfd3242482628cb0a
 SHA512:
-  metadata.gz: 8fea57524b210a9c547f6efcb17f775210cc591e1d04a904828fa9ac4d388aa0d4b31bc2a74f8b025b9d48f29618ec59f6b0deb5ee3ee2a789d1b4e47c68dece
-  data.tar.gz: 642f3a3612148d4a721f4bcc554aa9168e89eb0adb5ffbd4a6b9fc35e14187c1143306577a49b223e642caa6be9d1833bbc1bfd355463d97dbc06cbf22ca06ee
+  metadata.gz: 18b17445045304ce0dca3673e8f56188fea6c94df2870a6c56dce035dc79af6c8c6dab48900d3aac37b6a5e687dd5e7486dc6285f4c90b3274ba6292ba90f4c7
+  data.tar.gz: 99874e8769c23afd6a8f5401fae5f276cc6f17b1b65e920d2ed3cfbbbe60bc5ce3a7aeb451de1d08a5cdf97cec368217cd861ed6c309e325fbdc572509cf6619

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.4.1
+
+* Fix `Grocer::NotificationReader`, ensuring it sanitizes incoming `aps`
+  payload keys before building a new `Grocer::Notification`.
+
 ## 0.4.0
 
 * Add support for `content-available` for background fetches (iOS 7) for all

data/lib/grocer/notification_reader.rb

@@ -30,10 +30,23 @@ module Grocer
       payload_length = @io.read(2).unpack("n").first
       payload_hash = JSON.parse(@io.read(payload_length), symbolize_names: true)
 
-      payload.merge!(payload_hash.delete(:aps) || { })
+      aps = sanitize_keys(payload_hash.delete(:aps))
+      payload.merge!(aps)
+
       payload[:custom] = payload_hash
 
       Grocer::Notification.new(payload)
     end
+
+    def sanitize_keys(hash)
+      hash ||= {}
+
+      clean_hash = hash.map { |k, v|
+        new_key = k.to_s.gsub(/-/i, '_').to_sym
+        [new_key, v]
+      }
+
+      Hash[clean_hash]
+    end
   end
 end

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/grocer/notification_reader_spec.rb

@@ -62,5 +62,13 @@ describe Grocer::NotificationReader do
       notification = subject.first
       expect(notification.custom).to eq({ foo: "bar" })
     end
+
+    it "reads content-available" do
+      io.write(Grocer::Notification.new(alert: "Foo", content_available: true).to_bytes)
+      io.rewind
+
+      notification = subject.first
+      expect(notification.content_available).to be_true
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andy Lindeman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec