perobs 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50292da8f34e68427887d224c56dc2070242fc27
-  data.tar.gz: f3f41eca90b32ebefeeae05eaf655e99130a3af8
+  metadata.gz: 231bcc1e34113cad62eefa5bdac4b84d18937638
+  data.tar.gz: dfe932b0e210297a4a24a5a2c076d52db04c5ff6
 SHA512:
-  metadata.gz: 2ed683b2e8ae0cd9a6bc4531a8f70f6d2f0d98dc5f3f4947ea64f24d715e3c5d050317d6c29ab481820f25cb302e4d8c1e67ca5cf8048c0e1354d732489aef94
-  data.tar.gz: 2dce8dff389bc974126a88e9fdd5d042f5071e13c6560a2eeab63b05ae536ac209dfa4cddbcccac0e4a2332d46c82ea27894cc0e3a7de1c32b016f515920fbd6
+  metadata.gz: 433b39b2568538a634e53adc0bf6ae2ac8f4f8d6a24178b406d5b6de92981d141f6a29ce6a344388eedc5b1c0632e02d4bef6c2996c18650b7805501de29718a
+  data.tar.gz: 78904802a71bb2b958f79eebb70c945d5506267bf83c1e921de8ec4478a4e88e5fcfe9bf5409beecda8dd7fb4ea6358a366e3640dbd0965365a387f9b324d4e0

data/lib/perobs/DataBase.rb

@@ -83,20 +83,6 @@ module PEROBS
       end
     end
 
-    # Generate a new unique ID. It uses random numbers between 0 and 2**64 -
-    # 1.
-    # @return [Fixnum or Bignum]
-    def new_id
-      begin
-        # Generate a random number. It's recommended to not store more than
-        # 2**62 objects in the same store.
-        id = rand(2**64)
-        # Ensure that we don't have already another object with this ID.
-      end while include?(id)
-
-      id
-    end
-
     # Check a config option and adjust it if needed.
     # @param name [String] Name of the config option.
     def check_option(name)

data/lib/perobs/Object.rb

@@ -182,18 +182,17 @@ module PEROBS
     end
 
     def _set(attr, val)
-      if val.is_a?(ObjectBase)
+      if val.respond_to?(:is_poxreference?)
         # References to other PEROBS::Objects must be handled somewhat
         # special.
         if @store != val.store
           raise ArgumentError, 'The referenced object is not part of this store'
         end
-        unless val.respond_to?(:is_poxreference?)
-          raise ArgumentError, 'A PEROBS::ObjectBase object escaped! ' +
-                               'Have you used self() instead of myself() to' +
-                               'get the reference of the PEROBS object that ' +
-                               'you are trying to assign here?'
-        end
+      elsif val.is_a?(ObjectBase)
+        raise ArgumentError, 'A PEROBS::ObjectBase object escaped! ' +
+                             'Have you used self() instead of myself() to' +
+                             'get the reference of the PEROBS object that ' +
+                             'you are trying to assign here?'
       end
       instance_variable_set(('@' + attr.to_s).to_sym, val)
       # Let the store know that we have a modified object.

data/lib/perobs/ObjectBase.rb

@@ -127,7 +127,8 @@ module PEROBS
           "All PEROBS objects must exclusively be created by calling " +
           "Store.new(). Never call the object constructor directly."
       end
-      @_id = @store.db.new_id
+      @_id = @store._new_id
+      @store._register_in_memory(self, @_id)
       ObjectSpace.define_finalizer(self, ObjectBase._finalize(@store, @_id))
       @_stash_map = nil
       # Allocate a proxy object for this object. User code should only operate
@@ -146,8 +147,6 @@ module PEROBS
       proc { store._collect(id) }
     end
 
-    public
-
     # This method can be overloaded by derived classes to do some massaging on
     # the data after it has been restored from the database. This could either
     # be some sanity check or code to migrate the object from one version to
@@ -226,7 +225,7 @@ module PEROBS
       }
       @_stash_map = [] unless @_stash_map
       # Get a new ID to store this version of the object.
-      @_stash_map[level] = stash_id = @store.db.new_id
+      @_stash_map[level] = stash_id = @store._new_id
       @store.db.put_object(db_obj, stash_id)
     end
 
@@ -236,6 +235,8 @@ module PEROBS
       # Unregister the object with the old ID from the write cache to prevent
       # cache corruption. The objects are index by ID in the cache.
       @store.cache.unwrite(self)
+      @store._collect(@_id)
+      @store._register_in_memory(self, id)
       @_id = id
     end
 

data/lib/perobs/Store.rb

@@ -173,11 +173,6 @@ module PEROBS
       @object_creation_in_progress = false
       # If a specific object ID was requested we need to set it now.
       obj._change_id(id) if id
-      # Add the new object to the in-memory list. We only store a weak
-      # reference to the object so it can be garbage collected. When this
-      # happens the object finalizer is triggered and calls _forget() to
-      # remove the object from this hash again.
-      @in_memory_objects[obj._id] = WeakRef.new(obj)
       obj
     end
 
@@ -349,6 +344,31 @@ module PEROBS
     def rename_classes(rename_map)
       @class_map.rename(rename_map)
     end
+    # Internal method. Don't use this outside of this library!
+    # Generate a new unique ID that is not used by any other object. It uses
+    # random numbers between 0 and 2**64 - 1.
+    # @return [Fixnum or Bignum]
+    def _new_id
+      begin
+        # Generate a random number. It's recommended to not store more than
+        # 2**62 objects in the same store.
+        id = rand(2**64)
+        # Ensure that we don't have already another object with this ID.
+      end while @in_memory_objects.include?(id) || @db.include?(id)
+
+      id
+    end
+
+    # Internal method. Don't use this outside of this library!
+    # Add the new object to the in-memory list. We only store a weak
+    # reference to the object so it can be garbage collected. When this
+    # happens the object finalizer is triggered and calls _forget() to
+    # remove the object from this hash again.
+    # @param obj [BasicObject] Object to register
+    # @param id [Fixnum or Bignum] object ID
+    def _register_in_memory(obj, id)
+      @in_memory_objects[id] = WeakRef.new(obj)
+    end
 
     # Remove the object from the in-memory list. This is an internal method
     # and should never be called from user code.

data/lib/perobs/version.rb

@@ -1,4 +1,4 @@
 module PEROBS
   # The version number
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/test/Store_spec.rb

@@ -55,6 +55,27 @@ class PersonN < PEROBS::Object
 
 end
 
+class O0 < PEROBS::Object
+
+  po_attr :r
+
+  def initialize(store)
+    super
+    r = @store.new(O1, myself)
+  end
+
+end
+class O1 < PEROBS::Object
+
+  po_attr :p
+
+  def initialize(store, p = nil)
+    super(store)
+    parent = p
+  end
+
+end
+
 describe PEROBS::Store do
 
   before(:all) do
@@ -398,6 +419,7 @@ describe PEROBS::Store do
 
   it 'should track in-memory objects properly' do
     @store = PEROBS::Store.new(@db_file)
+    expect(@store.statistics[:in_memory_objects]).to eq(1)
     @store['person'] = @store.new(Person)
     # We have the root hash and the Person object.
     expect(@store.statistics[:in_memory_objects]).to eq(2)
@@ -407,6 +429,15 @@ describe PEROBS::Store do
     expect(@store.statistics[:in_memory_objects]).to eq(1)
   end
 
+  it 'should handle nested constructors' do
+    @store = PEROBS::Store.new(@db_file)
+    @store['r'] = @store.new(O0)
+    @store.sync
+    expect(@store.check).to eq(0)
+    @store = PEROBS::Store.new(@db_file)
+    expect(@store.check).to eq(0)
+  end
+
   it 'should survive a real world usage test' do
     options = { :engine => PEROBS::BTreeDB, :dir_bits => 4 }
     @store = PEROBS::Store.new(@db_file, options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: perobs
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Chris Schlaeger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-09 00:00:00.000000000 Z
+date: 2016-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler