perobs 4.2.0 → 4.5.0

data/test/Hash_spec.rb

@@ -31,7 +31,6 @@ require 'spec_helper'
 
 require 'perobs'
 
-
 class PO < PEROBS::Object
 
   attr_persist :name
@@ -68,9 +67,13 @@ describe PEROBS::Hash do
     h['po'] = po = @store.new(PO)
     po.name = 'foobar'
     h['b'] = 'B'
+    @store['po_key'] = po_key = @store.new(PO)
+    po_key.name = 'po key'
+    h[po_key] = 'PO Key'
 
     expect(h['a']).to eq('A')
     expect(h['b']).to eq('B')
+    expect(h[@store['po_key']]).to eq('PO Key')
     @store.exit
 
     @store = PEROBS::Store.new(@db_name)
@@ -78,6 +81,14 @@ describe PEROBS::Hash do
     expect(h['a']).to eq('A')
     expect(h['b']).to eq('B')
     expect(h['po'].name).to eq('foobar')
+    po_key = @store['po_key']
+    expect(po_key.name).to eq('po key')
+    expect(h[po_key]).to eq('PO Key')
+  end
+
+  it 'should not allow hash keys that conflict with internal notations' do
+    @store['h'] = h = @store.new(PEROBS::Hash)
+    expect { h['#<PEROBS::POReference id=1234>'] = 'foo'; @store.sync }.to raise_error(ArgumentError)
   end
 
   it 'should have an each method to iterate' do

data/test/Store_spec.rb

@@ -251,6 +251,20 @@ describe PEROBS::Store do
     end
     expect(i).to eq(6)
 
+    capture_io { store.gc }
+    capture_io { expect { store.check }.to_not raise_error }
+    capture_io { store.exit }
+
+    store = PEROBS::Store.new(@db_file)
+    capture_io { expect { store.check }.to_not raise_error }
+
+    person = store['person1']
+    i = 0
+    while (person = person.related) do
+      i += 1
+    end
+    expect(i).to eq(6)
+
     capture_io { store.gc }
     capture_io { expect { store.check }.to_not raise_error }
     expect { store.delete_store }.to_not raise_error

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.5.0
 platform: ruby
 authors:
 - Chris Schlaeger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-02 00:00:00.000000000 Z
+date: 2022-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.3
 description: Library to provide a persistent object store
 email:
 - chris@linux.com
@@ -70,7 +70,6 @@ files:
 - lib/perobs/BTreeBlob.rb
 - lib/perobs/BTreeDB.rb
 - lib/perobs/BTreeNode.rb
-- lib/perobs/BTreeNodeCache.rb
 - lib/perobs/BTreeNodeLink.rb
 - lib/perobs/BigArray.rb
 - lib/perobs/BigArrayNode.rb
@@ -147,7 +146,7 @@ homepage: https://github.com/scrapper/perobs
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,9 +161,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Persistent Ruby Object Store
 test_files:

data/lib/perobs/BTreeNodeCache.rb

@@ -1,109 +0,0 @@
-# encoding: UTF-8
-#
-# = BTree.rb -- Persistent Ruby Object Store
-#
-# Copyright (c) 2016, 2017 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.
-
-require 'perobs/BTreeNode'
-
-module PEROBS
-
-  class BTreeNodeCache
-
-    def initialize(tree)
-      @tree = tree
-      clear
-    end
-
-    def get(address)
-      if (node = @modified_nodes[address])
-        return node
-      end
-
-      if (node = @top_nodes[address])
-        return node
-      end
-
-      if (node = @ephemeral_nodes[address])
-        return node
-      end
-
-      BTreeNode::load(@tree, address)
-    end
-
-    def set_root(node)
-      node = node.get_node if node.is_a?(BTreeNodeLink)
-
-      @top_nodes = {}
-      @top_nodes[node.node_address] = node
-    end
-
-    def insert(node, modified = true)
-      unless node
-        PEROBS.log.fatal "nil cannot be cached"
-      end
-      node = node.get_node if node.is_a?(BTreeNodeLink)
-
-      if modified
-        @modified_nodes[node.node_address] = node
-      end
-      @ephemeral_nodes[node.node_address] = node
-
-      if !@top_nodes.include?(node) && node.is_top?
-        @top_nodes[node.node_address] = node
-      end
-    end
-
-    def _collect(address, ruby_object_id)
-      # Just a dummy for now
-    end
-
-    # Remove a node from the cache.
-    # @param address [Integer] address of node to remove.
-    def delete(address)
-      @ephemeral_nodes.delete(address)
-      @top_nodes.delete(address)
-      @modified_nodes.delete(address)
-    end
-
-    # Flush all dirty nodes into the backing store.
-    def flush(now = false)
-      if now || @modified_nodes.size > 1024
-        @modified_nodes.each_value { |node| node.write_node }
-        @modified_nodes = {}
-      end
-      @ephemeral_nodes = {}
-    end
-
-    # Remove all nodes from the cache.
-    def clear
-      @top_nodes = {}
-      @ephemeral_nodes = {}
-      @modified_nodes = {}
-    end
-
-  end
-
-end
-