distribustream 0.3.0 → 0.3.1

data/bin/dsclient

@@ -117,4 +117,4 @@ class Callbacks < PDTP::Client::Callbacks
 end
   
 client = PDTP::Client.new uri.host, uri.port || 6086, :listen_port => listen_port
-client.connect Callbacks, uri, output
+client.connect Callbacks.new(uri, output)

data/distribustream.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 GEMSPEC = Gem::Specification.new do |s|
   s.name = "distribustream"
-  s.version = "0.3.0"
+  s.version = "0.3.1"
   s.date = "2008-11-09"
   s.summary = "DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost"
   s.email = "tony@clickcaster.com"

data/lib/pdtp/client/transfer.rb

@@ -121,6 +121,7 @@ module PDTP
           vhost=@request.params["HTTP_HOST"]
           @url="http://"+vhost+path
 
+          return unless request.params["HTTP_RANGE"]
           @byte_range=parse_http_range(request.params["HTTP_RANGE"])
           @peer_id=@request.params["HTTP_X_PDTP_PEER_ID"]
 

data/lib/pdtp/client.rb

@@ -65,30 +65,21 @@ module PDTP
     end
 
     # Connect to the PDTP server. This is a blocking call which runs the client event loop
-    def connect(callbacks = nil, *args)
-      klass = if(callbacks and callbacks.is_a?(Class))
-        callbacks
-      else
-        Class.new(Callbacks) {callbacks and include callbacks}
-      end
+    def connect(callbacks = nil)
+      callbacks = Callbacks.new if callbacks.nil?
       
-      arity = klass.instance_method(:initialize).arity
-      expected = arity >= 0 ? arity : -(arity + 1)
-      if (arity >= 0 and args.size != expected) or (arity < 0 and args.size < expected)
-        raise ArgumentError, "wrong number of arguments for #{klass}#initialize (#{args.size} for #{expected})" 
+      unless callbacks.is_a?(Callbacks)
+        raise ArgumentError, "callbacks must be an instance of PDTP::Client::Callbacks"
       end
-          
+                
       # Run the EventMachine reactor loop
       EventMachine.run do
         @http_server.run_evented
         
-        EventMachine.connect(@host, @port, Connection) do |c|
-          # Store reference to the connection
-          @connection = c
-          
+        @connection = EventMachine.connect(@host, @port, Connection) do |c|
           # Set connection variables and configure callbacks
           c.client = self
-          c.callbacks = klass.new *args
+          c.callbacks = callbacks
         end
 
         #@@log.info "connecting with ev=#{EventMachine::VERSION}"
@@ -98,7 +89,7 @@ module PDTP
 
     # Are we currently connected to a server?
     def connected?
-      !!@connection
+      not @connection.nil?
     end
 
     # Retrieve the resource at the given path and write it to the given IO object

data/lib/pdtp/common.rb

@@ -22,7 +22,7 @@
 
 # Namespace for all PDTP components
 module PDTP
-  PDTP::VERSION = '0.3.0' unless defined? PDTP::VERSION
+  PDTP::VERSION = '0.3.1' unless defined? PDTP::VERSION
   def self.version() VERSION end
 
   PDTP::DEFAULT_PORT = 6086 unless defined? PDTP::DEFAULT_PORT

data/lib/pdtp/server.rb

@@ -51,7 +51,7 @@ module PDTP
     # Run a web server to display statistics on the given address and port 
     def enable_status_page(path = '/status')
       log "status at http://#{@addr}:#{@http_port}#{path}"
-      http_server.register path, StatusHandler.new(@dispatcher)
+      http_server.register path, StatusHandler.new(@dispatcher), true
     end
     
     # Serve files from the given directory

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: distribustream
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 date: 2008-11-09 00:00:00 -07:00
 summary: DistribuStream is a fully open peercasting system allowing on-demand or live streaming media to be delivered at a fraction of the normal cost
 require_paths: