Pimki 1.3.092 → 1.4.092

data/libraries/madeleine/clock.rb

@@ -1,94 +1,94 @@
-#
-# Copyright(c) Anders Bengtsson 2003
-#
-
-require 'madeleine'
-
-module Madeleine
-  module Clock
-
-    # Deprecated. Use SnapshotMadeleine instead.
-    class ClockedSnapshotMadeleine < ::Madeleine::SnapshotMadeleine
-    end
-
-    # Let your system extend this module if you need to access the
-    # machine time. Used together with a TimeActor that keeps
-    # the clock current.
-    module ClockedSystem
-
-      # Returns this system's Clock.
-      def clock
-        unless defined? @clock
-          @clock = Clock.new
-        end
-        @clock
-      end
-    end
-
-    # Sends clock ticks to update a ClockedSystem, so that time can be
-    # dealt with in a deterministic way.
-    class TimeActor
-
-      # Create and launch a new TimeActor
-      #
-      # * <tt>madeleine</tt> - The SnapshotMadeleine instance to work on.
-      # * <tt>delay</tt> - Delay between ticks in seconds (Optional).
-      def self.launch(madeleine, delay=0.1)
-        result = new(madeleine, delay)
-        result
-      end
-
-      # Stops the TimeActor.
-      def destroy
-        @is_destroyed = true
-        @thread.wakeup
-        @thread.join
-      end
-
-      private_class_method :new
-
-      private
-
-      def initialize(madeleine, delay) #:nodoc:
-        @madeleine = madeleine
-        @is_destroyed = false
-        send_tick
-        @thread = Thread.new {
-          until @is_destroyed
-            sleep(delay)
-            send_tick
-          end
-        }
-      end
-
-      def send_tick
-        @madeleine.execute_command(Tick.new(Time.now))
-      end
-    end
-
-    # Keeps track of time in a ClockedSystem.
-    class Clock
-      # Returns the system's time as a Ruby <tt>Time</tt>.
-      attr_reader :time
-
-      def initialize
-        @time = Time.at(0)
-      end
-
-      def forward_to(newTime)
-        @time = newTime
-      end
-    end
-
-    #
-    # Internal classes below
-    #
-
-    # Deprecated. Merged into default implementation.
-    class TimeOptimizingLogger < ::Madeleine::Logger
-    end
-
-  end
-end
-
-ClockedSnapshotMadeleine = Madeleine::Clock::ClockedSnapshotMadeleine
+#
+# Copyright(c) Anders Bengtsson 2003
+#
+
+require 'madeleine'
+
+module Madeleine
+  module Clock
+
+    # Deprecated. Use SnapshotMadeleine instead.
+    class ClockedSnapshotMadeleine < ::Madeleine::SnapshotMadeleine # :nodoc:
+    end
+
+    # Let your system extend this module if you need to access the
+    # machine time. Used together with a TimeActor that keeps
+    # the clock current.
+    module ClockedSystem
+
+      # Returns this system's Clock.
+      def clock
+        unless defined? @clock
+          @clock = Clock.new
+        end
+        @clock
+      end
+    end
+
+    # Sends clock ticks to update a ClockedSystem, so that time can be
+    # dealt with in a deterministic way.
+    class TimeActor
+
+      # Create and launch a new TimeActor
+      #
+      # * <tt>madeleine</tt> - The SnapshotMadeleine instance to work on.
+      # * <tt>delay</tt> - Delay between ticks in seconds (Optional).
+      def self.launch(madeleine, delay=0.1)
+        result = new(madeleine, delay)
+        result
+      end
+
+      # Stops the TimeActor.
+      def destroy
+        @is_destroyed = true
+        @thread.wakeup
+        @thread.join
+      end
+
+      private_class_method :new
+
+      private
+
+      def initialize(madeleine, delay) #:nodoc:
+        @madeleine = madeleine
+        @is_destroyed = false
+        send_tick
+        @thread = Thread.new {
+          until @is_destroyed
+            sleep(delay)
+            send_tick
+          end
+        }
+      end
+
+      def send_tick
+        @madeleine.execute_command(Tick.new(Time.now))
+      end
+    end
+
+    # Keeps track of time in a ClockedSystem.
+    class Clock
+      # Returns the system's time as a Ruby <tt>Time</tt>.
+      attr_reader :time
+
+      def initialize
+        @time = Time.at(0)
+      end
+
+      def forward_to(newTime)
+        @time = newTime
+      end
+    end
+
+    #
+    # Internal classes below
+    #
+
+    # Deprecated. Merged into default implementation.
+    class TimeOptimizingLogger < ::Madeleine::Logger # :nodoc:
+    end
+
+  end
+end
+
+ClockedSnapshotMadeleine = Madeleine::Clock::ClockedSnapshotMadeleine

data/libraries/madeleine/files.rb

@@ -0,0 +1,19 @@
+#
+# Wrapper for Ruby's file services, replaced during testing
+# so we can run tests without touching a real filesystem.
+#
+
+class FileService
+
+  def open(*args)
+    super(*args)
+  end
+
+  def exist?(name)
+    File.exist?(name)
+  end
+
+  def dir_entries(name)
+    Dir.entries(name)
+  end
+end

data/libraries/madeleine/zmarshal.rb

@@ -0,0 +1,60 @@
+#
+# Author::    Anders Bengtsson <ndrsbngtssn@yahoo.se>
+# Copyright:: Copyright (c) 2004
+#
+
+require 'zlib'
+
+module Madeleine
+  #
+  # Snapshot marshaller for compressed snapshots.
+  #
+  # Compresses the snapshots created by another marshaller. Uses either
+  # Marshal (the default) or another supplied marshaller.
+  #
+  # Uses <tt>zlib</tt> to do on-the-fly compression/decompression.
+  #
+  # ZMarshal works with Ruby's own Marshal and YAML, but not with SOAP
+  # marshalling.
+  #
+  # Usage:
+  #
+  #  require 'madeleine'
+  #  require 'madeleine/zmarshal'
+  #
+  #  marshaller = Madeleine::ZMarshal.new(YAML)
+  #  madeleine = SnapshotMadeleine.new("my_example_storage", marshaller) {
+  #    SomeExampleApplication.new()
+  #  }
+  #
+  class ZMarshal
+
+    def initialize(marshaller=Marshal)
+      @marshaller = marshaller
+    end
+
+    def load(stream)
+      zstream = Zlib::GzipReader.new(stream)
+      begin
+        # Buffer into a string first, since GzipReader can't handle
+        # Marshal's 0-sized reads and SOAP can't handle streams at all.
+        # In a bright future we can revert to reading directly from the
+        # stream again.
+        buffer = zstream.read
+        return @marshaller.load(buffer)
+      ensure
+        zstream.finish
+      end
+    end
+
+    def dump(system, stream)
+      zstream = Zlib::GzipWriter.new(stream)
+      begin
+        @marshaller.dump(system, zstream)
+      ensure
+        zstream.finish
+      end
+      nil
+    end
+  end
+end

data/libraries/madeleine_service.rb

@@ -1,5 +1,6 @@
-require 'madeleine/automatic'
 require 'madeleine'
+require 'madeleine/automatic'
+require 'madeleine/zmarshal'
 require 'singleton'
 require 'yaml'
 
@@ -17,40 +18,38 @@ class MadeleineService
       @@storage_path = storage_path
     end
 
-    def clean_storage
-      MadeleineServer.clean_storage(self)
-    end
-
     def instance
       @system = MadeleineServer.new(self).system if @system.nil?
       @system
     end
     
     def restart
-      clean_storage
+      MadeleineServer.clean_storage(self)
       @system = MadeleineServer.new(self).system
     end
   end
 end
 
 class MadeleineServer
-  SNAPSHOT_INTERVAL   = 60 * 60 * 24 # seconds * minutes * hours => Each day
+  SNAPSHOT_INTERVAL   = 30  * 60 * 24 # Each day
   AUTOMATIC_SNAPSHOTS = true
 
   # Clears all the command_log and snapshot files located in the storage directory, so the
-  # database is essentially dropped and recreated as blank
+  # database is essentially dropped and recreated as blank. Used in tests.
   def self.clean_storage(service)
-    begin 
-      Dir.foreach(service.storage_path) do |file|
-        File.delete(service.storage_path + File::SEPARATOR + file) if file =~ /(command_log|snapshot)$/
-      end
-    rescue
-      Dir.mkdir(service.storage_path)
+    require 'fileutils'
+    if (File.directory?(service.storage_path))
+      FileUtils.rm_rf(Dir[service.storage_path + '/*.command_log'])
+      FileUtils.rm_rf(Dir[service.storage_path + '/*.snapshot'])
+    else
+      FileUtils.mkdir_p(service.storage_path)
     end
   end
 
   def initialize(service)
-    @server = Madeleine::Automatic::AutomaticSnapshotMadeleine.new(service.storage_path) { service.new }
+    marshaller = Madeleine::ZMarshal.new()
+    @server = Madeleine::Automatic::AutomaticSnapshotMadeleine.new(service.storage_path, 
+        marshaller) { service.new }
     start_snapshot_thread if AUTOMATIC_SNAPSHOTS
   end
 

data/libraries/rdocsupport.rb

@@ -1,156 +1,156 @@
-begin
-  require "rdoc/markup/simple_markup"
-  require 'rdoc/markup/simple_markup/to_html'
-rescue LoadError
-  # use old version if available
-  require 'markup/simple_markup'
-  require 'markup/simple_markup/to_html'
-end
-
-module RDocSupport
-
-# A simple +rdoc+ markup class which recognizes some additional
-# formatting commands suitable for Wiki use.
-class RDocMarkup < SM::SimpleMarkup
-  def initialize
-    super()
-
-    pre = '(?:\\s|^|\\\\)'
-
-    # links of the form
-    # [[<url> description with spaces]]
-    add_special(/((\\)?\[\[\S+?\s+.+?\]\])/,:TIDYLINK)
-
-    # and external references
-    add_special(/((\\)?(link:|anchor:|http:|mailto:|ftp:|img:|www\.)\S+\w\/?)/,
-                :HYPERLINK)
-
-    # <br/>
-    add_special(%r{(#{pre}<br/>)}, :BR)
-
-    # and <center> ... </center>
-    add_html("center", :CENTER)
-  end
-
-  def convert(text, handler)
-        #$stderr.puts text.inspect
-    res = super
-    res.sub!(/^<p>\n/, '')
-    res.sub!(/<\/p>$/, '')
-    res
-  end
-end
-
-# Handle special hyperlinking requirments for RDoc formatted
-# entries. Requires RDoc
-
-class HyperLinkHtml < SM::ToHtml
-
-  # Initialize the HyperLinkHtml object.
-  # [path] location of the node
-  # [site] object representing the whole site (typically of class
-  #             +Site+)
-  def initialize
-    super()
-    add_tag(:CENTER, "<center>", "</center>")
-  end
-
-  # handle <br/>
-  def handle_special_BR(special)
-    return "&lt;br/&gt" if special.text[0,1] == '\\'
-    special.text
-  end
-
-  # We're invoked with a potential external hyperlink.
-  # [mailto:]   just gets inserted.
-  # [http:]     links are checked to see if they
-  #             reference an image. If so, that image gets inserted
-  #             using an <img> tag. Otherwise a conventional <a href>
-  #             is used.
-  # [img:] insert a <tt><img></tt> tag
-  # [link:] used to insert arbitrary <tt><a></tt> references
-  # [anchor:] used to create an anchor
-  def handle_special_HYPERLINK(special)
-      text = special.text.strip
-      return text[1..-1] if text[0,1] == '\\'
-      url = special.text.strip
-      if url =~ /([A-Za-z]+):(.*)/
-        type = $1
-        path = $2
-      else
-        type = "http"
-        path = url
-        url  = "http://#{url}"
-      end
-
-      case type 
-      when "http"
-        if url =~ /\.(gif|png|jpg|jpeg|bmp)$/
-          "<img src=\"#{url}\"/>"
-        else
-          "<a href=\"#{url}\">#{url.sub(%r{^\w+:/*}, '')}</a>"
-        end
-      when "img"
-        "<img src=\"#{path}\"/>"
-      when "link"
-        "<a href=\"#{path}\">#{path}</a>"
-      when "anchor"
-        "<a name=\"#{path}\"></a>"
-      else
-        "<a href=\"#{url}\">#{url.sub(%r{^\w+:/*}, '')}</a>"
-      end
-    end
-
-    # Here's a hyperlink where the label is different to the URL
-    #  [[url label that may contain spaces]]
-    #
-
-    def handle_special_TIDYLINK(special)
-      text = special.text.strip
-      return text[1..-1] if text[0,1] == '\\'
-      unless text =~ /\[\[(\S+?)\s+(.+?)\]\]/
-        return text
-      end
-      url   = $1
-      label = $2
-      label = RDocFormatter.new(label).to_html
-      label = label.split.select{|x| x =~ /\S/}.
-        map{|x| x.chomp}.join(' ')
-
-      case url
-      when /link:(\S+)/
-        return %{<a href="#{$1}">#{label}</a>}
-      when /img:(\S+)/
-        return %{<img src="http://#{$1}" alt="#{label}" />}
-      when /rubytalk:(\S+)/
-        return %{<a href="http://ruby-talk.org/blade/#{$1}">#{label}</a>}
-      when /rubygarden:(\S+)/
-        return %{<a href="http://www.rubygarden.org/ruby?#{$1}">#{label}</a>}
-      when /c2:(\S+)/
-        return %{<a href="http://c2.com/cgi/wiki?#{$1}">#{label}</a>}
-      when /isbn:(\S+)/
-        return %{<a href="http://search.barnesandnoble.com/bookSearch/} +
-          %{isbnInquiry.asp?isbn=#{$1}">#{label}</a>}
-      end
-
-      unless url =~ /\w+?:/
-        url = "http://#{url}"
-      end
-
-      "<a href=\"#{url}\">#{label}</a>"
-    end
-end
-
-class RDocFormatter
-  def initialize(text)
-    @text = text
-  end
-
-  def to_html
-    markup = RDocMarkup.new
-    h = HyperLinkHtml.new
-    markup.convert(@text, h)
-  end
-end
-
+begin
+  require "rdoc/markup/simple_markup"
+  require 'rdoc/markup/simple_markup/to_html'
+rescue LoadError
+  # use old version if available
+  require 'markup/simple_markup'
+  require 'markup/simple_markup/to_html'
+end
+
+module RDocSupport
+
+# A simple +rdoc+ markup class which recognizes some additional
+# formatting commands suitable for Wiki use.
+class RDocMarkup < SM::SimpleMarkup
+  def initialize
+    super()
+
+    pre = '(?:\\s|^|\\\\)'
+
+    # links of the form
+    # [[<url> description with spaces]]
+    add_special(/((\\)?\[\[\S+?\s+.+?\]\])/,:TIDYLINK)
+
+    # and external references
+    add_special(/((\\)?(link:|anchor:|http:|mailto:|ftp:|img:|www\.)\S+\w\/?)/,
+                :HYPERLINK)
+
+    # <br/>
+    add_special(%r{(#{pre}<br/>)}, :BR)
+
+    # and <center> ... </center>
+    add_html("center", :CENTER)
+  end
+
+  def convert(text, handler)
+        #$stderr.puts text.inspect
+    res = super
+    res.sub!(/^<p>\n/, '')
+    res.sub!(/<\/p>$/, '')
+    res
+  end
+end
+
+# Handle special hyperlinking requirments for RDoc formatted
+# entries. Requires RDoc
+
+class HyperLinkHtml < SM::ToHtml
+
+  # Initialize the HyperLinkHtml object.
+  # [path] location of the node
+  # [site] object representing the whole site (typically of class
+  #             +Site+)
+  def initialize
+    super()
+    add_tag(:CENTER, "<center>", "</center>")
+  end
+
+  # handle <br/>
+  def handle_special_BR(special)
+    return "&lt;br/&gt" if special.text[0,1] == '\\'
+    special.text
+  end
+
+  # We're invoked with a potential external hyperlink.
+  # [mailto:]   just gets inserted.
+  # [http:]     links are checked to see if they
+  #             reference an image. If so, that image gets inserted
+  #             using an <img> tag. Otherwise a conventional <a href>
+  #             is used.
+  # [img:] insert a <tt><img></tt> tag
+  # [link:] used to insert arbitrary <tt><a></tt> references
+  # [anchor:] used to create an anchor
+  def handle_special_HYPERLINK(special)
+      text = special.text.strip
+      return text[1..-1] if text[0,1] == '\\'
+      url = special.text.strip
+      if url =~ /([A-Za-z]+):(.*)/
+        type = $1
+        path = $2
+      else
+        type = "http"
+        path = url
+        url  = "http://#{url}"
+      end
+
+      case type 
+      when "http"
+        if url =~ /\.(gif|png|jpg|jpeg|bmp)$/
+          "<img src=\"#{url}\"/>"
+        else
+          "<a href=\"#{url}\">#{url.sub(%r{^\w+:/*}, '')}</a>"
+        end
+      when "img"
+        "<img src=\"#{path}\"/>"
+      when "link"
+        "<a href=\"#{path}\">#{path}</a>"
+      when "anchor"
+        "<a name=\"#{path}\"></a>"
+      else
+        "<a href=\"#{url}\">#{url.sub(%r{^\w+:/*}, '')}</a>"
+      end
+    end
+
+    # Here's a hyperlink where the label is different to the URL
+    #  [[url label that may contain spaces]]
+    #
+
+    def handle_special_TIDYLINK(special)
+      text = special.text.strip
+      return text[1..-1] if text[0,1] == '\\'
+      unless text =~ /\[\[(\S+?)\s+(.+?)\]\]/
+        return text
+      end
+      url   = $1
+      label = $2
+      label = RDocFormatter.new(label).to_html
+      label = label.split.select{|x| x =~ /\S/}.
+        map{|x| x.chomp}.join(' ')
+
+      case url
+      when /link:(\S+)/
+        return %{<a href="#{$1}">#{label}</a>}
+      when /img:(\S+)/
+        return %{<img src="http://#{$1}" alt="#{label}" />}
+      when /rubytalk:(\S+)/
+        return %{<a href="http://ruby-talk.org/blade/#{$1}">#{label}</a>}
+      when /rubygarden:(\S+)/
+        return %{<a href="http://www.rubygarden.org/ruby?#{$1}">#{label}</a>}
+      when /c2:(\S+)/
+        return %{<a href="http://c2.com/cgi/wiki?#{$1}">#{label}</a>}
+      when /isbn:(\S+)/
+        return %{<a href="http://search.barnesandnoble.com/bookSearch/} +
+          %{isbnInquiry.asp?isbn=#{$1}">#{label}</a>}
+      end
+
+      unless url =~ /\w+?:/
+        url = "http://#{url}"
+      end
+
+      "<a href=\"#{url}\">#{label}</a>"
+    end
+end
+
+class RDocFormatter
+  def initialize(text)
+    @text = text
+  end
+
+  def to_html
+    markup = RDocMarkup.new
+    h = HyperLinkHtml.new
+    markup.convert(@text, h)
+  end
+end
+
 end