rapns 1.0.6 → 1.0.7

data/History.md

@@ -0,0 +1,5 @@
+
+1.0.7 / 2012-04-22 
+==================
+
+  * Reconnect if the connnection has been idle for more than 30 minutes. TCP Keepalive alone is not enough to ensure the connection is still connected.

data/lib/rapns/daemon/connection.rb

@@ -3,10 +3,17 @@ module Rapns
     class ConnectionError < StandardError; end
 
     class Connection
+      attr_accessor :last_write
+
+      def self.idle_period
+        30.minutes
+      end
+
       def initialize(name, host, port)
         @name = name
         @host = host
         @port = port
+        written
       end
 
       def connect
@@ -31,6 +38,8 @@ module Rapns
       end
 
       def write(data)
+        reconnect_idle if idle_period_exceeded?
+
         retry_count = 0
 
         begin
@@ -59,9 +68,23 @@ module Rapns
 
       protected
 
+      def reconnect_idle
+        Rapns::Daemon.logger.info("[#{@name}] Idle period exceeded, reconnecting...")
+        reconnect
+      end
+
+      def idle_period_exceeded?
+        Time.now - last_write > self.class.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/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/spec/rapns/daemon/connection_spec.rb

@@ -252,3 +252,42 @@ describe Rapns::Daemon::Connection, "when sending a notification" do
     @connection.write("blah")
   end
 end
+
+describe Rapns::Daemon::Connection, 'idle period' do
+  before do
+    @connection = Rapns::Daemon::Connection.new('Connection 0', 'gateway.push.apple.com', 2195)
+    @ssl_socket = mock("SSLSocket", :write => nil, :flush => nil, :close => nil)
+    @tcp_socket = mock("TCPSocket", :close => nil)
+    @connection.stub(:setup_ssl_context)
+    @connection.stub(:connect_socket => [@tcp_socket, @ssl_socket])
+    @logger = mock("Logger", :info => nil)
+    Rapns::Daemon.stub(:logger).and_return(@logger)
+    @connection.connect
+  end
+
+  it 'reconnects if the connection has been idle for more than the defined period' do
+    Rapns::Daemon::Connection.stub(:idle_period => 0.1)
+    sleep 0.2
+    @connection.should_receive(:reconnect)
+    @connection.write('blah')
+  end
+
+  it 'resets the last write time' do
+    now = Time.now
+    Time.stub(:now => now)
+    @connection.write('blah')
+    @connection.last_write.should == now
+  end
+
+  it 'does not reconnect if the connection has not been idle for more than the defined period' do
+    @connection.should_not_receive(:reconnect)
+    @connection.write('blah')
+  end
+
+  it 'logs the the connection is idle' do
+    Rapns::Daemon::Connection.stub(:idle_period => 0.1)
+    sleep 0.2
+    Rapns::Daemon.logger.should_receive(:info).with('[Connection 0] Idle period exceeded, reconnecting...')
+    @connection.write('blah')
+  end
+end

data/spec/spec_helper.rb

@@ -1,8 +1,12 @@
 ENV['RAILS_ENV'] = 'test'
 
-require 'simplecov'
-SimpleCov.start do
-  add_filter '/spec/'
+begin
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter '/spec/'
+  end
+rescue LoadError
+  puts "Coverage disabled."
 end
 
 require 'active_record'
@@ -15,6 +19,7 @@ if !adapters.include?($adapter)
 end
 
 puts "Using #{$adapter} adapter."
+
 ActiveRecord::Base.establish_connection('adapter' => $adapter, 'database' => 'rapns_test')
 require 'generators/templates/create_rapns_notifications'
 require 'generators/templates/create_rapns_feedback'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-15 00:00:00.000000000 Z
+date: 2012-04-22 00:00:00.000000000 Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3
@@ -50,6 +50,7 @@ files:
 - lib/rapns/patches/rails/3.1.1/postgresql_adapter.rb
 - lib/rapns/version.rb
 - README.md
+- History.md
 - spec/rapns/daemon/certificate_spec.rb
 - spec/rapns/daemon/configuration_spec.rb
 - spec/rapns/daemon/connection_spec.rb
@@ -87,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Easy to use library for Apple's Push Notification Service with Rails 3