madeleine 0.7.1 → 0.7.2

data/NEWS

@@ -1,4 +1,11 @@
 
+Madeleine 0.7.2 (May 29, 2006):
+
+    * An automatic class with no methods would cause an error
+    * System sanity check at first use
+    * Now creates full path to storage files, not just the last
+      directory (reported by Wayne Vucenic)
+
 Madeleine 0.7.1 (August 22, 2004):
 
     * ZMarshal changed to work around Zlib bug.

data/contrib/create_command.rb

@@ -0,0 +1,39 @@
+#
+# Dynamic creation of command classes.
+#
+# Contributed by James Britt 2004.
+#
+
+class Command
+  Command::Target_map = {}
+
+  def execute( system )
+    cls = self.class.to_s
+    cmd  = Command::Target_map[ cls ]
+    system.send( cmd, *@_vars )
+  end
+end
+
+# See http://www.rubytalk.com/cgi-bin/scat.rb/ruby/ruby-talk/56334
+# But simplified/hacked so that it creates command/query classes
+# This method defines a new class derived from Command.  The initialize
+# method is defined such that all arguments are pushed onto an
+# instance variable array named @_vars.  When 'execute' is called,
+# this array will provide all the parameters to be sent to the
+# method invoked on 'system'.
+def createCommandClass( name, m_name )
+  Object.const_set( name, Class.new( Command ) ).instance_eval do
+    define_method( :initialize ) do  |*args|
+      inst_vars = []
+      args.each do |k|
+        inst_vars.push( k )
+      end
+      instance_variable_set( "@_vars",  inst_vars )
+    end
+  end
+  begin
+    Command::Target_map[ name ] = m_name
+  rescue Exception
+    STDERR.puts( "Error setting value in  Command::Target_map:  #{$!}" )
+  end
+end

data/lib/madeleine.rb

@@ -2,7 +2,7 @@
 # Madeleine - Ruby Object Prevalence
 #
 # Author::    Anders Bengtsson <ndrsbngtssn@yahoo.se>
-# Copyright:: Copyright (c) 2003-2004
+# Copyright:: Copyright (c) 2003-2006
 #
 # Usage:
 #
@@ -19,9 +19,11 @@ module Madeleine
 
   require 'thread'
   require 'sync'
+  require 'fileutils'
   require 'madeleine/files'
+  require 'madeleine/sanity'
 
-  MADELEINE_VERSION = "0.7.1"
+  MADELEINE_VERSION = "0.7.2"
 
   class SnapshotMadeleine
 
@@ -63,6 +65,8 @@ module Madeleine
     attr_reader :system
 
     def initialize(system, logger, snapshotter, lock, executer)
+      SanityCheck.instance.run_once
+
       @system = system
       @logger = logger
       @snapshotter = snapshotter
@@ -84,7 +88,7 @@ module Madeleine
     def execute_command(command)
       verify_command_sane(command)
       @lock.synchronize {
-        raise "closed" if @closed
+        raise MadeleineClosedException if @closed
         @logger.store(command)
         @executer.execute(command)
       }
@@ -149,6 +153,9 @@ module Madeleine
   class InvalidCommandException < Exception
   end
 
+  class MadeleineClosedException < RuntimeError
+  end
+
   #
   # Internal classes below
   #
@@ -309,7 +316,7 @@ module Madeleine
 
     def ensure_directory_exists
       if ! File.exist?(@directory_name)
-        Dir.mkdir(@directory_name)
+        FileUtils.mkpath(@directory_name)
       end
     end
 

data/lib/madeleine/automatic.rb

@@ -7,8 +7,8 @@ module Madeleine
 # Automatic commands for Madeleine
 #
 # Author::    Stephen Sykes <sds@stephensykes.com>
-# Copyright:: Copyright (C) 2003-2004
-# Version::   0.41
+# Copyright:: Copyright (C) 2003-2006
+# Version::   0.42
 #
 # This module provides a way of automatically generating command objects for madeleine to
 # store.  It works by making a proxy object for all objects of any classes in which it is included.
@@ -52,8 +52,8 @@ module Madeleine
 #  mad = AutomaticSnapshotMadeleine.new("storage_directory") { A.new(param1, ...) }
 #
 #  mad.system.some_method(paramA, ...) # logged as a command by madeleine
-#  print mad.foo                       # not logged
-#  print mad.bigfoo                    # not logged
+#  print mad.system.foo                # not logged
+#  print mad.system.bigfoo             # not logged
 #  mad.take_snapshot
 #
 
@@ -76,6 +76,7 @@ module Madeleine
           alias_method :_old_new, :new
 
           def new(*args, &block)
+            @read_only_methods ||= []
             Prox.new(_old_new(*args, &block))
           end
 #
@@ -153,6 +154,7 @@ module Madeleine
     class Automatic_marshaller #:nodoc:
       def Automatic_marshaller.load(io)
         restored_obj = Deserialize.load(io, Thread.current[:system].marshaller)
+p restored_obj if restored_obj.class != Prox
         ObjectSpace.each_object(Prox) {|o| Thread.current[:system].restore(o) if (o.sysid == restored_obj.sysid)}
         restored_obj
       end
@@ -268,14 +270,19 @@ module Madeleine
         @@systems[@sysid] = self
         Thread.critical = false
         @marshaller = marshaller # until attrb
+
         begin
           @persister = persister.new(directory_name, Automatic_marshaller, &new_system_block)
           @list.delete_if {|k,v|  # set all the prox objects that now exist to have the right sysid
             begin
-              ObjectSpace._id2ref(v).sysid = @sysid
+              obj = ObjectSpace._id2ref(v)
+              raise unless obj.respond_to?(:sysid=)
+              obj.sysid = @sysid
               false
             rescue RangeError
               true # Id was to a GC'd object, delete it
+            rescue RuntimeError
+              true # GC'd object, and id was reused for something else
             end
           }
         ensure
@@ -334,7 +341,10 @@ module Madeleine
 #
       def close
         begin
-          @list.each_key {|k| myid2ref(k).sysid = nil}
+          @list.each_key {|k|
+            ref = myid2ref(k)
+            ref.sysid = nil if ref.class == Prox
+          }
         rescue RangeError
           # do nothing
         end
@@ -389,6 +399,7 @@ module Madeleine
 #
       def Deserialize.load(io, marshaller=Marshal)
         begin
+          raise "Must detect with YAML" if marshaller == YAML
           marshaller.load(io)
         rescue Exception => e
           io.rewind

data/lib/madeleine/sanity.rb

@@ -0,0 +1,50 @@
+#
+# Author::    Anders Bengtsson <ndrsbngtssn@yahoo.se>
+# Copyright:: Copyright (c) 2004
+#
+
+require 'tempfile'
+require 'singleton'
+
+module Madeleine
+  class SanityCheck
+    include Singleton
+
+    def initialize
+      @testdata = "\x85\x00\x0a\0x0d\x0a".freeze
+      @was_run = false
+    end
+
+    def run_once
+      unless @was_run
+        run
+      end
+    end
+
+    def run
+      marshal_check
+      file_check
+      @was_run = true
+    end
+
+    def marshal_check
+      result = Marshal.load(Marshal.dump(@testdata))
+      if result != @testdata
+        raise "Sanity check failed for Marshal"
+      end
+    end
+
+    def file_check
+      Tempfile.open("madeleine_sanity") do |file|
+        file.write(@testdata)
+        file.flush
+        open(file.path, 'rb') do |read_file|
+          result = read_file.read
+          if result != @testdata
+            raise "Sanity check failed for file IO"
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.4
+rubygems_version: 0.8.11
 specification_version: 1
 name: madeleine
 version: !ruby/object:Gem::Version 
-  version: 0.7.1
-date: 2005-01-06
+  version: 0.7.2
+date: 2006-05-29 00:00:00 +02:00
 summary: Madeleine is a Ruby implementation of Object Prevalence
 require_paths: 
-  - lib
+- lib
 email: ndrsbngtssn@yahoo.se
 homepage: http://madeleine.sourceforge.net
 rubyforge_project: 
@@ -18,36 +18,46 @@ bindir: bin
 has_rdoc: false
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.8.1
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: 1.8.1
   version: 
 platform: ruby
+signing_key: 
+cert_chain: 
 authors: 
-  - Anders Bengtsson
+- Anders Bengtsson
 files: 
-  - lib/madeleine.rb
-  - lib/madeleine/automatic.rb
-  - lib/madeleine/clock.rb
-  - lib/madeleine/files.rb
-  - lib/madeleine/zmarshal.rb
-  - samples/clock_click.rb
-  - samples/dictionary_client.rb
-  - samples/dictionary_server.rb
-  - samples/painter.rb
-  - contrib/batched.rb
-  - contrib/benchmark.rb
-  - contrib/test_batched.rb
-  - contrib/test_scalability.rb
-  - contrib/threaded_benchmark.rb
-  - README
-  - NEWS
-  - COPYING
+- lib/madeleine.rb
+- lib/madeleine/automatic.rb
+- lib/madeleine/clock.rb
+- lib/madeleine/files.rb
+- lib/madeleine/sanity.rb
+- lib/madeleine/zmarshal.rb
+- samples/clock_click.rb
+- samples/dictionary_client.rb
+- samples/dictionary_server.rb
+- samples/painter.rb
+- contrib/batched.rb
+- contrib/benchmark.rb
+- contrib/create_command.rb
+- contrib/test_batched.rb
+- contrib/test_scalability.rb
+- contrib/threaded_benchmark.rb
+- README
+- NEWS
+- COPYING
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+