apnd 0.1.3 → 0.1.4

data/README.markdown

@@ -52,14 +52,14 @@ notifications to a running APND instance, or Apple directly. It is only
 recommended to send notifications directly to Apple for testing purposes.
 
     Usage:
-      apnd-push [OPTIONS] --token <token> --alert <alert>
+      apnd-push [OPTIONS] --token <token>
 
     Required Arguments:
             --token  [TOKEN]             Set Notification's iPhone token to TOKEN
-            --alert  [MESSAGE]           Set Notification's alert to MESSAGE
 
     Optional Arguments:
-            --sound  [SOUND]             Set Notification's sound to SOUND (default is 'default')
+            --alert  [MESSAGE]           Set Notification's alert to MESSAGE
+            --sound  [SOUND]             Set Notification's sound to SOUND
             --badge  [NUMBER]            Set Notification's badge number to NUMBER
             --custom [JSON]              Set Notification's custom data to JSON
             --host   [HOST]              Send Notification to HOST, usually the one running APND (default is 'localhost')

data/Rakefile

@@ -1,5 +1,9 @@
+$:.unshift 'lib'
+
 require 'rubygems'
 
+task :default => :test
+
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test' << '.'

data/bin/apnd-push

@@ -8,7 +8,7 @@ require 'optparse'
 
 help = <<HELP
 Usage:
-  apnd-push [OPTIONS] --token <token> --alert <alert>
+  apnd-push [OPTIONS] --token <token>
 
 HELP
 
@@ -23,13 +23,13 @@ opts = OptionParser.new do |opt|
     options[:token] = token
   end
 
+  opt.separator "\nOptional Arguments:\n"
+
   opt.on('--alert  [MESSAGE]', "Set Notification's alert to MESSAGE") do |alert|
     options[:alert] = alert
   end
 
-  opt.separator "\nOptional Arguments:\n"
-  
-  opt.on('--sound  [SOUND]', "Set Notification's sound to SOUND (default is 'default')") do |sound|
+  opt.on('--sound  [SOUND]', "Set Notification's sound to SOUND") do |sound|
     options[:sound] = sound
   end
 
@@ -74,8 +74,8 @@ begin
     exit
   end
 
-  unless options[:token] && options[:alert]
-    raise OptionParser::MissingArgument, "must specify --token and --alert"
+  unless options[:token]
+    raise OptionParser::MissingArgument, "must specify --token"
   end
 rescue OptionParser::InvalidOption, OptionParser::MissingArgument
   puts "#{$0}: #{$!.message}"

data/lib/apnd/daemon.rb

@@ -58,7 +58,7 @@ module APND
         count.times do
           @queue.pop do |notification|
             begin
-              ohai "Sending notification"
+              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"

data/lib/apnd/daemon/protocol.rb

@@ -25,15 +25,17 @@ module APND
     end
 
     #
-    # Add incoming notification to the queue if it is valid
+    # Add incoming notification(s) to the queue
     #
     def receive_data(data)
       (@buffer ||= "") << data
-      if notification = APND::Notification.valid?(@buffer)
-        ohai "#{@address.last}:#{@address.first} added new Notification to queue"
-        queue.push(notification)
-      else
-        ohai "#{@address.last}:#{@address.first} submitted invalid Notification"
+      @buffer.each_line do |line|
+        if notification = APND::Notification.valid?(line)
+          ohai "#{@address.last}:#{@address.first} added new Notification to queue"
+          queue.push(notification)
+        else
+          ohai "#{@address.last}:#{@address.first} submitted invalid Notification"
+        end
       end
     end
   end

data/lib/apnd/notification.rb

@@ -81,8 +81,6 @@ module APND
     #
     def self.valid?(data)
       parse(data)
-    rescue
-      false
     end
 
     #
@@ -119,6 +117,8 @@ module APND
       end
 
       notification
+    rescue
+      false
     end
 
     #
@@ -128,7 +128,7 @@ module APND
       @token  = params[:token]
       @alert  = params[:alert]
       @badge  = params[:badge]
-      @sound  = params[:sound] || 'default'
+      @sound  = params[:sound]
       @custom = params[:custom]
     end
 

data/lib/apnd/version.rb

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

data/test/{notification_test.rb → apnd_test.rb}

@@ -1,29 +1,41 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-context "APND Notification" do
+context "APND" do
   setup do
     @bytes = %|\000\000 \376\025\242}]\363\303Gx\336\373\037O8\200&\\\305,\f\004v\202";\345\237\266\205\000\251\242\000;{"aps":{"sound":"default","alert":"Red Alert, Numba One!"}}|
     @notification = APND::Notification.new({
       :token => 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2',
-      :alert => 'Red Alert, Numba One!'
+      :alert => 'Red Alert, Numba One!',
+      :sound => 'default'
     })
   end
 
-  test "returns a properly formatted hex_token" do
+  test "Notification returns 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
 
-  test "returns a properly formatted byte string for Apple" do
+  test "Notification returns a valid byte string for Apple" do
     assert_equal @notification.to_bytes, @bytes
   end
 
-  test "returns a Notification object when given valid byte string" do
+  test "Notification.parse returns a Notification when given a valid string" do
     notification = APND::Notification.parse(@bytes)
 
+    assert notification
+
     [:alert, :badge, :custom, :sound, :token, :hex_token, :to_bytes, :aps, :aps_json].each do |key|
       assert_equal @notification.send(key), notification.send(key)
     end
+
+    assert ! APND::Notification.parse("I'm not a packet!")
+  end
+
+  test "Notification multiple apns to be sent" do
+    notifications = [@bytes, @bytes, @bytes].join("\n")
+    notifications.each_line do |line|
+      assert APND::Notification.valid?(line)
+    end
   end
 
 end

data/test/test_helper.rb

@@ -7,6 +7,11 @@ $LOAD_PATH.unshift(dir)
 
 require 'apnd'
 
+begin
+  require 'turn'
+rescue LoadError
+end
+
 ##
 # test/spec/mini 3
 # http://gist.github.com/25455

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Joshua Priddle
@@ -81,8 +81,7 @@ files:
 - lib/apnd/settings.rb
 - lib/apnd/version.rb
 - lib/apnd.rb
-- test/daemon_test.rb
-- test/notification_test.rb
+- test/apnd_test.rb
 - test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/itspriddle/apnd

data/test/daemon_test.rb

@@ -1,5 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper.rb'
-
-# context "APND Daemon" do
-# 
-# end