perobs 1.1.0 → 2.0.0

data/{spec → test}/BTreeDB_spec.rb

@@ -40,20 +40,20 @@ describe PEROBS::BTreeDB do
 
   it 'should create database' do
     @db = PEROBS::BTreeDB.new('fs_test')
-    Dir.exists?('fs_test').should be_true
+    expect(Dir.exists?('fs_test')).to be true
   end
 
   it 'should write and read a simple Hash' do
     @db = PEROBS::BTreeDB.new('fs_test')
-    @db.get_hash('test').should == {}
+    expect(@db.get_hash('test')).to eq({})
     h = { 'A' => 1, 'B' => 2, 'D' => 4 }
     @db.put_hash('test', h)
-    @db.get_hash('test').should == h
+    expect(@db.get_hash('test')).to eq(h)
   end
 
   it 'should support object insertion and retrieval' do
     @db = PEROBS::BTreeDB.new('fs_test')
-    @db.include?(0).should be_false
+    expect(@db.include?(0)).to be false
     h = {
           'String' => 'What god has wrought',
           'Fixnum' => 42,
@@ -64,15 +64,15 @@ describe PEROBS::BTreeDB do
           'Array' => [ 0, 1, 2, 3 ]
         }
     @db.put_object(h, 0)
-    @db.include?(0).should be_true
-    @db.check(0, false).should be_true
-    @db.get_object(0).should == h
+    expect(@db.include?(0)).to be true
+    expect(@db.check(0, false)).to be true
+    expect(@db.get_object(0)).to eq(h)
   end
 
   it 'should support most Ruby objects types' do
     [ :marshal, :yaml ].each do |serializer|
       @db = PEROBS::BTreeDB.new('fs_test', { :serializer => serializer })
-      @db.include?(0).should be_false
+      expect(@db.include?(0)).to be false
       h = {
         'String' => 'What god has wrought',
         'Fixnum' => 42,
@@ -85,9 +85,9 @@ describe PEROBS::BTreeDB do
         'Struct' => UStruct.new("Where's", 'your', 'towel?')
       }
       @db.put_object(h, 0)
-      @db.include?(0).should be_true
-      @db.check(0, false).should be_true
-      @db.get_object(0).should == h
+      expect(@db.include?(0)).to be true
+      expect(@db.check(0, false)).to be true
+      expect(@db.get_object(0)).to eq(h)
       PEROBS::BTreeDB::delete_db('fs_test')
     end
   end
@@ -98,7 +98,7 @@ describe PEROBS::BTreeDB do
       @db.put_object({ "foo #{i}" => i }, i)
     end
     0.upto(10) do |i|
-      @db.get_object(i)["foo #{i}"].should == i
+      expect(@db.get_object(i)["foo #{i}"]).to eq(i)
     end
   end
 
@@ -119,12 +119,12 @@ describe PEROBS::BTreeDB do
     @db.put_object({ 'C' => 'c' * 129 }, 6)
     @db.put_object({ 'D' => 'd' * 1025 }, 7)
 
-    @db.get_object(0).should == { 'a' => 'a' * 257 }
-    @db.get_object(2).should == { 'c' => 'c' * 129 }
-    @db.get_object(4).should == { 'A' => 'a' * 257 }
-    @db.get_object(5).should == { 'B' => 'b' * 513 }
-    @db.get_object(6).should == { 'C' => 'c' * 129 }
-    @db.get_object(7).should == { 'D' => 'd' * 1025 }
+    expect(@db.get_object(0)).to eq({ 'a' => 'a' * 257 })
+    expect(@db.get_object(2)).to eq({ 'c' => 'c' * 129 })
+    expect(@db.get_object(4)).to eq({ 'A' => 'a' * 257 })
+    expect(@db.get_object(5)).to eq({ 'B' => 'b' * 513 })
+    expect(@db.get_object(6)).to eq({ 'C' => 'c' * 129 })
+    expect(@db.get_object(7)).to eq({ 'D' => 'd' * 1025 })
   end
 
   it 'should mark objects and detect markings' do
@@ -133,14 +133,14 @@ describe PEROBS::BTreeDB do
     @db.put_object(h, 1)
     @db.put_object(h, 2)
     @db.clear_marks
-    @db.is_marked?(1).should be_false
+    expect(@db.is_marked?(1)).to be false
     @db.mark(1)
-    @db.is_marked?(1).should be_true
+    expect(@db.is_marked?(1)).to be true
 
-    @db.include?(2).should be_true
+    expect(@db.include?(2)).to be true
     @db.delete_unmarked_objects
-    @db.include?(1).should be_true
-    @db.include?(2).should be_false
+    expect(@db.include?(1)).to be true
+    expect(@db.include?(2)).to be false
   end
 
 end

data/{spec → test}/ClassMap_spec.rb

@@ -23,7 +23,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+require 'spec_helper'
 
 require 'perobs/ClassMap'
 require 'perobs/BTreeDB'
@@ -31,40 +31,40 @@ require 'perobs/BTreeDB'
 describe PEROBS::ClassMap do
 
   before(:all) do
-    FileUtils.rm_rf('fs_test')
-    @db = PEROBS::BTreeDB.new('fs_test')
+    @db_name = generate_db_name(__FILE__)
+    @db = PEROBS::BTreeDB.new(@db_name)
     @map = PEROBS::ClassMap.new(@db)
   end
 
   after(:all) do
-    FileUtils.rm_rf('fs_test')
+    FileUtils.rm_rf(@db_name)
   end
 
   it 'should return nil for an unknown ID' do
-    @map.id_to_class(0).should be_nil
+    expect(@map.id_to_class(0)).to be_nil
   end
 
   it 'should add a class' do
-    @map.class_to_id('Foo').should == 0
+    expect(@map.class_to_id('Foo')).to eq(0)
   end
 
   it 'should find the class again' do
-    @map.id_to_class(0).should == 'Foo'
+    expect(@map.id_to_class(0)).to eq('Foo')
   end
 
   it 'should still return nil for an unknown ID' do
-    @map.id_to_class(1).should be_nil
+    expect(@map.id_to_class(1)).to be_nil
   end
 
   it 'should forget classes not in keep list' do
-    @map.class_to_id('Bar').should == 1
-    @map.class_to_id('Foobar').should == 2
+    expect(@map.class_to_id('Bar')).to eq(1)
+    expect(@map.class_to_id('Foobar')).to eq(2)
     @map.keep([ 'Bar' ])
-    @map.id_to_class(0).should be_nil
-    @map.id_to_class(1).should == 'Bar'
-    @map.id_to_class(2).should be_nil
-    @map.class_to_id('Foo1').should == 0
-    @map.class_to_id('Foo2').should == 2
+    expect(@map.id_to_class(0)).to be_nil
+    expect(@map.id_to_class(1)).to eq('Bar')
+    expect(@map.id_to_class(2)).to be_nil
+    expect(@map.class_to_id('Foo1')).to eq(0)
+    expect(@map.class_to_id('Foo2')).to eq(2)
   end
 
 end

data/test/Hash_spec.rb

@@ -0,0 +1,157 @@
+# encoding: UTF-8
+#
+# Copyright (c) 2015 by Chris Schlaeger <chris@taskjuggler.org>
+#
+# This file contains tests for Hash that are similar to the tests for the
+# Hash implementation in MRI. The ideas of these tests were replicated in
+# this code.
+#
+# MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'spec_helper'
+
+require 'perobs'
+
+
+class PO < PEROBS::Object
+
+  po_attr :name
+
+  def initialize(store, name = nil)
+    super(store)
+    @name = name
+  end
+
+end
+
+describe PEROBS::Hash do
+
+  before(:all) do
+    @db_name = generate_db_name(__FILE__)
+  end
+
+  before(:each) do
+    @store = PEROBS::Store.new(@db_name)
+  end
+
+  after(:each) do
+    @store.delete_store
+  end
+
+  it 'should store simple objects persistently' do
+    @store['h'] = h = @store.new(PEROBS::Hash)
+    h['a'] = 'A'
+    h['b'] = 'B'
+    h['po'] = po = @store.new(PO)
+    po.name = 'foobar'
+    h['b'] = 'B'
+
+    expect(h['a']).to eq('A')
+    expect(h['b']).to eq('B')
+    @store.sync
+
+    @store = PEROBS::Store.new(@db_name)
+    h = @store['h']
+    expect(h['a']).to eq('A')
+    expect(h['b']).to eq('B')
+    expect(h['po'].name).to eq('foobar')
+  end
+
+  it 'should have an each method to iterate' do
+    @store['h'] = h = @store.new(PEROBS::Hash)
+    h['a'] = 'A'
+    h['b'] = 'B'
+    h['c'] = 'C'
+    vs = []
+    h.each { |k, v| vs << k + v }
+    expect(vs.sort.join).to eq('aAbBcC')
+
+    @store = PEROBS::Store.new(@db_name)
+    @store['h'] = h = @store.new(PEROBS::Hash)
+    h['a'] = @store.new(PO, 'A')
+    h['b'] = @store.new(PO, 'B')
+    h['c'] = @store.new(PO, 'C')
+    vs = []
+    h.each { |k, v| vs << k + v.name }
+    expect(vs.sort.join).to eq('aAbBcC')
+  end
+
+  # Utility method to create a PEROBS::Hash from a normal Hash.
+  def cph(hash = nil)
+    a = @store.new(PEROBS::Hash)
+    a.replace(hash) unless hash.nil?
+    @store['a'] = a
+  end
+
+  def pcheck
+    yield
+    @store.sync
+    @store = PEROBS::Store.new(@db_name)
+    yield
+  end
+
+  it 'should support reading method' do
+    expect(cph({ [1] => [2] }).flatten).to eq([ [1], [2] ])
+
+    a = cph({ 1 => "one", 2 => [ 2, "two" ], 3 => [ 3, [ "three" ] ] })
+    expect(a.flatten).to eq([ 1, "one", 2, [ 2, "two" ], 3, [ 3, ["three"] ] ])
+    expect(a.flatten(0)).to eq([
+      [ 1, "one" ],
+      [ 2, [ 2, "two" ] ],
+      [ 3, [ 3, [ "three" ] ] ]
+    ])
+    expect(a.has_key?(2)).to be true
+  end
+
+  it 'should support Enumberable methods' do
+    h = cph({ 1 => 'a', 2 => 'b' })
+    expect(h.first).to eq([ 1, 'a' ])
+  end
+
+  it 'should support rewriting methods' do
+    h = cph({ 1 => 'a', 2 => 'b' })
+    h.clear
+    expect(h.size).to eq(0)
+    expect(h[1]).to be_nil
+
+    h = cph({ 1 => 'a', 2 => 'b' })
+    expect(h.delete_if { |k, v| k == 1 }.size).to eq(1)
+  end
+
+  it 'should support merge!' do
+    h1 = cph({ 1 => 2, 2 => 3, 3 => 4 })
+    h2 = cph({ 2 => 'two', 4 => 'four' })
+
+    ha = { 1 => 2, 2 => 'two', 3 => 4, 4 => 'four' }
+    hb = { 1 => 2, 2 => 3, 3 => 4, 4 => 'four' }
+
+    expect(h1.update(h2)).to eq(ha)
+    pcheck { expect(h1).to eq(ha) }
+
+    h1 = cph({ 1 => 2, 2 => 3, 3 => 4 })
+    h2 = cph({ 2 => 'two', 4 => 'four' })
+
+    expect(h2.update(h1)).to eq(hb)
+    pcheck { expect(h2).to eq(hb) }
+  end
+
+end

data/{spec → test}/Object_spec.rb

@@ -23,10 +23,7 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'fileutils'
-require 'time'
+require 'spec_helper'
 require 'perobs'
 
 class O1 < PEROBS::Object
@@ -50,59 +47,87 @@ class O2 < PEROBS::Object
     init_attr(:a4, 42)
   end
 
+  def a3_deref
+    @a3.a1
+  end
+
+end
+
+class O3 < PEROBS::Object
+
+  def initialize(store)
+    super
+  end
+
 end
 
 describe PEROBS::Store do
 
+  before(:all) do
+    @db_name = File.join(Dir.tmpdir, "Object_spec.#{rand(2**32)}")
+  end
+
   before(:each) do
-    FileUtils.rm_rf('test_db')
-    @store = PEROBS::Store.new('test_db')
+    @store = PEROBS::Store.new(@db_name)
   end
 
-  after(:all) do
-    FileUtils.rm_rf('test_db')
+  after(:each) do
+    FileUtils.rm_rf(@db_name)
   end
 
   it 'should initialize attributes with default values' do
-    @store['o1'] = o1 = O1.new(@store)
-    @store['o2'] = o2 = O2.new(@store)
-    o2.a1.should == 'a1'
-    o2.a2.should be_nil
-    o2.a3.should be_nil
-    o2.a4.should == 42
+    @store['o1'] = o1 = @store.new(O1)
+    @store['o2'] = o2 = @store.new(O2)
+    expect(o2.a1).to eq('a1')
+    expect(o2.a2).to be_nil
+    expect(o2.a3).to be_nil
+    expect(o2.a4).to eq(42)
   end
 
   it 'should assign values to attributes' do
-    @store['o1'] = o1 = O1.new(@store)
-    @store['o2'] = o2 = O2.new(@store)
+    @store['o1'] = o1 = @store.new(O1)
+    @store['o2'] = o2 = @store.new(O2)
     o1.a1 = 'a1'
     o2.a1 = nil
     o2.a3 = o1
 
-    o1.a1.should == 'a1'
-    o2.a1.should be_nil
-    o2.a3.should == o1
-    o2.a4.should == 42
+    expect(o1.a1).to eq('a1')
+    expect(o2.a1).to be_nil
+    expect(o2.a3).to eq(o1)
+    expect(o2.a4).to eq(42)
     @store.sync
   end
 
   it 'should persist assigned values' do
-    @store['o1'] = o1 = O1.new(@store)
-    @store['o2'] = o2 = O2.new(@store)
+    @store['o1'] = o1 = @store.new(O1)
+    @store['o2'] = o2 = @store.new(O2)
     o1.a1 = 'a1'
     o2.a1 = nil
     o2.a3 = o1
-    o2.a4 = PEROBS::Array.new(@store)
+    o2.a4 = @store.new(PEROBS::Array)
     o2.a4 += [ 0, 1, 2 ]
     @store.sync
 
-    @store = PEROBS::Store.new('test_db')
+    @store = PEROBS::Store.new(@db_name)
     o1 = @store['o1']
     o2 = @store['o2']
-    o1.a1.should == 'a1'
-    o2.a1.should be_nil
-    o2.a3.should == o1
-    o2.a4.should == [ 0, 1, 2 ]
+    expect(o1.a1).to eq('a1')
+    expect(o2.a1).to be_nil
+    expect(o2.a3).to eq(o1)
+    expect(o2.a4).to eq([ 0, 1, 2 ])
+  end
+
+  it 'should transparently access a referenced object' do
+    @store['o1'] = o1 = @store.new(O1)
+    @store['o2'] = o2 = @store.new(O2)
+    o1.a1 = 'a1'
+    o2.a3 = o1
+    expect(o2.a3_deref).to eq('a1')
+  end
+
+  it 'should raise an error when no attributes are defined' do
+    @store['o3'] = @store.new(O3)
+    expect { @store.sync }.to raise_error(StandardError)
   end
 
 end