rack_dav 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e79ae582f10f164cfcd53a6a2b5a48aaad203635
-  data.tar.gz: e385c0976e3a93eecac509509c53ca7e304b44b8
+  metadata.gz: 849a36645773dd942cbf87d7e41a685ff5814157
+  data.tar.gz: 5269572bc9f41e2c6fa73eb23f1e31a7ac17aa58
 SHA512:
-  metadata.gz: 0a3e8849bbed3be0100b1978a52d77510c1ccf4801079a2df9647155de3142dfd51911486f13c00a602cbb4db8fa4a46fbf953dbb091599c958ee1a57b42031c
-  data.tar.gz: 01d765203ece91396cf9eb80584c4cfd14f99a8f356d0f5fa1a8fa9539905589d9919ca297a06a08e341a1fb52a96b8959ea1e2291c38cd8516443cb99c5f2ed
+  metadata.gz: b6e6183c272dbd1c9c292c2de86fda4afef9282db0e190cc9fa31f1d7d0af7d3d175e917442f83d11c53231bf07f676fa4990bf722781a385f29d2dfcbdab299
+  data.tar.gz: c591239bce9cff7162639b6bf1b24b28b4e1d193a87eafda61c1aa0477085f491683270622cdd78eaeaa9855fb2c1a039b0816bfa0da7b66e986b11c0c15b25c

data/Gemfile.lock

@@ -1,26 +1,33 @@
 PATH
   remote: .
   specs:
-    rack_dav (0.3.1)
-      nokogiri
-      rack (>= 1.4.0)
+    rack_dav (0.4.0)
+      ffi-xattr (~> 0.1)
+      nokogiri (~> 1.5)
+      rack (~> 1.4)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    diff-lcs (1.2.1)
-    nokogiri (1.5.8)
-    nokogiri (1.5.8-java)
-    rack (1.5.2)
-    rake (10.0.3)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.10)
+    ffi (1.9.10-java)
+    ffi-xattr (0.1.2)
+      ffi
+    mini_portile (0.6.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    nokogiri (1.6.6.2-java)
+    rack (1.6.4)
+    rake (0.9.6)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
+    rspec-mocks (2.99.3)
 
 PLATFORMS
   java
@@ -28,5 +35,5 @@ PLATFORMS
 
 DEPENDENCIES
   rack_dav!
-  rake (>= 0.9.0)
-  rspec (>= 2.11.0)
+  rake (~> 0.9)
+  rspec (~> 2.11)

data/README.md

@@ -29,9 +29,9 @@ script looks like this:
 
     require 'rubygems'
     require 'rack_dav'
-    
+
     use Rack::CommonLogger
-    
+
     run RackDAV::Handler.new(:root => '/path/to/docs')
 
 ## Implementing your own WebDAV resource
@@ -85,6 +85,10 @@ to retrieve and change the resources:
 
 * __make\_collection__: Create this resource as collection.
 
+* __set_custom_property(name, value)__: Set a custom property on the resource. If the value is nil, delete the custom property.
+
+* __get_custom_property(name)__: Return the value of the named custom property.
+
 * __lock(locktoken, timeout, lockscope=nil, locktype=nil, owner=nil)__: Lock this resource.
   If scope, type and owner are nil, refresh the given lock.
 

data/lib/rack_dav/controller.rb

@@ -61,6 +61,7 @@ module RackDAV
       map_exceptions do
         resource.put
       end
+      response.status = Created
     end
 
     def post
@@ -70,6 +71,8 @@ module RackDAV
     end
 
     def delete
+      raise NotFound if not resource.exist?
+
       delete_recursive(resource, errors = [])
 
       if errors.empty?
@@ -82,6 +85,10 @@ module RackDAV
     end
 
     def mkcol
+      # Reject message bodies - RFC2518:8.3.1
+      body = @request.body.read(8)
+      fail UnsupportedMediaType if !body.nil? && body.length > 0
+
       map_exceptions do
         resource.make_collection
       end
@@ -98,6 +105,8 @@ module RackDAV
       raise Forbidden if destination == resource.path
 
       dest = resource_class.new(destination, @request, @response, @options)
+      raise PreconditionFailed if dest.exist? && !overwrite
+
       dest = dest.child(resource.name) if dest.collection?
 
       dest_existed = dest.exist?
@@ -125,9 +134,10 @@ module RackDAV
       raise Forbidden if destination == resource.path
 
       dest = resource_class.new(destination, @request, @response, @options)
-      dest = dest.child(resource.name) if dest.collection?
+      raise PreconditionFailed if dest.exist? && !overwrite
 
       dest_existed = dest.exist?
+      dest = dest.child(resource.name) if dest.collection?
 
       raise Conflict if depth <= 1
 
@@ -149,11 +159,26 @@ module RackDAV
       raise NotFound if not resource.exist?
 
       if not request_match("/d:propfind/d:allprop").empty?
-        names = resource.property_names
+        nodes = all_prop_nodes
       else
-        names = request_match("/d:propfind/d:prop/d:*").map { |e| e.name }
-        names = resource.property_names if names.empty?
-        raise BadRequest if names.empty?
+        nodes = request_match("/d:propfind/d:prop/*")
+        nodes = all_prop_nodes if nodes.empty?
+      end
+
+      nodes.each do |n|
+        # Don't allow empty namespace declarations
+        # See litmus props test 3
+        raise BadRequest if n.namespace.nil? && n.namespace_definitions.empty?
+
+        # Set a blank namespace if one is included in the request
+        # See litmus props test 16
+        # <propfind xmlns="DAV:"><prop><nonamespace xmlns=""/></prop></propfind>
+        if n.namespace.nil?
+          nd = n.namespace_definitions.first
+          if nd.prefix.nil? && nd.href.empty?
+            n.add_namespace(nil, '')
+          end
+        end
       end
 
       multistatus do |xml|
@@ -161,7 +186,7 @@ module RackDAV
           resource.path.gsub!(/\/\//, '/')
           xml.response do
             xml.href "http://#{host}#{url_escape resource.path}"
-            propstats xml, get_properties(resource, names)
+            propstats xml, get_properties(resource, nodes)
           end
         end
       end
@@ -170,19 +195,28 @@ module RackDAV
     def proppatch
       raise NotFound if not resource.exist?
 
-      prop_rem = request_match("/d:propertyupdate/d:remove/d:prop/d:*").map { |e| [e.name] }
-      prop_set = request_match("/d:propertyupdate/d:set/d:prop/d:*").map { |e| [e.name, e.text] }
+      nodes = request_match("/d:propertyupdate[d:remove/d:prop/* or d:set/d:prop/*]//d:prop/*")
+
+      # Set a blank namespace if one is included in the request
+      # See litmus props test 15
+      # <propertyupdate xmlns="DAV:"><set>
+      #   <prop><nonamespace xmlns="">randomvalue</nonamespace></prop>
+      # </set></propertyupdate>
+      nodes.each do |n|
+        nd = n.namespace_definitions.first
+        if !nd.nil? && nd.prefix.nil? && nd.href.empty?
+          n.add_namespace(nil, '')
+        end
+      end
 
       multistatus do |xml|
         for resource in find_resources
           xml.response do
             xml.href "http://#{host}#{resource.path}"
-            propstats xml, set_properties(resource, prop_set)
+            propstats xml, set_properties(resource, nodes)
           end
         end
       end
-
-      resource.save
     end
 
     def lock
@@ -310,6 +344,22 @@ module RackDAV
         request_document.xpath(pattern, 'd' => 'DAV:')
       end
 
+      def qualified_node_name(node)
+        node.namespace.nil? || node.namespace.prefix.nil? ? node.name : "#{node.namespace.prefix}:#{node.name}"
+      end
+
+      def qualified_property_name(node)
+        node.namespace.nil? || node.namespace.href == 'DAV:' ? node.name : "{#{node.namespace.href}}#{node.name}"
+      end
+
+      def all_prop_nodes
+        resource.property_names.map do |n|
+          node = Nokogiri::XML::Element.new(n, request_document)
+          node.add_namespace(nil, 'DAV:')
+          node
+        end
+      end
+
       # Quick and dirty parsing of the WEBDAV Timeout header.
       # Refuses infinity, rejects anything but Second- timeouts
       #
@@ -371,29 +421,29 @@ module RackDAV
         end
       end
 
-      def get_properties(resource, names)
+      def get_properties(resource, nodes)
         stats = Hash.new { |h, k| h[k] = [] }
-        for name in names
+        for node in nodes
           begin
             map_exceptions do
-              stats[OK] << [name, resource.get_property(name)]
+              stats[OK] << [node, resource.get_property(qualified_property_name(node))]
             end
           rescue Status
-            stats[$!] << name
+            stats[$!] << node
           end
         end
         stats
       end
 
-      def set_properties(resource, pairs)
+      def set_properties(resource, nodes)
         stats = Hash.new { |h, k| h[k] = [] }
-        for name, value in pairs
+        for node in nodes
           begin
             map_exceptions do
-              stats[OK] << [name, resource.set_property(name, value)]
+              stats[OK] << [node, resource.set_property(qualified_property_name(node), node.text)]
             end
           rescue Status
-            stats[$!] << name
+            stats[$!] << node
           end
         end
         stats
@@ -404,13 +454,22 @@ module RackDAV
         for status, props in stats
           xml.propstat do
             xml.prop do
-              for name, value in props
+              for node, value in props
                 if value.is_a?(Nokogiri::XML::Node)
-                  xml.send(name) do
+                  xml.send(qualified_node_name(node).to_sym) do
                     rexml_convert(xml, value)
                   end
                 else
-                  xml.send(name, value)
+                  attrs = {}
+                  unless node.namespace.nil?
+                    unless node.namespace.prefix.nil?
+                      attrs = { "xmlns:#{node.namespace.prefix}" => node.namespace.href }
+                    else
+                      attrs = { 'xmlns' => node.namespace.href }
+                    end
+                  end
+
+                  xml.send(qualified_node_name(node).to_sym, value, attrs)
                 end
               end
             end

data/lib/rack_dav/file_resource.rb

@@ -1,4 +1,5 @@
 require 'digest'
+require 'ffi-xattr'
 
 module RackDAV
 
@@ -65,6 +66,28 @@ module RackDAV
       stat.size
     end
 
+    def set_custom_property(name, value)
+      if value.nil? || value.empty?
+        begin
+          xattr.remove("rack_dav:#{name}")
+        rescue Errno::ENOATTR
+          # If the attribute being deleted doesn't exist, just do nothing
+        end
+      else
+        xattr["rack_dav:#{name}"] = value
+      end
+    end
+
+    def get_custom_property(name)
+      value = xattr["rack_dav:#{name}"]
+      raise HTTPStatus::NotFound if value.nil?
+      value
+    end
+
+    def list_custom_properties
+      xattr.list.select { |a| a.start_with?('rack_dav') }.map { |a| a.sub(/^rack_dav:/, '') }
+    end
+
     # HTTP GET request.
     #
     # Write the content of the resource to the response.body.
@@ -119,6 +142,10 @@ module RackDAV
         open(file_path, "rb") do |file|
           dest.write(file)
         end
+
+        list_custom_properties.each do |prop|
+          dest.set_custom_property(prop, get_custom_property(prop))
+        end
       end
     end
 
@@ -167,6 +194,10 @@ module RackDAV
         @stat ||= File.stat(file_path)
       end
 
+      def xattr
+        @xattr ||= Xattr.new(file_path)
+      end
+
       def content_md5_pass?(env)
         expected = env['HTTP_CONTENT_MD5'] or return true
 

data/lib/rack_dav/resource.rb

@@ -148,6 +148,7 @@ module RackDAV
       when 'getcontenttype'   then content_type
       when 'getetag'          then etag
       when 'getlastmodified'  then last_modified.httpdate
+      else self.get_custom_property(name) if self.respond_to?(:get_custom_property)
       end
     end
 
@@ -157,13 +158,14 @@ module RackDAV
       when 'getcontenttype'  then self.content_type = value
       when 'getetag'         then self.etag = value
       when 'getlastmodified' then self.last_modified = Time.httpdate(value)
+      else self.set_custom_property(name, value) if self.respond_to?(:set_custom_property)
       end
     rescue ArgumentError
       raise HTTPStatus::Conflict
     end
 
     def remove_property(name)
-      raise HTTPStatus::Forbidden
+      raise HTTPStatus::Forbidden if property_names.include?(name)
     end
 
     def parent

data/lib/rack_dav/version.rb

@@ -4,7 +4,7 @@ module RackDAV
   module Version
     MAJOR = 0
     MINOR = 4
-    PATCH = 0
+    PATCH = 1
     BUILD = nil
 
     STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")

data/rack_dav.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency("rack", "~> 1.4")
   s.add_dependency('nokogiri', "~> 1.5")
+  s.add_dependency("ffi-xattr", "~> 0.1")
   s.add_development_dependency("rspec", "~> 2.11")
   s.add_development_dependency("rake","~> 0.9")
 end

data/spec/controller_spec.rb

@@ -26,6 +26,12 @@ class Rack::MockResponse
 
 end
 
+if ENV['TRAVIS']
+  RSpec.configure do |c|
+    c.filter_run_excluding :has_xattr_support => true
+  end
+end
+
 describe RackDAV::Handler do
 
   DOC_ROOT = File.expand_path(File.dirname(__FILE__) + '/htdocs')
@@ -66,7 +72,7 @@ describe RackDAV::Handler do
 
     describe "LOCK" do
       before(:each) do
-        put("/test", :input => "body").should be_ok
+        put("/test", :input => "body").should be_created
         lock("/test", :input => File.read(fixture("requests/lock.xml")))
       end
 
@@ -78,7 +84,7 @@ describe RackDAV::Handler do
         it "sets a compliant rack response" do
           body = response.original_response.body
           body.should be_a(Array)
-          body.should have(1).part
+          expect(body.size).to eq(1)
         end
 
         it "prints the lockdiscovery" do
@@ -128,7 +134,7 @@ describe RackDAV::Handler do
 
     describe "UNLOCK" do
       before(:each) do
-        put("/test", :input => "body").should be_ok
+        put("/test", :input => "body").should be_created
         lock("/test", :input => File.read(fixture("requests/lock.xml"))).should be_ok
       end
 
@@ -176,12 +182,12 @@ describe RackDAV::Handler do
 
     describe "uri escaping" do
       it "allows url escaped utf-8" do
-        put('/D%C3%B6ner').should be_ok
+        put('/D%C3%B6ner').should be_created
         get('/D%C3%B6ner').should be_ok
       end
 
       it "allows url escaped iso-8859" do
-        put('/D%F6ner').should be_ok
+        put('/D%F6ner').should be_created
         get('/D%F6ner').should be_ok
       end
     end
@@ -222,7 +228,7 @@ describe RackDAV::Handler do
         end
 
         it 'should be successful' do
-          response.should be_ok
+          response.should be_created
         end
 
         it 'should create the resource' do
@@ -233,7 +239,7 @@ describe RackDAV::Handler do
     end
 
     it 'should return headers' do
-      put('/test.html', :input => '<html/>').should be_ok
+      put('/test.html', :input => '<html/>').should be_created
       head('/test.html').should be_ok
 
       response.headers['etag'].should_not be_nil
@@ -251,25 +257,25 @@ 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').should be_created
       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').should be_created
       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').should be_created
       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
+      put('/folder/a', :input => 'body').should be_created
+      put('/folder/b', :input => 'body').should be_created
 
       delete('/folder').should be_no_content
       get('/folder').should be_not_found
@@ -277,52 +283,59 @@ describe RackDAV::Handler do
       get('/folder/b').should be_not_found
     end
 
+    it 'should return not found when deleting a non-existent resource' do
+      delete('/not_found').should be_not_found
+    end
+
     it 'should not allow copy to another domain' do
-      put('/test', :input => 'body').should be_ok
+      put('/test', :input => 'body').should be_created
       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').should be_created
       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
+      put('/test', :input => 'body').should be_created
       copy('/test', 'HTTP_DESTINATION' => '%').should be_bad_request
     end
 
     it 'should copy a single resource' do
-      put('/test', :input => 'body').should be_ok
+      put('/test', :input => 'body').should be_created
       copy('/test', 'HTTP_DESTINATION' => '/copy').should be_created
       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
+      put(url_escape('/a b'), :input => 'body').should be_created
       copy(url_escape('/a b'), 'HTTP_DESTINATION' => url_escape('/a c')).should be_created
       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
-      copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'F')
-
-      multistatus_response('/d:href').first.text.should == 'http://localhost/test'
-      multistatus_response('/d:status').first.text.should match(/412 Precondition Failed/)
+      put('/test', :input => 'body').should be_created
+      put('/copy', :input => 'copy').should be_created
+      copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'F').should be_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
+      put('/test', :input => 'body').should be_created
+      put('/copy', :input => 'copy').should be_created
       copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'T').should be_no_content
       get('/copy').body.should == 'body'
     end
 
+    it 'should deny a move to an existing resource without overwrite' do
+      put('/test', :input => 'body').should be_created
+      put('/copy', :input => 'copy').should be_created
+      move('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'F').should be_precondition_failed
+    end
+
     it 'should copy a collection' do
       mkcol('/folder').should be_created
       copy('/folder', 'HTTP_DESTINATION' => '/copy').should be_created
@@ -332,8 +345,8 @@ describe RackDAV::Handler do
 
     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
+      put('/folder/a', :input => 'A').should be_created
+      put('/folder/b', :input => 'B').should be_created
 
       copy('/folder', 'HTTP_DESTINATION' => '/copy').should be_created
       propfind('/copy', :input => propfind_xml(:resourcetype))
@@ -345,8 +358,8 @@ describe RackDAV::Handler do
 
     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
+      put('/folder/a', :input => 'A').should be_created
+      put('/folder/b', :input => 'B').should be_created
 
       move('/folder', 'HTTP_DESTINATION' => '/move').should be_created
       propfind('/move', :input => propfind_xml(:resourcetype))
@@ -358,19 +371,30 @@ describe RackDAV::Handler do
       get('/folder/b').should be_not_found
     end
 
+    it 'should not move a collection onto an existing collection without overwrite' do
+      mkcol('/folder').should be_created
+      mkcol('/dest').should be_created
+
+      move('/folder', 'HTTP_DESTINATION' => '/dest', 'HTTP_OVERWRITE' => 'F').should be_precondition_failed
+    end
+
     it 'should create a collection' do
       mkcol('/folder').should be_created
       propfind('/folder', :input => propfind_xml(:resourcetype))
       multistatus_response('/d:propstat/d:prop/d:resourcetype/d:collection').should_not be_empty
     end
 
+    it 'should not create a collection with a body' do
+      mkcol('/folder', :input => 'body').should be_unsupported_media_type
+    end
+
     it 'should not find properties for nonexistent resources' do
       propfind('/non').should be_not_found
     end
 
     it 'should find all properties' do
       xml = render do |xml|
-        xml.propfind('xmlns:d' => "DAV:") do
+        xml.propfind('xmlns' => "DAV:") do
           xml.allprop
         end
       end
@@ -386,15 +410,53 @@ describe RackDAV::Handler do
     end
 
     it 'should find named properties' do
-      put('/test.html', :input => '<html/>').should be_ok
+      put('/test.html', :input => '<html/>').should be_created
       propfind('/test.html', :input => propfind_xml(:getcontenttype, :getcontentlength))
 
       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 set custom properties in the dav namespace', :has_xattr_support => true do
+      put('/prop', :input => 'A').should be_created
+      proppatch('/prop', :input => propset_xml([:foo, 'testing']))
+      multistatus_response('/d:propstat/d:prop/d:foo').should_not be_empty
+
+      propfind('/prop', :input => propfind_xml(:foo))
+      multistatus_response('/d:propstat/d:prop/d:foo').first.text.should == 'testing'
+    end
+
+    it 'should set custom properties in custom namespaces', :has_xattr_support => true do
+      xmlns = { 'xmlns:s' => 'SPEC:' }
+      put('/prop', :input => 'A').should be_created
+      proppatch('/prop', :input => propset_xml(['s:foo'.to_sym, 'testing', xmlns]))
+      multistatus_response('/d:propstat/d:prop/s:foo', xmlns).should_not be_empty
+
+      propfind('/prop', :input => propfind_xml(['s:foo'.to_sym, xmlns]))
+      multistatus_response('/d:propstat/d:prop/s:foo', xmlns).first.text.should == 'testing'
+    end
+
+    it 'should copy custom properties', :has_xattr_support => true do
+      xmlns = { 'xmlns:s' => 'SPEC:' }
+      put('/prop', :input => 'A').should be_created
+      proppatch('/prop', :input => propset_xml(['s:foo'.to_sym, 'testing', xmlns]))
+      multistatus_response('/d:propstat/d:prop/s:foo', xmlns).should_not be_empty
+
+      copy('/prop', 'HTTP_DESTINATION' => '/propcopy').should be_created
+      propfind('/propcopy', :input => propfind_xml(['s:foo'.to_sym, xmlns]))
+      multistatus_response('/d:propstat/d:prop/s:foo', xmlns).first.text.should == 'testing'
+    end
+
+    it 'should not set properties for a non-existent resource' do
+      proppatch('/not_found', :input => propset_xml([:foo, 'testing'])).should be_not_found
+    end
+
+    it 'should not return properties for non-existent resource' do
+      propfind('/prop', :input => propfind_xml(:foo)).should be_not_found
+    end
+
     it 'should return the correct charset (utf-8)' do
-      put('/test.html', :input => '<html/>').should be_ok
+      put('/test.html', :input => '<html/>').should be_created
       propfind('/test.html', :input => propfind_xml(:getcontenttype, :getcontentlength))
 
       charset = @response.media_type_params['charset']
@@ -402,7 +464,7 @@ describe RackDAV::Handler do
     end
 
     it 'should not support LOCK' do
-      put('/test', :input => 'body').should be_ok
+      put('/test', :input => 'body').should be_created
 
       xml = render do |xml|
         xml.lockinfo('xmlns:d' => "DAV:") do
@@ -416,7 +478,7 @@ describe RackDAV::Handler do
     end
 
     it 'should not support UNLOCK' do
-      put('/test', :input => 'body').should be_ok
+      put('/test', :input => 'body').should be_created
       unlock('/test', :input => '').should be_method_not_allowed
     end
 
@@ -477,22 +539,39 @@ describe RackDAV::Handler do
       match['/d:locktoken/d:href'].first.text.should == token
     end
 
-    def multistatus_response(pattern)
+    def multistatus_response(pattern, ns=nil)
+      xmlns = { 'd' => 'DAV:' }
+      xmlns.merge!(ns) unless ns.nil?
+
       @response.should be_multi_status
-      response_xml.xpath("/d:multistatus/d:response", 'd' => 'DAV:').should_not be_empty
-      response_xml.xpath("/d:multistatus/d:response" + pattern, 'd' => 'DAV:')
+      response_xml.xpath("/d:multistatus/d:response", xmlns).should_not be_empty
+      response_xml.xpath("/d:multistatus/d:response" + pattern, xmlns)
     end
 
     def propfind_xml(*props)
       render do |xml|
-        xml.propfind('xmlns:d' => "DAV:") do
+        xml.propfind('xmlns' => "DAV:") do
           xml.prop do
-            props.each do |prop|
-            xml.send prop.to_sym
+            props.each do |prop, attrs|
+              xml.send(prop.to_sym, attrs)
             end
           end
         end
       end
     end
 
+    def propset_xml(*props)
+      render do |xml|
+        xml.propertyupdate('xmlns' => 'DAV:') do
+          xml.set do
+            xml.prop do
+              props.each do |prop, value, attrs|
+                attrs = {} if attrs.nil?
+                xml.send(prop.to_sym, value, attrs)
+              end
+            end
+          end
+        end
+      end
+    end
 end

metadata

@@ -1,69 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: rack_dav
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Matthias Georgi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-28 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: ffi-xattr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 description: WebDAV handler for Rack.
@@ -74,8 +88,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -110,17 +124,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: WebDAV handler for Rack.