apnd 0.1.6 → 0.1.7

data/README.markdown

@@ -101,8 +101,8 @@ push notifications to APND.
     # Send multiple notifications at once to avoid overhead in
     # opening/closing the upstream socket connection each time
     APND::Notification.open_upstream_socket do |sock|
-      sock.puts notification1
-      sock.puts notification2
+      sock.write(notification1.to_bytes)
+      sock.write(notification2.to_bytes)
     end
 
 

data/lib/apnd.rb

@@ -21,9 +21,11 @@ module APND
     yield settings
   end
 
-end
-
+  #
+  # Write message to stdout with date
+  #
+  def self.ohai(message) #:nodoc:
+    puts "[%s] %s" % [Time.now.strftime("%Y-%m-%d %H:%M:%S"), message]
+  end
 
-def ohai(message) #:nodoc:
-  puts "[%s] %s" % [Time.now.strftime("%Y-%m-%d %H:%M:%S"), message]
 end

data/lib/apnd/daemon.rb

@@ -35,7 +35,7 @@ module APND
     #
     def run!
       EventMachine::run do
-        ohai "Starting APND Daemon v#{APND::Version} on #{@bind}:#{@port}"
+        APND.ohai "Starting APND Daemon v#{APND::Version} on #{@bind}:#{@port}"
         EventMachine::start_server(@bind, @port, APND::Daemon::ServerConnection) do |server|
           server.queue = @queue
         end
@@ -54,19 +54,19 @@ module APND
     def process_notifications!
       count = @queue.size
       if count > 0
-        ohai "Queue has #{count} item#{count == 1 ? '' : 's'}"
+        APND.ohai "Queue has #{count} item#{count == 1 ? '' : 's'}"
         @apple.connect!
         count.times do
           @queue.pop do |notification|
             begin
-              ohai "Sending notification for #{notification.token}"
+              APND.ohai "Sending notification for #{notification.token}"
               @apple.write(notification.to_bytes)
             rescue Errno::EPIPE, OpenSSL::SSL::SSLError
-              ohai "Error, notification has been added back to the queue"
+              APND.ohai "Error, notification has been added back to the queue"
               @queue.push(notification)
               @apple.reconnect!
             rescue RuntimeError => error
-              ohai "Error: #{error}"
+              APND.ohai "Error: #{error}"
             end
           end
         end

data/lib/apnd/daemon/apple_connection.rb

@@ -57,7 +57,8 @@ module APND
     # Disconnect/connect to Apple
     #
     def reconnect!
-      disconnect! && connect!
+      disconnect!
+      connect!
     end
 
     #

data/lib/apnd/daemon/protocol.rb

@@ -11,14 +11,14 @@ module APND
     #
     def post_init
       @address = ::Socket.unpack_sockaddr_in(self.get_peername)
-      ohai "#{@address.last}:#{@address.first} opened connection"
+      APND.ohai "#{@address.last}:#{@address.first} opened connection"
     end
 
     #
     # Called when a client connection is closed
     #
     def unbind
-      ohai "#{@address.last}:#{@address.first} closed connection"
+      APND.ohai "#{@address.last}:#{@address.first} closed connection"
     end
 
     #
@@ -28,10 +28,10 @@ module APND
       (@buffer ||= "") << data
       @buffer.each_line do |line|
         if notification = APND::Notification.valid?(line)
-          ohai "#{@address.last}:#{@address.first} added new Notification to queue"
+          APND.ohai "#{@address.last}:#{@address.first} added new Notification to queue"
           queue.push(notification)
         else
-          ohai "#{@address.last}:#{@address.first} submitted invalid Notification"
+          APND.ohai "#{@address.last}:#{@address.first} submitted invalid Notification"
         end
       end
     end

data/lib/apnd/version.rb

@@ -2,7 +2,7 @@ module APND
   class Version #:nodoc:
     MAJOR = 0
     MINOR = 1
-    TINY  = 6
+    TINY  = 7
 
     def self.to_s
       [MAJOR, MINOR, TINY].join('.')

data/test/apnd_test.rb

@@ -66,14 +66,14 @@ class APNDTest < Test::Unit::TestCase
 
       should "receive multiple Notifications in a single packet" do
         @daemon.receive_data([@@bytes, @@bytes, @@bytes].join("\n"))
-        assert 3, @daemon.queue.size
+        assert_equal 3, @daemon.queue.size
       end
 
       should "raise InvalidNotificationHeader parsing a bad packet" do
         assert_raise APND::Errors::InvalidNotificationHeader do
           APND::Notification.parse("I'm not a packet!")
         end
-        assert 0, @daemon.queue.size
+        assert_equal 0, @daemon.queue.size
       end
     end
   end

data/test/test_helper.rb

@@ -23,5 +23,5 @@ class TestDaemon
 
 end
 
-# Silence ohai in testing
-def ohai(*args); end
+# Silence APND.ohai in testing
+def APND.ohai(*args); end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: apnd
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 21
+  prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Joshua Priddle
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-09 00:00:00 -05:00
+date: 2011-02-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: eventmachine
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 59
         segments: 
         - 0
         - 12
@@ -35,9 +38,11 @@ dependencies:
   name: json
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 11
         segments: 
         - 1
         - 4
@@ -49,9 +54,11 @@ dependencies:
   name: daemons
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 19
         segments: 
         - 1
         - 1
@@ -63,9 +70,11 @@ dependencies:
   name: shoulda
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -106,23 +115,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: "APND: Apple Push Notification Daemon sends Apple Push Notifications to iPhones"