rack_dav 0.1.3 → 0.3.1

data/lib/rack_dav/file_resource.rb

@@ -1,8 +1,10 @@
+require 'digest'
+
 module RackDAV
 
   class FileResource < Resource
     include WEBrick::HTTPUtils
-    
+
     # If this is a collection, return the child resources.
     def children
       Dir[file_path + '/*'].map do |path|
@@ -19,7 +21,7 @@ module RackDAV
     def exist?
       File.exist?(file_path)
     end
-    
+
     # Return the creation time.
     def creation_date
       stat.ctime
@@ -29,7 +31,7 @@ module RackDAV
     def last_modified
       stat.mtime
     end
-    
+
     # Set the time of last modification.
     def last_modified=(time)
       File.utime(Time.now, time, file_path)
@@ -42,11 +44,10 @@ module RackDAV
 
     # Return the resource type.
     #
-    # If this is a collection, return
-    # REXML::Element.new('D:collection')
+    # If this is a collection, return a collection element
     def resource_type
       if collection?
-        REXML::Element.new('D:collection')
+        Nokogiri::XML::fragment('<D:collection xmlns:D="DAV:"/>').children.first
       end
     end
 
@@ -54,7 +55,7 @@ module RackDAV
     def content_type
       if stat.directory?
         "text/html"
-      else 
+      else
         mime_type(file_path, DefaultMimeTypes)
       end
     end
@@ -69,14 +70,12 @@ module RackDAV
     # Write the content of the resource to the response.body.
     def get(request, response)
       if stat.directory?
-        response.body = ""
-        Rack::Directory.new(root).call(request.env)[2].each do |line|
-          response.body << line
-        end
-        response['Content-Length'] = response.body.size.to_s
+        content = ""
+        Rack::Directory.new(root).call(request.env)[2].each { |line| content << line }
+        response.body = [content]
+        response['Content-Length'] = (content.respond_to?(:bytesize) ? content.bytesize : content.size).to_s
       else
-        file = Rack::File.new(nil)
-        file.path = file_path
+        file = File.open(file_path)
         response.body = file
       end
     end
@@ -85,16 +84,20 @@ module RackDAV
     #
     # Save the content of the request.body.
     def put(request, response)
+      if request.env['HTTP_CONTENT_MD5']
+        content_md5_pass?(request.env) or raise HTTPStatus::BadRequest.new('Content-MD5 mismatch')
+      end
+
       write(request.body)
     end
-    
+
     # HTTP POST request.
     #
     # Usually forbidden.
     def post(request, response)
       raise HTTPStatus::Forbidden
     end
-    
+
     # HTTP DELETE request.
     #
     # Delete this resource.
@@ -105,7 +108,7 @@ module RackDAV
         File.unlink(file_path)
       end
     end
-    
+
     # HTTP COPY request.
     #
     # Copy this resource to given destination resource.
@@ -118,7 +121,7 @@ module RackDAV
         end
       end
     end
-  
+
     # HTTP MOVE request.
     #
     # Move this resource to given destination resource.
@@ -126,42 +129,55 @@ module RackDAV
       copy(dest)
       delete
     end
-    
+
     # HTTP MKCOL request.
     #
     # Create this resource as collection.
     def make_collection
       Dir.mkdir(file_path)
     end
-  
+
     # Write to this resource from given IO.
     def write(io)
       tempfile = "#{file_path}.#{Process.pid}.#{object_id}"
-      
+
       open(tempfile, "wb") do |file|
         while part = io.read(8192)
           file << part
         end
       end
 
-      File.rename(tempfile, file_path)      
+      File.rename(tempfile, file_path)
     ensure
       File.unlink(tempfile) rescue nil
     end
-    
+
+
     private
 
-    def root
-      @options[:root]
-    end
+      def root
+        @options[:root]
+      end
 
-    def file_path
-      root + '/' + path
-    end
+      def file_path
+        root + '/' + path
+      end
 
-    def stat
-      @stat ||= File.stat(file_path)
-    end
+      def stat
+        @stat ||= File.stat(file_path)
+      end
+
+      def content_md5_pass?(env)
+        expected = env['HTTP_CONTENT_MD5'] or return true
+
+        body   = env['rack.input'].dup
+        digest = Digest::MD5.new.digest(body.read)
+        actual = [ digest ].pack('m').strip
+
+        body.rewind
+
+        expected == actual
+      end
 
   end
 

data/lib/rack_dav/handler.rb

@@ -1,8 +1,20 @@
 module RackDAV
-  
+
   class Handler
-    
-    def initialize(options={})
+
+    # @return [Hash] The hash of options.
+    attr_reader :options
+
+
+    # Initializes a new instance with given options.
+    #
+    # @param  [Hash] options Hash of options to customize the handler behavior.
+    # @option options [Class] :resource_class (FileResource)
+    #         The resource class.
+    # @option options [String] :root (".")
+    #         The root resource folder.
+    #
+    def initialize(options = {})
       @options = {
         :resource_class => FileResource,
         :root => Dir.pwd
@@ -10,25 +22,20 @@ module RackDAV
     end
 
     def call(env)
-      request = Rack::Request.new(env)
+      request  = Rack::Request.new(env)
       response = Rack::Response.new
 
       begin
-        controller = Controller.new(request, response, @options.dup)
+        controller = Controller.new(request, response, @options)
         controller.send(request.request_method.downcase)
-        
+
       rescue HTTPStatus::Status => status
         response.status = status.code
       end
-      
-      # Strings in Ruby 1.9 are no longer enumerable.  Rack still expects the response.body to be
-      # enumerable, however.
-      response.body = [response.body] if not response.body.respond_to? :each
 
-      response.status = response.status ? response.status.to_i : 200
       response.finish
     end
-    
+
   end
 
 end

data/lib/rack_dav/http_status.rb

@@ -1,19 +1,19 @@
 module RackDAV
 
   module HTTPStatus
-    
+
     class Status < Exception
-      
+
       class << self
         attr_accessor :code, :reason_phrase
         alias_method :to_i, :code
-        
+
         def status_line
           "#{code} #{reason_phrase}"
         end
-        
+
       end
-      
+
       def code
         self.class.code
       end
@@ -21,17 +21,17 @@ module RackDAV
       def reason_phrase
         self.class.reason_phrase
       end
-      
+
       def status_line
         self.class.status_line
       end
-      
+
       def to_i
         self.class.to_i
       end
-      
+
     end
-    
+
     StatusMessage = {
       100 => 'Continue',
       101 => 'Switching Protocols',
@@ -71,7 +71,7 @@ module RackDAV
       417 => 'Expectation Failed',
       422 => 'Unprocessable Entity',
       423 => 'Locked',
-      424 => 'Failed Dependency',      
+      424 => 'Failed Dependency',
       500 => 'Internal Server Error',
       501 => 'Not Implemented',
       502 => 'Bad Gateway',

data/lib/rack_dav/resource.rb

@@ -1,13 +1,14 @@
 module RackDAV
 
   class Resource
+
     attr_reader :path, :options
-    
+
     def initialize(path, options)
       @path = path
       @options = options
     end
-        
+
     # If this is a collection, return the child resources.
     def children
       raise NotImplementedError
@@ -22,7 +23,7 @@ module RackDAV
     def exist?
       raise NotImplementedError
     end
-    
+
     # Return the creation time.
     def creation_date
       raise NotImplementedError
@@ -32,7 +33,7 @@ module RackDAV
     def last_modified
       raise NotImplementedError
     end
-    
+
     # Set the time of last modification.
     def last_modified=(time)
       raise NotImplementedError
@@ -45,11 +46,10 @@ module RackDAV
 
     # Return the resource type.
     #
-    # If this is a collection, return
-    # REXML::Element.new('D:collection')
+    # If this is a collection, return a collection element
     def resource_type
       if collection?
-        REXML::Element.new('D:collection')
+        Nokogiri::XML::fragment('<D:collection xmlns:D="DAV:"/>').children.first
       end
     end
 
@@ -76,28 +76,28 @@ module RackDAV
     def put(request, response)
       raise NotImplementedError
     end
-    
+
     # HTTP POST request.
     #
     # Usually forbidden.
     def post(request, response)
       raise NotImplementedError
     end
-    
+
     # HTTP DELETE request.
     #
     # Delete this resource.
     def delete
       raise NotImplementedError
     end
-    
+
     # HTTP COPY request.
     #
     # Copy this resource to given destination resource.
     def copy(dest)
       raise NotImplementedError
     end
-  
+
     # HTTP MOVE request.
     #
     # Move this resource to given destination resource.
@@ -105,7 +105,7 @@ module RackDAV
       copy(dest)
       delete
     end
-    
+
     # HTTP MKCOL request.
     #
     # Create this resource as collection.
@@ -124,20 +124,24 @@ module RackDAV
     def display_name
       name
     end
-    
+
     def child(name, option={})
       self.class.new(path + '/' + name, options)
     end
-    
+
+    def lockable?
+      self.respond_to?(:lock) && self.respond_to?(:unlock)
+    end
+
     def property_names
       %w(creationdate displayname getlastmodified getetag resourcetype getcontenttype getcontentlength)
     end
-    
+
     def get_property(name)
       case name
       when 'resourcetype'     then resource_type
       when 'displayname'      then display_name
-      when 'creationdate'     then creation_date.xmlschema 
+      when 'creationdate'     then creation_date.xmlschema
       when 'getcontentlength' then content_length.to_s
       when 'getcontenttype'   then content_type
       when 'getetag'          then etag
@@ -165,7 +169,7 @@ module RackDAV
       return nil if elements.empty?
       self.class.new('/' + elements[0..-2].to_a.join('/'), @options)
     end
-    
+
     def descendants
       list = []
       children.each do |child|

data/lib/rack_dav/string.rb

@@ -0,0 +1,28 @@
+class String
+
+  if RUBY_VERSION >= "1.9"
+    def force_valid_encoding
+      find_encoding(Encoding.list.to_enum)
+    end
+  else
+    def force_valid_encoding
+      self
+    end
+  end
+
+  private
+
+  def find_encoding(encodings)
+    if valid_encoding?
+      self
+    else
+      force_next_encoding(encodings)
+    end
+  end
+
+  def force_next_encoding(encodings)
+    force_encoding(encodings.next)
+    find_encoding(encodings)
+  end
+
+end

data/lib/rack_dav/version.rb

@@ -0,0 +1,16 @@
+module RackDAV
+
+  # Holds information about library version.
+  module Version
+    MAJOR = 0
+    MINOR = 3
+    PATCH = 1
+    BUILD = nil
+
+    STRING = [MAJOR, MINOR, PATCH, BUILD].compact.join(".")
+  end
+
+  # The current library version.
+  VERSION = Version::STRING
+
+end