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

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5181efd03d6487fde7a093fa325893e2ea32a540
-  data.tar.gz: 6de48a3c06fa85bc2528929b68cf8da9edb53a13
+  metadata.gz: efc2bbab50485a9c869eedbe32b47a5493780034
+  data.tar.gz: 5f287d84ca34d2ccaf2c06e234e6955d9d8845d2
 SHA512:
-  metadata.gz: 936533c37781f04415a8e4f63e49e79f9aea36f16db3b848df645b29681342e154190145bd79677bd2bee359df817069919da853c889d53a01f79c4eb9caffd8
-  data.tar.gz: 55296d2a67c8cacd82a38f9841231a73bb5bb06e243b667235b2e81ea935bf55312c7f6029943403295073e840bfb645871dc8af461ea060035f5931bf226ffb
+  metadata.gz: f2a3c1e7ae567fe58e1d6941ba81f069ac0d56d2f9c41af18266536b478a35b40fc02ad15a77534aef7fea6aad079807ff272c4b6523d1e09c7c7e30648f05a8
+  data.tar.gz: 71d2da4ef4ce5663649523fd0efe35bf22dff0247beef7e30b4ea4f2d189b8a55d16ef0009f4d572d526d3eaacc8172a629090a7daf60ee82f9520c3458608af

data/lib/pushr-apns/version.rb

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

data/lib/pushr/apns.rb

@@ -3,11 +3,13 @@ require 'pathname'
 require 'pushr-apns/version'
 require 'pushr/configuration'
 require 'pushr/configuration_apns'
+require 'pushr/configuration_apns_feedback'
 require 'pushr/message'
 require 'pushr/message_apns'
 require 'pushr/feedback'
 require 'pushr/feedback_apns'
 require 'pushr/daemon/apns'
+require 'pushr/daemon/apns_feedback'
 require 'pushr/daemon/apns_support/interruptible_sleep'
 require 'pushr/daemon/apns_support/disconnection_error'
 require 'pushr/daemon/apns_support/connection_apns'

data/lib/pushr/configuration_apns.rb

@@ -1,10 +1,9 @@
 module Pushr
   class ConfigurationApns < Pushr::Configuration
     attr_accessor :id, :type, :app, :enabled, :connections, :certificate, :certificate_password,
-                  :sandbox, :feedback_poll, :skip_check_for_error
+                  :sandbox, :skip_check_for_error
     validates :certificate, presence: true
     validates :sandbox, inclusion: { in: [true, false] }
-    validates :feedback_poll, numericality: true, presence: true
     validates :skip_check_for_error, inclusion: { in: [true, false] }, allow_blank: true
 
     def name
@@ -13,8 +12,7 @@ module Pushr
 
     def to_json
       hsh = { type: self.class.to_s, app: app, enabled: enabled, connections: connections, certificate: certificate,
-              certificate_password: certificate_password, sandbox: sandbox, feedback_poll: feedback_poll,
-              skip_check_for_error: skip_check_for_error }
+              certificate_password: certificate_password, sandbox: sandbox, skip_check_for_error: skip_check_for_error }
       MultiJson.dump(hsh)
     end
   end

data/lib/pushr/configuration_apns_feedback.rb

@@ -0,0 +1,15 @@
+module Pushr
+  class ConfigurationApnsFeedback < Pushr::Configuration
+    attr_accessor :id, :type, :app, :enabled, :connections, :feedback_poll
+    validates :feedback_poll, numericality: true, presence: true
+
+    def name
+      :apns_feedback
+    end
+
+    def to_json
+      hsh = { type: self.class.to_s, app: app, enabled: enabled, connections: connections, feedback_poll: feedback_poll }
+      MultiJson.dump(hsh)
+    end
+  end
+end

data/lib/pushr/daemon/apns.rb

@@ -1,29 +1,26 @@
 module Pushr
   module Daemon
     class Apns
-      attr_accessor :configuration
+      attr_accessor :configuration, :handlers
 
       def initialize(options)
-        self.configuration = options
-
-        @feedback_receiver = ApnsSupport::FeedbackReceiver.new(configuration)
-        start_feedback
-      end
-
-      def connectiontype
-        ApnsSupport::ConnectionApns
+        @configuration = options
+        @handlers = []
       end
 
-      def start_feedback
-        @feedback_receiver.start
-      end
+      def start
+        configuration.connections.times do |i|
+          connection = ApnsSupport::ConnectionApns.new(configuration, i + 1)
+          connection.connect
 
-      def stop_feedback
-        @feedback_receiver.stop
+          handler = MessageHandler.new("pushr:#{configuration.app}:#{configuration.name}", connection, configuration.app, i + 1)
+          handler.start
+          @handlers << handler
+        end
       end
 
       def stop
-        stop_feedback
+        @handlers.map(&:stop)
       end
     end
   end

data/lib/pushr/daemon/apns_feedback.rb

@@ -0,0 +1,24 @@
+module Pushr
+  module Daemon
+    class ApnsFeedback
+      attr_accessor :configuration, :handlers
+
+      def initialize(options)
+        @configuration = options
+        @handlers = []
+      end
+
+      def start
+        configuration.connections.times do |i|
+          connection = ApnsSupport::FeedbackReceiver.new(configuration, i + 1)
+          connection.start
+          @handlers << connection
+        end
+      end
+
+      def stop
+        @handlers.map(&:stop)
+      end
+    end
+  end
+end

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

@@ -39,6 +39,8 @@ module Pushr
         def connect
           @ssl_context = setup_ssl_context
           @tcp_socket, @ssl_socket = connect_socket
+        rescue
+          Pushr::Daemon.logger.error("#{@name}] Error connection to server, invalid certificate?")
         end
 
         def close
@@ -93,8 +95,10 @@ module Pushr
             error = nil
 
             if tuple = read(ERROR_TUPLE_BYTES)
-              cmd, code, notification_id = tuple.unpack('ccN')
+              _, 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/daemon/apns_support/feedback_receiver.rb

@@ -5,7 +5,7 @@ module Pushr
 
         FEEDBACK_TUPLE_BYTES = 38
 
-        def initialize(configuration)
+        def initialize(configuration, _)
           @configuration = configuration
           @interruptible_sleep = InterruptibleSleep.new
         end
@@ -14,7 +14,7 @@ module Pushr
           @thread = Thread.new do
             loop do
               break if @stop
-              check_for_feedback
+              check_every_configuration
               @interruptible_sleep.sleep @configuration.feedback_poll
             end
           end
@@ -26,15 +26,24 @@ module Pushr
           @thread.join if @thread
         end
 
-        def check_for_feedback
+        def check_every_configuration
+          Pushr::Configuration.all.each do |config|
+            if config.enabled == true && config.class == Pushr::ConfigurationApns
+              Pushr::Daemon.logger.info("[#{config.app}: Checking for feedback")
+              check_for_feedback(config)
+            end
+          end
+        end
+
+        def check_for_feedback(config)
           connection = nil
           begin
-            connection = ConnectionApns.new(@configuration)
+            connection = ConnectionApns.new(config)
             connection.connect
 
             while tuple = connection.read(FEEDBACK_TUPLE_BYTES)
               timestamp, device = parse_tuple(tuple)
-              create_feedback(connection, timestamp, device)
+              create_feedback(config, connection, timestamp, device)
             end
           rescue StandardError => e
             Pushr::Daemon.logger.error(e)
@@ -50,10 +59,10 @@ module Pushr
           [Time.at(failed_at).utc, device]
         end
 
-        def create_feedback(connection, failed_at, device)
+        def create_feedback(config, connection, failed_at, device)
           formatted_failed_at = failed_at.strftime('%Y-%m-%d %H:%M:%S UTC')
           Pushr::Daemon.logger.info("[#{connection.name}: Delivery failed at #{formatted_failed_at} for #{device}")
-          Pushr::FeedbackApns.new(app: @configuration.app, failed_at: failed_at, device: device, follow_up: 'delete').save
+          Pushr::FeedbackApns.new(app: config.app, failed_at: failed_at, device: device, follow_up: 'delete').save
         end
       end
     end

data/lib/pushr/message_apns.rb

@@ -2,7 +2,7 @@ module Pushr
   class MessageApns < Pushr::Message
     POSTFIX = 'apns'
 
-    attr_accessor :type, :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority
+    attr_accessor :type, :app, :device, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority
 
     validates :badge, numericality: true, allow_nil: true
     validates :expiry, numericality: true, presence: true

data/spec/lib/pushr/configuration_apns_spec.rb

@@ -18,7 +18,7 @@ describe Pushr::ConfigurationApns do
   describe 'create' do
     it 'should create a configuration' do
       config = Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: 'test', certificate_password: nil,
-                                            sandbox: true, feedback_poll: 100, skip_check_for_error: true)
+                                            sandbox: true, skip_check_for_error: true)
       expect(config.key).to eql('app_name:apns')
     end
   end
@@ -26,7 +26,7 @@ describe Pushr::ConfigurationApns do
   describe 'save' do
     let(:config) do
       Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: 'test', certificate_password: nil,
-                                   sandbox: true, feedback_poll: 100, skip_check_for_error: true)
+                                   sandbox: true, skip_check_for_error: true)
     end
     it 'should save a configuration' do
       config.save

data/spec/lib/pushr/{apns_support → daemon/apns_support}/connection_apns_spec.rb

@@ -25,7 +25,7 @@ describe Pushr::Daemon::ApnsSupport::ConnectionApns do
 
   let(:tcpsocket) { double('TCPSocket').as_null_object }
   let(:sslsocket) { double('SSLSocket').as_null_object }
-  let(:certificate) { File.read(File.join(File.dirname(__FILE__), '..', '..', '..', 'support', 'cert_without_password.pem')) }
+  let(:certificate) { File.read(File.join(File.dirname(__FILE__), '..', '..', '..', '..', 'support', 'cert_without_password.pem')) }
   let(:config) do
     Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: certificate)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushr-apns
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.2
+  version: 1.0.0.pre.3
 platform: ruby
 authors:
 - Tom Pesman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -174,7 +174,9 @@ files:
 - lib/pushr-apns/version.rb
 - lib/pushr/apns.rb
 - lib/pushr/configuration_apns.rb
+- lib/pushr/configuration_apns_feedback.rb
 - lib/pushr/daemon/apns.rb
+- lib/pushr/daemon/apns_feedback.rb
 - lib/pushr/daemon/apns_support/connection_apns.rb
 - lib/pushr/daemon/apns_support/disconnection_error.rb
 - lib/pushr/daemon/apns_support/feedback_receiver.rb
@@ -183,12 +185,12 @@ files:
 - lib/pushr/message_apns.rb
 - README.md
 - MIT-LICENSE
-- spec/lib/pushr/apns_spec.rb
-- spec/lib/pushr/apns_support/connection_apns_spec.rb
-- spec/lib/pushr/apns_support/disconnection_error_spec.rb
-- spec/lib/pushr/apns_support/feedback_receiver_spec.rb
-- spec/lib/pushr/apns_support/interruptible_sleep_spec.rb
 - spec/lib/pushr/configuration_apns_spec.rb
+- spec/lib/pushr/daemon/apns_spec.rb
+- spec/lib/pushr/daemon/apns_support/connection_apns_spec.rb
+- spec/lib/pushr/daemon/apns_support/disconnection_error_spec.rb
+- spec/lib/pushr/daemon/apns_support/feedback_receiver_spec.rb
+- spec/lib/pushr/daemon/apns_support/interruptible_sleep_spec.rb
 - spec/lib/pushr/feedback_apns_spec.rb
 - spec/lib/pushr/message_apns_spec.rb
 - spec/spec_helper.rb
@@ -219,12 +221,12 @@ signing_key:
 specification_version: 4
 summary: APNS (iOS/Apple) part of the modular push daemon.
 test_files:
-- spec/lib/pushr/apns_spec.rb
-- spec/lib/pushr/apns_support/connection_apns_spec.rb
-- spec/lib/pushr/apns_support/disconnection_error_spec.rb
-- spec/lib/pushr/apns_support/feedback_receiver_spec.rb
-- spec/lib/pushr/apns_support/interruptible_sleep_spec.rb
 - spec/lib/pushr/configuration_apns_spec.rb
+- spec/lib/pushr/daemon/apns_spec.rb
+- spec/lib/pushr/daemon/apns_support/connection_apns_spec.rb
+- spec/lib/pushr/daemon/apns_support/disconnection_error_spec.rb
+- spec/lib/pushr/daemon/apns_support/feedback_receiver_spec.rb
+- spec/lib/pushr/daemon/apns_support/interruptible_sleep_spec.rb
 - spec/lib/pushr/feedback_apns_spec.rb
 - spec/lib/pushr/message_apns_spec.rb
 - spec/spec_helper.rb