pushr-apns 1.0.0.pre.4 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003fa0a9aa2c107746eb4affaa5a22ff13c39914
-  data.tar.gz: 20aa0e25b3561f31d0fe2fe4bcc0f13b76beaf4e
+  metadata.gz: c96cb0793ec34675dad88454fef5acb152b278d7
+  data.tar.gz: 21570b81ee97e8fc9132cd9bc8e5ae904e356c18
 SHA512:
-  metadata.gz: 5d6a328bb38292445943e19b7fbd9d8ffa7eec962b16d4534afe26c3b930e2d361ec6dc9a96cdeb2587a094e7442db71245f168460acee8bcf8d607a19868fb0
-  data.tar.gz: 0712b0857645b13c3be749bbf0b6f6a89eadcac3c8292efab28512badafe86309027bd72ec3d589b016f8f9ef841008f1afabdee13dd2f71e95474cd0d69de5a
+  metadata.gz: 5cab65d46970744c9fbd0a94fc287cbc999ef7a9e857bc0cbca3f5f20d8d448a2ab25a6dc116c92bc7e6e52305adcee97fab19a9ffd3c60630f520a5ff0ac687
+  data.tar.gz: 8fb1f7e0ca76d10ae96fcbe83cc531b9c0a291bc464e6940b52e09595129c50a3529a6aab45aa31849da061b94b8eb8d4a22a588df4565ecdd2f0f4771e589ef

data/lib/pushr-apns/version.rb

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

data/lib/pushr/configuration_apns.rb

@@ -1,7 +1,7 @@
 module Pushr
   class ConfigurationApns < Pushr::Configuration
-    attr_accessor :id, :type, :app, :enabled, :connections, :certificate, :certificate_password,
-                  :sandbox, :skip_check_for_error
+    attr_reader :certificate
+    attr_accessor :certificate_password, :sandbox, :skip_check_for_error
     validates :certificate, presence: true
     validates :sandbox, inclusion: { in: [true, false] }
     validates :skip_check_for_error, inclusion: { in: [true, false] }, allow_blank: true
@@ -10,10 +10,35 @@ module Pushr
       :apns
     end
 
-    def to_json
-      hsh = { type: self.class.to_s, app: app, enabled: enabled, connections: connections, certificate: certificate,
-              certificate_password: certificate_password, sandbox: sandbox, skip_check_for_error: skip_check_for_error }
-      MultiJson.dump(hsh)
+    def certificate=(value)
+      if /BEGIN CERTIFICATE/.match(value)
+        @certificate = value
+      else
+        # assume it's the path to the certificate and try to read it:
+        @certificate = read_file(value)
+      end
+    end
+
+    def to_hash
+      { type: self.class.to_s, app: app, enabled: enabled, connections: connections, certificate: certificate,
+        certificate_password: certificate_password, sandbox: sandbox, skip_check_for_error: skip_check_for_error }
+    end
+
+    private
+
+    # if filename is something wacky, this will break and raise an exception - that's OK
+    def read_file(filename)
+      File.read(build_filename(filename))
+    end
+
+    def build_filename(filename)
+      if Pathname.new(filename).absolute?
+        filename
+      elsif Pushr::Core.configuration_file
+        File.join(File.dirname(Pushr::Core.configuration_file), filename)
+      else
+        File.join(Dir.pwd, filename)
+      end
     end
   end
 end

data/lib/pushr/configuration_apns_feedback.rb

@@ -7,9 +7,8 @@ module Pushr
       :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)
+    def to_hash
+      { type: self.class.to_s, app: app, enabled: enabled, connections: connections, feedback_poll: feedback_poll }
     end
   end
 end

data/lib/pushr/daemon/apns.rb

@@ -13,7 +13,7 @@ module Pushr
           connection = ApnsSupport::ConnectionApns.new(configuration, i + 1)
           connection.connect
 
-          handler = MessageHandler.new("pushr:#{configuration.app}:#{configuration.name}", connection, configuration.app, i + 1)
+          handler = MessageHandler.new("pushr:#{configuration.key}", connection, configuration.app, i + 1)
           handler.start
           @handlers << handler
         end

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

@@ -2,7 +2,6 @@ module Pushr
   module Daemon
     module ApnsSupport
       class FeedbackReceiver
-
         FEEDBACK_TUPLE_BYTES = 38
 
         def initialize(configuration, _)

data/lib/pushr/feedback_apns.rb

@@ -1,12 +1,11 @@
 module Pushr
   class FeedbackApns < Pushr::Feedback
-    attr_accessor :type, :app, :device, :follow_up, :failed_at
-
+    attr_accessor :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' }
 
-    def to_json
-      MultiJson.dump(type: 'Pushr::FeedbackApns', app: app, device: device, follow_up: follow_up, failed_at: failed_at)
+    def to_hash
+      { type: 'Pushr::FeedbackApns', app: app, device: device, follow_up: follow_up, failed_at: failed_at }
     end
   end
 end

data/lib/pushr/message_apns.rb

@@ -2,8 +2,7 @@ module Pushr
   class MessageApns < Pushr::Message
     POSTFIX = 'apns'
 
-    attr_accessor :type, :app, :device, :badge, :sound, :expiry, :attributes_for_device, :content_available, :priority
-
+    attr_accessor :device, :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/ }
@@ -49,11 +48,12 @@ module Pushr
       payload.bytesize
     end
 
-    def to_json
+    def to_hash
       hsh = { type: self.class.to_s, app: app, device: device, alert: alert, badge: badge,
               sound: sound, expiry: expiry, attributes_for_device: attributes_for_device,
               content_available: content_available, priority: priority }
-      MultiJson.dump(hsh)
+      hsh[Pushr::Core.external_id_tag] = external_id if external_id
+      hsh
     end
 
     private

data/spec/lib/pushr/configuration_apns_spec.rb

@@ -17,16 +17,16 @@ 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, skip_check_for_error: true)
+      config = Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: 'BEGIN CERTIFICATE',
+                                            certificate_password: nil, sandbox: true, skip_check_for_error: true)
       expect(config.key).to eql('app_name:apns')
     end
   end
 
   describe 'save' do
     let(:config) do
-      Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: 'test', certificate_password: nil,
-                                   sandbox: true, skip_check_for_error: true)
+      Pushr::ConfigurationApns.new(app: 'app_name', connections: 2, enabled: true, certificate: 'BEGIN CERTIFICATE',
+                                   certificate_password: nil, sandbox: true, skip_check_for_error: true)
     end
     it 'should save a configuration' do
       config.save

metadata

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