dav4rack 0.2.7 → 0.2.8

data/README.rdoc

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

data/lib/dav4rack/controller.rb

@@ -44,35 +44,45 @@ module DAV4Rack
     
     # Return response to HEAD
     def head
-      raise NotFound unless resource.exist?
-      response['Etag'] = resource.etag
-      response['Content-Type'] = resource.content_type
-      response['Last-Modified'] = resource.last_modified.httpdate
-      OK
+      if(resource.exist?)
+        response['Etag'] = resource.etag
+        response['Content-Type'] = resource.content_type
+        response['Last-Modified'] = resource.last_modified.httpdate
+        OK
+      else
+        NotFound
+      end
     end
     
     # Return response to GET
     def get
-      raise NotFound unless resource.exist?
-      res = resource.get(request, response)
-      if(res == OK && !resource.collection?)
-        response['Etag'] = resource.etag
-        response['Content-Type'] = resource.content_type
-        response['Content-Length'] = resource.content_length.to_s
-        response['Last-Modified'] = resource.last_modified.httpdate
+      if(resource.exist?)
+        res = resource.get(request, response)
+        if(res == OK && !resource.collection?)
+          response['Etag'] = resource.etag
+          response['Content-Type'] = resource.content_type
+          response['Content-Length'] = resource.content_length.to_s
+          response['Last-Modified'] = resource.last_modified.httpdate
+        end
+        res
+      else
+        NotFound
       end
-      res
     end
 
     # 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)
-      response['Location'] = "#{scheme}://#{host}:#{port}#{resource.public_path}" if status == Created
-      response.body = response['Location']
-      status
+      if(resource.collection?)
+        Forbidden
+      elsif(!resource.parent_exists? || !resource.parent.collection?)
+        Conflict
+      else
+        resource.lock_check
+        status = resource.put(request, response)
+        response['Location'] = "#{scheme}://#{host}:#{port}#{resource.public_path}" if status == Created
+        response.body = response['Location']
+        status
+      end
     end
 
     # Return response to POST
@@ -82,9 +92,12 @@ module DAV4Rack
 
     # Return response to DELETE
     def delete
-      raise NotFound unless resource.exist?
-      resource.lock_check
-      resource.delete
+      if(resource.exist?)
+        resource.lock_check
+        resource.delete
+      else
+        NotFound
+      end
     end
     
     # Return response to MKCOL
@@ -108,43 +121,53 @@ module DAV4Rack
     # Move Resource to new location. If :copy is provided,
     # Resource will be copied (implementation ease)
     def move(*args)
-      raise NotFound unless resource.exist?
-      resource.lock_check unless args.include?(:copy)
-      destination = url_unescape(env['HTTP_DESTINATION'].sub(%r{https?://([^/]+)}, ''))
-      dest_host = $1
-      raise BadGateway if dest_host and dest_host.gsub(/:\d{2,5}$/,'') != request.host
-      raise Forbidden if destination == resource.public_path
-      dest = resource_class.new(destination, clean_path(destination), @request, @response, @options.merge(:user => resource.user))
-      status = nil
-      if(args.include?(:copy))
-        status = resource.copy(dest, overwrite)
+      unless(resource.exist?)
+        NotFound
       else
-        raise Conflict unless depth.is_a?(Symbol) || depth > 1
-        status = resource.move(dest, overwrite)
-      end
-      response['Location'] = "#{scheme}://#{host}:#{port}#{dest.public_path}" if status == Created
-      multistatus do |xml|
-        xml.response do
-          xml.href "#{scheme}://#{host}:#{port}#{status == Created ? dest.public_path : resource.public_path}"
-          xml.status "#{http_version} #{status.status_line}"
+        resource.lock_check unless args.include?(:copy)
+        destination = url_unescape(env['HTTP_DESTINATION'].sub(%r{https?://([^/]+)}, ''))
+        dest_host = $1
+        if(dest_host && dest_host.gsub(/:\d{2,5}$/, '') != request.host)
+          BadGateway
+        elsif(destination == resource.public_path)
+          Forbidden
+        else
+          dest = resource_class.new(destination, clean_path(destination), @request, @response, @options.merge(:user => resource.user))
+          status = nil
+          if(args.include?(:copy))
+            status = resource.copy(dest, overwrite)
+          else
+            return Conflict unless depth.is_a?(Symbol) || depth > 1
+            status = resource.move(dest, overwrite)
+          end
+          response['Location'] = "#{scheme}://#{host}:#{port}#{dest.public_path}" if status == Created
+          multistatus do |xml|
+            xml.response do
+              xml.href "#{scheme}://#{host}:#{port}#{status == Created ? dest.public_path : resource.public_path}"
+              xml.status "#{http_version} #{status.status_line}"
+            end
+          end
         end
       end
     end
     
     # Return respoonse to PROPFIND
     def propfind
-      raise NotFound unless resource.exist?
-      unless(request_document.xpath("//#{ns}propfind/#{ns}allprop").empty?)
-        names = resource.property_names
+      unless(resource.exist?)
+        NotFound
       else
-        names = request_document.xpath("//#{ns}propfind/#{ns}prop").children.find_all{|n|n.element?}.map{|n|n.name}
-        names = resource.property_names if names.empty?
-      end
-      multistatus do |xml|
-        find_resources.each do |resource|
-          xml.response do
-            xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
-            propstats(xml, get_properties(resource, names))
+        unless(request_document.xpath("//#{ns}propfind/#{ns}allprop").empty?)
+          names = resource.property_names
+        else
+          names = request_document.xpath("//#{ns}propfind/#{ns}prop").children.find_all{|n|n.element?}.map{|n|n.name}
+          names = resource.property_names if names.empty?
+        end
+        multistatus do |xml|
+          find_resources.each do |resource|
+            xml.response do
+              xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
+              propstats(xml, get_properties(resource, names))
+            end
           end
         end
       end
@@ -152,15 +175,18 @@ module DAV4Rack
     
     # Return response to PROPPATCH
     def proppatch
-      raise NotFound unless resource.exist?
-      resource.lock_check
-      prop_rem = request_match('/propertyupdate/remove/prop').children.map{|n| [n.name] }
-      prop_set = request_match('/propertyupdate/set/prop').children.map{|n| [n.name, n.text] }
-      multistatus do |xml|
-        find_resources.each do |resource|
-          xml.response do
-            xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
-            propstats(xml, set_properties(resource, prop_set))
+      unless(resource.exist?)
+        NotFound
+      else
+        resource.lock_check
+        prop_rem = request_match('/propertyupdate/remove/prop').children.map{|n| [n.name] }
+        prop_set = request_match('/propertyupdate/set/prop').children.map{|n| [n.name, n.text] }
+        multistatus do |xml|
+          find_resources.each do |resource|
+            xml.response do
+              xml.href "#{scheme}://#{host}:#{port}#{url_escape(resource.public_path)}"
+              propstats(xml, set_properties(resource, prop_set))
+            end
           end
         end
       end
@@ -171,48 +197,50 @@ module DAV4Rack
     # NOTE: This will pass an argument hash to Resource#lock and
     # wait for a success/failure response. 
     def lock
-      raise NotFound unless resource.exist?
       lockinfo = request_document.xpath("//#{ns}lockinfo")
       asked = {}
       asked[:timeout] = request.env['Timeout'].split(',').map{|x|x.strip} if request.env['Timeout']
       asked[:depth] = depth
-      raise BadRequest unless [0, :infinity].include?(asked[:depth])
-      asked[:scope] = lockinfo.xpath("//#{ns}lockscope").children.find_all{|n|n.element?}.map{|n|n.name}.first
-      asked[:type] = lockinfo.xpath("#{ns}locktype").children.find_all{|n|n.element?}.map{|n|n.name}.first
-      asked[:owner] = lockinfo.xpath("//#{ns}owner/#{ns}href").children.map{|n|n.text}.first
-      begin
-        lock_time, locktoken = resource.lock(asked)
-        render_xml(:prop) do |xml|
-          xml.lockdiscovery do
-            xml.activelock do
-              if(asked[:scope])
-                xml.lockscope do
-                  xml.send(asked[:scope])
+      unless([0, :infinity].include?(asked[:depth]))
+        BadRequest
+      else
+        asked[:scope] = lockinfo.xpath("//#{ns}lockscope").children.find_all{|n|n.element?}.map{|n|n.name}.first
+        asked[:type] = lockinfo.xpath("#{ns}locktype").children.find_all{|n|n.element?}.map{|n|n.name}.first
+        asked[:owner] = lockinfo.xpath("//#{ns}owner/#{ns}href").children.map{|n|n.text}.first
+        begin
+          lock_time, locktoken = resource.lock(asked)
+          render_xml(:prop) do |xml|
+            xml.lockdiscovery do
+              xml.activelock do
+                if(asked[:scope])
+                  xml.lockscope do
+                    xml.send(asked[:scope])
+                  end
                 end
-              end
-              if(asked[:type])
-                xml.locktype do
-                  xml.send(asked[:type])
+                if(asked[:type])
+                  xml.locktype do
+                    xml.send(asked[:type])
+                  end
+                end
+                xml.depth asked[:depth].to_s
+                xml.timeout lock_time ? "Second-#{lock_time}" : 'infinity'
+                xml.locktoken do
+                  xml.href locktoken
+                end
+                if(asked[:owner])
+                  xml.owner asked[:owner]
                 end
-              end
-              xml.depth asked[:depth].to_s
-              xml.timeout lock_time ? "Second-#{lock_time}" : 'infinity'
-              xml.locktoken do
-                xml.href locktoken
-              end
-              if(asked[:owner])
-                xml.owner asked[:owner]
               end
             end
           end
-        end
-        response.status = resource.exist? ? OK : Created
-      rescue LockFailure => e
-        multistatus do |xml|
-          e.path_status.each_pair do |path, status|
-            xml.response do
-              xml.href path
-              xml.status "#{http_version} #{status.status_line}"
+          response.status = resource.exist? ? OK : Created
+        rescue LockFailure => e
+          multistatus do |xml|
+            e.path_status.each_pair do |path, status|
+              xml.response do
+                xml.href path
+                xml.status "#{http_version} #{status.status_line}"
+              end
             end
           end
         end

data/lib/dav4rack/logger.rb

@@ -8,10 +8,12 @@ module DAV4Rack
       # args:: Arguments for Logger -> [path, level] (level is optional) or a Logger instance
       # Set the path to the log file.
       def set(*args)
-        if(args.first.is_a?(Logger))
+        if(%w(info debug warn fatal).all?{|meth| args.first.respond_to?(meth)})
           @@logger = args.first
-        else
-          @@logger = ::Logger.new(args.first, 'weekly')
+        elsif(args.first.respond_to?(:to_s) && !args.first.to_s.empty?)
+          @@logger = ::Logger.new(args.first.to_s, 'weekly')
+        elsif(args.first)
+          raise 'Invalid type specified for logger'
         end
         if(args.size > 1)
           @@logger.level = args[1]

data/lib/dav4rack/resource.rb

@@ -117,17 +117,17 @@ module DAV4Rack
     
     # If this is a collection, return the child resources.
     def children
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Is this resource a collection?
     def collection?
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Does this resource exist?
     def exist?
-      raise NotImplementedError
+      NotImplemented
     end
     
     # Does the parent resource exist?
@@ -137,22 +137,22 @@ module DAV4Rack
     
     # Return the creation time.
     def creation_date
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Return the time of last modification.
     def last_modified
-      raise NotImplementedError
+      NotImplemented
     end
     
     # Set the time of last modification.
     def last_modified=(time)
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Return an Etag, an unique hash value for this resource.
     def etag
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Return the resource type. Generally only used to specify
@@ -163,54 +163,54 @@ module DAV4Rack
 
     # Return the mime type of this resource.
     def content_type
-      raise NotImplementedError
+      NotImplemented
     end
 
     # Return the size in bytes for this resource.
     def content_length
-      raise NotImplementedError
+      NotImplemented
     end
 
     # HTTP GET request.
     #
     # Write the content of the resource to the response.body.
     def get(request, response)
-      raise NotImplementedError
+      NotImplemented
     end
 
     # HTTP PUT request.
     #
     # Save the content of the request.body.
     def put(request, response)
-      raise NotImplementedError
+      NotImplemented
     end
     
     # HTTP POST request.
     #
     # Usually forbidden.
     def post(request, response)
-      raise NotImplementedError
+      NotImplemented
     end
     
     # HTTP DELETE request.
     #
     # Delete this resource.
     def delete
-      raise NotImplementedError
+      NotImplemented
     end
     
     # HTTP COPY request.
     #
     # Copy this resource to given destination resource.
     def copy(dest, overwrite=false)
-      raise NotImplementedError
+      NotImplemented
     end
   
     # HTTP MOVE request.
     #
     # Move this resource to given destination resource.
     def move(dest, overwrite=false)
-      raise NotImplemented
+      NotImplemented
     end
     
     # args:: Hash of lock arguments
@@ -229,31 +229,39 @@ module DAV4Rack
     # (http://www.webdav.org/specs/rfc4918.html#rfc.section.9.10)
     
     def lock(args)
-      raise NotImplemented if @lock_class.nil?
-      raise Conflict unless parent_exists?
-      lock_check(args[:scope])
-      lock = @lock_class.explicit_locks(@path).find{|l| l.scope == args[:scope] && l.kind == args[:type] && l.user == @user}
-      unless(lock)
-        token = UUIDTools::UUID.random_create.to_s
-        lock = @lock_class.generate(@path, @user, token)
-        lock.scope = args[:scope]
-        lock.kind = args[:type]
-        lock.owner = args[:owner]
-        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
+      unless(@lock_class)
+        NotImplemented
+      else
+        unless(parent_exists?)
+          Conflict
         else
-          lock.timeout = @default_timeout
+          lock_check(args[:scope])
+          lock = @lock_class.explicit_locks(@path).find{|l| l.scope == args[:scope] && l.kind == args[:type] && l.user == @user}
+          unless(lock)
+            token = UUIDTools::UUID.random_create.to_s
+            lock = @lock_class.generate(@path, @user, token)
+            lock.scope = args[:scope]
+            lock.kind = args[:type]
+            lock.owner = args[:owner]
+            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
+              lock.timeout = @default_timeout
+            end
+            lock.save if lock.respond_to? :save
+          end
+          begin
+            lock_check(args[:type])
+          rescue DAV4Rack::LockFailure => lock_failure
+            lock.destroy
+            raise lock_failure
+          rescue HTTPStatus::Status => status
+            status
+          end
+          [lock.remaining_timeout, lock.token]
         end
-        lock.save if lock.respond_to? :save
-      end
-      begin
-        lock_check(args[:type])
-      rescue DAV4Rack::LockFailure => e
-        lock.destroy
-        raise e
       end
-      [lock.remaining_timeout, lock.token]
     end
 
     # lock_scope:: scope of lock
@@ -286,20 +294,30 @@ module DAV4Rack
     # token:: Lock token
     # Remove the given lock
     def unlock(token)
-      raise NotImplemented if @lock_class.nil?
-      token = token.slice(1, token.length - 2)
-      raise BadRequest if token.nil? || token.empty?
-      lock = @lock_class.find_by_token(token)
-      raise Forbidden unless lock && lock.user == @user
-      raise Conflict unless lock.path =~ /^#{Regexp.escape(@path)}.*$/
-      lock.destroy
-      NoContent
+      unless(@lock_class)
+        NotImplemented
+      else
+        token = token.slice(1, token.length - 2)
+        if(token.nil? || token.empty?)
+          BadRequest
+        else
+          lock = @lock_class.find_by_token(token)
+          if(lock.nil? || lock.user != @user)
+            Forbidden
+          elsif(lock.path !~ /^#{Regexp.escape(@path)}.*$/)
+            Conflict
+          else
+            lock.destroy
+            NoContent
+          end
+        end
+      end
     end
     
     
     # Create this resource as collection.
     def make_collection
-      raise NotImplementedError
+      NotImplemented
     end
 
     # other:: Resource
@@ -348,13 +366,13 @@ module DAV4Rack
       when 'getlastmodified' then self.last_modified = Time.httpdate(value)
       end
     rescue ArgumentError
-      raise HTTPStatus::Conflict
+      Conflict
     end
 
     # name:: Property name
     # Remove the property from the resource
     def remove_property(name)
-      raise HTTPStatus::Forbidden
+      Forbidden
     end
 
     # name:: Name of child

data/lib/dav4rack/version.rb

@@ -13,5 +13,5 @@ module DAV4Rack
     end
   end
 
-  VERSION = Version.new('0.2.7')
+  VERSION = Version.new('0.2.8')
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dav4rack
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Chris Roberts
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-23 00:00:00 -07:00
+date: 2011-08-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency