hashtree 0.0.5 → 0.0.6

data/lib/hashtree/version.rb

@@ -1,3 +1,3 @@
 class HashTree
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/lib/hashtree.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'digest'
 require 'securerandom'
+require 'thread'
 
 require "hashtree/version"
 
@@ -13,9 +14,10 @@ class HashTree
       max_branch_size: 16
     }.merge(settings)
     @index = {}
-    @branches = {
-      free: {}
-    }
+    @branches = {}
+    @free = {}
+    @lock = Mutex.new
+    @cv = ConditionVariable.new
   end
 
   def [](key)
@@ -37,17 +39,13 @@ class HashTree
   end
 
   def delete(key)
-    begin
-      id = @index[key]
-      if id
-        doc = read(id)
-        destroy(id)
-        @index.delete(key)
-        return doc
-      else
-        nil
-      end
-    rescue
+    id = @index[key]
+    if id
+      doc = read(id)
+      destroy(id)
+      @index.delete(key)
+      return doc
+    else
       nil
     end
   end
@@ -84,20 +82,17 @@ class HashTree
   end
 
   def branch(key)
-    branch_id = get_branch_id(key)
-    @branches[branch_id] if branch_id
-  end
-
-  private
-  def get_branch_id(key)
     id = @index[key]
     if id
       branch_id = id[0..31]
+      @branches[branch_id]
     else
       nil
     end
   end
 
+  private
+
   def translate_id(id)
     branch_id, leaf_id = id[0..31], id[32..64]
     return branch_id, leaf_id
@@ -107,25 +102,14 @@ class HashTree
     Digest::SHA256.hexdigest(SecureRandom.uuid)
   end
 
-  def read(id)
-    branch_id, leaf_id = translate_id(id)
-    @branches[branch_id][leaf_id]
-  end
-
-  def update(id, value)
-    branch_id, leaf_id = translate_id(id)
-    @branches[branch_id][leaf_id] = value
-    return value
-  end
-
   def create(key, value)
-    free_branch_id = @branches[:free].keys.sample
+    free_branch_id = @free.keys.sample
     if free_branch_id
       leaf_id = generate_id[0..31]
       id = free_branch_id + leaf_id
       @index[key] = id
       @branches[free_branch_id][leaf_id] = value
-      @branches[:free].delete(branch_id) if branch.size >= @settings[:max_branch_size]
+      @free.delete(branch_id) if branch.size >= @settings[:max_branch_size]
     else
       id = generate_id
       branch_id, leaf_id = translate_id(id)
@@ -136,16 +120,34 @@ class HashTree
     return value
   end
 
+  def read(id)
+    branch_id, leaf_id = translate_id(id)
+    begin
+      @branches[branch_id][leaf_id]
+    rescue
+      nil
+    end
+  end
+
+  def update(id, value)
+    branch_id, leaf_id = translate_id(id)
+    begin
+      @branches[branch_id][leaf_id] = value
+    rescue
+      nil
+    end
+  end
+
   def destroy(id)
     branch_id, leaf_id = translate_id(id)
-    branch = @branches[branch_id]
-    destroyed_element = branch.delete(leaf_id)
-    if branch.size == 0
+    value = @branches[branch_id].delete(leaf_id)
+    if @branches[branch_id].size == 0
       @branches.delete(branch_id)
-      @branches[:free].delete(branch_id)
+      @free.delete(branch_id)
     elsif branch.size > 0 and branch.size < @settings[:max_branch_size]
-      @branches[:free][branch_id] = nil
+      @free[branch_id] = nil
     end
+    return value
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hashtree
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: