dav4rack 0.2.3 → 0.2.4

data/README.rdoc

@@ -305,6 +305,7 @@ A big thanks to everyone contributing to help make this project better.
 * {clyfe}[http://github.com/clyfe]
 * {antiloopgmbh}[http://github.com/antiloopgmbh]
 * {krug}[http://github.com/krug]
+* {teefax}[http://github.com/teefax]
 
 == License
 

data/lib/dav4rack/controller.rb

@@ -71,7 +71,7 @@ module DAV4Rack
       status = resource.put(request, response)
       multistatus do |xml|
         xml.response do
-          xml.href resource.path
+          xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
           xml.status "#{http_version} #{status.status_line}"
         end
       end
@@ -95,7 +95,7 @@ module DAV4Rack
       status = resource.make_collection
       multistatus do |xml|
         xml.response do
-          xml.href resource.path
+          xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
           xml.status "#{http_version} #{status.status_line}"
         end
       end
@@ -468,19 +468,7 @@ module DAV4Rack
     # element:: Nokogiri::XML::Element
     # Converts element into proper text
     def xml_convert(xml, element)
-      if element.children.empty?
-        if element.text?
-          xml.send(element.name, element.text, element.attributes)
-        else
-          xml.send(element.name, element.attributes)
-        end
-      else
-        xml.send(element.name, element.attributes) do
-          element.elements.each do |child|
-            xml_convert(xml, child)
-          end
-        end
-      end
+      xml.doc.root.add_child(element)
     end
 
   end

data/lib/dav4rack/resource.rb

@@ -234,7 +234,7 @@ module DAV4Rack
         lock.scope = args[:scope]
         lock.kind = args[:type]
         lock.owner = args[:owner]
-        lock.depth = args[:depth].to_i
+        lock.depth = args[:depth].is_a?(Symbol) ? args[:depth] : args[:depth].to_i
         if(args[:timeout])
           lock.timeout = args[:timeout] <= @max_timeout && args[:timeout] > 0 ? args[:timeout] : @max_timeout
         else

data/lib/dav4rack/version.rb

@@ -1,3 +1,3 @@
 module DAV4Rack
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

data/spec/handler_spec.rb

@@ -120,6 +120,13 @@ describe DAV4Rack::Handler do
     get('/test').should be_ok
     response.body.should == 'body'
   end
+  
+  it 'should return an absolute url after a put request' do
+    put('/test', :input => 'body')
+    multi_status_ok.should eq true
+    multistatus_response('/D:href').first.text.should =~ /http:\/\/localhost(:\d+)?\/test/
+  end
+  
   it 'should create and find a url with escaped characters' do
     put(url_escape('/a b'), :input => 'body')
     multi_status_ok.should eq true
@@ -250,6 +257,14 @@ describe DAV4Rack::Handler do
     multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty
   end
   
+  it 'should return full urls after creating a collection' do
+    mkcol('/folder')
+    multi_status_created.should eq true
+    propfind('/folder', :input => propfind_xml(:resourcetype))
+    multistatus_response('/D:propstat/D:prop/D:resourcetype/D:collection').should_not be_empty
+    multistatus_response('/D:href').first.text.should =~ /http:\/\/localhost(:\d+)?\/folder/
+  end
+  
   it 'should not find properties for nonexistent resources' do
     propfind('/non').should be_not_found
   end
@@ -305,4 +320,18 @@ describe DAV4Rack::Handler do
     match['/D:locktoken'].should_not be_empty
     match['/D:owner'].should_not be_empty
   end
+  
+  context "when mapping a path" do
+    
+    before do
+      @controller = DAV4Rack::Handler.new(:root => DOC_ROOT, :root_uri_path => '/webdav/')
+    end
+    
+    it "should return correct urls" do
+      # FIXME: a put to '/test' works, too -- should it?
+      put('/webdav/test', :input => 'body')
+      multi_status_ok.should eq true
+      multistatus_response('/D:href').first.text.should =~ /http:\/\/localhost(:\d+)?\/webdav\/test/
+    end
+  end
 end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 3
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-31 00:00:00 -07:00
+date: 2011-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
         version: 2.1.1
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id003
@@ -109,23 +89,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: WebDAV handler for Rack