hprevalence 0.1.0 → 0.1.1

data/lib/hprevalence.rb

@@ -13,15 +13,25 @@ module HPrevalence
   class EngineBuilder
     
     def self.build( target_dir, &system_init )
+      ensure_dir( target_dir )
       system = system_init.call
       SimpleEngine.new( target_dir, system )
     end
     
     def self.build_transparent( target_dir, &system_init )
+      ensure_dir( target_dir )
       system = system_init.call
       TransparentEngine.new( target_dir, system )
     end
     
+    private
+    
+    def self.ensure_dir( dir )
+      return if File.exists?( dir )
+      require 'fileutils'
+      FileUtils.mkdir_p( dir )
+    end
+    
   end
   
   #   
@@ -56,7 +66,6 @@ module HPrevalence
   end
   
   #
-  # Holds only one system
   #
   class TransparentEngine < SimpleEngine
     @@engines = Hash.new()
@@ -70,11 +79,11 @@ module HPrevalence
       
       TransparentEngine.register_engine( self )
       
-      @proxies = []
+      @proxies = Hash.new
       add_engine_id_method( system )
       store_manager = TransparentStorageManager.new(self, target_dir)
       within_engine {
-        @proxied_system = HPrevalence::Transparent::TransparentProxy.new( system )
+        @proxied_system = HPrevalence::Transparent::TransparentProxy.new( system, Guid.from_s('00000000-0000-0000-0000-000000000000') )
       }
       
       super( target_dir, system, store_manager )
@@ -103,17 +112,20 @@ module HPrevalence
     end
     
     def execute_command(command)
-      super(command)
+      begin
+        Thread.current[:references] = Hash.new
+        super(command)
+      ensure
+        Thread.current[:references] = nil
+      end
     end
     
     def register_proxy(proxy)
-      # TODO: Synchronization here?
-      @proxies << proxy
-      @proxies.length - 1
+      @proxies[ proxy.proxy_id.to_s ] = proxy
     end
     
     def proxy_by_id( id, related_symbol = nil, parent_proxy_id = nil )
-      p = @proxies[ id ]
+      p = @proxies[ id.to_s ]
       return p unless p.nil?
       if !related_symbol.nil? && !parent_proxy_id.nil?
         return create_nested_proxy( parent_proxy_id, related_symbol )
@@ -126,12 +138,23 @@ module HPrevalence
         parent_proxy = proxy_by_id( parent_proxy_id )
         target = parent_proxy.target
         nested_target = target.send( related_symbol )
-        new_proxy = HPrevalence::Transparent::NestedTransparentProxy.new( nested_target, related_symbol, parent_proxy_id )
+        new_proxy = HPrevalence::Transparent::NestedTransparentProxy.new( 
+          nested_target, related_symbol, parent_proxy_id )
         target._set_proxy( related_symbol, new_proxy )
         return new_proxy
       }
     end
     
+    def create_result_proxy( target )
+      @proxies_lock.synchronize {
+#        parent_proxy = proxy_by_id( parent_proxy_id )
+#        target = parent_proxy.target
+#        result = target.send( related_symbol, *args )
+        new_proxy = HPrevalence::Transparent::TransparentProxy.new( target )
+        return new_proxy
+      }
+    end
+    
     def within_engine()
       begin
         Thread.current[:engine] = self
@@ -143,9 +166,9 @@ module HPrevalence
     
     def restore(proxy)
       proxy.engine_id = @engine_id 
-      p = proxy_by_id(proxy.proxy_id)
+      p = proxy_by_id( proxy.proxy_id )
       if (p.nil?)
-        proxy.proxy_id = register_proxy(proxy)
+        register_proxy(proxy)
         p = proxy
       end
       p
@@ -157,6 +180,12 @@ module HPrevalence
       }
     end
     
+    def self.create_result_proxy( target, engine_id )
+      within_engine( engine_id ) { |engine|
+        engine.create_result_proxy( target )
+      }
+    end 
+    
     def self.within_engine( engine_id )
       engine = @@engines[ engine_id ]
       raise 'Engine not found' if engine.nil?
@@ -202,13 +231,10 @@ module HPrevalence
       system.instance_eval { 
         @engine_id = temp_id
       }
-      #      (class << system; self;end).class_eval do
-      #        define_method(:_engine_id) { @engine_id }
-      #      end
     end
-    
   end
   
+  #
   class PrevalenceService
     attr_reader :engine
     

data/lib/transparent.rb

@@ -7,10 +7,35 @@ module HPrevalence
       
       def self.included(type)
         class << type
-          def attr_proxy( *symbols )
+          def method_added(symbol)
+            self.instance_eval do
+              @readonly_attributes ||= []
+              hierarchy = self
+              while hierarchy = hierarchy.superclass
+                if (hierarchy.instance_eval {instance_variables.include? '@readonly_attributes'})
+                  @readonly_attributes |= hierarchy.instance_eval {@readonly_attributes}
+                end
+              end
+            end
+          end
+          
+          def attr_proxy_attribute( *symbols )
             @proxied_attributes ||= []
             symbols.each do |symbol|
-              @proxied_attributes << symbol
+              self.instance_eval {
+                @proxied_attributes ||= []
+                @proxied_attributes << symbol
+              }
+            end
+          end
+          
+          def attr_proxy_method( *symbols )
+            @proxied_attributes ||= []
+            symbols.each do |symbol|
+              self.instance_eval {
+                @proxied_methods ||= []
+                @proxied_methods << symbol
+              }
             end
           end
           
@@ -28,14 +53,20 @@ module HPrevalence
       def _read_only_attributes()
         self.class.instance_eval { @readonly_attributes ||= [] }
       end
-
+      
       def _proxied_attributes()
         self.class.instance_eval { @proxied_attributes ||= [] }
       end
       
+      def _proxied_methods()
+        self.class.instance_eval { @proxied_methods ||= [] }
+      end
+      
       def _should_proxy( symbol )
         if _proxied_attributes().include?( symbol )
           return true if _symbol2proxy(symbol).nil?
+        elsif _proxied_methods().include?( symbol )
+          return true
         end
         false
       end
@@ -46,7 +77,7 @@ module HPrevalence
           @symbol2proxy[symbol]
         }
       end
-
+      
       def _set_proxy( symbol, proxy )
         self.instance_eval { 
           @symbol2proxy ||= {}
@@ -59,14 +90,14 @@ module HPrevalence
     class AutomaticCommand
       
       def initialize( proxy_id, symbol, *args )
-        @proxy_id, @symbol, @args = proxy_id, symbol, *args
+        @proxy_id, @symbol, @args = proxy_id, symbol, args
       end
       
       def execute(system)
         TransparentEngine.current() { |engine|
           proxy = engine.proxy_by_id(@proxy_id)
           raise 'Could not obtain proxy' if proxy.nil? 
-          return proxy.send(@symbol, *arguments)
+          return proxy.target.send(@symbol, *arguments)
         }
       end
       
@@ -77,7 +108,7 @@ module HPrevalence
       end
       
     end
-
+    
     class NestedAutomaticCommand < AutomaticCommand
       
       attr_reader :related_symbol, :parent_proxy_id
@@ -93,7 +124,7 @@ module HPrevalence
         TransparentEngine.current() { |engine|
           proxy = engine.proxy_by_id(@proxy_id, @related_symbol, @parent_proxy_id)
           raise 'Could not obtain proxy' if proxy.nil? 
-          return proxy.send(@symbol, *arguments)
+          return proxy.target.send(@symbol, *arguments)
         }
       end
     end
@@ -101,14 +132,15 @@ module HPrevalence
     class TransparentProxy
       attr_accessor :target, :proxy_id, :engine_id
       
-      def initialize(target)
+      def initialize(target, new_id = Guid.new)
         raise 'A proxy must have a target' if target.nil?
         raise 'Strange. A proxy is supposed to exist within an engine' unless Thread.current[:engine]
+        @proxy_id = new_id
         @engine_id = Thread.current[:engine].engine_id
-        @proxy_id = Thread.current[:engine].register_proxy(self)
-        # puts  "New proxy with id #{@proxy_id.to_s} for #{target.class.to_s}"
+        Thread.current[:engine].register_proxy(self)
         @target = target
         @is_custom = target.kind_of?(CustomBehavior)
+#        puts  "New proxy with id #{@proxy_id.to_s} for #{target.class.to_s}"
       end
       
       def method_missing(symbol, *args, &block)
@@ -117,16 +149,15 @@ module HPrevalence
         
         if (@is_custom)
           if (@target._read_only_attributes.include?(symbol) )
-            return @target.send(symbol, *args)
-          elsif (@target._should_proxy(symbol) )
+            return @target.send(symbol, *args, &block)
+          elsif (args.length == 0 && @target._should_proxy(symbol) )
+            # Attribute being accessed
             return TransparentEngine.create_nested_proxy( @proxy_id, symbol, @engine_id )
-#            nested_target = @target.send(symbol, *args)
-#            return nil if nested_target.nil?
-#            TransparentEngine.within_engine( @engine_id ) { |engine|
-#              new_proxy = TransparentProxy.new( nested_target )
-#              @target._set_proxy( symbol, new_proxy )
-#              return new_proxy
-#            }
+          elsif (args.length != 0 && @target._should_proxy(symbol) )
+            # Method being accessed
+            result = proceed(symbol, *args, &block)
+            return TransparentEngine.create_result_proxy( result, @engine_id )
+            #            return TransparentProxy.new( result )
           else
             nested_proxy = @target._symbol2proxy(symbol)
             # Returns the nested proxy associated with this symbol
@@ -138,30 +169,26 @@ module HPrevalence
         proceed(symbol, *args, &block)
       end
       
-      #       Custom marshalling - this adds the internal id (myid) and the system id to a marshall 
-      #       of the object we are the proxy for.
-      #       We take care to not marshal the same object twice, so circular references will work.
-      
       def _dump(depth)
         references = Thread.current[:references]
         if (references)
           if (references[self])
-            [@proxy_id.to_s, @engine_id.to_s].pack("A8A40")
+#            puts "> serializing placeholder #{@proxy_id.to_s}"
+            [@proxy_id.to_s, @engine_id.to_s].pack("A40A40")
           else
+#            puts "> serializing proxy       #{@proxy_id.to_s}"
             references[self] = true
-            [@proxy_id.to_s, @engine_id.to_s].pack("A8A40") + Marshal.dump(@target, depth)
+            [@proxy_id.to_s, @engine_id.to_s].pack("A40A40") + Marshal.dump(@target, depth)
           end
         else
-          [@proxy_id.to_s, @engine_id.to_s].pack("A8A40")
+          [@proxy_id.to_s, @engine_id.to_s].pack("A40A40")
         end
       end
       
-      #       Custom marshalling - restore a Prox object.
-      
       def TransparentProxy._load(buffer)
         proxy = TransparentProxy.allocate
-        list = buffer.unpack("A8A40a*")
-        proxy.proxy_id = list[0].to_i
+        list = buffer.unpack("A40A40a*")
+        proxy.proxy_id = Guid.from_s( list[0] )
         proxy.engine_id = Guid.from_s( list[1] )
         TransparentEngine.current() { |engine|
           proxy = engine.restore(proxy)
@@ -193,24 +220,24 @@ module HPrevalence
         end
         result 
       end
-         
+      
     end
-
+    
     class NestedTransparentProxy < TransparentProxy
-      attr_reader :related_symbol, :parent_proxy_id
+      attr_reader :related_symbol, :parent_proxy_id, :args
       
-      def initialize(target, symbol, parent_proxy_id)
+      def initialize(target, symbol, parent_proxy_id, *args)
         raise 'A nested-proxy must have a symbol' if symbol.nil?
         super(target)
-        @related_symbol, @parent_proxy_id = symbol, parent_proxy_id
+        @related_symbol, @parent_proxy_id, @args = symbol, parent_proxy_id, args
       end
-
+      
       protected 
       
       def build_command( symbol, *args )
         NestedAutomaticCommand.new( @related_symbol, @parent_proxy_id, @proxy_id, symbol, *args )
       end
-
+      
     end
     
   end

data/rakefile.rb

@@ -10,7 +10,7 @@ require 'rake/rdoctask'
 
 #task :default => [ :test_units, :test_functional, :appdoc, :stats ]
 desc "Run all the tests"
-task :default => [ :test_units, :package ]
+task :default => [ :test_units ]
 
 desc "Run the unit tests in test/unit"
 Rake::TestTask.new("test_units") { |t|
@@ -19,7 +19,7 @@ Rake::TestTask.new("test_units") { |t|
   t.verbose = true
 }
 
-PKG_VERSION = '0.1.0'
+PKG_VERSION = '0.1.1'
 PKG_FILES = FileList['README', './**/*.rb'] 
 
 spec = Gem::Specification.new do |s|

data/test/abstract_hprevalence_testcase.rb

@@ -1,10 +1,14 @@
 
 module AbstractHPrevalenceTestHelper
   
+  def create_dir_name( name )
+    current_dir = File.dirname(__FILE__)
+    File.join( current_dir, name )
+  end
+  
   def reset_dir( dir )
     begin
-      current_dir = File.dirname(__FILE__)
-      @target_dir = File.join( current_dir, dir )
+      @target_dir = create_dir_name( dir )
       if File.exist?( @target_dir )
         Dir.entries( @target_dir ).each do |file|
           File.delete( File.join(@target_dir,file) ) unless File.directory?( file )

data/test/circular_reference_test.rb

@@ -0,0 +1,96 @@
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+require 'hprevalence'
+require 'transparent'
+require 'abstract_hprevalence_testcase'
+require 'dvd_store_model'
+require 'test/unit'
+
+class Item
+  attr_accessor :sub_item
+  
+  def initialize( sub )
+    @sub_item = sub
+  end
+end
+
+class SampleDatabase
+  include HPrevalence::Transparent::CustomBehavior
+  
+  attr_reader :list
+  attr_proxy_attribute :list
+  attr_proxy_method :create_item
+  
+  def initialize()
+    @list = []
+  end
+  
+  def create_item( sub = nil )
+    Item.new( sub )
+  end
+end
+
+class CircularReferenceTest < Test::Unit::TestCase
+  include AbstractHPrevalenceTestHelper
+  
+  def setup
+    reset_dir 'store/circular_test'
+    ensure_dir
+    load_engine
+  end
+  
+  def teardown
+    @engine.close
+  end
+  
+  def load_engine
+    teardown unless @engine.nil?
+  
+    @engine = HPrevalence::EngineBuilder.build_transparent( @target_dir ) { 
+      SampleDatabase.new() 
+    }
+    
+    assert_not_nil @engine
+    @system = @engine.system
+    assert_not_nil @system
+  end
+  
+  def test_simple
+    item = @system.create_item()
+    @system.list << item
+    
+    load_engine
+    
+    assert_equal 1, @system.list.length
+  end
+
+  def test_circular
+    item = @system.create_item()
+    item.sub_item = item
+    
+    @system.list << item
+    
+    load_engine
+    
+    assert_equal 1, @system.list.length
+    item = @system.list[0]
+    assert_equal item, item.sub_item
+  end
+
+  def test_circular_with_snapshot
+    item = @system.create_item()
+    item.sub_item = item
+    
+    @system.list << item
+    
+    @engine.take_snapshot
+    load_engine
+    
+    assert_equal 1, @system.list.length
+    item = @system.list[0]
+    assert_equal item, item.sub_item
+  end
+  
+end
+

data/test/dvd_store_model.rb

@@ -2,6 +2,41 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'transparent'
 
+class AbstractCollection
+  include Enumerable
+  include HPrevalence::Transparent::CustomBehavior
+  attr_read_only :each
+
+  def initialize()
+    @list = []
+  end
+
+  def add( item )
+    @list << item
+    item
+  end
+  
+  def each()
+    @list.each { |item|
+      yield(item)
+    }
+  end
+  
+  def length
+    @list.length
+  end
+  
+end
+
+class DvdCollection < AbstractCollection
+  # include HPrevalence::Transparent::CustomBehavior
+
+  def initialize()
+    super
+  end
+  
+end
+
 class DvdStore
   include HPrevalence::Transparent::CustomBehavior
   
@@ -9,11 +44,12 @@ class DvdStore
   attr_reader :available_categories
   attr_reader :customers
   
-  attr_proxy :available_items, :available_categories, :customers
+  attr_proxy_attribute :available_items, :available_categories, :customers
+  attr_proxy_method :create_dvd
   attr_read_only :total_customers
   
   def initialize()
-    @available_items = []
+    @available_items = DvdCollection.new()
     @available_categories = []
     @customers = []
   end
@@ -21,6 +57,10 @@ class DvdStore
   def total_customers
     @customers.length
   end
+
+  def create_dvd( dvd )
+    dvd
+  end
   
 end
 

data/test/natural_object_model_test.rb

@@ -41,8 +41,11 @@ class NaturalObjectModelTest < Test::Unit::TestCase
     @system.available_categories << fiction
     @system.available_categories << comedy
     
-    @system.available_items << Dvd.new( 'Fight Club', 22.1, fiction )
-    @system.available_items << Dvd.new( 'Monty Python and the Holy Grail', 15, comedy )
+    dvd1 = @system.create_dvd( Dvd.new( 'Fight Club', 22.1, fiction ) )
+    dvd2 = @system.create_dvd( Dvd.new( 'Monty Python and the Holy Grail', 15, comedy ) )
+
+    @system.available_items.add( dvd1 )
+    @system.available_items.add( dvd2 )
 
     assert_equal 2, @system.available_items.length
     assert_equal 2, @system.available_categories.length
@@ -53,6 +56,27 @@ class NaturalObjectModelTest < Test::Unit::TestCase
     assert_equal 2, @system.available_categories.length
   end
 
+  def test_read_only_each
+    assert_equal 0, @system.total_customers
+
+    fiction = Category.new('Fiction')
+    comedy = Category.new('Comedy')
+    
+    @system.available_categories << fiction
+    @system.available_categories << comedy
+    
+    dvd1 = @system.create_dvd( Dvd.new( 'Fight Club', 22.1, fiction ) )
+    dvd2 = @system.create_dvd( Dvd.new( 'Monty Python and the Holy Grail', 15, comedy ) )
+
+    @system.available_items.add( dvd1 )
+    @system.available_items.add( dvd2 )
+
+    @system.available_items.each() do |item|
+      
+    end
+
+  end
+
   def test_more_engine_loads
     load_engine
     assert_equal 0, @system.total_customers
@@ -66,8 +90,8 @@ class NaturalObjectModelTest < Test::Unit::TestCase
     assert_equal 0, @system.available_items.length
     assert_equal 2, @system.available_categories.length
     
-    @system.available_items << Dvd.new( 'Fight Club', 22.1, fiction )
-    @system.available_items << Dvd.new( 'Monty Python and the Holy Grail', 15, comedy )
+    @system.available_items.add( Dvd.new( 'Fight Club', 22.1, fiction ) )
+    @system.available_items.add( Dvd.new( 'Monty Python and the Holy Grail', 15, comedy ) )
 
     assert_equal 2, @system.available_items.length
     assert_equal 2, @system.available_categories.length
@@ -80,8 +104,8 @@ class NaturalObjectModelTest < Test::Unit::TestCase
     horror = Category.new('Horror')
     @system.available_categories << horror
 
-    @system.available_items << Dvd.new( 'Pet Sematary - 1989', 22.6, horror )
-    @system.available_items << Dvd.new( 'Falwty Towers - 12 episodes', 40.6, comedy )
+    @system.available_items.add( Dvd.new( 'Pet Sematary - 1989', 22.6, horror ) )
+    @system.available_items.add( Dvd.new( 'Fawlty Towers - 12 episodes', 40.6, comedy ) )
 
     assert_equal 4, @system.available_items.length
     assert_equal 3, @system.available_categories.length
@@ -102,8 +126,8 @@ class NaturalObjectModelTest < Test::Unit::TestCase
     @system.available_categories << fiction
     @system.available_categories << comedy
     
-    @system.available_items << Dvd.new( 'Fight Club', 22.1, fiction )
-    @system.available_items << Dvd.new( 'Monty Python and the Holy Grail', 15, comedy )
+    @system.available_items.add( Dvd.new( 'Fight Club', 22.1, fiction ) )
+    @system.available_items.add( Dvd.new( 'Monty Python and the Holy Grail', 15, comedy ) )
 
     assert_equal 2, @system.available_items.length
     assert_equal 2, @system.available_categories.length

data/test/project_model.rb

@@ -0,0 +1,99 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+require 'hprevalence'
+require 'transparent'
+
+class ModelBase
+  include HPrevalence::Transparent::CustomBehavior
+  attr_read_only :ident
+  
+  attr_reader :ident
+  attr_accessor :name
+  
+  def initialize(name, id_val = name)
+    @ident, @name = id_val, name
+  end
+end
+
+class ModelArrayBase
+  include Enumerable
+  include HPrevalence::Transparent::CustomBehavior
+  attr_read_only :[], :each, :length
+  
+  def initialize()
+    @list = []
+  end
+  
+  def add( item )
+    @list << item
+  end
+  
+  def each
+    @list.each { |item| yield(item) }
+  end
+  
+  def [](index)
+    if (index.kind_of?(Integer))
+      return @list[index]
+    elsif (index.kind_of?(String))
+      return find { |item| item.ident == index }
+    end
+  end
+  
+  def length
+    @list.length
+  end
+  
+end
+
+class User < ModelBase
+  attr_reader :password
+  
+  def initialize(name, password)
+    super(name)
+    @password = password
+  end 
+end
+
+class Project < ModelBase
+  attr_reader :owner
+  
+  def initialize(name, idVal, owner)
+    super(name, idVal)
+    @owner = owner
+  end
+end
+
+class UserCollection < ModelArrayBase
+  def initialize()
+    super
+  end
+end
+
+class ProjectCollection < ModelArrayBase
+  def initialize()
+    super
+  end
+end
+
+class ApplicationDatabase
+  include HPrevalence::Transparent::CustomBehavior
+  
+  attr_reader :users, :projects
+  attr_proxy_attribute :users, :projects
+  attr_proxy_method :create_user, :create_project
+  
+  def initialize
+    @users = UserCollection.new()
+    @projects = ProjectCollection.new()
+  end
+  
+  def create_user( login, pass )
+    User.new( login, pass )
+  end
+
+  def create_project( name, id, user )
+    Project.new( name, id, user )
+  end
+
+end

data/test/restoring_test.rb

@@ -0,0 +1,54 @@
+
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+require 'hprevalence'
+require 'transparent'
+require 'abstract_hprevalence_testcase'
+require 'project_model'
+require 'test/unit'
+
+class RestoringTest < Test::Unit::TestCase
+  include AbstractHPrevalenceTestHelper
+  
+  def setup
+    @target_dir = create_dir_name('store/fixed')
+    load_engine
+  end
+  
+  def teardown
+    @engine.close
+  end
+  
+  def load_engine
+    teardown unless @engine.nil?
+  
+    @engine = HPrevalence::EngineBuilder.build_transparent( @target_dir ) { 
+      ApplicationDatabase.new() 
+    }
+    
+    assert_not_nil @engine
+    @system = @engine.system
+    assert_not_nil @system
+  end
+  
+  def test_a
+    teardown
+    reset_dir 'store/fixed'
+    setup 
+    
+    user = @system.create_user( "test", "test" )
+    @system.users.add( user ) unless @system.users.length != 0 
+    
+    project = @system.create_project( 'cas', 'Castle', user )
+    @system.projects.add( project )
+    
+  end
+  
+  def atest_aaa
+    
+    assert_equal 1, @system.users.length
+    assert_equal 1, @system.projects.length
+    
+  end
+  
+end

data/test/task_model.rb

@@ -22,6 +22,10 @@ class TaskDatabase
   def add_task( task )
     @tasks << task
   end
+
+  def add( name, contents )
+    add_task( Task.new(name, contents) )
+  end
   
   def remove_task_by_name( name )
     @tasks.delete_if { |task|

data/test/transparent_module_test.rb

@@ -5,6 +5,16 @@ require 'transparent'
 require 'abstract_hprevalence_testcase'
 require 'task_model'
 require 'test/unit'
+require 'guid'
+
+class FakeProxy
+  attr_reader :proxy_id
+  
+  def initialize()
+    @proxy_id = Guid.new
+  end
+  
+end
 
 class TransparentTest < Test::Unit::TestCase
   include AbstractHPrevalenceTestHelper
@@ -32,17 +42,14 @@ class TransparentTest < Test::Unit::TestCase
   end
   
   def test_proxy_registration
-    fake_proxy1 = ""
-    fake_proxy2 = 10
+    fake_proxy1 = FakeProxy.new()
+    fake_proxy2 = FakeProxy.new()
     
-    proxy_id1 = @engine.register_proxy( fake_proxy1 )
-    proxy_id2 = @engine.register_proxy( fake_proxy2 )
+    @engine.register_proxy( fake_proxy1 )
+    @engine.register_proxy( fake_proxy2 )
 
-    assert_not_nil proxy_id1
-    assert_not_nil proxy_id2
-    
-    assert_equal fake_proxy1, @engine.proxy_by_id( proxy_id1 )
-    assert_equal fake_proxy2, @engine.proxy_by_id( proxy_id2 )
+    assert_equal fake_proxy1, @engine.proxy_by_id( fake_proxy1.proxy_id )
+    assert_equal fake_proxy2, @engine.proxy_by_id( fake_proxy2.proxy_id )
   end
   
   def test_simple_case
@@ -91,5 +98,18 @@ class TransparentTest < Test::Unit::TestCase
 
     assert_equal 3, @system.tasks.length
   end
+
+  def test_recursive_invocations
+    assert_equal 0, @system.tasks.length
+    @system.add( 'first', 'content' )
+    @system.add( 'second', 'content' )
+    assert_equal 2, @system.tasks.length
+    
+    @engine.take_snapshot
+    
+    load_engine
+
+    assert_equal 2, @system.tasks.length
+  end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.1
 specification_version: 1
 name: hprevalence
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2004-10-24
+  version: 0.1.1
+date: 2004-10-27
 summary: Ruby based prevalence engine.
 require_paths: 
   - lib
@@ -33,15 +33,17 @@ files:
   - "./lib/transparent.rb"
   - "./lib/internal/command_logger.rb"
   - "./lib/internal/iomanager.rb"
-  - "./lib/internal/object_graph.rb"
   - "./lib/internal/serializer.rb"
   - "./lib/internal/store_manager.rb"
   - "./test/abstract_hprevalence_testcase.rb"
+  - "./test/circular_reference_test.rb"
   - "./test/command_logger_test.rb"
   - "./test/default_model_serializer_test.rb"
   - "./test/dvd_store_model.rb"
   - "./test/file_io_manager_test.rb"
   - "./test/natural_object_model_test.rb"
+  - "./test/project_model.rb"
+  - "./test/restoring_test.rb"
   - "./test/simple_engine_test.rb"
   - "./test/task_model.rb"
   - "./test/transparent_module_test.rb"

data/lib/internal/object_graph.rb

@@ -1,68 +0,0 @@
-
-class ObjectGraph
-  
-  def initialize()
-    @root = nil
-    @registry = Hash.new()
-  end
-  
-  def self.build( node )
-    graph = ObjectGraph.new()
-    graph.root = node
-    graph
-  end
-  
-  def root=( node )
-    @root = GraphItem.new( self, node )
-  end
-  
-  def root
-    @root.object
-  end
-  
-  def object_reference( var )
-    graph_item = @registry[ var ]
-    if (graph_item.nil?)
-      graph_item = GraphItem.new( self, var )
-      @registry[ var ] = graph_item
-    end
-    graph_item
-  end
-  
-end
-
-class GraphItem
-  
-  def initialize( graph, node )
-    @instance_vars = Hash.new
-    @node_type = node.class
-    
-    node.instance_variables.each do |var|
-      name = var.slice(1, var.length - 1)
-      @instance_vars[ name ] = graph.object_reference( node.instance_eval(var) )
-    end
-  end
-  
-  def object
-    obj = @node_type.allocate
-    restore_instance_vars obj
-    obj
-  end
-  
-  protected
-  
-  def restore_instance_vars(obj)
-    @instance_vars.each do |name, value|
-      
-      var = value.object
-      
-      setter = name + "="
-      if obj.respond_to?(setter)
-        obj.__send__(setter, var)
-      else
-        obj.instance_eval("@#{ name } = var")
-      end
-    end
-  end
-  
-end