dav4rack 0.1.4 → 0.1.5

data/README.rdoc

@@ -21,6 +21,10 @@ a pull request with your modifications. If you are just here to use the library,
 === Via RubyGems
 
     gem install dav4rack
+    
+== Documentation
+
+* {DAV4Rack documentation}[http://chrisroberts.github.com/dav4rack]
 
 == Quickstart
 
@@ -90,9 +94,9 @@ lets continue with the last example but this time include the interceptor:
     end
     map '/' do
       use DAV4Rack::Interceptor, :mappings => {
-                                                '/webdav/share/' => {:resource_class => FileResource, :custom => 'option'},
-                                                '/webdav/share2/' => {:resource_class => CustomResource}
-                                              }
+        '/webdav/share/' => {:resource_class => FileResource, :custom => 'option'},
+        '/webdav/share2/' => {:resource_class => CustomResource}
+      }
       use Rails::Rack::Static
       run ActionController::Dispatcher.new
     end
@@ -202,7 +206,7 @@ And if you don't have the X-Sendfile-Type header set, you can fix that by changi
 
   response.body = DAV4Rack::RemoteFile.new(item[:url], :size => content_length, :mime_type => content_type, :sendfile => 'X-Accel-Redirect', :sendfile_prefix => 'webdav_redirect')
 
-And if you have none of the above because your server hasn't been configured for sendfile support, your out of luck until it's configured.
+And if you have none of the above because your server hasn't been configured for sendfile support, you're out of luck until it's configured.
 
 == Authentication
 
@@ -295,6 +299,13 @@ without getting stuck in a loop.
 
 Please use the issues at github: http://github.com/chrisroberts/dav4rack/issues
 
+== Contributors
+
+A big thanks to everyone contributing to help make this project better.
+
+* {clyfe}[http://github.com/clyfe]
+* {antiloopgmbh}[http://github.com/antiloopgmbh]
+
 == License
 
 Just like RackDAV before it, this software is distributed under the MIT license.

data/lib/dav4rack/controller.rb

@@ -39,7 +39,7 @@
       response["Allow"] = 'OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK'
       response["Dav"] = "2"
       response["Ms-Author-Via"] = "DAV"
-      NoContent
+      OK
     end
     
     # Return response to HEAD
@@ -48,7 +48,7 @@
       response['Etag'] = resource.etag
       response['Content-Type'] = resource.content_type
       response['Last-Modified'] = resource.last_modified.httpdate
-      NoContent
+      OK
     end
     
     # Return response to GET
@@ -127,8 +127,8 @@
       response['Location'] = "#{scheme}://#{host}:#{port}#{dest.public_path}" if status == Created
       multistatus do |xml|
         xml.response do
-          xml.href "#{scheme}://#{host}:#{port}#{dest.public_path}"
-          xml.status = "#{http_version} #{status.status_line}"
+          xml.href "#{scheme}://#{host}:#{port}#{status == Created ? dest.public_path : resource.public_path}"
+          xml.status "#{http_version} #{status.status_line}"
         end
       end
     end
@@ -202,6 +202,9 @@
               xml.locktoken do
                 xml.href locktoken
               end
+              if(asked[:owner])
+                xml.owner asked[:owner]
+              end
             end
           end
         end
@@ -228,14 +231,18 @@
     # has defined an #authenticate method
     def authenticate
       authed = true
-      if(resource.respond_to?(:authenticate))
+      if(resource.respond_to?(:authenticate, true))
         authed = false
+        uname = nil
+        password = nil
         if(request.env['HTTP_AUTHORIZATION'])
           auth = Rack::Auth::Basic::Request.new(request.env)
           if(auth.basic? && auth.credentials)
-            authed = resource.authenticate(auth.credentials[0], auth.credentials[1])
+            uname = auth.credentials[0]
+            password = auth.credentials[1]
           end
         end
+        authed = resource.send(:authenticate, uname, password)
       end
       raise Unauthorized unless authed
     end
@@ -320,17 +327,17 @@
     end
 
     # Find resources at depth requested
-    def find_resources
+    def find_resources(with_current_resource=true)
       ary = nil
       case depth
       when 0
-        ary = [resource]
+        ary = []
       when 1
         ary = resource.children
       else
         ary = resource.descendants
       end
-      ary ? ary : []
+      with_current_resource ? [resource] + ary : ary
     end
     
     # XML parsed request

data/lib/dav4rack/file_resource.rb

@@ -6,10 +6,6 @@ module DAV4Rack
     
     include WEBrick::HTTPUtils
     
-    before do |resource, method_name|
-      resource.send(:check_authentication)
-    end
-    
     # If this is a collection, return the child resources.
     def children
       Dir[file_path + '/*'].map do |path|
@@ -84,7 +80,7 @@ module DAV4Rack
     # Save the content of the request.body.
     def put(request, response)
       write(request.body)
-      Created
+      OK
     end
     
     # HTTP POST request.
@@ -99,7 +95,7 @@ module DAV4Rack
     # Delete this resource.
     def delete
       if stat.directory?
-        Dir.rmdir(file_path)
+        FileUtils.rm_rf(file_path)
       else
         File.unlink(file_path)
       end
@@ -109,22 +105,31 @@ module DAV4Rack
     # HTTP COPY request.
     #
     # Copy this resource to given destination resource.
-    def copy(dest)
-      if stat.directory?
+    def copy(dest, overwrite = false)
+      if(dest.path == path)
+        Conflict
+      elsif(stat.directory?)
         dest.make_collection
+        FileUtils.cp_r("#{file_path}/.", "#{dest.send(:file_path)}/")
+        OK
       else
-        open(file_path, "rb") do |file|
-          dest.write(file)
+        exists = File.exists?(file_path)
+        if(exists && !overwrite)
+          PreconditionFailed
+        else
+          open(file_path, "rb") do |file|
+            dest.write(file)
+          end
+          exists ? NoContent : Created
         end
       end
-      OK
     end
   
     # HTTP MOVE request.
     #
     # Move this resource to given destination resource.
-    def move(dest)
-      copy(dest)
+    def move(*args)
+      copy(*args)
       delete
       OK
     end
@@ -134,7 +139,7 @@ module DAV4Rack
     # Create this resource as collection.
     def make_collection
       Dir.mkdir(file_path)
-      NoContent
+      Created
     end
   
     # Write to this resource from given IO.
@@ -154,21 +159,6 @@ module DAV4Rack
     
     private
 
-    def check_authentication
-      valid = true
-      if(options[:username])
-        valid = false
-        if(request.env['HTTP_AUTHORIZATION'])
-          auth = Rack::Auth::Basic::Request.new(request.env)
-          if(auth.basic? && auth.credentials)
-            valid = options[:username] == auth.credentials[0] && options[:password] == auth.credentials[1]
-          end
-        end
-      end
-      raise Unauthorized unless valid
-      valid
-    end
-    
     def authenticate(user, pass)
       if(options[:username])
         options[:username] == user && options[:password] == pass

data/lib/dav4rack/interceptor.rb

@@ -5,13 +5,15 @@ module DAV4Rack
       @roots = args[:mappings].keys
       @args = args
       @app = app
+      @intercept_methods = %w(OPTIONS PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK)
+      @intercept_methods -= args[:ignore_methods] if args[:ignore_methods]
     end
 
     def call(env)
       path = env['PATH_INFO'].downcase
       method = env['REQUEST_METHOD'].upcase
       app = nil
-      if(@roots.detect{|x| path =~ /^#{Regexp.escape(x.downcase)}\/?/}.nil? && %w(OPTIONS PUT PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK).include?(method))
+      if(@roots.detect{|x| path =~ /^#{Regexp.escape(x.downcase)}\/?/}.nil? && @intercept_methods.include?(method))
         app = DAV4Rack::Handler.new(:resource_class => InterceptorResource, :mappings => @args[:mappings], :log_to => @args[:log_to])
       end
       app ? app.call(env) : @app.call(env)

data/lib/dav4rack/resource.rb

@@ -196,14 +196,14 @@ module DAV4Rack
     # HTTP COPY request.
     #
     # Copy this resource to given destination resource.
-    def copy(dest)
+    def copy(dest, overwrite=false)
       raise NotImplementedError
     end
   
     # HTTP MOVE request.
     #
     # Move this resource to given destination resource.
-    def move(dest)
+    def move(dest, overwrite=false)
       raise NotImplemented
     end
     
@@ -287,7 +287,6 @@ module DAV4Rack
       raise Forbidden unless lock && lock.user == @user
       raise Conflict unless lock.path =~ /^#{Regexp.escape(@path)}.*$/
       lock.destroy
-      delete if name[0,1] == '.' && @options[:delete_dotfiles]
       NoContent
     end
     
@@ -394,6 +393,7 @@ module DAV4Rack
     end
 
     # Does client allow GET redirection
+    # TODO: Get a comprehensive list in here. Especially now that trasmit added support
     def allows_redirect?
       %w(cyberduck konqueror).any?{|x| (request.respond_to?(:user_agent) ? request.user_agent.to_s.downcase : request.env['HTTP_USER_AGENT'].to_s.downcase) =~ /#{Regexp.escape(x)}/}
     end

data/lib/dav4rack/version.rb

@@ -1,3 +1,3 @@
 module DAV4Rack
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/spec/handler_spec.rb

@@ -1,16 +1,17 @@
 $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
 
 require 'rubygems'
-require 'rack_dav'
+require 'dav4rack'
 require 'fileutils'
+require 'nokogiri'
 
-describe RackDAV::Handler do
+describe DAV4Rack::Handler do
   DOC_ROOT = File.expand_path(File.dirname(__FILE__) + '/htdocs')
   METHODS = %w(GET PUT POST DELETE PROPFIND PROPPATCH MKCOL COPY MOVE OPTIONS HEAD LOCK UNLOCK)  
   
   before do
     FileUtils.mkdir(DOC_ROOT) unless File.exists?(DOC_ROOT)
-    @controller = RackDAV::Handler.new(:root => DOC_ROOT)
+    @controller = DAV4Rack::Handler.new(:root => DOC_ROOT)
   end
 
   after do
@@ -22,7 +23,7 @@ describe RackDAV::Handler do
   def request(method, uri, options={})
     options = {
       'HTTP_HOST' => 'localhost',
-      'REMOTE_USER' => 'manni'
+      'REMOTE_USER' => 'user'
     }.merge(options)
     request = Rack::MockRequest.new(@controller)
     @response = request.request(method, uri, options)
@@ -34,13 +35,16 @@ describe RackDAV::Handler do
     end
   end  
   
-  def render
-    xml = Builder::XmlMarkup.new
-    xml.instruct! :xml, :version => "1.0", :encoding => "UTF-8"      
-    xml.namespace('d') do
-      yield xml
+  def render(root_type)
+    raise ArgumentError.new 'Expecting block' unless block_given?
+    doc = Nokogiri::XML::Builder.new do |xml_base|
+      xml_base.send(root_type.to_s, 'xmlns:D' => 'D:') do
+        xml_base.parent.namespace = xml_base.parent.namespace_definitions.first
+        xml = xml_base['D']
+        yield xml
+      end
     end
-    xml.target!
+    doc.to_xml
   end
  
   def url_escape(string)
@@ -50,22 +54,35 @@ describe RackDAV::Handler do
   end
   
   def response_xml
-    REXML::Document.new(@response.body)
+    Nokogiri.XML(@response.body)
   end
   
   def multistatus_response(pattern)
     @response.should be_multi_status
-    REXML::XPath::match(response_xml, "/multistatus/response", '' => 'DAV:').should_not be_empty
-    REXML::XPath::match(response_xml, "/multistatus/response" + pattern, '' => 'DAV:')
+    response_xml.xpath('//D:multistatus/D:response', response_xml.root.namespaces).should_not be_empty
+    response_xml.xpath("//D:multistatus/D:response#{pattern}", response_xml.root.namespaces)
   end
 
+  def multi_status_created
+    response_xml.xpath('//D:multistatus/D:response/D:status').should_not be_empty
+    response_xml.xpath('//D:multistatus/D:response/D:status').text.should =~ /Created/
+  end
+  
+  def multi_status_ok
+    response_xml.xpath('//D:multistatus/D:response/D:status').should_not be_empty
+    response_xml.xpath('//D:multistatus/D:response/D:status').text.should =~ /OK/
+  end
+  
+  def multi_status_no_content
+    response_xml.xpath('//D:multistatus/D:response/D:status').should_not be_empty
+    response_xml.xpath('//D:multistatus/D:response/D:status').text.should =~ /No Content/
+  end
+  
   def propfind_xml(*props)
-    render do |xml|
-      xml.propfind('xmlns:d' => "DAV:") do
-        xml.prop do
-          props.each do |prop|
-          xml.tag! prop
-          end
+    render(:propfind) do |xml|
+      xml.prop do
+        props.each do |prop|
+        xml.send(prop.to_sym)
         end
       end
     end
@@ -80,7 +97,8 @@ describe RackDAV::Handler do
   end
   
   it 'should return headers' do
-    put('/test.html', :input => '<html/>').should be_ok
+    put('/test.html', :input => '<html/>')
+    multi_status_ok.should eq true
     head('/test.html').should be_ok
     
     response.headers['etag'].should_not be_nil
@@ -97,25 +115,31 @@ describe RackDAV::Handler do
   end
   
   it 'should create a resource and allow its retrieval' do
-    put('/test', :input => 'body').should be_ok    
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
     get('/test').should be_ok
     response.body.should == 'body'
   end
   it 'should create and find a url with escaped characters' do
-    put(url_escape('/a b'), :input => 'body').should be_ok    
+    put(url_escape('/a b'), :input => 'body')
+    multi_status_ok.should eq true
     get(url_escape('/a b')).should be_ok
     response.body.should == 'body'
   end
   
   it 'should delete a single resource' do
-    put('/test', :input => 'body').should be_ok
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
     delete('/test').should be_no_content
   end
   
   it 'should delete recursively' do
-    mkcol('/folder').should be_created
-    put('/folder/a', :input => 'body').should be_ok
-    put('/folder/b', :input => 'body').should be_ok
+    mkcol('/folder')
+    multi_status_created.should eq true
+    put('/folder/a', :input => 'body')
+    multi_status_ok.should eq true
+    put('/folder/b', :input => 'body')
+    multi_status_ok.should eq true
     
     delete('/folder').should be_no_content
     get('/folder').should be_not_found
@@ -124,79 +148,94 @@ describe RackDAV::Handler do
   end
 
   it 'should not allow copy to another domain' do
-    put('/test', :input => 'body').should be_ok
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
     copy('http://localhost/', 'HTTP_DESTINATION' => 'http://another/').should be_bad_gateway
   end
 
   it 'should not allow copy to the same resource' do
-    put('/test', :input => 'body').should be_ok
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
     copy('/test', 'HTTP_DESTINATION' => '/test').should be_forbidden
   end
 
-  it 'should not allow an invalid destination uri' do
-    put('/test', :input => 'body').should be_ok
-    copy('/test', 'HTTP_DESTINATION' => '%').should be_bad_request
-  end
-
   it 'should copy a single resource' do
-    put('/test', :input => 'body').should be_ok
-    copy('/test', 'HTTP_DESTINATION' => '/copy').should be_created
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
+    copy('/test', 'HTTP_DESTINATION' => '/copy')
+    multi_status_no_content.should eq true
     get('/copy').body.should == 'body'
   end
 
   it 'should copy a resource with escaped characters' do
-    put(url_escape('/a b'), :input => 'body').should be_ok
-    copy(url_escape('/a b'), 'HTTP_DESTINATION' => url_escape('/a c')).should be_created
+    put(url_escape('/a b'), :input => 'body')
+    multi_status_ok.should eq true
+    copy(url_escape('/a b'), 'HTTP_DESTINATION' => url_escape('/a c'))
+    multi_status_no_content.should eq true
     get(url_escape('/a c')).should be_ok
     response.body.should == 'body'
   end
   
   it 'should deny a copy without overwrite' do
-    put('/test', :input => 'body').should be_ok
-    put('/copy', :input => 'copy').should be_ok
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
+    put('/copy', :input => 'copy')
+    multi_status_ok.should eq true
     copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'F')
     
-    multistatus_response('/href').first.text.should == 'http://localhost/test'
-    multistatus_response('/status').first.text.should match(/412 Precondition Failed/)
+    multistatus_response('/D:href').first.text.should =~ /http:\/\/localhost(:\d+)?\/test/
+    multistatus_response('/D:status').first.text.should match(/412 Precondition Failed/)
     
     get('/copy').body.should == 'copy'
   end
   
   it 'should allow a copy with overwrite' do
-    put('/test', :input => 'body').should be_ok
-    put('/copy', :input => 'copy').should be_ok
-    copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'T').should be_no_content
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
+    put('/copy', :input => 'copy')
+    multi_status_ok.should eq true
+    copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'T')
+    multi_status_no_content.should eq true
     get('/copy').body.should == 'body'
   end
   
-  it 'should copy a collection' do
-    mkcol('/folder').should be_created
-    copy('/folder', 'HTTP_DESTINATION' => '/copy').should be_created
+  it 'should copy a collection' do  
+    mkcol('/folder')
+    multi_status_created.should eq true
+    copy('/folder', 'HTTP_DESTINATION' => '/copy')
+    multi_status_ok.should eq true
     propfind('/copy', :input => propfind_xml(:resourcetype))
-    multistatus_response('/propstat/prop/resourcetype/collection').should_not be_empty
+    multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty
   end
 
   it 'should copy a collection resursively' do
-    mkcol('/folder').should be_created
-    put('/folder/a', :input => 'A').should be_ok
-    put('/folder/b', :input => 'B').should be_ok
+    mkcol('/folder')
+    multi_status_created.should eq true
+    put('/folder/a', :input => 'A')
+    multi_status_ok.should eq true
+    put('/folder/b', :input => 'B')
+    multi_status_ok.should eq true
     
-    copy('/folder', 'HTTP_DESTINATION' => '/copy').should be_created
+    copy('/folder', 'HTTP_DESTINATION' => '/copy')
+    multi_status_ok.should eq true
     propfind('/copy', :input => propfind_xml(:resourcetype))
-    multistatus_response('/propstat/prop/resourcetype/collection').should_not be_empty    
-    
+    multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty
     get('/copy/a').body.should == 'A'
     get('/copy/b').body.should == 'B'
   end
   
   it 'should move a collection recursively' do
-    mkcol('/folder').should be_created
-    put('/folder/a', :input => 'A').should be_ok
-    put('/folder/b', :input => 'B').should be_ok
+    mkcol('/folder')
+    multi_status_created.should eq true
+    put('/folder/a', :input => 'A')
+    multi_status_ok.should eq true
+    put('/folder/b', :input => 'B')
+    multi_status_ok.should eq true
     
-    move('/folder', 'HTTP_DESTINATION' => '/move').should be_created
+    move('/folder', 'HTTP_DESTINATION' => '/move')
+    multi_status_ok.should eq true
     propfind('/move', :input => propfind_xml(:resourcetype))
-    multistatus_response('/propstat/prop/resourcetype/collection').should_not be_empty    
+    multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty    
     
     get('/move/a').body.should == 'A'
     get('/move/b').body.should == 'B'
@@ -205,9 +244,10 @@ describe RackDAV::Handler do
   end
   
   it 'should create a collection' do
-    mkcol('/folder').should be_created
+    mkcol('/folder')
+    multi_status_created.should eq true
     propfind('/folder', :input => propfind_xml(:resourcetype))
-    multistatus_response('/propstat/prop/resourcetype/collection').should_not be_empty
+    multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty
   end
   
   it 'should not find properties for nonexistent resources' do
@@ -215,56 +255,54 @@ describe RackDAV::Handler do
   end
   
   it 'should find all properties' do
-    xml = render do |xml|
-      xml.propfind('xmlns:d' => "DAV:") do
-        xml.allprop
-      end
+    xml = render(:propfind) do |xml|
+      xml.allprop
     end
     
     propfind('http://localhost/', :input => xml)
     
-    multistatus_response('/href').first.text.strip.should == 'http://localhost/'
+    multistatus_response('/D:href').first.text.strip.should =~ /http:\/\/localhost(:\d+)?\//
 
     props = %w(creationdate displayname getlastmodified getetag resourcetype getcontenttype getcontentlength)
     props.each do |prop|
-      multistatus_response('/propstat/prop/' + prop).should_not be_empty
+      multistatus_response("/D:propstat/D:prop/D:#{prop}").should_not be_empty
     end
   end
   
   it 'should find named properties' do
-    put('/test.html', :input => '<html/>').should be_ok    
+    put('/test.html', :input => '<html/>')
+    multi_status_ok.should eq true
     propfind('/test.html', :input => propfind_xml(:getcontenttype, :getcontentlength))
    
-    multistatus_response('/propstat/prop/getcontenttype').first.text.should == 'text/html'
-    multistatus_response('/propstat/prop/getcontentlength').first.text.should == '7'
+    multistatus_response('/D:propstat/D:prop/D:getcontenttype').first.text.should == 'text/html'
+    multistatus_response('/D:propstat/D:prop/D:getcontentlength').first.text.should == '7'
   end
 
   it 'should lock a resource' do
-    put('/test', :input => 'body').should be_ok
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
     
-    xml = render do |xml|
-      xml.lockinfo('xmlns:d' => "DAV:") do
-        xml.lockscope { xml.exclusive }
-        xml.locktype { xml.write }
-        xml.owner { xml.href "http://test.de/" }
-      end      
+    xml = render(:lockinfo) do |xml|
+      xml.lockscope { xml.exclusive }
+      xml.locktype { xml.write }
+      xml.owner { xml.href "http://test.de/" }
     end
 
     lock('/test', :input => xml)
     
     response.should be_ok
-
+    
     match = lambda do |pattern|
-      REXML::XPath::match(response_xml, "/prop/lockdiscovery/activelock" + pattern, '' => 'DAV:')
+      response_xml.xpath "/D:prop/D:lockdiscovery/D:activelock#{pattern}"
     end
     
     match[''].should_not be_empty
 
-    match['/locktype'].should_not be_empty
-    match['/lockscope'].should_not be_empty
-    match['/depth'].should_not be_empty
-    match['/owner'].should_not be_empty
-    match['/timeout'].should_not be_empty
-    match['/locktoken'].should_not be_empty
+    match['/D:locktype'].should_not be_empty
+    match['/D:lockscope'].should_not be_empty
+    match['/D:depth'].should_not be_empty
+    match['/D:timeout'].should_not be_empty
+    match['/D:locktoken'].should_not be_empty
+    match['/D:owner'].should_not be_empty
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 -07:00
+date: 2010-11-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency