Fixed Superclass errors when running the complete testsuite and other errors/warnings during tests.

Author: Florian Aßmann

lib/dav/storages/file_storage.rb

@@ -1,6 +1,8 @@
 require 'pathname'
 require 'tmpdir'
 
+# TODO use chambermaid for a typed implementation
+
 module DAV
   class FileStorage < Storage
     include Addressable
@@ -15,9 +17,10 @@ def initialize(opts = {})
       @opts   = opts
       @memory = Pathname File.expand_path(path)
 
-      # TODO Check if user can write, too.
-      if @memory.exist? && !@memory.directory?
-        raise "Cannot store data at #{ @memory }!"
+      @memory.mkpath unless @memory.exist?
+
+      unless @memory.directory? or @memory.writable?
+        raise "Cannot store data at #{ @memory }"
       end
     end
 

test/unit/file_storage_test.rb

@@ -1,98 +1,100 @@
 require File.expand_path('../../teststrap', __FILE__)
 
-context "DAV::FileStorage" do
-  URI = Addressable::URI
+module FileStorageTest
+  context "DAV::FileStorage" do
+    URI = Addressable::URI
 
-  root = File.join Dir.tmpdir
+    root = File.join Dir.tmpdir
 
-  key = 'example.com/foo bar/baz'
-  encoded_key = URI.encode_component key, URI::CharacterClasses::PATH
+    key = 'example.com/foo bar/baz'
+    encoded_key = URI.encode_component key, URI::CharacterClasses::PATH
 
-  path = File.join key.split('/')
+    path = File.join key.split('/')
 
-  setup { DAV::FileStorage }
+    setup { DAV::FileStorage }
 
-  context "without prefix" do
-    setup { topic.new }
+    context "without prefix" do
+      setup { topic.new }
 
-    asserts 'get on non-existing key' do
-      topic.get key
-    end.nil
+      asserts 'get on non-existing key' do
+        topic.get key
+      end.nil
 
-    asserts 'delete on non-existing key' do
-      topic.delete key
-    end.nil
+      asserts 'delete on non-existing key' do
+        topic.delete key
+      end.nil
 
-    asserts '@memory' do
-      topic.memory
-    end.kind_of Pathname
+      asserts '@memory' do
+        topic.memory
+      end.kind_of Pathname
 
-    asserts 'set on key' do
-      topic.set key, 'value-1'
-    end.equals 'value-1'
+      asserts 'set on key' do
+        topic.set key, 'value-1'
+      end.equals 'value-1'
 
-    asserts 'stores values in files in tmp dir' do
-      File.file? File.join(root, 'file_storage.rb', path)
-    end
-
-    asserts 'get on existing key' do
-      topic.set key, 'value-2'
-      topic.get key
-    end.equals 'value-2'
+      asserts 'stores values in files in tmp dir' do
+        File.file? File.join(root, 'file_storage.rb', path)
+      end
 
-    asserts '#keys' do
-      topic.keys
-    end.equals [key]
+      asserts 'get on existing key' do
+        topic.set key, 'value-2'
+        topic.get key
+      end.equals 'value-2'
 
-    denies '#keys with pattern "/foo"' do
-      topic.keys '/foo'
-    end.any
-    asserts '#keys with pattern "example.com/*"' do
-      topic.keys 'example.com/*'
-    end.equals [key]
+      asserts '#keys' do
+        topic.keys
+      end.equals [key]
 
-    asserts 'delete on existing key' do
-      topic.set key, 'value-3'
-      topic.delete key
-    end.equals 'value-3'
+      asserts '#keys with pattern "/foo"' do
+        topic.keys '/foo'
+      end.empty
+      asserts '#keys with pattern "example.com/*"' do
+        topic.keys 'example.com/*'
+      end.equals [key]
 
-    asserts 'get a nil value' do
-      topic.set key, nil
-      topic.get key
-    end.nil
+      asserts 'delete on existing key' do
+        topic.set key, 'value-3'
+        topic.delete key
+      end.equals 'value-3'
 
-    asserts 'get on deleted key' do
-      topic.get key
-    end.nil
+      asserts 'get a nil value' do
+        topic.set key, nil
+        topic.get key
+      end.nil
 
-  end
+      asserts 'get on deleted key' do
+        topic.get key
+      end.nil
 
-  context "with prefix" do
-    setup do
-      topic.new :prefix => 'DELETE-ME'
     end
 
-    asserts 'creates DELETE-ME dir in current working dir' do
-      full_path = File.join Dir.tmpdir, 'DELETE-ME'
+    context "with prefix" do
+      setup do
+        topic.new :prefix => 'DELETE-ME'
+      end
+
+      asserts 'creates DELETE-ME dir in current working dir' do
+        full_path = File.join Dir.tmpdir, 'DELETE-ME'
 
-      File.directory?(full_path).tap do |exist|
-        FileUtils.rmtree full_path if exist
+        File.directory?(full_path).tap do |exist|
+          FileUtils.rmtree full_path if exist
+        end
       end
-    end
 
-  end
+    end
 
-  context "with root" do
-    setup { topic.new :root => File.join(root, 'DELETE-ME') }
+    context "with root" do
+      setup { topic.new :root => File.join(root, 'DELETE-ME') }
 
-    asserts 'creates DELETE-ME-TOO dir in root' do
-      full_path = File.join root, 'DELETE-ME'
+      asserts "creates DELETE-ME dir in #{root}" do
+        full_path = File.join root, 'DELETE-ME'
 
-      File.directory?(full_path).tap do |exist|
-        FileUtils.rmtree full_path if exist
+        File.directory?(full_path).tap do |exist|
+          FileUtils.rmtree full_path if exist
+        end
       end
+
     end
 
   end
-
-end
+end

test/unit/memory_storage_test.rb

@@ -1,78 +1,73 @@
 require File.expand_path('../../teststrap', __FILE__)
 
-class KeyMaster < Struct.new(:results)
-  def [](key)
-    results[:get] << key
-  end
-  def []=(key, value)
-    results[:set] << key
-  end
-  def delete(key)
-    results[:delete] << key
+module MemoryStorageTest
+  class KeyMaster < Struct.new(:results)
+    def [](ns)
+      results[ns] ||= {}
+    end
   end
-end
 
-context "DAV::MemoryStorage" do
-  setup { DAV::MemoryStorage }
+  context "DAV::MemoryStorage" do
+    setup { DAV::MemoryStorage }
 
-  context "without prefix" do
-    setup { topic.new }
+    context "without prefix" do
+      setup { topic.new }
 
-    asserts 'get on non-existing key' do
-      topic.get 'key'
-    end.nil
+      asserts 'get on non-existing key' do
+        topic.get 'key'
+      end.nil
 
-    asserts 'delete on non-existing key' do
-      topic.delete 'key'
-    end.nil
+      asserts 'delete on non-existing key' do
+        topic.delete 'key'
+      end.nil
 
-    asserts 'set on key' do
-      topic.set 'key', 'value-1'
-    end.equals 'value-1'
+      asserts 'set on key' do
+        topic.set 'key', 'value-1'
+      end.equals 'value-1'
 
-    asserts 'get on existing key' do
-      topic.set 'key', 'value-2'
-      topic.get 'key'
-    end.equals 'value-2'
+      asserts 'get on existing key' do
+        topic.set 'key', 'value-2'
+        topic.get 'key'
+      end.equals 'value-2'
 
-    asserts 'get a nil value' do
-      topic.set 'key', nil
-      topic.get 'key'
-    end.nil
+      asserts 'get a nil value' do
+        topic.set 'key', nil
+        topic.get 'key'
+      end.nil
 
-    asserts 'delete on existing key' do
-      topic.set 'key', 'value-3'
-      topic.delete 'key'
-    end.equals 'value-3'
+      asserts 'delete on existing key' do
+        topic.set 'key', 'value-3'
+        topic.delete 'key'
+      end.equals 'value-3'
 
-    asserts 'get on deleted key' do
-      topic.get 'key'
-    end.nil
+      asserts 'get on deleted key' do
+        topic.get 'key'
+      end.nil
 
-  end
-  context "with prefix" do
-    setup do
-      topic.new(:prefix => 'PREFIX-').tap do |storage|
-        @storage = Hash.new { |h, k| h[k] = [] }
-        storage.memory = KeyMaster.new(@storage)
-      end
     end
+    context "with prefix" do
+      setup do
+        topic.new(:prefix => 'PREFIX-').tap do |storage|
+          @storage = {}
+          storage.memory = KeyMaster.new(@storage)
+        end
+      end
 
-    asserts 'get key-0' do
-      topic.get 'key-0'
-      @storage[:get].last
-    end.equals 'PREFIX-key-0'
+      asserts 'set key' do
+        topic.set 'key', 'value'
+        @storage['PREFIX-']['key']
+      end.equals 'value'
 
-    asserts 'delete key-1' do
-      topic.delete 'key-1'
-      @storage[:delete].last
-    end.equals 'PREFIX-key-1'
+      asserts 'get key' do
+        topic.get 'key'
+      end.equals 'value'
 
-    asserts 'set key-2' do
-      topic.set 'key-2', 'value-1'
-      @storage[:set].last
-    end.equals 'PREFIX-key-2'
+      asserts 'delete key' do
+        topic.delete 'key'
+        @storage['PREFIX-']['key']
+      end.nil
 
-  end
+    end
 
-end
+  end
+end