keyvaluetree 0.0.3 → 0.0.4

data/lib/keyvaluetree/hash.rb

@@ -2,6 +2,8 @@ module KeyValueTree
 
   class Hash
 
+    attr_reader :store
+
     def initialize(store = KeyValueTree::MemoryStore.new(), key=nil, parent = nil)
       @key = key.to_s
       @parent = parent
@@ -9,15 +11,16 @@ module KeyValueTree
     end
 
     def [] (key)
+      return self if key.nil?
       value = @store.key(key_path_string(key))
       return value unless value.nil?
       return KeyValueTree::Hash.new(@store, key, self)
     end
 
     def []= (key, value)
-      if value.is_a?(Hash)
+      if value.is_a?(::Hash)
         value.each do |hash_key, hash_value|
-          self[key_path_string(key)][hash_key] = hash_value
+          self[key][hash_key] = hash_value
         end
         return
       end
@@ -75,6 +78,9 @@ module KeyValueTree
       @store.keys_starting_with(key_path_string()).map { |each| each.split(".").first }.uniq
     end
 
+    def import(object)
+      self[nil] = object
+    end
   end
 
 end

data/lib/keyvaluetree/memory_store.rb

@@ -26,7 +26,6 @@ module KeyValueTree
       @hash
     end
 
-
   end
 
 end

data/lib/keyvaluetree/store.rb

@@ -2,6 +2,30 @@ module KeyValueTree
 
   class Store
 
+    def initialize(hash={})
+      raise NotImplementedError
+    end
+
+    def key(key)
+      raise NotImplementedError
+    end
+
+    def store(key, value)
+      raise NotImplementedError
+    end
+
+    def basic_delete(key)
+      raise NotImplementedError
+    end
+
+    def keys
+      raise NotImplementedError
+    end
+
+    def to_hash
+      raise NotImplementedError
+    end
+
     def delete(key)
       self.delete_keys_start_with(key.to_s)
     end

data/lib/keyvaluetree/transaction_store.rb

@@ -0,0 +1,85 @@
+module KeyValueTree
+
+  class TransactionStore < Store
+
+    def initialize(store = MemoryStore.new())
+      @store = store
+      @access_mutex = Mutex.new()
+      reset()
+    end
+
+    def key(key)
+      @access_mutex.synchronize do
+        result = @changed_properties[key]
+        return result unless result.nil?
+        @store.key(key)
+      end
+    end
+
+    def store(key, value)
+      @access_mutex.synchronize do
+        @changed_properties[key] = value
+        @deleted_property_keys.delete(key)
+        value
+      end
+    end
+
+    def basic_delete(key)
+      @access_mutex.synchronize do
+        @changed_properties.delete(key)
+        @deleted_property_keys << key
+      end
+    end
+
+    def keys
+      @access_mutex.synchronize do
+        result = @store.keys + @changed_properties.keys
+        @deleted_property_keys.each do |key|
+          result.delete(key)
+        end
+        result
+      end
+    end
+
+    def to_hash
+      result = @store.to_hash
+      @changed_properties.each do |key, value|
+        result[key] = value
+      end
+      @deleted_property_keys.each do |key|
+        result.delete(key)
+      end
+      result
+    end
+
+    def commit
+      @access_mutex.synchronize do
+        @changed_properties.each do |key, value|
+          @store.store(key, value)
+        end
+        @deleted_property_keys.each do |key|
+          @store.delete(key)
+        end
+        reset()
+      end
+    end
+
+    def rollback
+      @access_mutex.synchronize do
+        reset()
+      end
+    end
+
+    def pending_changes?
+      !(@changed_properties.empty? && @deleted_property_keys.empty?)
+    end
+
+    private
+
+    def reset
+      @changed_properties = {}
+      @deleted_property_keys = []
+    end
+
+  end
+end

data/lib/keyvaluetree/version.rb

@@ -1,3 +1,3 @@
 module KeyValueTree
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/lib/keyvaluetree.rb

@@ -2,6 +2,7 @@ require "keyvaluetree/version"
 
 require 'keyvaluetree/store'
 require 'keyvaluetree/memory_store'
+require 'keyvaluetree/transaction_store'
 
 require 'keyvaluetree/hash'
 

data/test/hash_test.rb

@@ -5,7 +5,7 @@ class HashTest < Test::Unit::TestCase
   context "Hash" do
 
     setup do
-      @hash_object ={:a => :b}
+      @hash_object = {"a" => "b", "c" => {"d" => "e", "f" => "g"}}
       @array_object = [:a, :b]
       @store = KeyValueTree::MemoryStore.new()
       @root = KeyValueTree::Hash.new(@store)
@@ -78,6 +78,16 @@ class HashTest < Test::Unit::TestCase
       assert_same_elements ["one", "two"], @root.keys
     end
 
+    should "import existing object" do
+      @root.import(@hash_object)
+      assert_same_elements ["a", "c"], @root.keys
+      assert_same_elements ["a", "c.d", "c.f"], @store.keys
+      assert_equal "b", @root.a
+      assert_equal "e", @root.c.d
+      assert_equal "g", @root.c.f
+    end
+
+
   end
 
 end

data/test/memory_store_test.rb

@@ -17,7 +17,7 @@ class MemoryStoreTest < Test::Unit::TestCase
     should "get a value" do
       @store.store(@key, @value)
       assert_equal(@value, @store.key(@key))
-      assert_equal(nil, @store.key(:@nilkey))
+      assert_equal(nil, @store.key(@nilkey))
     end
 
     should "delete a value" do

data/test/transaction_store_test.rb

@@ -0,0 +1,70 @@
+require "common"
+
+class TransactionStoreTest < MemoryStoreTest
+
+  context "a TransactionStore" do
+    setup do
+
+      @embedded_store = KeyValueTree::MemoryStore.new()
+      @store = KeyValueTree::TransactionStore.new(@embedded_store)
+      @key = "key"
+      @nilkey = "nil"
+      @value = 42
+    end
+
+    should "set a value" do
+      assert_equal @value, @store.store(@key, @value)
+    end
+
+    should "get a value" do
+      @store.store(@key, @value)
+      assert_equal(@value, @store.key(@key))
+      assert_equal(nil, @store.key(:@nilkey))
+    end
+
+    should "delete a value" do
+      assert_equal nil, @store.key(@key)
+      @store.store(@key, @value)
+      assert_equal @value, @store.key(@key)
+      @store.delete(@key)
+      assert_equal nil, @store.key(@nilkey)
+    end
+
+    should "access the hash" do
+      assert_nothing_raised(Exception) { @store.to_hash }
+      @store.store(@key, @value)
+      assert_equal @value, @store.to_hash[@key]
+    end
+
+    should "set a value with commit" do
+      assert_equal @value, @store.store(@key, @value)
+      assert_equal 1, @store.keys.size
+      assert_equal 0, @embedded_store.keys.size
+      @store.commit
+      assert_equal 1, @store.keys.size
+      assert_equal 1, @embedded_store.keys.size
+    end
+
+    should "set a value with rollback" do
+      assert_equal @value, @store.store(@key, @value)
+      assert_equal 1, @store.keys.size
+      assert_equal 0, @embedded_store.keys.size
+      @store.rollback
+      assert_equal 0, @store.keys.size
+      assert_equal 0, @embedded_store.keys.size
+    end
+
+    should "track changes" do
+      assert !@store.pending_changes?
+      @store.store(@key, @value)
+      assert @store.pending_changes?
+      @store.commit
+      assert !@store.pending_changes?
+      @store.delete(@key)
+      assert @store.pending_changes?
+      @store.commit
+      assert !@store.pending_changes?
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: keyvaluetree
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -85,7 +85,6 @@ files:
 - .gitignore
 - .idea/encodings.xml
 - .idea/misc.xml
-- .idea/modules.xml
 - .idea/vcs.xml
 - Gemfile
 - LICENSE.txt
@@ -96,10 +95,12 @@ files:
 - lib/keyvaluetree/hash.rb
 - lib/keyvaluetree/memory_store.rb
 - lib/keyvaluetree/store.rb
+- lib/keyvaluetree/transaction_store.rb
 - lib/keyvaluetree/version.rb
 - test/common.rb
 - test/hash_test.rb
 - test/memory_store_test.rb
+- test/transaction_store_test.rb
 homepage: ''
 licenses:
 - MIT
@@ -115,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1144361209399156749
+      hash: -3979295287032402634
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1144361209399156749
+      hash: -3979295287032402634
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -135,3 +136,4 @@ test_files:
 - test/common.rb
 - test/hash_test.rb
 - test/memory_store_test.rb
+- test/transaction_store_test.rb

data/.idea/modules.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/KeyValueTree.iml" filepath="$PROJECT_DIR$/.idea/KeyValueTree.iml" />
-    </modules>
-  </component>
-</project>
-