tilia-dav 3.1.0.pre.alpha6 → 3.1.1

data/test/dav/xml/property/href_test.rb

@@ -24,6 +24,20 @@ XML
             assert_xml_equal(expected, xml)
           end
 
+          def test_serialize_space
+            href = Href.new('path alsopath')
+            assert_equal('path alsopath', href.href)
+
+            @context_uri = '/bla/'
+            xml = write('{DAV:}anything' => href)
+
+            expected = <<XML
+<?xml version="1.0"?>
+<d:anything xmlns:d="DAV:"><d:href>/bla/path alsopath</d:href></d:anything>
+XML
+            assert_xml_equal(expected, xml)
+          end
+
           def test_serialize_no_prefix
             href = Tilia::Dav::Xml::Property::Href.new('path', false)
             assert_equal('path', href.href)

data/test/dav_acl/principal_backend/abstract_sequel_test.rb

@@ -153,6 +153,22 @@ module Tilia
             backend.principal_by_path('principals/user')
           )
         end
+
+        def test_find_by_uri_unknown_scheme
+          db = sequel
+          backend = Sequel.new(db)
+          assert_nil(backend.find_by_uri('http://foo', 'principals'))
+        end
+
+        def test_find_by_uri
+          db = sequel
+          backend = Sequel.new(db)
+
+          assert_equal(
+            'principals/user',
+            backend.find_by_uri('mailto:user@example.org', 'principals')
+          )
+        end
       end
     end
   end

data/test/dav_acl/principal_backend/mock.rb

@@ -36,7 +36,7 @@ module Tilia
 
           to_return = []
           @principals.each do |principal|
-            next if !prefix.blank? && principal['uri'].index(prefix) != 0
+            next if prefix.present? && principal['uri'].index(prefix) != 0
             to_return << principal
           end
 

data/test/dav_server_test.rb

@@ -182,7 +182,7 @@ module Tilia
       end
 
       if @setup_card_dav || @setup_cal_dav
-        @tree << DavAcl::PrincipalCollection.new(
+        @tree << CalDav::Principal::Collection.new(
           @principal_backend
         )
       end

data/tilia-dav.gemspec

@@ -10,14 +10,14 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split("\n")
   s.homepage    = 'https://github.com/tilia/tilia-dav'
 
-  s.add_runtime_dependency 'tilia-vobject', '>= 4.0.0-alpha4'
+  s.add_runtime_dependency 'tilia-vobject', '~> 4.0.2'
   s.add_runtime_dependency 'tilia-event', '~> 2.0'
   s.add_runtime_dependency 'tilia-xml', '~> 1.2'
   s.add_runtime_dependency 'tilia-http', '~> 4.1'
   s.add_runtime_dependency 'tilia-uri', '~> 1.0'
 
   # External dependencies
-  s.add_runtime_dependency 'activesupport', '~> 4.2'
+  s.add_runtime_dependency 'activesupport', '>= 4.0'
   s.add_runtime_dependency 'sys-filesystem', '~> 1.1'
   s.add_runtime_dependency 'sequel', '~> 4.29'
   s.add_runtime_dependency 'sqlite3', '~> 1.3'

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: tilia-dav
 version: !ruby/object:Gem::Version
-  version: 3.1.0.pre.alpha6
+  version: 3.1.1
 platform: ruby
 authors:
 - Jakob Sack
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilia-vobject
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.alpha4
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0.pre.alpha4
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: tilia-event
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sys-filesystem
   requirement: !ruby/object:Gem::Requirement
@@ -215,7 +215,29 @@ files:
 - README.md
 - Rakefile
 - database.sample.yml
+- examples/addressbookserver.rb
+- examples/calendarserver.rb
+- examples/fileserver.rb
+- examples/groupwareserver.rb
 - examples/minimal.rb
+- examples/sql/mysql.addressbook.sql
+- examples/sql/mysql.calendars.sql
+- examples/sql/mysql.locks.sql
+- examples/sql/mysql.principals.sql
+- examples/sql/mysql.propertystorage.sql
+- examples/sql/mysql.users.sql
+- examples/sql/pgsql.addressbook.sql
+- examples/sql/pgsql.calendars.sql
+- examples/sql/pgsql.locks.sql
+- examples/sql/pgsql.principals.sql
+- examples/sql/pgsql.propertystorage.sql
+- examples/sql/pgsql.users.sql
+- examples/sql/sqlite.addressbooks.sql
+- examples/sql/sqlite.calendars.sql
+- examples/sql/sqlite.locks.sql
+- examples/sql/sqlite.principals.sql
+- examples/sql/sqlite.propertystorage.sql
+- examples/sql/sqlite.users.sql
 - lib/tilia/cal_dav.rb
 - lib/tilia/cal_dav/backend.rb
 - lib/tilia/cal_dav/backend/abstract_backend.rb
@@ -325,6 +347,7 @@ files:
 - lib/tilia/dav/auth.rb
 - lib/tilia/dav/auth/backend.rb
 - lib/tilia/dav/auth/backend/abstract_basic.rb
+- lib/tilia/dav/auth/backend/abstract_bearer.rb
 - lib/tilia/dav/auth/backend/abstract_digest.rb
 - lib/tilia/dav/auth/backend/apache.rb
 - lib/tilia/dav/auth/backend/backend_interface.rb
@@ -575,6 +598,7 @@ files:
 - test/card_dav/xml/request/address_book_query_report_test.rb
 - test/dav/abstract_server.rb
 - test/dav/auth/backend/abstract_basic_test.rb
+- test/dav/auth/backend/abstract_bearer_test.rb
 - test/dav/auth/backend/abstract_digest_test.rb
 - test/dav/auth/backend/abstract_sequel_test.rb
 - test/dav/auth/backend/apache_test.rb
@@ -591,7 +615,7 @@ files:
 - test/dav/browser/prop_find_all_test.rb
 - test/dav/client_mock.rb
 - test/dav/client_test.rb
-- test/dav/copy_test.rb
+- test/dav/core_plugin_test.rb
 - test/dav/exception/locked_test.rb
 - test/dav/exception/payment_required_test.rb
 - test/dav/exception/service_unavailable_test.rb
@@ -600,6 +624,7 @@ files:
 - test/dav/fs_ext/file_test.rb
 - test/dav/fs_ext/server_test.rb
 - test/dav/get_if_conditions_test.rb
+- test/dav/http_copy_test.rb
 - test/dav/http_delete_test.rb
 - test/dav/http_get_test.rb
 - test/dav/http_head_test.rb
@@ -631,7 +656,6 @@ files:
 - test/dav/property_storage/backend/sequel_mysql_test.rb
 - test/dav/property_storage/backend/sequel_sqlite_test.rb
 - test/dav/property_storage/plugin_test.rb
-- test/dav/server_copy_move_test.rb
 - test/dav/server_events_test.rb
 - test/dav/server_mkcol_test.rb
 - test/dav/server_mock.rb
@@ -713,9 +737,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.5

data/test/dav/copy_test.rb

@@ -1,33 +0,0 @@
-require 'test_helper'
-
-module Tilia
-  module Dav
-    class BasicNodeTest < Minitest::Test
-      def setup
-        @temp_dir = Dir.mktmpdir
-      end
-
-      def teardown
-        FileUtils.remove_entry @temp_dir
-      end
-
-      # This test makes sure that a path like /foo cannot be copied into a path
-      # like /foo/bar/
-      def test_copy_into_sub_path
-        dir = Fs::Directory.new(@temp_dir)
-        server = ServerMock.new(dir)
-
-        dir.create_directory('foo')
-
-        request = Http::Request.new(
-          'COPY',
-          '/foo',
-          'Destination' => '/foo/bar'
-        )
-        response = Http::ResponseMock.new
-
-        assert_raises(Exception::Conflict) { server.invoke_method(request, response) }
-      end
-    end
-  end
-end

data/test/dav/server_copy_move_test.rb

@@ -1,164 +0,0 @@
-require 'test_helper'
-
-module Tilia
-  module Dav
-    class ServerCopyMoveTest < AbstractServer
-      def setup
-        super
-
-        @server.debug_exceptions = true
-
-        ::File.open("#{@temp_dir}/test2.txt", 'w') { |f| f.write 'Test contents2' }
-        Dir.mkdir("#{@temp_dir}/col")
-        ::File.open("#{@temp_dir}/col/test.txt", 'w') { |f| f.write 'Test contents' }
-      end
-
-      def test_copy_over_write
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'COPY',
-          'HTTP_DESTINATION' => '/test2.txt'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(204, @response.status, "Received an incorrect HTTP status. Full body inspection: #{@response.body_as_string}")
-        assert_equal(
-          {
-            'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0']
-          },
-          @response.headers
-        )
-
-        assert_equal('Test contents', ::File.read("#{@temp_dir}/test2.txt"))
-      end
-
-      def test_copy_to_self
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'COPY',
-          'HTTP_DESTINATION' => '/test.txt'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(403, @response.status, "Received an incorrect HTTP status. Full body inspection: #{@response.body_as_string}")
-        assert_equal('Test contents', ::File.read("#{@temp_dir}/test.txt"))
-      end
-
-      def test_non_existant_parent
-        server_vars = {
-          'PATH_INFO'        => '/test.txt',
-          'REQUEST_METHOD'   => 'COPY',
-          'HTTP_DESTINATION' => '/testcol2/test2.txt',
-          'HTTP_OVERWRITE'   => 'F'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(
-          {
-            'X-Sabre-Version' => [Version::VERSION],
-            'Content-Type' => ['application/xml; charset=utf-8']
-          },
-          @response.headers
-        )
-
-        assert_equal(409, @response.status)
-      end
-
-      def test_random_overwrite_header
-        server_vars = {
-          'PATH_INFO'        => '/test.txt',
-          'REQUEST_METHOD'   => 'COPY',
-          'HTTP_DESTINATION' => '/testcol2/test2.txt',
-          'HTTP_OVERWRITE'   => 'SURE!'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(400, @response.status)
-      end
-
-      def test_copy_directory
-        server_vars = {
-          'PATH_INFO'      => '/col',
-          'REQUEST_METHOD' => 'COPY',
-          'HTTP_DESTINATION' => '/col2'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(201, @response.status, "Full response: #{@response.body_as_string}")
-
-        assert_equal(
-          {
-            'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0']
-          },
-          @response.headers
-        )
-
-        assert_equal('Test contents', ::File.read("#{@temp_dir}/col/test.txt"))
-      end
-
-      def test_simple_copy_file
-        server_vars = {
-          'PATH_INFO'      => '/test.txt',
-          'REQUEST_METHOD' => 'COPY',
-          'HTTP_DESTINATION' => '/test3.txt'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(
-          {
-            'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0']
-          },
-          @response.headers
-        )
-
-        assert_equal(201, @response.status)
-        assert_equal('Test contents', ::File.read("#{@temp_dir}/test3.txt"))
-      end
-
-      def test_simple_copy_collection
-        server_vars = {
-          'PATH_INFO'      => '/col',
-          'REQUEST_METHOD' => 'COPY',
-          'HTTP_DESTINATION' => '/col2'
-        }
-
-        request = Http::Sapi.create_from_server_array(server_vars)
-        @server.http_request = request
-        @server.exec
-
-        assert_equal(201, @response.status, "Incorrect status received. Full response body: #{@response.body_as_string}")
-
-        assert_equal(
-          {
-            'X-Sabre-Version' => [Version::VERSION],
-            'Content-Length' => ['0']
-          },
-          @response.headers
-        )
-
-        assert_equal('Test contents', ::File.read("#{@temp_dir}/col2/test.txt"))
-      end
-    end
-  end
-end