push-apns 0.0.1.pre2 → 0.0.1.pre3

data/README.md

@@ -1,3 +1,3 @@
-= PushApns
+# PushApns
 
-This project rocks and uses MIT-LICENSE.
+Please see [push-core](https://github.com/tompesman/push-core) for more information.

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

@@ -3,6 +3,8 @@ module Push
     module ApnsSupport
       class ConnectionApns
         attr_reader :name, :provider
+        attr_accessor :last_write
+        IDLE_PERIOD = 30.minutes
 
         def initialize(provider, i=nil)
           @provider = provider
@@ -16,6 +18,7 @@ module Push
             @host = "feedback.#{provider.configuration[:sandbox] ? 'sandbox.' : ''}push.apple.com"
             @port = 2196
           end
+          written
         end
 
         def connect
@@ -40,6 +43,8 @@ module Push
         end
 
         def write(data)
+          reconnect_idle if idle_period_exceeded?
+
           retry_count = 0
 
           begin
@@ -68,9 +73,23 @@ module Push
 
         protected
 
+        def reconnect_idle
+          Push::Daemon.logger.info("[#{@name}] Idle period exceeded, reconnecting...")
+          reconnect
+        end
+
+        def idle_period_exceeded?
+           Time.now - last_write > IDLE_PERIOD
+        end
+
         def write_data(data)
           @ssl_socket.write(data)
           @ssl_socket.flush
+          written
+        end
+
+        def written
+          self.last_write = Time.now
         end
 
         def setup_ssl_context

data/lib/push/message_apns.rb

@@ -1,6 +1,6 @@
 module Push
   class MessageApns < Push::Message
-    SELECT_TIMEOUT = 0.5
+    SELECT_TIMEOUT = 0.2
     ERROR_TUPLE_BYTES = 6
     APN_ERRORS = {
       1 => "Processing error",
@@ -15,41 +15,40 @@ module Push
     }
 
     store :properties, accessors: [:alert, :badge, :sound, :expiry, :attributes_for_device]
+    attr_accessible :device, :alert, :badge, :sound, :expiry, :attributes_for_device
 
     validates :badge, :numericality => true, :allow_nil => true
     validates :expiry, :numericality => true, :presence => true
     validates :device, :format => { :with => /\A[a-z0-9]{64}\z/ }
     validates_with Push::Apns::BinaryNotificationValidator
 
-    # def attributes_for_device=(attrs)
-    #   raise ArgumentError, "attributes_for_device must be a Hash" if !attrs.is_a?(Hash)
-    #   write_attribute(:attributes_for_device, MultiJson.encode(attrs))
-    # end
-    #
-    # def attributes_for_device
-    #   MultiJson.decode(read_attribute(:attributes_for_device)) if read_attribute(:attributes_for_device)
-    # end
+    def attributes_for_device=(attrs)
+      raise ArgumentError, "attributes_for_device must be a Hash" if !attrs.is_a?(Hash)
+      properties[:attributes_for_device] = MultiJson.dump(attrs)
+    end
+
+    def attributes_for_device
+      MultiJson.load(properties[:attributes_for_device]) if properties[:attributes_for_device]
+    end
 
     def alert=(alert)
       if alert.is_a?(Hash)
-        #write_attribute(:alert, MultiJson.encode(alert))
-        properties[:alert] = MultiJson.encode(alert)
+        properties[:alert] = MultiJson.dump(alert)
       else
-        #write_attribute(:alert, alert)
         properties[:alert] = alert
       end
     end
 
     def alert
-      string_or_json = read_attribute(:alert)
-      MultiJson.decode(string_or_json) rescue string_or_json
+      string_or_json = properties[:alert]
+      MultiJson.load(string_or_json) rescue 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 to_message(options = {})
       id_for_pack = options[:for_validation] ? 0 : id
-      [1, id_for_pack, expiry, 0, 32, device, 0, payload_size, payload].pack("cNNccH*cca*")
+      [1, id_for_pack, expiry, 0, 32, device, payload_size, payload].pack("cNNccH*na*")
     end
 
     def use_connection
@@ -57,7 +56,7 @@ module Push
     end
 
     def payload
-      MultiJson.encode(as_json)
+      MultiJson.dump(as_json)
     end
 
     def payload_size

data/lib/push-apns/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: push-apns
 version: !ruby/object:Gem::Version
-  version: 0.0.1.pre2
+  version: 0.0.1.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70242282760980 !ruby/object:Gem::Requirement
+  requirement: &70130311065320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,21 +21,21 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242282760980
+  version_requirements: *70130311065320
 - !ruby/object:Gem::Dependency
   name: push-core
-  requirement: &70242282760440 !ruby/object:Gem::Requirement
+  requirement: &70130311063400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 0.0.1.pre
+        version: 0.0.1.pre2
   type: :runtime
   prerelease: false
-  version_requirements: *70242282760440
+  version_requirements: *70130311063400
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70242282760000 !ruby/object:Gem::Requirement
+  requirement: &70130311061660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242282760000
+  version_requirements: *70130311061660
 description: Plugin with APNS specific push information.
 email:
 - tom@tnux.net