File locking seemingly working (untested)

lib/redmine_dmsf/webdav/dmsf_resource.rb

@@ -1,7 +1,8 @@
+require 'uuidtools'
+
 module RedmineDmsf
   module Webdav
     class DmsfResource < BaseResource
-
       def initialize(*args)
         super(*args)
         @file = false
@@ -322,6 +323,46 @@ module RedmineDmsf
         end
       end
 
+      # Lock Check
+      # Check for the existance of locks of files (Folders unsupported)
+      # At present as deletions of folders are not recursive, we do not need to extend 
+      # this to cover every file, just queried
+      # TODO: Allow recursive deletions and update lock code appropriately
+      def lock_check(lock_scope=nil)
+        if file?
+          raise Locked if file.locked_for_user?
+        end
+      end
+
+      def lock(args)
+        return Conflict unless (parent.projectless_path == "/" || parent_exists?) && !collection? && file?
+        token = UUIDTools::UUID.md5_create(UUIDTools::UUID_URL_NAMESPACE, projectless_path).to_s
+        lock_check(args[:scope])
+        if (file.locked? && file.locked_for_user?)
+          raise DAV4Rack::LockFailure.new("Failed to lock: #{@path}")
+        else
+          file.lock unless file.locked?
+          @response['Lock-Token'] = token
+          Locked
+          [8600, token]
+        end
+      end
+
+      def unlock(token)
+        return NoContent unless file?
+        token=token.slice(1, token.length - 2)
+        if (token.nil? || token.empty?)
+          BadRequest
+        else
+          _token = UUIDTools::UUID.md5_create(UUIDTools::UUID_URL_NAMESPACE, projectless_path).to_s
+          if (!file.locked? || file.locked_for_user? || token != _token)
+            Forbidden
+          else
+            file.unlock
+            NoContent
+          end
+        end
+      end
 
       private
       # Prepare file for download using Rack functionality:

lib/redmine_dmsf/webdav/resource_proxy.rb

@@ -2,15 +2,15 @@ module RedmineDmsf
   module Webdav
     class ResourceProxy < DAV4Rack::Resource
 
-      def initialize(public_path, path, request, response, options)
-        super(public_path, path, request, response, options)
+      def initialize(*args)
+        super(*args)
         pinfo = path.split('/').drop(1)
         if (pinfo.length == 0) #If this is the base_path, we're at root
-          @resource_c = IndexResource.new(public_path, path, request, response, options)
+          @resource_c = IndexResource.new(*args)
         elsif (pinfo.length == 1) #This is first level, and as such, project path
-          @resource_c = ProjectResource.new(public_path, path, request, response, options)
+          @resource_c = ProjectResource.new(*args)
         else #We made it all the way to DMSF Data
-          @resource_c = DmsfResource.new(public_path, path, request, response, options)
+          @resource_c = DmsfResource.new(*args)
         end
 
         @resource_c.accessor= self unless @resource_c.nil?
@@ -91,15 +91,17 @@ module RedmineDmsf
       end
 
       def lock(*args)
-        debugger
         @resource_c.lock(*args)
       end
 
-      def check_lock(*args)
-        debugger
+      def lock_check(*args)
         @resource_c.check_lock(*args)
       end
 
+      def unlock(*args)
+        @resource_c.unlock(*args)
+      end
+
       def resource
         @resource_c
       end