dav4rack 0.1.7 → 0.1.8

data/.gitignore

@@ -1,4 +1,6 @@
 .*
+!.gitignore
+*.gem
 *~
 doc/*
 pkg/*

data/lib/dav4rack/controller.rb

@@ -122,7 +122,7 @@ module DAV4Rack
         status = resource.copy(dest, overwrite)
       else
         raise Conflict unless depth.is_a?(Symbol) || depth > 1
-        status = resource.move(dest)
+        status = resource.move(dest, overwrite)
       end
       response['Location'] = "#{scheme}://#{host}:#{port}#{dest.public_path}" if status == Created
       multistatus do |xml|

data/lib/dav4rack/handler.rb

@@ -15,45 +15,47 @@ module DAV4Rack
     end
 
     def call(env)
-      start = Time.now
-      request = Rack::Request.new(env)
-      response = Rack::Response.new
-
-      Logger.info "Processing WebDAV request: #{request.path} (for #{request.ip} at #{Time.now}) [#{request.request_method}]"
-      
-      controller = nil
       begin
-        controller = Controller.new(request, response, @options.dup)
-        controller.authenticate
-        res = controller.send(request.request_method.downcase)
-        response.status = res.code if res.respond_to?(:code)
-      rescue HTTPStatus::Unauthorized => status
-        response.body = controller.resource.respond_to?(:authentication_error_msg) ? controller.resource.authentication_error_msg : 'Not Authorized'
-        response['WWW-Authenticate'] = "Basic realm=\"#{controller.resource.respond_to?(:authentication_realm) ? controller.resource.authentication_realm : 'Locked content'}\""
-        response.status = status.code
-      rescue HTTPStatus::Status => status
-        response.status = status.code
+        start = Time.now
+        request = Rack::Request.new(env)
+        response = Rack::Response.new
+
+        Logger.info "Processing WebDAV request: #{request.path} (for #{request.ip} at #{Time.now}) [#{request.request_method}]"
+        
+        controller = nil
+        begin
+          controller = Controller.new(request, response, @options.dup)
+          controller.authenticate
+          res = controller.send(request.request_method.downcase)
+          response.status = res.code if res.respond_to?(:code)
+        rescue HTTPStatus::Unauthorized => status
+          response.body = controller.resource.respond_to?(:authentication_error_msg) ? controller.resource.authentication_error_msg : 'Not Authorized'
+          response['WWW-Authenticate'] = "Basic realm=\"#{controller.resource.respond_to?(:authentication_realm) ? controller.resource.authentication_realm : 'Locked content'}\""
+          response.status = status.code
+        rescue HTTPStatus::Status => status
+          response.status = status.code
+        end
+
+        # Strings in Ruby 1.9 are no longer enumerable.  Rack still expects the response.body to be
+        # enumerable, however.
+        
+        response['Content-Length'] = response.body.to_s.length unless response['Content-Length'] || !response.body.is_a?(String)
+        response.body = [response.body] if not response.body.respond_to? :each
+        response.status = response.status ? response.status.to_i : 200
+        response.headers.keys.each{|k| response.headers[k] = response[k].to_s}
+        
+        # Apache wants the body dealt with, so just read it and junk it
+        buf = true
+        buf = request.body.read(8192) while buf
+
+        Logger.debug "Response in string form. Outputting contents: \n#{response.body}" if response.body.is_a?(String)
+        Logger.info "Completed in: #{((Time.now.to_f - start.to_f) * 1000).to_i} ms | #{response.status} [#{request.url}]"
+        
+        response.body.is_a?(Rack::File) ? response.body.call(env) : response.finish
       rescue Exception => e
         Logger.error "WebDAV Error: #{e}\n#{e.backtrace.join("\n")}"
         raise e
       end
-
-      # Strings in Ruby 1.9 are no longer enumerable.  Rack still expects the response.body to be
-      # enumerable, however.
-      
-      response['Content-Length'] = response.body.to_s.length unless response['Content-Length'] || !response.body.is_a?(String)
-      response.body = [response.body] if not response.body.respond_to? :each
-      response.status = response.status ? response.status.to_i : 200
-      response.headers.keys.each{|k| response.headers[k] = response[k].to_s}
-      
-      # Apache wants the body dealt with, so just read it and junk it
-      buf = true
-      buf = request.body.read(8192) while buf
-
-      Logger.debug "Response in string form. Outputting contents: \n#{response.body}" if response.body.is_a?(String)
-      Logger.info "Completed in: #{((Time.now.to_f - start.to_f) * 1000).to_i} ms | #{response.status} [#{request.url}]"
-      
-      response.body.is_a?(Rack::File) ? response.body.call(env) : response.finish
     end
     
   end

data/lib/dav4rack/resource.rb

@@ -1,4 +1,5 @@
 require 'uuidtools'
+require 'dav4rack/http_status'
 
 module DAV4Rack
   

data/lib/dav4rack/version.rb

@@ -1,3 +1,3 @@
 module DAV4Rack
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-19 00:00:00 -08:00
+date: 2010-12-17 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency