apnd 0.1.5 → 0.1.6

data/README.markdown

@@ -79,10 +79,12 @@ push notifications to APND.
 
     # Set the host/port APND is running on
     # (not needed if you're using localhost:22195)
-
+    # Put this in config/initializers/apnd.rb for Rails
     APND::Notification.upstream_host = 'localhost'
     APND::Notification.upstream_port = 22195
 
+
+    # Initialize some notifications
     notification1 = APND::Notification.new(
       :alert  => 'Alert!',
       :token  => 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2',
@@ -95,6 +97,7 @@ push notifications to APND.
       :badge  => 99
     )
 
+
     # Send multiple notifications at once to avoid overhead in
     # opening/closing the upstream socket connection each time
     APND::Notification.open_upstream_socket do |sock|
@@ -102,6 +105,7 @@ push notifications to APND.
       sock.puts notification2
     end
 
+
     # Send a notification to the upstream socket immediately
     notification3 = APND::Notification.create(
       :alert  => 'Alert!',

data/Rakefile

@@ -1,7 +1,5 @@
 $:.unshift 'lib'
 
-require 'rubygems'
-
 task :default => :test
 
 require 'rake/testtask'
@@ -29,5 +27,5 @@ task :publish do
   sh "git push origin v#{ver}"
   sh "git push origin master"
   sh "git clean -fd"
-  exec "rake pages"
+  sh "rake pages"
 end

data/lib/apnd/daemon.rb

@@ -7,8 +7,9 @@ module APND
   # writen to the AppleConnection
   #
   class Daemon
-    autoload :Protocol,        'apnd/daemon/protocol'
-    autoload :AppleConnection, 'apnd/daemon/apple_connection'
+    autoload :Protocol,         'apnd/daemon/protocol'
+    autoload :AppleConnection,  'apnd/daemon/apple_connection'
+    autoload :ServerConnection, 'apnd/daemon/server_connection'
 
     #
     # Create a new Daemon and run it
@@ -35,7 +36,7 @@ module APND
     def run!
       EventMachine::run do
         ohai "Starting APND Daemon v#{APND::Version} on #{@bind}:#{@port}"
-        EventMachine::start_server(@bind, @port, APND::Daemon::Protocol) do |server|
+        EventMachine::start_server(@bind, @port, APND::Daemon::ServerConnection) do |server|
           server.queue = @queue
         end
 

data/lib/apnd/daemon/apple_connection.rb

@@ -63,7 +63,7 @@ module APND
     #
     # Establishes a connection if needed and yields it
     #
-    # Ex: open { |conn| conn.write('write to socket) }
+    # Ex: open { |conn| conn.write('write to socket') }
     #
     def open(&block)
       unless connected?

data/lib/apnd/daemon/protocol.rb

@@ -1,19 +1,16 @@
+require 'socket'
+
 module APND
   #
   # Daemon::Protocol handles incoming APNs
   #
-  class Daemon::Protocol < ::EventMachine::Connection
-
-    #
-    # Queue should be the EventMachine queue, see APND::Daemon
-    #
-    attr_accessor :queue
+  module Daemon::Protocol
 
     #
     # Called when a client connection is opened
     #
     def post_init
-      @address = Socket.unpack_sockaddr_in(self.get_peername)
+      @address = ::Socket.unpack_sockaddr_in(self.get_peername)
       ohai "#{@address.last}:#{@address.first} opened connection"
     end
 

data/lib/apnd/daemon/server_connection.rb

@@ -0,0 +1,15 @@
+module APND
+  #
+  # Daemon::ServerConnection links APND::Daemon::Protocol to EM
+  #
+  class Daemon::ServerConnection < ::EventMachine::Connection
+
+    include APND::Daemon::Protocol
+
+    #
+    # Queue should be the EventMachine queue, see APND::Daemon
+    #
+    attr_accessor :queue
+
+  end
+end

data/lib/apnd/version.rb

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

data/test/apnd_test.rb

@@ -14,24 +14,13 @@ class APNDTest < Test::Unit::TestCase
       })
     end
 
-    context "instances" do
-      should "be initialized with a hash of options" do
-        [:token, :alert, :sound, :badge, :custom].each do |key|
-          assert_not_nil @notification.send(key)
-        end
-      end
-
-      should "return a valid hex_token" do
-        expected = %|\376\025\242}]\363\303Gx\336\373\037O8\200&\\\305,\f\004v\202";\345\237\266\205\000\251\242|
-        assert_equal @notification.hex_token, expected
-      end
-
-      should "return a valid byte string" do
-        assert_equal @notification.to_bytes, @@bytes
+    should "allow initialization with options hash" do
+      [:token, :alert, :sound, :badge, :custom].each do |key|
+        assert_not_nil @notification.send(key)
       end
     end
 
-    should "parse a valid packet" do
+    should "parse a raw packet" do
       notification = APND::Notification.parse(@@bytes)
 
       assert notification
@@ -41,12 +30,6 @@ class APNDTest < Test::Unit::TestCase
       end
     end
 
-    should "raise InvalidNotificationHeader parsing a bad packet" do
-      assert_raise APND::Errors::InvalidNotificationHeader do
-        APND::Notification.parse("I'm not a packet!")
-      end
-    end
-
     should "raise InvalidPayload if custom hash is too large" do
       assert_raise APND::Errors::InvalidPayload do
         notification = @notification.dup
@@ -56,13 +39,41 @@ class APNDTest < Test::Unit::TestCase
         APND::Notification.parse(notification.to_bytes)
       end
     end
+
+    context "instances" do
+      should "return a valid hex_token" do
+        expected = %|\376\025\242}]\363\303Gx\336\373\037O8\200&\\\305,\f\004v\202";\345\237\266\205\000\251\242|
+        assert_equal @notification.hex_token, expected
+      end
+
+      should "return a valid byte string" do
+        assert_equal @notification.to_bytes, @@bytes
+      end
+    end
+
   end
 
   context "APND Daemon" do
-    should "receive multiple Notifications in a single packet" do
-      notifications = [@@bytes, @@bytes, @@bytes].join("\n")
-      notifications.each_line do |line|
-        assert APND::Notification.valid?(line)
+    context "Protocol" do
+      setup do
+        @daemon = TestDaemon.new
+      end
+
+      should "add valid notification to queue" do
+        @daemon.receive_data(@@bytes)
+        assert_equal 1, @daemon.queue.size
+      end
+
+      should "receive multiple Notifications in a single packet" do
+        @daemon.receive_data([@@bytes, @@bytes, @@bytes].join("\n"))
+        assert 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
       end
     end
   end

data/test/test_helper.rb

@@ -8,3 +8,20 @@ rescue LoadError
 end
 
 require 'apnd'
+
+class TestDaemon
+  include APND::Daemon::Protocol
+
+  def initialize
+    @queue   = []
+    @address = [123, '10.10.10.1']
+  end
+
+  def queue
+    @queue
+  end
+
+end
+
+# Silence ohai in testing
+def ohai(*args); end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Joshua Priddle
@@ -87,6 +87,7 @@ files:
 - bin/apnd-push
 - lib/apnd/daemon/apple_connection.rb
 - lib/apnd/daemon/protocol.rb
+- lib/apnd/daemon/server_connection.rb
 - lib/apnd/daemon.rb
 - lib/apnd/errors.rb
 - lib/apnd/notification.rb