pushr-apns 1.0.0.pre.1 → 1.0.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc63a9d097c133a4caf7e2fe309d18c1d344440f
-  data.tar.gz: 4da07aeccda83b5c40ee1c0833ad54a25ba6af74
+  metadata.gz: 5181efd03d6487fde7a093fa325893e2ea32a540
+  data.tar.gz: 6de48a3c06fa85bc2528929b68cf8da9edb53a13
 SHA512:
-  metadata.gz: 9d21d622874f347b12241dc570c4f48506cd34570e4d8ccf68ee41e413f5a739fc865a07f47a7be1e389906a9f2112de3910078641aca96a212f3380f9980f83
-  data.tar.gz: 743a1c257e31d7ec9236ce437f77bed12a17a87a6800728c0590032119298f125cd09c9d91554c53630c1f6a5073437a9d6b0c65ef37fab5f4386e3a6b465bd3
+  metadata.gz: 936533c37781f04415a8e4f63e49e79f9aea36f16db3b848df645b29681342e154190145bd79677bd2bee359df817069919da853c889d53a01f79c4eb9caffd8
+  data.tar.gz: 55296d2a67c8cacd82a38f9841231a73bb5bb06e243b667235b2e81ea935bf55312c7f6029943403295073e840bfb645871dc8af461ea060035f5931bf226ffb

data/lib/pushr/configuration_apns.rb

@@ -4,7 +4,7 @@ module Pushr
                   :sandbox, :feedback_poll, :skip_check_for_error
     validates :certificate, presence: true
     validates :sandbox, inclusion: { in: [true, false] }
-    validates :feedback_poll, presence: true
+    validates :feedback_poll, numericality: true, presence: true
     validates :skip_check_for_error, inclusion: { in: [true, false] }, allow_blank: true
 
     def name

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

@@ -22,7 +22,7 @@ module Pushr
 
         def stop
           @stop = true
-          @interruptible_sleep.interrupt_sleep
+          @interruptible_sleep.interrupt
           @thread.join if @thread
         end
 

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

@@ -2,44 +2,16 @@ module Pushr
   module Daemon
     module ApnsSupport
       class InterruptibleSleep
-
-        def initialize
-          @sleep_reader, @wake_writer = IO.pipe
-        end
-
-        # wait for the given timeout in seconds, or data was written to the pipe.
-        # @return [boolean] true if the sleep was interrupted, or false
-        def sleep(timeout)
-          read_ports = [@sleep_reader]
-          rs, = IO.select(read_ports, nil, nil, timeout) rescue nil
-
-          # consume all data on the readable io's so that our next call will wait for more data
-          perform_io(rs, @sleep_reader, :read_nonblock)
-
-          !rs.nil? && rs.any?
+        def sleep(seconds)
+          @_sleep_check, @_sleep_interrupt = IO.pipe
+          IO.select([@_sleep_check], nil, nil, seconds)
+          @_sleep_check.close rescue IOError
+          @_sleep_interrupt.close rescue IOError
         end
 
-        # writing to the pipe will wake the sleeping thread
-        def interrupt_sleep
-          @wake_writer.write('.')
-        end
-
-        def close
-          @sleep_reader.close rescue nil
-          @wake_writer.close rescue nil
-        end
-
-        private
-
-        def perform_io(selected, io, meth)
-          if selected && selected.include?(io)
-            while true
-              begin
-                io.__send__(meth, 1)
-              rescue Errno::EAGAIN, IO::WaitReadable
-                break
-              end
-            end
+        def interrupt
+          if @_sleep_interrupt
+            @_sleep_interrupt.close rescue IOError
           end
         end
       end

data/lib/pushr/message_apns.rb

@@ -2,11 +2,13 @@ module Pushr
   class MessageApns < Pushr::Message
     POSTFIX = 'apns'
 
-    attr_accessor :type, :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device
+    attr_accessor :type, :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority
 
     validates :badge, numericality: true, allow_nil: true
     validates :expiry, numericality: true, presence: true
     validates :device, format: { with: /\A[a-z0-9]{64}\z/ }
+    validates :priority, inclusion: { in: [5, 10] }
+    validates :content_available, inclusion: { in: [1] }, allow_nil: true
     validate :max_payload_size
 
     def alert=(alert)
@@ -24,10 +26,18 @@ module Pushr
       return string_or_json
     end
 
-    # This method conforms to the enhanced binary format.
-    # http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW4
+    def id
+      @id ||= OpenSSL::Random.random_bytes(4)
+    end
+
     def to_message
-      [1, 0, expiry, 0, 32, device, payload_size, payload].pack('cNNccH*na*')
+      data = ''
+      data << [1, [device].pack('H*').bytesize, [device].pack('H*')].pack('CnA*')
+      data << [2, payload.bytesize, payload].pack('CnA*')
+      data << [3, id.bytesize, id].pack('CnA*')
+      data << [4, 4, expiry].pack('CnN')
+      data << [5, 1, priority].pack('CnC')
+      ([2, data.bytesize].pack('CN') + data)
     end
 
     def payload
@@ -40,7 +50,8 @@ module Pushr
 
     def to_json
       hsh = { type: self.class.to_s, app: app, device: device, alert: alert, badge: badge,
-              sound: sound, expiry: expiry, attributes_for_device: attributes_for_device }
+              sound: sound, expiry: expiry, attributes_for_device: attributes_for_device,
+              content_available: content_available, priority: priority }
       MultiJson.dump(hsh)
     end
 
@@ -52,6 +63,7 @@ module Pushr
       json['aps']['alert'] = alert if alert
       json['aps']['badge'] = badge if badge
       json['aps']['sound'] = sound if sound
+      json['aps']['content-available'] = content_available if content_available
       attributes_for_device.each { |k, v| json[k.to_s] = v.to_s } if attributes_for_device
       json
     end

data/lib/pushr-apns/version.rb

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

data/spec/lib/pushr/apns_support/connection_apns_spec.rb

@@ -30,8 +30,8 @@ describe Pushr::Daemon::ApnsSupport::ConnectionApns do
     Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: certificate)
   end
   let(:message) do
-    hsh = { app: 'app_name', device: 'a' * 64,  alert: 'message',
-            badge: 1, sound: '1.aiff', expiry: 24 * 60 * 60, attributes_for_device: { key: 'test' } }
+    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
   let(:connection) { Pushr::Daemon::ApnsSupport::ConnectionApns.new(config, 1) }

data/spec/lib/pushr/apns_support/interruptible_sleep_spec.rb

@@ -11,7 +11,8 @@ describe Pushr::Daemon::ApnsSupport::InterruptibleSleep do
 
   it 'creates a new pipe' do
     expect(IO).to receive(:pipe).and_return([rd, wr])
-    subject
+    allow(IO).to receive(:select).with([rd], nil, nil, 1)
+    subject.sleep(1)
   end
 
   it 'selects on the reader' do
@@ -22,17 +23,9 @@ describe Pushr::Daemon::ApnsSupport::InterruptibleSleep do
 
   it 'closes the writer' do
     allow(IO).to receive(:pipe).and_return([rd, wr])
-    expect(rd).to receive(:close)
+    allow(IO).to receive(:select).with([rd], nil, nil, 1)
     expect(wr).to receive(:close)
-    subject.close
-  end
-
-  it 'returns false when timeout occurs' do
-    expect(subject.sleep(0.01)).to eql false
-  end
-
-  it 'returns true when sleep does not timeout' do
-    subject.interrupt_sleep
-    expect(subject.sleep(0.01)).to eql true
+    subject.sleep(1)
+    subject.interrupt
   end
 end

data/spec/lib/pushr/message_apns_spec.rb

@@ -17,8 +17,8 @@ describe Pushr::MessageApns do
 
   describe 'save' do
     let(:message) do
-      hsh = { app: 'app_name', device: 'a' * 64,  alert: 'message',
-              badge: 1, sound: '1.aiff', expiry: 24 * 60 * 60, attributes_for_device: { key: 'test' } }
+      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,7 +32,5 @@ describe Pushr::MessageApns do
     it 'should respond to to_message' do
       expect(message.to_message).to be_kind_of(String)
     end
-
-    # TODO: add more tests
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushr-apns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0.pre.2
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-09 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -195,7 +195,8 @@ files:
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 homepage: https://github.com/tompesman/pushr-apns
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -205,7 +206,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"