pushr-apns 1.0.0.pre.3 → 1.0.0.pre.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efc2bbab50485a9c869eedbe32b47a5493780034
-  data.tar.gz: 5f287d84ca34d2ccaf2c06e234e6955d9d8845d2
+  metadata.gz: 003fa0a9aa2c107746eb4affaa5a22ff13c39914
+  data.tar.gz: 20aa0e25b3561f31d0fe2fe4bcc0f13b76beaf4e
 SHA512:
-  metadata.gz: f2a3c1e7ae567fe58e1d6941ba81f069ac0d56d2f9c41af18266536b478a35b40fc02ad15a77534aef7fea6aad079807ff272c4b6523d1e09c7c7e30648f05a8
-  data.tar.gz: 71d2da4ef4ce5663649523fd0efe35bf22dff0247beef7e30b4ea4f2d189b8a55d16ef0009f4d572d526d3eaacc8172a629090a7daf60ee82f9520c3458608af
+  metadata.gz: 5d6a328bb38292445943e19b7fbd9d8ffa7eec962b16d4534afe26c3b930e2d361ec6dc9a96cdeb2587a094e7442db71245f168460acee8bcf8d607a19868fb0
+  data.tar.gz: 0712b0857645b13c3be749bbf0b6f6a89eadcac3c8292efab28512badafe86309027bd72ec3d589b016f8f9ef841008f1afabdee13dd2f71e95474cd0d69de5a

data/lib/pushr-apns/version.rb

@@ -1,3 +1,3 @@
 module PushrApns
-  VERSION = '1.0.0.pre.3'
+  VERSION = '1.0.0.pre.4'
 end

data/lib/pushr/daemon/apns_support/connection_apns.rb

@@ -97,8 +97,6 @@ module Pushr
             if tuple = read(ERROR_TUPLE_BYTES)
               _, code, notification_id = tuple.unpack('ccN')
 
-              # TODO: if error 8, create feedback object to remove
-              # Pushr::FeedbackApns.new(app: notification.app, failed_at: Time.now, device: notification.device, follow_up: 'delete').save
               description = APN_ERRORS[code.to_i] || 'Unknown error. Possible push bug?'
               error = Pushr::Daemon::DeliveryError.new(code, notification_id, description, 'APNS')
             else

data/lib/pushr/message_apns.rb

@@ -10,6 +10,7 @@ module Pushr
     validates :priority, inclusion: { in: [5, 10] }
     validates :content_available, inclusion: { in: [1] }, allow_nil: true
     validate :max_payload_size
+    validate :priority_with_content_available
 
     def alert=(alert)
       if alert.is_a?(Hash)
@@ -73,5 +74,11 @@ module Pushr
         errors.add(:payload, 'APN notification cannot be larger than 256 bytes. Try condensing your alert and device attributes.')
       end
     end
+
+    def priority_with_content_available
+      if content_available == 1 && priority != 5 && !(alert || badge || sound)
+        errors.add(:priority, 'Priority should be 5 if content_available = 1 and no alert/badge/sound')
+      end
+    end
   end
 end

data/spec/lib/pushr/message_apns_spec.rb

@@ -17,7 +17,7 @@ describe Pushr::MessageApns do
 
   describe 'save' do
     let(:message) do
-      hsh = { app: 'app_name', device: 'a' * 64,  alert: 'message', badge: 1, sound: '1.aiff',
+      hsh = { app: 'app_name', device: 'a' * 64, alert: 'message', badge: 1, sound: '1.aiff',
               expiry: 24 * 60 * 60, attributes_for_device: { key: 'test' }, priority: 10 }
       Pushr::MessageApns.new(hsh)
     end
@@ -32,5 +32,49 @@ describe Pushr::MessageApns do
     it 'should respond to to_message' do
       expect(message.to_message).to be_kind_of(String)
     end
+
+    context 'content-available: 1' do
+      context 'with no alert/badge/sound' do
+        let(:message) do
+          hsh = { app: 'app_name', device: 'a' * 64, expiry: 24 * 60 * 60, priority: priority, content_available: 1 }
+          Pushr::MessageApns.new(hsh)
+        end
+
+        context 'with priority 5' do
+          let(:priority) { 5 }
+          it 'should have priority 5' do
+            expect(message.save).to eql true
+          end
+        end
+
+        context 'with priority 10' do
+          let(:priority) { 10 }
+          it 'should be invalid if priority 10' do
+            expect(message.save).to eql false
+          end
+        end
+      end
+
+      context 'with alert/badge/sound' do
+        let(:message) do
+          hsh = { app: 'app_name', alert: 'test', device: 'a' * 64, expiry: 24 * 60 * 60, priority: priority, content_available: 1 }
+          Pushr::MessageApns.new(hsh)
+        end
+
+        context 'with priority 5' do
+          let(:priority) { 5 }
+          it 'should have priority 5' do
+            expect(message.save).to eql true
+          end
+        end
+
+        context 'with priority 10' do
+          let(:priority) { 10 }
+          it 'should be valid if priority 10' do
+            expect(message.save).to eql true
+          end
+        end
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushr-apns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.3
+  version: 1.0.0.pre.4
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-27 00:00:00.000000000 Z
+date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json