2 files changed, 33 insertions, 3 deletions
diff --git a/lib/server.rb b/lib/server.rb
index 1d4706c..a5c25ab 100644
--- a/lib/server.rb
+++ b/lib/server.rb
@@ -1,12 +1,12 @@
-#!/usr/bin/env ruby
 require 'digest'
-require 'rack'
 require 'json'
+require 'rack'
+require 'storage'
 
 class DataStorageServer
   MAX_BYTES=4096
 
-  def initialize(storage: {})
+  def initialize(storage: Storage.new)
     @storage = storage
   end
 
diff --git a/lib/storage.rb b/lib/storage.rb
new file mode 100644
index 0000000..57b2548
--- /dev/null
+++ b/lib/storage.rb
@@ -0,0 +1,30 @@
+class Storage
+  def initialize(storage: {})
+    @storage = storage
+    @mutex = Mutex.new
+  end
+
+  def key?(key)
+    with_lock { @storage.key?(key) }
+  end
+
+  def [](key)
+    with_lock { @storage[key] }
+  end
+
+  def []=(key, value)
+    with_lock { @storage[key] = value }
+  end
+
+  def delete(key)
+    with_lock { @storage.delete(key) }
+  end
+
+  private
+
+  def with_lock
+    @mutex.synchronize do
+      yield
+    end
+  end
+end