perobs 4.5.0 → 4.6.0

data/test/Array_spec.rb

@@ -1,5 +1,5 @@
-# encoding: UTF-8
-#
+# frozen_string_literal: true
+
 # Copyright (c) 2015, 2016 by Chris Schlaeger <chris@taskjuggler.org>
 #
 # This file contains tests for Array that are similar to the tests for the
@@ -27,12 +27,11 @@
 # 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_relative 'spec_helper'
 
-require 'perobs'
+require_relative '../lib/perobs'
 
 class PO < PEROBS::Object
-
   attr_persist :name
 
   def initialize(store, name = nil)
@@ -43,11 +42,9 @@ class PO < PEROBS::Object
   def get_self
     self # Never do this in real user code!
   end
-
 end
 
 describe PEROBS::Array do
-
   before(:all) do
     @db_name = generate_db_name(__FILE__)
   end
@@ -99,14 +96,14 @@ describe PEROBS::Array do
     a[0] = 'A'
     a[1] = 'B'
     a[2] = 'C'
-    vs = ''
+    vs = String.new
     a.each { |v| vs << v }
     expect(vs).to eq('ABC')
     @store.exit
 
     @store = PEROBS::Store.new(@db_name)
     a = @store['a']
-    vs = ''
+    vs = String.new
     a[3] = @store.new(PO, 'D')
     a.each { |v| vs << (v.is_a?(String) ? v : v.name) }
     expect(vs).to eq('ABCD')
@@ -127,125 +124,125 @@ describe PEROBS::Array do
   end
 
   it 'should support reading methods' do
-    expect(cpa([ 1, 1, 3, 5 ]) & cpa([ 1, 2, 3 ])).to eq([ 1, 3 ])
-    expect(cpa & cpa([ 1, 2, 3 ])).to eq([])
+    expect(cpa([1, 1, 3, 5]) & cpa([1, 2, 3])).to eq([1, 3])
+    expect(cpa & cpa([1, 2, 3])).to eq([])
 
     expect(cpa.empty?).to be true
-    expect(cpa([ 0 ]).empty?).to be false
+    expect(cpa([0]).empty?).to be false
 
-    x = cpa([ 'it', 'came', 'to', 'pass', 'that', '...'])
+    x = cpa(['it', 'came', 'to', 'pass', 'that', '...'])
     x = x.sort.join(' ')
     expect(x).to eq('... came it pass that to')
   end
 
   it 'should support Enumberable methods' do
-    x = cpa([ 2, 5, 3, 1, 7 ])
+    x = cpa([2, 5, 3, 1, 7])
     expect(x.find { |e| e == 4 }).to be_nil
     expect(x.find { |e| e == 3 }).to eq(3)
   end
 
   it 'should support re-writing methods' do
     x = cpa([2, 5, 3, 1, 7])
-    x.sort!{ |a, b| a <=> b }
-    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 5, 7 ]) }
-    @store['a'].sort!{ |a, b| b - a }
-    pcheck { expect(@store['a']).to eq([ 7, 5, 3, 2, 1 ]) }
+    x.sort! { |a, b| a <=> b }
+    pcheck { expect(@store['a']).to eq([1, 2, 3, 5, 7]) }
+    @store['a'].sort! { |a, b| b - a }
+    pcheck { expect(@store['a']).to eq([7, 5, 3, 2, 1]) }
 
     @store['a'].clear
     pcheck { expect(@store['a']).to eq([]) }
   end
 
   it 'should support <<()' do
-    a = cpa([ 0, 1, 2 ])
+    a = cpa([0, 1, 2])
     a << 4
-    pcheck { expect(@store['a']).to eq([ 0, 1, 2, 4 ]) }
+    pcheck { expect(@store['a']).to eq([0, 1, 2, 4]) }
   end
 
   it 'should support []=' do
-    a = cpa([ 0, nil, 2 ])
+    a = cpa([0, nil, 2])
     a[1] = 1
-    pcheck { expect(@store['a']).to eq([ 0, 1, 2 ]) }
+    pcheck { expect(@store['a']).to eq([0, 1, 2]) }
   end
 
   it 'should support collect!()' do
-    a = cpa([ 1, 'cat', 1..1 ])
+    a = cpa([1, 'cat', 1..1])
     if RUBY_VERSION < '2.2'
-      expect(a.collect! { |e| e.class.to_s }.to_a).to eq([ 'Fixnum', 'String', 'Range' ])
-      pcheck { expect(@store['a'].to_a).to eq([ 'Fixnum', 'String', 'Range' ]) }
+      expect(a.collect! { |e| e.class.to_s }.to_a).to eq(%w[Fixnum String Range])
+      pcheck { expect(@store['a'].to_a).to eq(%w[Fixnum String Range]) }
     else
-      expect(a.collect! { |e| e.class.to_s }.to_a).to eq([ 'Integer', 'String', 'Range' ])
-      pcheck { expect(@store['a'].to_a).to eq([ 'Integer', 'String', 'Range' ]) }
+      expect(a.collect! { |e| e.class.to_s }.to_a).to eq(%w[Integer String Range])
+      pcheck { expect(@store['a'].to_a).to eq(%w[Integer String Range]) }
     end
 
-    a = cpa([ 1, 'cat', 1..1 ])
-    expect(a.collect! { 99 }).to eq([ 99, 99, 99])
-    pcheck { expect(@store['a']).to eq([ 99, 99, 99]) }
+    a = cpa([1, 'cat', 1..1])
+    expect(a.collect! { 99 }).to eq([99, 99, 99])
+    pcheck { expect(@store['a']).to eq([99, 99, 99]) }
   end
 
   it 'should support map!()' do
-    a = cpa([ 1, 'cat', 1..1 ])
+    a = cpa([1, 'cat', 1..1])
     if RUBY_VERSION < '2.2'
-      expect(a.map! { |e| e.class.to_s }.to_a).to eq([ 'Fixnum', 'String', 'Range' ])
-      pcheck { expect(@store['a'].to_a).to eq([ 'Fixnum', 'String', 'Range' ]) }
+      expect(a.map! { |e| e.class.to_s }.to_a).to eq(%w[Fixnum String Range])
+      pcheck { expect(@store['a'].to_a).to eq(%w[Fixnum String Range]) }
     else
-      expect(a.map! { |e| e.class.to_s }.to_a).to eq([ 'Integer', 'String', 'Range' ])
-      pcheck { expect(@store['a'].to_a).to eq([ 'Integer', 'String', 'Range' ]) }
+      expect(a.map! { |e| e.class.to_s }.to_a).to eq(%w[Integer String Range])
+      pcheck { expect(@store['a'].to_a).to eq(%w[Integer String Range]) }
     end
 
-    a = cpa([ 1, 'cat', 1..1 ])
-    expect(a.map! { 99 }).to eq([ 99, 99, 99])
-    pcheck { expect(@store['a']).to eq ([ 99, 99, 99]) }
+    a = cpa([1, 'cat', 1..1])
+    expect(a.map! { 99 }).to eq([99, 99, 99])
+    pcheck { expect(@store['a']).to eq([99, 99, 99]) }
   end
 
   it 'should support fill()' do
     pcheck { expect(cpa([]).fill(99)).to eq([]) }
     pcheck { expect(cpa([]).fill(99, 0)).to eq([]) }
-    pcheck { expect(cpa([]).fill(99, 0, 1)).to eq([ 99 ]) }
+    pcheck { expect(cpa([]).fill(99, 0, 1)).to eq([99]) }
   end
 
   it 'should support flatten!()' do
-    a1 = cpa([ 1, 2, 3], 'a1')
-    a2 = cpa([ 5, 6 ], 'a2')
-    a3 = cpa([ 4, a2 ], 'a3')
-    a4 = cpa([ a1, a3 ], 'a4')
-    pcheck { expect(@store['a4'].flatten).to eq([ 1, 2, 3, 4, 5, 6 ]) }
+    a1 = cpa([1, 2, 3], 'a1')
+    a2 = cpa([5, 6], 'a2')
+    a3 = cpa([4, a2], 'a3')
+    a4 = cpa([a1, a3], 'a4')
+    pcheck { expect(@store['a4'].flatten).to eq([1, 2, 3, 4, 5, 6]) }
   end
 
   it 'should support replace()' do
-    a1 = cpa([ 1, 2, 3], 'a1')
+    a1 = cpa([1, 2, 3], 'a1')
     a_id = a1.__id__
-    expect(a1.replace(cpa([4, 5, 6], 'a2'))).to eq([ 4, 5, 6 ])
-    pcheck { expect(@store['a1']).to eq ([ 4, 5, 6 ]) }
+    expect(a1.replace(cpa([4, 5, 6], 'a2'))).to eq([4, 5, 6])
+    pcheck { expect(@store['a1']).to eq([4, 5, 6]) }
   end
 
   it 'should support insert()' do
-    a = cpa([ 0 ])
+    a = cpa([0])
     a.insert(1)
-    pcheck { expect(@store['a']).to eq([ 0 ]) }
+    pcheck { expect(@store['a']).to eq([0]) }
     @store['a'].insert(1, 1)
-    pcheck { expect(@store['a']).to eq([ 0, 1]) }
+    pcheck { expect(@store['a']).to eq([0, 1]) }
   end
 
   it 'should support push()' do
-    a = cpa([ 1, 2, 3 ])
+    a = cpa([1, 2, 3])
     a.push(4, 5)
-    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 4, 5 ]) }
+    pcheck { expect(@store['a']).to eq([1, 2, 3, 4, 5]) }
     @store['a'].push(nil)
-    pcheck { expect(@store['a']).to eq([ 1, 2, 3, 4, 5, nil ]) }
+    pcheck { expect(@store['a']).to eq([1, 2, 3, 4, 5, nil]) }
   end
 
   it 'should support inspect' do
-    a1 = cpa([ 1 ], 'a1')
-    a2 = cpa([ 1, a1 ], 'a2')
+    a1 = cpa([1], 'a1')
+    a2 = cpa([1, a1], 'a2')
     expect(a1.inspect).to eq("<PEROBS::Array:#{a1._id}>\n[\n  1\n]\n")
     expect(a2.inspect).to eq("<PEROBS::Array:#{a2._id}>\n[\n  1,\n  <PEROBS::ObjectBase:#{a1._id}>\n]\n")
   end
 
   it 'should only provide POXReference objects' do
-    a = cpa([ @store.new(PO), @store.new(PO) ])
+    a = cpa([@store.new(PO), @store.new(PO)])
     expect(a[0].respond_to?(:is_poxreference?)).to be true
-    a.each do |a|
-      expect(a.respond_to?(:is_poxreference?)).to be true
+    a.each do |ai|
+      expect(ai.respond_to?(:is_poxreference?)).to be true
     end
   end
 
@@ -256,5 +253,4 @@ describe PEROBS::Array do
     expect { a[0] = o.get_self }.to raise_error(PEROBS::FatalError)
     PEROBS.log.open($stderr)
   end
-
 end

data/test/BTreeDB_spec.rb

@@ -40,7 +40,7 @@ describe PEROBS::BTreeDB do
 
   it 'should create database' do
     @db = PEROBS::BTreeDB.new('fs_test')
-    expect(Dir.exists?('fs_test')).to be true
+    expect(Dir.exist?('fs_test')).to be true
   end
 
   it 'should write and read a simple Hash' do
@@ -72,6 +72,10 @@ describe PEROBS::BTreeDB do
   it 'should support most Ruby objects types' do
     [ :marshal, :yaml ].each do |serializer|
       @db = PEROBS::BTreeDB.new('fs_test', { :serializer => serializer })
+      class_map = PEROBS::ClassMap.new(@db)
+      @db.register_class_map(class_map)
+      class_map.class_to_id(Time)
+      class_map.class_to_id(UStruct)
       expect(@db.include?(0)).to be false
       h = {
         'String' => 'What god has wrought',

data/test/BigTreeNode_spec.rb

@@ -1,5 +1,5 @@
-# encoding: UTF-8
-#
+# frozen_string_literal: true
+
 # Copyright (c) 2016, 2017 by Chris Schlaeger <chris@taskjuggler.org>
 #
 # MIT License
@@ -25,12 +25,11 @@
 
 require 'fileutils'
 
-require 'spec_helper'
-require 'perobs/Store'
-require 'perobs/BigTree'
+require_relative 'spec_helper'
+require_relative '../lib/perobs/Store'
+require_relative '../lib/perobs/BigTree'
 
 describe PEROBS::BigTreeNode do
-
   before(:all) do
     @db_name = generate_db_name(__FILE__)
     @store = PEROBS::Store.new(@db_name)
@@ -148,6 +147,4 @@ describe PEROBS::BigTreeNode do
     expect(s.leaf_nodes).to eql(3)
     expect(s.branch_nodes).to eql(1)
   end
-
 end
-

data/test/LegacyDBs/version_4.1/class_map.json

@@ -0,0 +1 @@
+{"LegacyDB::Fragment":0,"PEROBS::Hash":1,"PEROBS::Array":2}

data/test/LegacyDBs/version_4.1/config.json

@@ -0,0 +1 @@
+{"serializer":{"json_class":"Symbol","s":"json"}}

data/test/LegacyDBs/version_4.1/log

@@ -0,0 +1,5 @@
+# Logfile created on 2020-03-31 21:50:02 +0200 by logger.rb/61378
+2020-03-31 21:50:02 +0200 INFO New FlatFile database 'test/database.blobs' created
+2020-03-31 21:50:02 +0200 INFO FlatFile 'test' opened
+2020-03-31 21:50:02 +0200 INFO FlatFile 'test' closed
+2020-03-31 21:50:02 +0200 INFO FlatFile 'test' opened

data/test/LegacyDBs/version_4.1/version

@@ -0,0 +1 @@
+4

data/test/spec_helper.rb

@@ -35,7 +35,7 @@ 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)
+  end while File.exist?(db_name)
 
   db_name
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors:
 - Chris Schlaeger
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2023-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 13.0.3
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
 description: Library to provide a persistent object store
 email:
 - chris@linux.com
@@ -59,6 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE.txt
@@ -134,6 +149,13 @@ files:
 - test/LegacyDBs/version_3/database_spaces.blobs
 - test/LegacyDBs/version_3/index.blobs
 - test/LegacyDBs/version_3/version
+- test/LegacyDBs/version_4.1/class_map.json
+- test/LegacyDBs/version_4.1/config.json
+- test/LegacyDBs/version_4.1/database.blobs
+- test/LegacyDBs/version_4.1/database_spaces.blobs
+- test/LegacyDBs/version_4.1/index.blobs
+- test/LegacyDBs/version_4.1/log
+- test/LegacyDBs/version_4.1/version
 - test/LockFile_spec.rb
 - test/Object_spec.rb
 - test/SpaceManager_spec.rb
@@ -146,7 +168,7 @@ homepage: https://github.com/scrapper/perobs
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -154,15 +176,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
-signing_key:
+rubygems_version: 3.4.1
+signing_key: 
 specification_version: 4
 summary: Persistent Ruby Object Store
 test_files:
@@ -187,6 +209,13 @@ test_files:
 - test/LegacyDBs/version_3/database_spaces.blobs
 - test/LegacyDBs/version_3/index.blobs
 - test/LegacyDBs/version_3/version
+- test/LegacyDBs/version_4.1/class_map.json
+- test/LegacyDBs/version_4.1/config.json
+- test/LegacyDBs/version_4.1/database.blobs
+- test/LegacyDBs/version_4.1/database_spaces.blobs
+- test/LegacyDBs/version_4.1/index.blobs
+- test/LegacyDBs/version_4.1/log
+- test/LegacyDBs/version_4.1/version
 - test/LockFile_spec.rb
 - test/Object_spec.rb
 - test/SpaceManager_spec.rb