perobs 1.1.0 → 2.0.0

data/{spec → test}/perobs_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 Person < PEROBS::Object
@@ -45,43 +42,43 @@ end
 describe PEROBS::Store do
 
   before(:all) do
-    FileUtils.rm_rf('test_db')
+    @db_name = File.join(Dir.tmpdir, "perobs_spec.#{rand(2**32)}")
   end
 
   after(:each) do
-    FileUtils.rm_rf('test_db')
+    FileUtils.rm_rf(@db_name)
   end
 
   it 'should store simple objects' do
-    store = PEROBS::Store.new('test_db')
-    store['john'] = john = Person.new(store)
+    store = PEROBS::Store.new(@db_name)
+    store['john'] = john = store.new(Person)
     john.name = 'John'
     john.zip = 4060
     john.bmi = 25.5
-    store['jane'] = jane = Person.new(store)
+    store['jane'] = jane = store.new(Person)
     jane.name = 'Jane'
     jane.related = john
     jane.married = true
     jane.relatives = 'test'
 
-    john.name.should == 'John'
-    john.zip.should == 4060
-    john.bmi.should == 25.5
-    john.married.should be_false
-    john.related.should be_nil
+    expect(john.name).to eq('John')
+    expect(john.zip).to eq(4060)
+    expect(john.bmi).to eq(25.5)
+    expect(john.married).to be false
+    expect(john.related).to be_nil
     jane = store['jane']
-    jane.name.should == 'Jane'
-    jane.related.should == john
-    jane.married.should be_true
+    expect(jane.name).to eq('Jane')
+    expect(jane.related).to eq(john)
+    expect(jane.married).to be true
   end
 
   it 'should store and retrieve simple objects' do
-    store = PEROBS::Store.new('test_db')
-    store['john'] = john = Person.new(store)
+    store = PEROBS::Store.new(@db_name)
+    store['john'] = john = store.new(Person)
     john.name = 'John'
     john.zip = 4060
     john.bmi = 25.5
-    store['jane'] = jane = Person.new(store)
+    store['jane'] = jane = store.new(Person)
     jane.name = 'Jane'
     jane.related = john
     jane.married = true
@@ -89,67 +86,67 @@ describe PEROBS::Store do
 
     store.sync
 
-    store = PEROBS::Store.new('test_db')
+    store = PEROBS::Store.new(@db_name)
     john = store['john']
-    john.name.should == 'John'
-    john.zip.should == 4060
-    john.bmi.should == 25.5
-    john.married.should be_false
-    john.related.should be_nil
+    expect(john.name).to eq('John')
+    expect(john.zip).to eq(4060)
+    expect(john.bmi).to eq(25.5)
+    expect(john.married).to be false
+    expect(john.related).to be_nil
     jane = store['jane']
-    jane.name.should == 'Jane'
-    jane.related.should == john
-    jane.married.should be_true
+    expect(jane.name).to eq('Jane')
+    expect(jane.related).to eq(john)
+    expect(jane.married).to be true
   end
 
   it 'should flush cached objects when necessary' do
-    store = PEROBS::Store.new('test_db', :cache_bits => 3)
+    store = PEROBS::Store.new(@db_name, :cache_bits => 3)
     last_obj = nil
     0.upto(20) do |i|
-      store["person#{i}"] = obj = Person.new(store)
-      store["person#{i}"].should == obj
+      store["person#{i}"] = obj = store.new(Person)
+      expect(store["person#{i}"]).to eq(obj)
       obj.name = "Person #{i}"
-      obj.name.should == "Person #{i}"
+      expect(obj.name).to eq("Person #{i}")
       obj.related = last_obj
-      obj.related.should == last_obj
+      expect(obj.related).to eq(last_obj)
       last_obj = obj
     end
     0.upto(20) do |i|
-      store["person#{i}"].name.should == "Person #{i}"
+      expect(store["person#{i}"].name).to eq("Person #{i}")
     end
   end
 
   it 'should detect modification to non-working objects' do
-    store = PEROBS::Store.new('test_db', :cache_bits => 3)
+    store = PEROBS::Store.new(@db_name, :cache_bits => 3)
     0.upto(20) do |i|
-      store["person#{i}"] = obj = Person.new(store)
+      store["person#{i}"] = obj = store.new(Person)
       obj.name = "Person #{i}"
     end
     0.upto(20) do |i|
       store["person#{i}"].name = "New Person #{i}"
     end
     store.sync
-    store = PEROBS::Store.new('test_db')
+    store = PEROBS::Store.new(@db_name)
     0.upto(20) do |i|
-      store["person#{i}"].name.should == "New Person #{i}"
+      expect(store["person#{i}"].name).to eq("New Person #{i}")
     end
   end
 
   it 'should garbage collect unlinked objects' do
-    store = PEROBS::Store.new('test_db')
-    store['person1'] = obj = Person.new(store)
+    store = PEROBS::Store.new(@db_name)
+    store['person1'] = obj = store.new(Person)
     id1 = obj._id
-    store['person2'] = obj = Person.new(store)
+    store['person2'] = obj = store.new(Person)
     id2 = obj._id
-    obj.related = obj = Person.new(store)
+    obj.related = obj = store.new(Person)
     id3 = obj._id
     store.sync
     store['person1'] = nil
     store.gc
-    store = PEROBS::Store.new('test_db')
-    store.object_by_id(id1).should be_nil
-    store['person2']._id.should == id2
-    store['person2'].related._id.should == id3
+    store = PEROBS::Store.new(@db_name)
+    expect(store.object_by_id(id1)).to be_nil
+    expect(store['person2']._id).to eq(id2)
+    expect(store['person2'].related._id).to eq(id3)
   end
 
 end

data/{spec/Array_spec.rb → test/spec_helper.rb}

@@ -25,70 +25,18 @@
 
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
+require 'tmpdir'
 require 'fileutils'
-require 'time'
-
-require 'perobs'
-
-class PO < PEROBS::Object
-
-  po_attr :name
-
-  def initialize(store, name = nil)
-    super(store)
-    set(:name, name)
-  end
 
+class UStruct < Struct.new(:first, :second, :third)
 end
 
-describe PEROBS::Array do
-
-  before(:all) do
-    @db_name = 'test_db'
-    FileUtils.rm_rf(@db_name)
-  end
-
-  after(:each) do
-    FileUtils.rm_rf(@db_name)
-  end
-
-  it 'should store simple objects persistently' do
-    store = PEROBS::Store.new(@db_name)
-    store['a'] = a = PEROBS::Array.new(store)
-    a[0] = 'A'
-    a[1] = 'B'
-    a[2] = po = PO.new(store)
-    po.name = 'foobar'
-
-    a[0].should == 'A'
-    a[1].should == 'B'
-    a[2].name.should == 'foobar'
-    store.sync
-
-    store = PEROBS::Store.new(@db_name)
-    a = store['a']
-    a[0].should == 'A'
-    a[1].should == 'B'
-    a[2].name.should == 'foobar'
-  end
-
-  it 'should have an each method to iterate' do
-    store = PEROBS::Store.new(@db_name)
-    store['a'] = a = PEROBS::Array.new(store)
-    a[0] = 'A'
-    a[1] = 'B'
-    a[2] = 'C'
-    vs = ''
-    a.each { |v| vs << v }
-    vs.should == 'ABC'
-    store.sync
-
-    store = PEROBS::Store.new(@db_name)
-    a = store['a']
-    vs = ''
-    a[3] = PO.new(store, 'D')
-    a.each { |v| vs << (v.is_a?(String) ? v : v.name) }
-    vs.should == 'ABCD'
-  end
+def generate_db_name(caller_file)
+  begin
+    db_name = File.join(Dir.tmpdir,
+                        "#{File.basename(caller_file)}.#{rand(2**32)}")
+  end while File.exists?(db_name)
 
+  db_name
 end
+

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-26 00:00:00.000000000 Z
+date: 2015-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 description: Library to provide a persistent object store
@@ -59,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -71,6 +71,7 @@ files:
 - lib/perobs/Cache.rb
 - lib/perobs/ClassMap.rb
 - lib/perobs/DataBase.rb
+- lib/perobs/Delegator.rb
 - lib/perobs/DynamoDB.rb
 - lib/perobs/Hash.rb
 - lib/perobs/Object.rb
@@ -78,17 +79,18 @@ files:
 - lib/perobs/Store.rb
 - lib/perobs/version.rb
 - perobs.gemspec
-- spec/Array_spec.rb
-- spec/BTreeDB_spec.rb
-- spec/ClassMap_spec.rb
-- spec/Hash_spec.rb
-- spec/Object_spec.rb
-- spec/Store_spec.rb
-- spec/perobs_spec.rb
 - tasks/changelog.rake
 - tasks/gem.rake
 - tasks/rdoc.rake
 - tasks/test.rake
+- test/Array_spec.rb
+- test/BTreeDB_spec.rb
+- test/ClassMap_spec.rb
+- test/Hash_spec.rb
+- test/Object_spec.rb
+- test/Store_spec.rb
+- test/perobs_spec.rb
+- test/spec_helper.rb
 homepage: https://github.com/scrapper/perobs
 licenses:
 - MIT
@@ -99,26 +101,27 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Persistent Ruby Object Store
 test_files:
-- spec/Array_spec.rb
-- spec/BTreeDB_spec.rb
-- spec/ClassMap_spec.rb
-- spec/Hash_spec.rb
-- spec/Object_spec.rb
-- spec/Store_spec.rb
-- spec/perobs_spec.rb
+- test/Array_spec.rb
+- test/BTreeDB_spec.rb
+- test/ClassMap_spec.rb
+- test/Hash_spec.rb
+- test/Object_spec.rb
+- test/Store_spec.rb
+- test/perobs_spec.rb
+- test/spec_helper.rb
 has_rdoc: 

data/spec/Hash_spec.rb

@@ -1,96 +0,0 @@
-# encoding: UTF-8
-#
-# Copyright (c) 2015 by Chris Schlaeger <chris@taskjuggler.org>
-#
-# 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.
-
-$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-
-require 'fileutils'
-require 'time'
-
-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 = 'test_db'
-    FileUtils.rm_rf(@db_name)
-  end
-
-  after(:each) do
-    FileUtils.rm_rf(@db_name)
-  end
-
-  it 'should store simple objects persistently' do
-    store = PEROBS::Store.new(@db_name)
-    store['h'] = h = PEROBS::Hash.new(store)
-    h['a'] = 'A'
-    h['b'] = 'B'
-    h['po'] = po = PO.new(store)
-    po.name = 'foobar'
-    h['b'] = 'B'
-
-    h['a'].should == 'A'
-    h['b'].should == 'B'
-    store.sync
-
-    store = PEROBS::Store.new(@db_name)
-    h = store['h']
-    h['a'].should == 'A'
-    h['b'].should == 'B'
-    h['po'].name.should == 'foobar'
-  end
-
-  it 'should have an each method to iterate' do
-    store = PEROBS::Store.new(@db_name)
-    store['h'] = h = PEROBS::Hash.new(store)
-    h['a'] = 'A'
-    h['b'] = 'B'
-    h['c'] = 'C'
-    vs = []
-    h.each { |k, v| vs << k + v }
-    vs.sort.join.should == 'aAbBcC'
-
-    store = PEROBS::Store.new(@db_name)
-    store['h'] = h = PEROBS::Hash.new(store)
-    h['a'] = PO.new(store, 'A')
-    h['b'] = PO.new(store, 'B')
-    h['c'] = PO.new(store, 'C')
-    vs = []
-    h.each { |k, v| vs << k + v.name }
-    vs.sort.join.should == 'aAbBcC'
-  end
-
-end