dav4rack 0.2.4 → 0.2.5

data/README.rdoc

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

data/lib/dav4rack/controller.rb

@@ -37,7 +37,7 @@ module DAV4Rack
     # Return response to OPTIONS
     def options
       response["Allow"] = 'OPTIONS,HEAD,GET,PUT,POST,DELETE,PROPFIND,PROPPATCH,MKCOL,COPY,MOVE,LOCK,UNLOCK'
-      response["Dav"] = "2"
+      response["Dav"] = "1, 2"
       response["Ms-Author-Via"] = "DAV"
       OK
     end
@@ -67,14 +67,11 @@ module DAV4Rack
     # Return response to PUT
     def put
       raise Forbidden if resource.collection?
+      raise Conflict unless resource.parent_exists? && resource.parent.collection?
       resource.lock_check
       status = resource.put(request, response)
-      multistatus do |xml|
-        xml.response do
-          xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
-          xml.status "#{http_version} #{status.status_line}"
-        end
-      end
+      response['Content-Location'] = "#{scheme}://#{host}:#{port}#{resource.public_path}" if status == Created
+      status
     end
 
     # Return response to POST

data/lib/dav4rack/file.rb

@@ -27,7 +27,7 @@ module DAV4Rack
     end
 
     def not_found
-      body = "File not found: #{Utils.unescape(env["PATH_INFO"])}\n"
+      body = "File not found: #{Rack::Utils.unescape(env["PATH_INFO"])}\n"
       [404, {"Content-Type" => "text/plain",
          "Content-Length" => body.size.to_s,
          "X-Cascade" => "pass"},

data/lib/dav4rack/file_resource.rb

@@ -80,7 +80,7 @@ module DAV4Rack
     # Save the content of the request.body.
     def put(request, response)
       write(request.body)
-      OK
+      Created
     end
     
     # HTTP POST request.

data/lib/dav4rack/logger.rb

@@ -5,10 +5,14 @@ module DAV4Rack
   # to log messages from the library.
   class Logger
     class << self
-      # args:: Arguments for Logger -> [path, level] (level is optional)
+      # args:: Arguments for Logger -> [path, level] (level is optional) or a Logger instance
       # Set the path to the log file.
       def set(*args)
-        @@logger = ::Logger.new(args.first, 'weekly')
+        if(args.first.is_a?(Logger))
+          @@logger = args.first
+        else
+          @@logger = ::Logger.new(args.first, 'weekly')
+        end
         if(args.size > 1)
           @@logger.level = args[1]
         end
@@ -21,4 +25,4 @@ module DAV4Rack
       end
     end
   end
-end
+end

data/lib/dav4rack/resource.rb

@@ -63,7 +63,12 @@ module DAV4Rack
     # NOTE: Customized Resources should not use initialize for setup. Instead
     #       use the #setup method
     def initialize(public_path, path, request, response, options)
-      @skip_alias = [:authenticate, :authentication_error_msg, :authentication_realm, :path, :options, :public_path, :request, :response, :user, :user=]
+      @skip_alias = [
+        :authenticate, :authentication_error_msg, 
+        :authentication_realm, :path, :options, 
+        :public_path, :request, :response, :user, 
+        :user=, :setup
+      ]
       @public_path = public_path.dup
       @path = path.dup
       @request = request

data/lib/dav4rack/version.rb

@@ -1,3 +1,17 @@
 module DAV4Rack
-  VERSION = '0.2.4'
+  class Version
+
+    attr_reader :major, :minor, :tiny
+
+    def initialize(version)
+      version = version.split('.')
+      @major, @minor, @tiny = [version[0].to_i, version[1].to_i, version[2].to_i]
+    end
+
+    def to_s
+      "#{@major}.#{@minor}.#{@tiny}"
+    end
+  end
+
+  VERSION = Version.new('0.2.5')
 end

data/spec/handler_spec.rb

@@ -97,8 +97,7 @@ describe DAV4Rack::Handler do
   end
   
   it 'should return headers' do
-    put('/test.html', :input => '<html/>')
-    multi_status_ok.should eq true
+    put('/test.html', :input => '<html/>').should be_created
     head('/test.html').should be_ok
     
     response.headers['etag'].should_not be_nil
@@ -115,38 +114,32 @@ describe DAV4Rack::Handler do
   end
   
   it 'should create a resource and allow its retrieval' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
     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/
+    put('/test', :input => 'body').should be_created
+    response['content-location'].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
+    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')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
     delete('/test').should be_no_content
   end
   
   it 'should delete recursively' do
     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
+    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
@@ -155,28 +148,24 @@ describe DAV4Rack::Handler do
   end
 
   it 'should not allow copy to another domain' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
+    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')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
     copy('/test', 'HTTP_DESTINATION' => '/test').should be_forbidden
   end
 
   it 'should copy a single resource' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
     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')
-    multi_status_ok.should eq true
+    put(url_escape('/a b'), :input => 'body').should be_created
     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
@@ -184,10 +173,8 @@ describe DAV4Rack::Handler do
   end
   
   it 'should deny a copy without overwrite' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
-    put('/copy', :input => 'copy')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
+    put('/copy', :input => 'copy').should be_created
     copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'F')
     
     multistatus_response('/D:href').first.text.should =~ /http:\/\/localhost(:\d+)?\/test/
@@ -197,10 +184,8 @@ describe DAV4Rack::Handler do
   end
   
   it 'should allow a copy with overwrite' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
-    put('/copy', :input => 'copy')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
+    put('/copy', :input => 'copy').should be_created
     copy('/test', 'HTTP_DESTINATION' => '/copy', 'HTTP_OVERWRITE' => 'T')
     multi_status_no_content.should eq true
     get('/copy').body.should == 'body'
@@ -218,10 +203,8 @@ describe DAV4Rack::Handler do
   it 'should copy a collection resursively' do
     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
+    put('/folder/a', :input => 'A').should be_created
+    put('/folder/b', :input => 'B').should be_created
     
     copy('/folder', 'HTTP_DESTINATION' => '/copy')
     multi_status_ok.should eq true
@@ -234,10 +217,8 @@ describe DAV4Rack::Handler do
   it 'should move a collection recursively' do
     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
+    put('/folder/a', :input => 'A').should be_created
+    put('/folder/b', :input => 'B').should be_created
     
     move('/folder', 'HTTP_DESTINATION' => '/move')
     multi_status_ok.should eq true
@@ -285,8 +266,7 @@ describe DAV4Rack::Handler do
   end
   
   it 'should find named properties' do
-    put('/test.html', :input => '<html/>')
-    multi_status_ok.should eq true
+    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'
@@ -294,8 +274,7 @@ describe DAV4Rack::Handler do
   end
 
   it 'should lock a resource' do
-    put('/test', :input => 'body')
-    multi_status_ok.should eq true
+    put('/test', :input => 'body').should be_created
     
     xml = render(:lockinfo) do |xml|
       xml.lockscope { xml.exclusive }
@@ -329,9 +308,8 @@ describe DAV4Rack::Handler do
     
     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/
+      put('/webdav/test', :input => 'body').should be_created
+      response.headers['content-location'].should =~ /http:\/\/localhost(:\d+)?\/webdav\/test/
     end
   end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
-  version: 0.2.4
+  segments: 
+  - 0
+  - 2
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Chris Roberts
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-14 00:00:00 -07:00
+date: 2011-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
         version: 1.4.2
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 2
+        - 1
+        - 1
         version: 2.1.1
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id003
@@ -89,12 +109,18 @@ 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: []