push-apns 0.0.1.pre3 → 0.0.1.pre4

data/lib/push/configuration_apns.rb

@@ -0,0 +1,13 @@
+module Push
+  class ConfigurationApns < Push::Configuration
+    store :properties, accessors: [:certificate, :certificate_password, :sandbox, :feedback_poll]
+    attr_accessible :app, :enabled, :connections, :certificate, :certificate_password, :sandbox, :feedback_poll
+    validates :certificate, :presence => true
+    validates :sandbox, :inclusion => { :in => [true, false] }
+    validates :feedback_poll, :presence => true
+
+    def name
+      :apns
+    end
+  end
+end

data/lib/push/daemon/apns.rb

@@ -1,14 +1,12 @@
 module Push
   module Daemon
     class Apns
-      attr_accessor :configuration, :certificate
+      attr_accessor :configuration
 
       def initialize(options)
         self.configuration = options
 
-        self.certificate = ApnsSupport::Certificate.new(configuration[:certificate])
-        certificate.load
-
+        @feedback_receiver = ApnsSupport::FeedbackReceiver.new(self)
         start_feedback
       end
 
@@ -26,11 +24,11 @@ module Push
       end
 
       def start_feedback
-        ApnsSupport::FeedbackReceiver.start(self)
+        @feedback_receiver.start
       end
 
       def stop_feedback
-        ApnsSupport::FeedbackReceiver.stop
+        @feedback_receiver.stop
       end
 
       def stop

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

@@ -10,11 +10,11 @@ module Push
           @provider = provider
           if i
             # Apns push connection
-            @name = "ConnectionApns #{i}"
+            @name = "#{@provider.configuration[:name]}: ConnectionApns #{i}"
             @host = "gateway.#{provider.configuration[:sandbox] ? 'sandbox.' : ''}push.apple.com"
             @port = 2195
           else
-            @name = "FeedbackReceiver"
+            @name = "#{@provider.configuration[:name]}: FeedbackReceiver"
             @host = "feedback.#{provider.configuration[:sandbox] ? 'sandbox.' : ''}push.apple.com"
             @port = 2196
           end
@@ -94,8 +94,8 @@ module Push
 
         def setup_ssl_context
           ssl_context = OpenSSL::SSL::SSLContext.new
-          ssl_context.key = OpenSSL::PKey::RSA.new(provider.certificate.certificate, provider.configuration[:certificate_password])
-          ssl_context.cert = OpenSSL::X509::Certificate.new(provider.certificate.certificate)
+          ssl_context.key = OpenSSL::PKey::RSA.new(provider.configuration[:certificate], provider.configuration[:certificate_password])
+          ssl_context.cert = OpenSSL::X509::Certificate.new(provider.configuration[:certificate])
           ssl_context
         end
 

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

@@ -2,12 +2,14 @@ module Push
   module Daemon
     module ApnsSupport
       class FeedbackReceiver
-        extend Push::Daemon::InterruptibleSleep
-        attr_accessor :provider
+        include Push::Daemon::InterruptibleSleep
         FEEDBACK_TUPLE_BYTES = 38
 
-        def self.start(provider)
+        def initialize(provider)
           @provider = provider
+        end
+
+        def start
           @thread = Thread.new do
             loop do
               break if @stop
@@ -17,13 +19,12 @@ module Push
           end
         end
 
-        def self.stop
+        def stop
           @stop = true
           interrupt_sleep
-          @thread.join if @thread
         end
 
-        def self.check_for_feedback
+        def check_for_feedback
           connection = nil
           begin
             connection = ApnsSupport::ConnectionApns.new(@provider)
@@ -42,15 +43,15 @@ module Push
 
         protected
 
-        def self.parse_tuple(tuple)
+        def parse_tuple(tuple)
           failed_at, _, device = tuple.unpack("N1n1H*")
           [Time.at(failed_at).utc, device]
         end
 
-        def self.create_feedback(failed_at, device)
+        def create_feedback(failed_at, device)
           formatted_failed_at = failed_at.strftime("%Y-%m-%d %H:%M:%S UTC")
           Push::Daemon.logger.info("[FeedbackReceiver] Delivery failed at #{formatted_failed_at} for #{device}")
-          Push::FeedbackApns.create!(:failed_at => failed_at, :device => device)
+          Push::FeedbackApns.create!(:app => @provider.configuration[:name], :failed_at => failed_at, :device => device, :follow_up => 'delete')
         end
       end
     end

data/lib/push/feedback_apns.rb

@@ -1,5 +1,7 @@
 module Push
   class FeedbackApns < Push::Feedback
+    attr_accessible :app, :device, :follow_up, :failed_at
     validates :device, :format => { :with => /\A[a-z0-9]{64}\z/ }
+    validates :follow_up, :inclusion => { :in => %w(delete), :message => "%{value} is not a valid follow-up" }
   end
 end

data/lib/push/message_apns.rb

@@ -15,7 +15,7 @@ module Push
     }
 
     store :properties, accessors: [:alert, :badge, :sound, :expiry, :attributes_for_device]
-    attr_accessible :device, :alert, :badge, :sound, :expiry, :attributes_for_device
+    attr_accessible :app, :device, :alert, :badge, :sound, :expiry, :attributes_for_device
 
     validates :badge, :numericality => true, :allow_nil => true
     validates :expiry, :numericality => true, :presence => true

data/lib/push-apns/version.rb

@@ -1,3 +1,3 @@
 module PushApns
-  VERSION = "0.0.1.pre3"
+  VERSION = "0.0.1.pre4"
 end

data/lib/push-apns.rb

@@ -2,12 +2,13 @@ require 'socket'
 require 'pathname'
 require 'push-apns/version'
 require 'push/apns/binary_notification_validator'
+require 'push/configuration'
+require 'push/configuration_apns'
 require 'push/message'
 require 'push/message_apns'
 require 'push/feedback'
 require 'push/feedback_apns'
 require 'push/daemon/apns'
 require 'push/daemon/interruptible_sleep'
-require 'push/daemon/apns_support/certificate'
 require 'push/daemon/apns_support/connection_apns'
 require 'push/daemon/apns_support/feedback_receiver'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-apns
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre3
+  version: 0.0.1.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70130311065320 !ruby/object:Gem::Requirement
+  requirement: &70225631818240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70130311065320
+  version_requirements: *70225631818240
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70130311063400 !ruby/object:Gem::Requirement
+  requirement: &70225631817380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre2
+        version: 0.0.1.pre4
   type: :runtime
   prerelease: false
-  version_requirements: *70130311063400
+  version_requirements: *70225631817380
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70130311061660 !ruby/object:Gem::Requirement
+  requirement: &70225631816340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,8 +43,8 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70130311061660
-description: Plugin with APNS specific push information.
+  version_requirements: *70225631816340
+description: APNS support for the modular push daemon.
 email:
 - tom@tnux.net
 executables: []
@@ -54,8 +54,8 @@ files:
 - lib/push-apns.rb
 - lib/push-apns/version.rb
 - lib/push/apns/binary_notification_validator.rb
+- lib/push/configuration_apns.rb
 - lib/push/daemon/apns.rb
-- lib/push/daemon/apns_support/certificate.rb
 - lib/push/daemon/apns_support/connection_apns.rb
 - lib/push/daemon/apns_support/feedback_receiver.rb
 - lib/push/feedback_apns.rb
@@ -85,5 +85,5 @@ rubyforge_project:
 rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
-summary: APNS (iOS) part of the modular push daemon.
+summary: APNS (iOS/Apple) part of the modular push daemon.
 test_files: []

data/lib/push/daemon/apns_support/certificate.rb

@@ -1,37 +0,0 @@
-module Push
-  class CertificateError < StandardError; end
-
-  module Daemon
-    module ApnsSupport
-      class Certificate
-        attr_accessor :certificate
-
-        def initialize(certificate_path)
-          @certificate_path = path(certificate_path)
-        end
-
-        def path(path)
-          if Pathname.new(path).absolute?
-            path
-          else
-            File.join(Rails.root, "config", "push", path)
-          end
-        end
-
-        def load
-          @certificate = read_certificate
-        end
-
-        protected
-
-        def read_certificate
-          if !File.exists?(@certificate_path)
-            raise CertificateError, "#{@certificate_path} does not exist. The certificate location can be configured in config/push/<<environment>>.rb"
-          else
-            File.read(@certificate_path)
-          end
-        end
-      end
-    end
-  end
-end