hprevalence 0.1.1 → 0.2.0

data/lib/internal/store_manager.rb

@@ -2,10 +2,15 @@
 module HPrevalence
   
   class StorageManager
-    
-    def initialize( target_dir, iomanager = FileIOManager.new(target_dir), logger = CommandLogger.new(iomanager), model_serializer = DefaultModelSerializer.new(iomanager) )
-      @target_dir, @model_serializer = target_dir, model_serializer
-      @logger = logger
+
+    def initialize( 
+          target_dir, 
+          iomanager = FileIOManager.new(target_dir), 
+          marshaller = DefaultMarshaller.new(), 
+          model_serializer = DefaultModelSerializer.new(iomanager, marshaller) )
+
+      @model_serializer = model_serializer
+      @logger = CommandLogger.new(iomanager, marshaller) 
       @comand_store = nil
     end
     
@@ -50,25 +55,5 @@ module HPrevalence
     end
     
   end
-  
-  #
-  #
-  #
-  class TransparentStorageManager < StorageManager
-    
-    def initialize( engine, target_dir, iomanager = FileIOManager.new(target_dir), logger = CommandLogger.new(iomanager), model_serializer = DefaultModelSerializer.new(iomanager) )
-      super( target_dir, iomanager, logger, model_serializer )
-      @engine = engine
-    end
     
-    def restore( system )
-      @engine.within_engine {
-        system = restore_snapshot( system )
-        restore_commands( system )
-      }
-      system
-    end
-    
-  end
-  
 end

data/rakefile.rb

@@ -19,7 +19,7 @@ Rake::TestTask.new("test_units") { |t|
   t.verbose = true
 }
 
-PKG_VERSION = '0.1.1'
+PKG_VERSION = '0.2.0'
 PKG_FILES = FileList['README', './**/*.rb'] 
 
 spec = Gem::Specification.new do |s|

data/samples/simple/main.rb

@@ -0,0 +1,10 @@
+
+require 'tkclass'
+
+root = TkRoot.new() { title "More Widgets" }
+frame = TkFrame.new(root).pack("side"=>"right")
+buttons = TkFrame.new(frame).pack("side"=>"bottom")
+load = TkButton.new(buttons) { text "Load" }
+save = TkButton.new(buttons) { text "Save" }
+TkGrid.configure(load, save)
+root.mainloop()

data/{test → samples/simple}/task_model.rb

@@ -1,22 +1,17 @@
-$:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 class Task
-  
   attr_accessor :name, :contents
   
   def initialize( name, contents )
     @name, @contents = name, contents
   end
-  
 end
 
 class TaskDatabase
   attr_reader :tasks
-  attr_accessor :priority_task
   
   def initialize()
     @tasks = []
-    @priority_task = nil
   end
   
   def add_task( task )
@@ -38,11 +33,9 @@ class TaskDatabase
       task.name == name
     }
   end
-  
 end
 
 class AddTaskCommand 
-  
   def initialize( task )
     @task = task
   end
@@ -50,11 +43,9 @@ class AddTaskCommand
   def execute( system )
     system.add_task( @task )
   end
-  
 end
 
 class UpdateTaskCommand 
-  
   def initialize( name, new_content )
     @name, @new_content = name, new_content
   end
@@ -62,11 +53,9 @@ class UpdateTaskCommand
   def execute( system )
     system.find_task_by_name( @name ).contents = new_content
   end
-  
 end
 
 class RemoveTaskCommand 
-  
   def initialize( name )
     @name = name
   end
@@ -74,5 +63,4 @@ class RemoveTaskCommand
   def execute( system )
     system.remove_task_by_name( @name )
   end
-  
 end

data/samples/transparent/task_model.rb

@@ -0,0 +1,36 @@
+
+class Task
+  attr_accessor :name, :contents
+  
+  def initialize( name, contents )
+    @name, @contents = name, contents
+  end
+end
+
+class TaskDatabase
+  attr_reader :tasks
+  
+  def initialize()
+    @tasks = []
+  end
+  
+  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|
+      task.name == name
+    }
+  end
+  
+  def find_task_by_name( name )
+    @tasks.find { |task|
+      task.name == name
+    }
+  end
+end

data/test/command_logger_test.rb

@@ -2,6 +2,7 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'internal/command_logger'
 require 'internal/iomanager'
+require 'internal/marshallers/default'
 require 'abstract_hprevalence_testcase'
 require 'test/unit'
 
@@ -10,16 +11,11 @@ class CommandLoggerTest < Test::Unit::TestCase
   
   def setup
     reset_dir 'store/file_command_test'
-
-    @fc = CommandLogger.new( FileIOManager.new( @target_dir ) )    
+    @fc = CommandLogger.new( FileIOManager.new( @target_dir ), DefaultMarshaller.new() )
   end
   
   def test_available_logs
     assert_equal 0, @fc.log_files.length
-    
-    ensure_dir
-    
-    assert_equal 0, @fc.log_files.length
   end
   
   def test_new_log

data/test/default_model_serializer_test.rb

@@ -2,9 +2,10 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 
 require 'internal/iomanager'
 require 'internal/serializer'
+require 'internal/marshallers/default'
 require 'abstract_hprevalence_testcase'
 require 'test/unit'
-require 'task_model'
+require 'models/task_model'
 
 class DefaultModelSerializerTest < Test::Unit::TestCase
   include AbstractHPrevalenceTestHelper
@@ -13,15 +14,15 @@ class DefaultModelSerializerTest < Test::Unit::TestCase
     reset_dir 'store/default_model_serializer'
     ensure_dir 
     
-    @serializer = DefaultModelSerializer.new( FileIOManager.new( @target_dir ) )
+    @serializer = DefaultModelSerializer.new( FileIOManager.new( @target_dir ), DefaultMarshaller.new() )
   end
   
   def test_dump_and_load
     
     db = TaskDatabase.new()
-    db.add_task( Task.new( 'one', 'yada yada yada' ) )
-    db.add_task( Task.new( 'two', 'yada yada yada' ) )
-    db.add_task( Task.new( 'three', 'yada yada yada' ) )
+    db.add_task( Task.new( 'one', 'yada yada yada' ), Time.now )
+    db.add_task( Task.new( 'two', 'yada yada yada' ), Time.now )
+    db.add_task( Task.new( 'three', 'yada yada yada' ), Time.now )
     db.priority_task = db.tasks[0]
     
     @serializer.dump( db )
@@ -43,15 +44,15 @@ class DefaultModelSerializerTest < Test::Unit::TestCase
   def test_multiple_snapshots
     
     db = TaskDatabase.new()
-    db.add_task( Task.new( 'one', 'yada yada yada' ) )
+    db.add_task( Task.new( 'one', 'yada yada yada' ), Time.now )
 
     @serializer.dump( db )
 
-    db.add_task( Task.new( 'two', 'yada yada yada' ) )
+    db.add_task( Task.new( 'two', 'yada yada yada' ), Time.now )
 
     @serializer.dump( db )
 
-    db.add_task( Task.new( 'three', 'yada yada yada' ) )
+    db.add_task( Task.new( 'three', 'yada yada yada' ), Time.now )
     
     @serializer.dump( db )
     

data/test/marshaller_test.rb

@@ -0,0 +1,68 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+require 'internal/marshallers/default'
+require 'internal/marshallers/soap_marshaller'
+require 'internal/marshallers/yaml_marshaller'
+require 'abstract_hprevalence_testcase'
+require 'test/unit'
+require 'models/task_model'
+
+class MarshalersTest < Test::Unit::TestCase
+  include AbstractHPrevalenceTestHelper
+  
+  def setup
+    reset_dir 'store/marshallers'
+    ensure_dir 
+    
+    @db = TaskDatabase.new()
+    @db.add_task( Task.new('first','contents'), Time.now )
+    @db.add_task( Task.new('second','contents'), Time.now )
+  end
+
+  def test_default
+    serialize_and_deserialize( DefaultMarshaller.new() )
+  end
+
+  def test_soap
+    serialize_and_deserialize( SoapMarshaller.new() )
+  end
+  
+  def test_yaml
+    serialize_and_deserialize( YamlMarshaller.new() )
+  end
+
+  def serialize_and_deserialize( marshaller )
+    marshalled = marshaller.serialize( @db )
+    assert_not_nil marshalled
+    newdb = marshaller.restore( marshalled )
+    assert_not_nil newdb
+    assert_task newdb
+    
+    file_name = File.join( @target_dir, 'temp' )
+    stream = File.new( file_name, 'w' )
+    marshaller.serialize_to_stream( '1', stream )
+    marshaller.serialize_to_stream( '2', stream )
+    marshaller.serialize_to_stream( '3', stream )
+    stream.close
+    
+    File.open( file_name, 'r' ) { |readstream|
+      assert_equal '1', marshaller.restore( readstream )
+      assert_equal '2', marshaller.restore( readstream )
+      assert_equal '3', marshaller.restore( readstream )
+    }
+
+  end
+  
+  def assert_task(newdb)
+    assert_equal @db.tasks.length, newdb.tasks.length
+    task1 = @db.tasks[0]
+    task2 = @db.tasks[1]
+    
+    assert_equal 'first', task1.name
+    assert_equal 'contents', task1.contents
+    assert_equal 'second', task2.name
+    assert_equal 'contents', task2.contents
+  end
+
+end
+

data/test/models/task_model.rb

@@ -0,0 +1,91 @@
+$:.unshift(File.dirname(__FILE__) + "/../lib/")
+
+class Task
+  
+  attr_accessor :name, :contents, :creation
+  
+  def initialize( name, contents )
+    @name, @contents = name, contents
+  end
+  
+end
+
+class TaskDatabase
+  attr_reader :tasks
+  attr_accessor :priority_task
+  
+  def initialize()
+    @tasks = []
+    @priority_task = nil
+  end
+  
+  def add_task( task, time )
+    task.creation = time
+    @tasks << task
+  end
+
+  def remove_task_by_name( name )
+    @tasks.delete_if { |task|
+      task.name == name
+    }
+  end
+  
+  def find_task_by_name( name )
+    @tasks.find { |task|
+      task.name == name
+    }
+  end
+  
+end
+
+class AddTaskCommand 
+  
+  def initialize( task )
+    @task = task
+  end
+  
+  def now=(value)
+    @now = value
+  end
+    
+  def execute( system )
+    system.add_task( @task, @now )
+  end
+  
+end
+
+class SetPriorityTaskCommand
+  
+  def initialize( task_name )
+    @task_name = task_name
+  end
+  
+  def execute( system )
+    system.priority_task = system.find_task_by_name( @task_name )
+  end
+  
+end
+
+class UpdateTaskCommand 
+  
+  def initialize( name, new_content )
+    @name, @new_content = name, new_content
+  end
+  
+  def execute( system )
+    system.find_task_by_name( @name ).contents = new_content
+  end
+  
+end
+
+class RemoveTaskCommand 
+  
+  def initialize( name )
+    @name = name
+  end
+  
+  def execute( system )
+    system.remove_task_by_name( @name )
+  end
+  
+end

data/test/simple_engine_test.rb

@@ -3,7 +3,7 @@ $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'hprevalence'
 require 'test/unit'
 require 'abstract_hprevalence_testcase'
-require 'task_model'
+require 'models/task_model'
 
 class SimpleEngineTest < Test::Unit::TestCase
   include AbstractHPrevalenceTestHelper
@@ -35,24 +35,41 @@ class SimpleEngineTest < Test::Unit::TestCase
     @engine.execute_command( AddTaskCommand.new( task ) )
     
     assert_equal 1, @system.tasks.length
+    creation = task.creation
+    assert_not_nil creation
     
     load_engine
     
     assert_equal 1, @system.tasks.length
+    creation2 = @system.tasks[0].creation
+    assert_equal creation, creation2
+
     assert_equal 'put the cat out', @system.tasks[0].name
     assert_equal 'Before go sleep, put the cat out otherwise he will meow during the night', @system.tasks[0].contents
   end
 
+  def test_same_object
+    task = Task.new( 'first', 'content' )
+    @engine.execute_command( AddTaskCommand.new( task ) )
+    @engine.execute_command( SetPriorityTaskCommand.new('first') )
+    
+    assert_equal 1, @system.tasks.length
+    assert_not_nil @system.priority_task
+    
+    load_engine
+    
+    assert_not_nil @system.priority_task
+    assert_equal 1, @system.tasks.length
+    assert_equal @system.priority_task, @system.tasks[0]
+  end
+
   def test_add_and_remove
     task = Task.new( 'one', 'Before go sleep, put the cat out otherwise he will meow during the night' )
     @engine.execute_command( AddTaskCommand.new( task ) )
     task = Task.new( 'two', 'Brush your teeth before go to bed' )
     @engine.execute_command( AddTaskCommand.new( task ) )
-
     assert_equal 2, @system.tasks.length
-
-    @engine.execute_command( RemoveTaskCommand.new( 'two' ) )
-    
+    @engine.execute_command( RemoveTaskCommand.new( 'two' ) )   
     assert_equal 1, @system.tasks.length
     
     load_engine