net_dav 0.2.0 → 0.2.1

data/README.rdoc

@@ -6,6 +6,10 @@ Installing the gem:
 
   gem install net_dav
 
+and if you want acceleration for large files (from 4MB/s to 20MB/s in my setup):
+
+  gem install curb
+
 If you're having install issues with nokogiri on Mac OS X read
 http://wiki.github.com/tenderlove/nokogiri/what-to-do-if-libxml2-is-being-a-jerk
 
@@ -17,6 +21,19 @@ http://wiki.github.com/tenderlove/nokogiri/what-to-do-if-libxml2-is-being-a-jerk
     end
   end
 
-  (Note that if you want to use "." to refer to the origin URL, it should
-  end with a slash, otherwise it is assumed that the last component is a file
-  and "." will refer to the parent.)
+(Note that if you want to use "." to refer to the origin URL, it should
+end with a slash, otherwise it is assumed that the last component is a file
+and "." will refer to the parent.)
+
+== Performance
+
+This should be threadsafe if you use a different Net::DAV object
+for each thread.
+Check out script/multi-test for a multi-threaded application.
+
+Installing the +curb+ gem will gain speedup with large files, but currently
+is much slower doing many small +get+ operations. If your usecase is the
+latter and you have +curb+ installed, you can disable its use by passing the 
+ :curl => false
+option to Net::DAV::start or Net::DAV::new .
+

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/lib/net/dav.rb

@@ -11,6 +11,7 @@ end
 module Net #:nodoc:
   # Implement a WebDAV client
   class DAV
+    MAX_REDIRECTS = 10
     class NetHttpHandler
       attr_writer :user, :pass
 
@@ -61,8 +62,7 @@ module Net #:nodoc:
 	if (@user)
 	  req.basic_auth @user, @pass
 	end
-	res = @http.request(req)
-	res.value # raises error if not success
+	res = handle_request(req, headers)
 	res
       end
 
@@ -80,8 +80,7 @@ module Net #:nodoc:
 	if (@user)
 	  req.basic_auth @user, @pass
 	end
-	res = @http.request(req)
-	res.value # raises error if not success
+	res = handle_request(req, headers)
 	res
       end
 
@@ -97,12 +96,7 @@ module Net #:nodoc:
 	if (@user)
 	  req.basic_auth @user, @pass
 	end
-	res = nil
-	@http.request(req) {|response|
-	  response.read_body nil, &block
-	  res = response
-	}
-	res.value # raises error if not success
+	res = handle_request(req, headers, MAX_REDIRECTS, &block)
 	res.body
       end
 
@@ -122,20 +116,68 @@ module Net #:nodoc:
 	if (@user)
 	  req.basic_auth @user, @pass
 	end
-	res = @http.request(req)
-	res.value # raises error if not success
+	res = handle_request(req, headers)
 	res
       end
+
+      def handle_request(req, headers, limit = MAX_REDIRECTS, &block)
+	# You should choose better exception. 
+	raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+
+	response = nil
+	if block
+	  @http.request(req) {|res|
+	    res.read_body nil, &block
+	    response = res
+	  }
+	else
+	  response = @http.request(req)
+	end
+	case response
+	when Net::HTTPSuccess     then response
+	when Net::HTTPRedirection then
+	  location = URI.parse(response['location'])
+	  if (@uri.scheme != location.scheme ||
+	      @uri.host != location.host ||
+	      @uri.port != location.port)
+	    raise "cannot redirect to a different host #{@uri} => #{location}"
+	  end
+	  new_req = req.class.new(location.path)
+	  new_req.body = req.body
+	  new_req.body_stream = req.body_stream
+	  headers.each_pair { |key, value| new_req[key] = value } if headers
+	  if (@user)
+	    new_req.basic_auth @user, @pass
+	  end
+	  handle_request(new_req, limit - 1, &block)
+	else
+	  response.error!
+	end
+      end
     end
 
+
     class CurlHandler < NetHttpHandler
+      def make_curl
+	unless @curl
+	  @curl = Curl::Easy.new
+	  @curl.timeout = @http.read_timeout
+	  @curl.follow_location = true
+	  @curl.max_redirects = MAX_REDIRECTS
+	end
+	@curl
+      end
+
       def request_returning_body(verb, path, headers)
 	raise "unkown returning_body verb #{verb}" unless verb == :get
 	url = @uri.merge(path)
-	curl = Curl::Easy.new(url.to_s)
+	curl = make_curl
+	curl.url = url.to_s
 	headers.each_pair { |key, value| curl.headers[key] = value } if headers
 	if (@user)
-	  curl.headers["Authorization"] = "Basic #{Base64.encode64("#{@user}:#{@pass}")}"
+	  curl.userpwd = "#{@user}:#{@pass}"
+	else
+	  curl.userpwd = nil
 	end
 	res = nil
 	if block_given?
@@ -283,8 +325,8 @@ module Net #:nodoc:
     # object will *not* contain a (meaningful) body.
 
     def get(path, &block)
-      @handler.request_returning_body(:get, path, nil, &block)
-      true
+      body = @handler.request_returning_body(:get, path, nil, &block)
+      body
     end
 
     # Stores the content of a stream to a URL

data/net_dav.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{net_dav}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Miron Cuperman"]
-  s.date = %q{2009-10-30}
+  s.date = %q{2009-10-31}
   s.default_executable = %q{dav}
   s.description = %q{WebDAV client library in the style of Net::HTTP}
   s.email = %q{c1.github@niftybox.net}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: net_dav
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Miron Cuperman
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-30 00:00:00 -07:00
+date: 2009-10-31 00:00:00 -07:00
 default_executable: dav
 dependencies: 
 - !ruby/object:Gem::Dependency