tilia-dav 3.1.0.pre.alpha6 → 3.1.1

data/test/dav/server_events_test.rb

@@ -42,7 +42,7 @@ module Tilia
         @server.http_request = req
         @server.exec
 
-        assert_equal(nil, @server.http_response.status)
+        assert_equal(500, @server.http_response.status)
       end
 
       def before_bind_cancel_handler(_path)
@@ -85,11 +85,13 @@ module Tilia
           end
         )
 
-        @server.invoke_method(
-          Http::Request.new('BLABLA', '/'),
-          Http::Response.new,
-          false
-        )
+        assert_raises(Exception) do
+          @server.invoke_method(
+            Http::Request.new('BLABLA', '/'),
+            Http::Response.new,
+            false
+          )
+        end
 
         assert_equal(2, k)
       end

data/test/dav/server_range_test.rb

@@ -2,25 +2,33 @@ require 'test_helper'
 
 module Tilia
   module Dav
-    class ServerRangeTest < AbstractServer
-      def root_node
-        FsExt::Directory.new(@temp_dir)
+    class ServerRangeTest < DavServerTest
+      def setup
+        @setup_files = true
+        super
+        @server.create_file('files/test.txt', 'Test contents')
+        @last_modified = Http::Util.to_http_date(
+          Time.zone.at(@server.tree.node_for_path('files/test.txt').last_modified)
+        )
+
+        stream = StringIO.new
+        stream.write('Test contents')
+        stream.rewind
+        streaming_file = Mock::StreamingFile.new(
+          'no-seeking.txt',
+          stream
+        )
+        streaming_file.size = 12
+        @server.tree.node_for_path('files').add_node(streaming_file)
       end
 
       def test_range
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-5'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-5'
+        )
+        response = request(request)
 
         assert_equal(
           {
@@ -28,30 +36,23 @@ module Tilia
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [4],
             'Content-Range'   => ['bytes 2-5/13'],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(206, @response.status)
-        assert_equal('st c', @response.body_as_string[0, 4])
+        assert_equal(206, response.status)
+        assert_equal('st c', response.body_as_string)
       end
 
       def test_start_range
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-'
+        )
+        response = request(request)
 
         assert_equal(
           {
@@ -59,30 +60,23 @@ module Tilia
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [11],
             'Content-Range'   => ['bytes 2-12/13'],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(206, @response.status)
-        assert_equal('st contents', @response.body_as_string[0, 11])
+        assert_equal(206, response.status)
+        assert_equal('st contents', response.body_as_string)
       end
 
       def test_end_range
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=-8'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=-8'
+        )
+        response = request(request)
 
         assert_equal(
           {
@@ -90,61 +84,70 @@ module Tilia
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [8],
             'Content-Range'   => ['bytes 5-12/13'],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(206, @response.status)
-        assert_equal('contents', @response.body_as_string[0, 8])
+        assert_equal(206, response.status)
+        assert_equal('contents', response.body_as_string)
       end
 
       def test_too_high_range
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=100-200'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=100-200'
+        )
+        response = request(request)
 
-        assert_equal(416, @response.status)
+        assert_equal(416, response.status)
       end
 
       def test_crazy_range
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=8-4'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=8-4'
+        )
+        response = request(request)
 
-        assert_equal(416, @response.status)
+        assert_equal(416, response.status)
       end
 
-      def test_if_range_etag
-        node = @server.tree.node_for_path('test.txt')
+      def test_non_seekable_stream
+        request = Http::Request.new(
+          'GET',
+          '/files/no-seeking.txt',
+          'Range' => 'bytes=2-5'
+        )
+        response = request(request)
 
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-5',
-          'HTTP_IF_RANGE'  => node.etag
-        }
-        filename = "#{@temp_dir}/test.txt"
+        assert_equal(206, response.status, response)
+        assert_equal(
+          {
+            'X-Sabre-Version' => [Version::VERSION],
+            'Content-Type'    => ['application/octet-stream'],
+            'Content-Length'  => [4],
+            'Content-Range'   => ['bytes 2-5/12'],
+            # 'ETag'            => ['"' . md5('Test contents') . '"'],
+            'Last-Modified'   => [@last_modified]
+          },
+          response.headers
+        )
 
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
+        assert_equal('st c', response.body_as_string)
+      end
 
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+      def test_if_range_etag
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-5',
+          'If-Range' => '"' + Digest::MD5.hexdigest('Test contents') + '"'
+        )
+        response = request(request)
 
         assert_equal(
           {
@@ -152,64 +155,48 @@ module Tilia
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [4],
             'Content-Range'   => ['bytes 2-5/13'],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(206, @response.status)
-        assert_equal('st c', @response.body_as_string[0, 4])
+        assert_equal(206, response.status)
+        assert_equal('st c', response.body_as_string)
       end
 
       def test_if_range_etag_incorrect
-        node = @server.tree.node_for_path('test.txt')
-
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-5',
-          'HTTP_IF_RANGE'  => node.etag + 'blabla'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-5',
+          'If-Range' => '"foobar"'
+        )
+        response = request(request)
 
         assert_equal(
           {
             'X-Sabre-Version' => [Version::VERSION],
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [13],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(200, @response.status)
-        assert_equal('Test contents', @response.body_as_string)
+        assert_equal(200, response.status)
+        assert_equal('Test contents', response.body_as_string)
       end
 
       def test_if_range_modification_date
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-5',
-          'HTTP_IF_RANGE'  => 'tomorrow'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-5',
+          'If-Range' => 'tomorrow'
+        )
+        response = request(request)
 
         assert_equal(
           {
@@ -217,45 +204,38 @@ module Tilia
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [4],
             'Content-Range'   => ['bytes 2-5/13'],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(206, @response.status)
-        assert_equal('st c', @response.body_as_string[0, 4])
+        assert_equal(206, response.status)
+        assert_equal('st c', response.body_as_string)
       end
 
       def test_if_range_modification_date_modified
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'GET',
-          'HTTP_RANGE'     => 'bytes=2-5',
-          'HTTP_IF_RANGE'  => '-2 years'
-        }
-        filename = "#{@temp_dir}/test.txt"
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        stat = ::File.stat(filename)
-        etag = '"' + Digest::SHA1.hexdigest(stat.ino.to_s + stat.size.to_s + stat.mtime.to_s) + '"'
+        request = Http::Request.new(
+          'GET',
+          '/files/test.txt',
+          'Range' => 'bytes=2-5',
+          'If-Range' => '-2 years'
+        )
+        response = request(request)
 
         assert_equal(
           {
             'X-Sabre-Version' => [Version::VERSION],
             'Content-Type'    => ['application/octet-stream'],
             'Content-Length'  => [13],
-            'Last-Modified'   => [Http::Util.to_http_date(::File.mtime(filename))],
-            'ETag'            => [etag]
+            'Last-Modified'   => [@last_modified],
+            'ETag'            => ['"' + Digest::MD5.hexdigest('Test contents') + '"']
           },
-          @response.headers
+          response.headers
         )
 
-        assert_equal(200, @response.status)
-        assert_equal('Test contents', @response.body_as_string)
+        assert_equal(200, response.status)
+        assert_equal('Test contents', response.body_as_string)
       end
     end
   end

data/test/dav/server_simple_test.rb

@@ -386,6 +386,20 @@ module Tilia
 
         assert_equal(expected, result)
       end
+
+      # There are certain cases where no HTTP status may be set. We need to
+      # intercept these and set it to a default error message.
+      def test_no_http_status_set
+        @server.on(
+          'method:GET',
+          -> (request, response) { false },
+          1
+        )
+
+        @server.http_request = Http::Request.new('GET', '/')
+        @server.exec
+        assert_equal(500, @response.status)
+      end
     end
   end
 end

data/test/dav/xml/element/response_test.rb

@@ -165,7 +165,62 @@ XML
             assert_instance_equal(expected, result['value'])
           end
 
-          # In the case of {DAV:}prop, a deserializer should never get called, if
+          def test_serialize_urlencoding
+            inner_props = {
+              200 => {
+                '{DAV:}displayname' => 'my file',
+              }
+            }
+
+            property = Response.new('space here', inner_props)
+
+            xml = write('{DAV:}root' => {'{DAV:}response' => property})
+            expected = <<XML
+<?xml version="1.0"?>
+<d:root xmlns:d="DAV:">
+  <d:response>
+    <d:href>/space%20here</d:href>
+    <d:propstat>
+      <d:prop>
+        <d:displayname>my file</d:displayname>
+      </d:prop>
+      <d:status>HTTP/1.1 200 OK</d:status>
+    </d:propstat>
+  </d:response>
+</d:root>
+XML
+            assert_xml_equal(expected, xml)
+          end
+
+          # The WebDAV spec _requires_ at least one DAV:propstat to appear for
+          # every DAV:response. In some circumstances however, there are no
+          # properties to encode.
+          #
+          # In those cases we MUST specify at least one DAV:propstat anyway, with
+          # no properties.
+          def test_serialize_no_properties
+
+        inner_props = []
+
+            property = Response.new('uri', inner_props)
+
+            xml = write('{DAV:}root' => { '{DAV:}response' => property})
+            expected = <<XML
+<?xml version="1.0"?>
+<d:root xmlns:d="DAV:">
+  <d:response>
+      <d:href>/uri</d:href>
+      <d:propstat>
+        <d:prop />
+        <d:status>HTTP/1.1 418 I\'m a teapot</d:status>
+      </d:propstat>
+  </d:response>
+</d:root>
+XML
+            assert_xml_equal(expected, xml)
+          end
+
+           # In the case of {DAV:}prop, a deserializer should never get called, if
           # the property element is empty.
           def test_deserialize_complex_property_empty
             xml = <<XML