pdf-labels 1.0.0 → 1.0.1

data/History.txt

@@ -6,3 +6,6 @@
 
 * PDFLabels library packed for Ruport and general consumption
 
+== 1.0.1 / 2007-10-17
+
+* PDFLabels xml-mapping package is wrong in the vendor directory

data/Manifest.txt

@@ -1,8 +1,5 @@
 History.txt
-LICENCE
-Manifest.txt
-README.txt
-Rakefile
+lib
 lib/alias.rb
 lib/glabel_template.rb
 lib/label.rb
@@ -12,6 +9,11 @@ lib/markup.rb
 lib/pdf_label_page.rb
 lib/pdf_labels.rb
 lib/template.rb
+LICENCE
+Manifest.txt
+Rakefile
+README.txt
+templates
 templates/avery-iso-templates.xml
 templates/avery-other-templates.xml
 templates/avery-us-templates.xml
@@ -21,30 +23,39 @@ templates/misc-other-templates.xml
 templates/misc-us-templates.xml
 templates/paper-sizes.xml
 templates/zweckform-iso-templates.xml
+test
 test/test_pdf_label_page.rb
-vendor/color.rb
+vendor
+vendor/color
 vendor/color/cmyk.rb
 vendor/color/css.rb
 vendor/color/grayscale.rb
 vendor/color/hsl.rb
-vendor/color/palette.rb
+vendor/color/palette
 vendor/color/palette/gimp.rb
 vendor/color/palette/monocontrast.rb
+vendor/color/palette.rb
+vendor/color/rgb
+vendor/color/rgb/metallic.rb
 vendor/color/rgb-colors.rb
 vendor/color/rgb.rb
-vendor/color/rgb/metallic.rb
 vendor/color/yiq.rb
-vendor/pdf/charts.rb
+vendor/color.rb
+vendor/pdf
+vendor/pdf/charts
 vendor/pdf/charts/stddev.rb
+vendor/pdf/charts.rb
+vendor/pdf/fonts
 vendor/pdf/grid.rb
 vendor/pdf/math.rb
 vendor/pdf/pagenumbers.rb
 vendor/pdf/quickref.rb
 vendor/pdf/simpletable.rb
 vendor/pdf/techbook.rb
-vendor/pdf/writer.rb
+vendor/pdf/writer
 vendor/pdf/writer/arc4.rb
 vendor/pdf/writer/fontmetrics.rb
+vendor/pdf/writer/fonts
 vendor/pdf/writer/fonts/Courier-Bold.afm
 vendor/pdf/writer/fonts/Courier-BoldOblique.afm
 vendor/pdf/writer/fonts/Courier-Oblique.afm
@@ -59,11 +70,13 @@ vendor/pdf/writer/fonts/Times-BoldItalic.afm
 vendor/pdf/writer/fonts/Times-Italic.afm
 vendor/pdf/writer/fonts/Times-Roman.afm
 vendor/pdf/writer/fonts/ZapfDingbats.afm
-vendor/pdf/writer/graphics.rb
+vendor/pdf/writer/graphics
 vendor/pdf/writer/graphics/imageinfo.rb
-vendor/pdf/writer/lang.rb
+vendor/pdf/writer/graphics.rb
+vendor/pdf/writer/lang
 vendor/pdf/writer/lang/en.rb
-vendor/pdf/writer/object.rb
+vendor/pdf/writer/lang.rb
+vendor/pdf/writer/object
 vendor/pdf/writer/object/action.rb
 vendor/pdf/writer/object/annotation.rb
 vendor/pdf/writer/object/catalog.rb
@@ -81,61 +94,25 @@ vendor/pdf/writer/object/page.rb
 vendor/pdf/writer/object/pages.rb
 vendor/pdf/writer/object/procset.rb
 vendor/pdf/writer/object/viewerpreferences.rb
+vendor/pdf/writer/object.rb
 vendor/pdf/writer/ohash.rb
 vendor/pdf/writer/oreader.rb
 vendor/pdf/writer/state.rb
 vendor/pdf/writer/strokestyle.rb
-vendor/transaction/simple.rb
+vendor/pdf/writer.rb
+vendor/transaction
+vendor/transaction/simple
 vendor/transaction/simple/group.rb
-vendor/transaction/simple/threadsafe.rb
+vendor/transaction/simple/threadsafe
 vendor/transaction/simple/threadsafe/group.rb
-vendor/xml-mapping/ChangeLog
-vendor/xml-mapping/LICENSE
-vendor/xml-mapping/README
-vendor/xml-mapping/README_XPATH
-vendor/xml-mapping/Rakefile
-vendor/xml-mapping/TODO.txt
-vendor/xml-mapping/doc/xpath_impl_notes.txt
-vendor/xml-mapping/examples/company.rb
-vendor/xml-mapping/examples/company.xml
-vendor/xml-mapping/examples/company_usage.intin.rb
-vendor/xml-mapping/examples/company_usage.intout
-vendor/xml-mapping/examples/order.rb
-vendor/xml-mapping/examples/order.xml
-vendor/xml-mapping/examples/order_signature_enhanced.rb
-vendor/xml-mapping/examples/order_signature_enhanced.xml
-vendor/xml-mapping/examples/order_signature_enhanced_usage.intin.rb
-vendor/xml-mapping/examples/order_signature_enhanced_usage.intout
-vendor/xml-mapping/examples/order_usage.intin.rb
-vendor/xml-mapping/examples/order_usage.intout
-vendor/xml-mapping/examples/time_augm.intin.rb
-vendor/xml-mapping/examples/time_augm.intout
-vendor/xml-mapping/examples/time_node.rb
-vendor/xml-mapping/examples/xpath_create_new.intin.rb
-vendor/xml-mapping/examples/xpath_create_new.intout
-vendor/xml-mapping/examples/xpath_docvsroot.intin.rb
-vendor/xml-mapping/examples/xpath_docvsroot.intout
-vendor/xml-mapping/examples/xpath_ensure_created.intin.rb
-vendor/xml-mapping/examples/xpath_ensure_created.intout
-vendor/xml-mapping/examples/xpath_pathological.intin.rb
-vendor/xml-mapping/examples/xpath_pathological.intout
-vendor/xml-mapping/examples/xpath_usage.intin.rb
-vendor/xml-mapping/examples/xpath_usage.intout
-vendor/xml-mapping/install.rb
-vendor/xml-mapping/lib/xml/mapping.rb
-vendor/xml-mapping/lib/xml/mapping/base.rb
-vendor/xml-mapping/lib/xml/mapping/standard_nodes.rb
-vendor/xml-mapping/lib/xml/mapping/version.rb
-vendor/xml-mapping/lib/xml/xxpath.rb
-vendor/xml-mapping/test/all_tests.rb
-vendor/xml-mapping/test/company.rb
-vendor/xml-mapping/test/documents_folders.rb
-vendor/xml-mapping/test/fixtures/bookmarks1.xml
-vendor/xml-mapping/test/fixtures/company1.xml
-vendor/xml-mapping/test/fixtures/documents_folders.xml
-vendor/xml-mapping/test/fixtures/documents_folders2.xml
-vendor/xml-mapping/test/multiple_mappings.rb
-vendor/xml-mapping/test/tests_init.rb
-vendor/xml-mapping/test/xml_mapping_adv_test.rb
-vendor/xml-mapping/test/xml_mapping_test.rb
-vendor/xml-mapping/test/xpath_test.rb
+vendor/transaction/simple/threadsafe.rb
+vendor/transaction/simple.rb
+vendor/xml
+vendor/xml/LICENSE
+vendor/xml/mapping
+vendor/xml/mapping/base.rb
+vendor/xml/mapping/standard_nodes.rb
+vendor/xml/mapping/version.rb
+vendor/xml/mapping.rb
+vendor/xml/xxpath.rb
+vendor/xml/README

data/README.txt

@@ -1,6 +1,7 @@
-PdfLabels
-    by Rob Kaufman
-    http://www.lightning-tree.net
+= PdfLabels
+
+* by Rob Kaufman - http://www.lightning-tree.net
+* http://rubyforge.org/projects/pdf-labels/
 
 == DESCRIPTION:
   

data/lib/pdf_labels.rb

@@ -1,6 +1,3 @@
-#This file just adds the lib directory below it into the load path and 
-#loads up all the classes in lib via require
-
 class Pdflabels
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/test/test_pdf_label_page.rb

@@ -3,7 +3,7 @@ require 'test/unit'
 require 'pdf_label_page'
 
 class TestPDFLabelPage < Test::Unit::TestCase
-
+  ROOT = File.expand_path(File.dirname(__FILE__) + "/../")
   def setup
   end
 
@@ -35,13 +35,13 @@ class TestPDFLabelPage < Test::Unit::TestCase
   #TODO other options are possible for pdf_options, we need to test those at some point
   
   def test_PDFLabelPage_load_tempalte_set
-    PDFLabelPage.load_template_set(File.expand_path(File.dirname(__FILE__) + "/../templates/avery-iso-templates.xml"))
+    PDFLabelPage.load_template_set("#{ROOT}/templates/avery-iso-templates.xml")
      #Avery   7160 is found in avery-iso-templates
      p = PDFLabelPage.new("Avery   7160")
      assert p
      assert_equal p.pdf.page_width, 595.28
      assert_equal p.pdf.page_height, 841.89
-     PDFLabelPage.load_template_set(File.expand_path(File.dirname(__FILE__) + "/../templates/avery-us-templates.xml"))
+     PDFLabelPage.load_template_set("#{ROOT}/templates/avery-us-templates.xml")
    end
    
    def test_PDFLabelPage_all_template_names
@@ -71,7 +71,7 @@ class TestPDFLabelPage < Test::Unit::TestCase
     p.add_label(:position => 8, :text => "This was added last and has a BIG font", :font_size => 18)
     p.draw_boxes(false, true)
     #TODO Anybody out there think of a better way to test this?
-    p.save_as("../test_add_label_output.pdf")
+    p.save_as("#{ROOT}/test_add_label_output.pdf")
   end
   
   def test_add_many_labels
@@ -79,13 +79,13 @@ class TestPDFLabelPage < Test::Unit::TestCase
     #without positoin, so start at 1
     p.add_many_labels(:text => "Hello Five Times!", :count => 5)
     p.add_many_labels(:text => "Hellow four more times, starting at 15", :count => 4, :position => 15)
-    p.save_as("../test_add_many_label_output.pdf")
+    p.save_as("#{ROOT}/test_add_many_label_output.pdf")
   end
   
   def test_draw_boxes
     p = PDFLabelPage.new("Avery  5366") # label is 2 x 10
     p.draw_boxes
-    p.save_as("../test_draw_boxes_output.pdf")
+    p.save_as("#{ROOT}/test_draw_boxes_output.pdf")
   end
  
 end

data/vendor/transaction/simple.rb

@@ -1,693 +1,486 @@
 # :title: Transaction::Simple -- Active Object Transaction Support for Ruby
-# :main: Transaction::Simple
-#
-# == Licence
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
+# :main: Readme.txt
+
 #--
 # Transaction::Simple
-#   Simple object transaction support for Ruby
-#   Version 1.3.0
+# Simple object transaction support for Ruby
+# http://rubyforge.org/projects/trans-simple/
+#   Version 1.4.0
+#
+# Licensed under a MIT-style licence. See Licence.txt in the main
+# distribution for full licensing information.
 #
-# Copyright (c) 2003 - 2005 Austin Ziegler
+# Copyright (c) 2003 - 2007 Austin Ziegler
 #
-# $Id: simple.rb,v 1.5 2005/05/05 16:16:49 austin Exp $
+# $Id: simple.rb 50 2007-02-03 20:26:19Z austin $
 #++
-  # The "Transaction" namespace can be used for additional transaction
-  # support objects and modules.
+
+# The "Transaction" namespace can be used for additional transaction support
+# objects and modules.
 module Transaction
-    # A standard exception for transaction errors.
+  # A standard exception for transaction errors.
   class TransactionError < StandardError; end
-    # The TransactionAborted exception is used to indicate when a
-    # transaction has been aborted in the block form.
+  # The TransactionAborted exception is used to indicate when a transaction
+  # has been aborted in the block form.
   class TransactionAborted < Exception; end
-    # The TransactionCommitted exception is used to indicate when a
-    # transaction has been committed in the block form.
+  # The TransactionCommitted exception is used to indicate when a
+  # transaction has been committed in the block form.
   class TransactionCommitted < Exception; end
 
   te = "Transaction Error: %s"
 
-  Messages = {
-    :bad_debug_object =>
-      te % "the transaction debug object must respond to #<<.",
-    :unique_names =>
-      te % "named transactions must be unique.",
-    :no_transaction_open =>
-      te % "no transaction open.",
-    :cannot_rewind_no_transaction =>
-      te % "cannot rewind; there is no current transaction.",
-    :cannot_rewind_named_transaction =>
-      te % "cannot rewind to transaction %s because it does not exist.",
-    :cannot_rewind_transaction_before_block =>
-      te % "cannot rewind a transaction started before the execution block.",
-    :cannot_abort_no_transaction =>
-      te % "cannot abort; there is no current transaction.",
-    :cannot_abort_transaction_before_block =>
-      te % "cannot abort a transaction started before the execution block.",
-    :cannot_abort_named_transaction =>
-      te % "cannot abort nonexistant transaction %s.",
-    :cannot_commit_no_transaction =>
-      te % "cannot commit; there is no current transaction.",
-    :cannot_commit_transaction_before_block =>
-      te % "cannot commit a transaction started before the execution block.",
-    :cannot_commit_named_transaction =>
-      te % "cannot commit nonexistant transaction %s.",
-    :cannot_start_empty_block_transaction =>
-      te % "cannot start a block transaction with no objects.",
-    :cannot_obtain_transaction_lock =>
-      te % "cannot obtain transaction lock for #%s.",
+  Messages = { #:nodoc:
+    :bad_debug_object => te % "the transaction debug object must respond to #<<.",
+    :unique_names => te % "named transactions must be unique.",
+    :no_transaction_open => te % "no transaction open.",
+    :cannot_rewind_no_transaction => te % "cannot rewind; there is no current transaction.",
+    :cannot_rewind_named_transaction => te % "cannot rewind to transaction %s because it does not exist.",
+    :cannot_rewind_transaction_before_block => te % "cannot rewind a transaction started before the execution block.",
+    :cannot_abort_no_transaction => te % "cannot abort; there is no current transaction.",
+    :cannot_abort_transaction_before_block => te % "cannot abort a transaction started before the execution block.",
+    :cannot_abort_named_transaction => te % "cannot abort nonexistant transaction %s.",
+    :cannot_commit_no_transaction => te % "cannot commit; there is no current transaction.",
+    :cannot_commit_transaction_before_block => te % "cannot commit a transaction started before the execution block.",
+    :cannot_commit_named_transaction => te % "cannot commit nonexistant transaction %s.",
+    :cannot_start_empty_block_transaction => te % "cannot start a block transaction with no objects.",
+    :cannot_obtain_transaction_lock => te % "cannot obtain transaction lock for #%s.",
   }
+end
+
+# = Transaction::Simple for Ruby
+# Simple object transaction support for Ruby
+module Transaction::Simple
+  TRANSACTION_SIMPLE_VERSION = '1.4.0'
 
-    # = Transaction::Simple for Ruby
-    # Simple object transaction support for Ruby
-    #
-    # == Introduction
-    # Transaction::Simple provides a generic way to add active transaction
-    # support to objects. The transaction methods added by this module will
-    # work with most objects, excluding those that cannot be
-    # <i>Marshal</i>ed (bindings, procedure objects, IO instances, or
-    # singleton objects).
-    #
-    # The transactions supported by Transaction::Simple are not backed
-    # transactions; they are not associated with any sort of data store.
-    # They are "live" transactions occurring in memory and in the object
-    # itself. This is to allow "test" changes to be made to an object
-    # before making the changes permanent.
-    #
-    # Transaction::Simple can handle an "infinite" number of transaction
-    # levels (limited only by memory). If I open two transactions, commit
-    # the second, but abort the first, the object will revert to the
-    # original version.
-    # 
-    # Transaction::Simple supports "named" transactions, so that multiple
-    # levels of transactions can be committed, aborted, or rewound by
-    # referring to the appropriate name of the transaction. Names may be any
-    # object *except* +nil+. As with Hash keys, String names will be
-    # duplicated and frozen before using.
-    #
-    # Copyright::   Copyright � 2003 - 2005 by Austin Ziegler
-    # Version::     1.3.0
-    # Licence::     MIT-Style
-    #
-    # Thanks to David Black for help with the initial concept that led to
-    # this library.
-    #
-    # == Usage
-    #   include 'transaction/simple'
-    #
-    #   v = "Hello, you."               # -> "Hello, you."
-    #   v.extend(Transaction::Simple)   # -> "Hello, you."
-    #
-    #   v.start_transaction             # -> ... (a Marshal string)
-    #   v.transaction_open?             # -> true
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #
-    #   v.rewind_transaction            # -> "Hello, you."
-    #   v.transaction_open?             # -> true
-    #
-    #   v.gsub!(/you/, "HAL")           # -> "Hello, HAL."
-    #   v.abort_transaction             # -> "Hello, you."
-    #   v.transaction_open?             # -> false
-    #
-    #   v.start_transaction             # -> ... (a Marshal string)
-    #   v.start_transaction             # -> ... (a Marshal string)
-    #
-    #   v.transaction_open?             # -> true
-    #   v.gsub!(/you/, "HAL")           # -> "Hello, HAL."
-    #
-    #   v.commit_transaction            # -> "Hello, HAL."
-    #   v.transaction_open?             # -> true
-    #   v.abort_transaction             # -> "Hello, you."
-    #   v.transaction_open?             # -> false
-    #
-    # == Named Transaction Usage
-    #   v = "Hello, you."               # -> "Hello, you."
-    #   v.extend(Transaction::Simple)   # -> "Hello, you."
-    #   
-    #   v.start_transaction(:first)     # -> ... (a Marshal string)
-    #   v.transaction_open?             # -> true
-    #   v.transaction_open?(:first)     # -> true
-    #   v.transaction_open?(:second)    # -> false
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   v.rewind_transaction(:first)    # -> "Hello, you."
-    #   v.transaction_open?             # -> true
-    #   v.transaction_open?(:first)     # -> true
-    #   v.transaction_open?(:second)    # -> false
-    #   
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   v.transaction_name              # -> :second
-    #   v.abort_transaction(:first)     # -> "Hello, you."
-    #   v.transaction_open?             # -> false
-    #   
-    #   v.start_transaction(:first)     # -> ... (a Marshal string)
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   
-    #   v.commit_transaction(:first)    # -> "Hello, HAL."
-    #   v.transaction_open?             # -> false
-    #
-    # == Block Usage
-    #   v = "Hello, you."               # -> "Hello, you."
-    #   Transaction::Simple.start(v) do |tv|
-    #       # v has been extended with Transaction::Simple and an unnamed
-    #       # transaction has been started.
-    #     tv.transaction_open?          # -> true
-    #     tv.gsub!(/you/, "world")      # -> "Hello, world."
-    #
-    #     tv.rewind_transaction         # -> "Hello, you."
-    #     tv.transaction_open?          # -> true
-    #
-    #     tv.gsub!(/you/, "HAL")        # -> "Hello, HAL."
-    #       # The following breaks out of the transaction block after
-    #       # aborting the transaction.
-    #     tv.abort_transaction          # -> "Hello, you."
-    #   end
-    #     # v still has Transaction::Simple applied from here on out.
-    #   v.transaction_open?             # -> false
-    #
-    #   Transaction::Simple.start(v) do |tv|
-    #     tv.start_transaction          # -> ... (a Marshal string)
-    #
-    #     tv.transaction_open?          # -> true
-    #     tv.gsub!(/you/, "HAL")        # -> "Hello, HAL."
-    #
-    #       # If #commit_transaction were called without having started a
-    #       # second transaction, then it would break out of the transaction
-    #       # block after committing the transaction.
-    #     tv.commit_transaction         # -> "Hello, HAL."
-    #     tv.transaction_open?          # -> true
-    #     tv.abort_transaction          # -> "Hello, you."
-    #   end
-    #   v.transaction_open?             # -> false
-    #
-    # == Named Transaction Usage
-    #   v = "Hello, you."               # -> "Hello, you."
-    #   v.extend(Transaction::Simple)   # -> "Hello, you."
-    #   
-    #   v.start_transaction(:first)     # -> ... (a Marshal string)
-    #   v.transaction_open?             # -> true
-    #   v.transaction_open?(:first)     # -> true
-    #   v.transaction_open?(:second)    # -> false
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   v.rewind_transaction(:first)    # -> "Hello, you."
-    #   v.transaction_open?             # -> true
-    #   v.transaction_open?(:first)     # -> true
-    #   v.transaction_open?(:second)    # -> false
-    #   
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   v.transaction_name              # -> :second
-    #   v.abort_transaction(:first)     # -> "Hello, you."
-    #   v.transaction_open?             # -> false
-    #   
-    #   v.start_transaction(:first)     # -> ... (a Marshal string)
-    #   v.gsub!(/you/, "world")         # -> "Hello, world."
-    #   v.start_transaction(:second)    # -> ... (a Marshal string)
-    #   v.gsub!(/world/, "HAL")         # -> "Hello, HAL."
-    #   
-    #   v.commit_transaction(:first)    # -> "Hello, HAL."
-    #   v.transaction_open?             # -> false
-    #
-    # == Thread Safety
-    # Threadsafe version of Transaction::Simple and
-    # Transaction::Simple::Group exist; these are loaded from
-    # 'transaction/simple/threadsafe' and
-    # 'transaction/simple/threadsafe/group', respectively, and are
-    # represented in Ruby code as Transaction::Simple::ThreadSafe and
-    # Transaction::Simple::ThreadSafe::Group, respectively.
-    #
-    # == Contraindications
-    # While Transaction::Simple is very useful, it has some severe
-    # limitations that must be understood. Transaction::Simple:
-    #
-    # * uses Marshal. Thus, any object which cannot be <i>Marshal</i>ed
-    #   cannot use Transaction::Simple. In my experience, this affects
-    #   singleton objects more often than any other object. It may be that
-    #   Ruby 2.0 will solve this problem.
-    # * does not manage resources. Resources external to the object and its
-    #   instance variables are not managed at all. However, all instance
-    #   variables and objects "belonging" to those instance variables are
-    #   managed. If there are object reference counts to be handled,
-    #   Transaction::Simple will probably cause problems.
-    # * is not inherently thread-safe. In the ACID ("atomic, consistent,
-    #   isolated, durable") test, Transaction::Simple provides CD, but it is
-    #   up to the user of Transaction::Simple to provide isolation and
-    #   atomicity. Transactions should be considered "critical sections" in
-    #   multi-threaded applications. If thread safety and atomicity is
-    #   absolutely required, use Transaction::Simple::ThreadSafe, which uses
-    #   a Mutex object to synchronize the accesses on the object during the
-    #   transaction operations.
-    # * does not necessarily maintain Object#__id__ values on rewind or
-    #   abort. This may change for future versions that will be Ruby 1.8 or
-    #   better *only*. Certain objects that support #replace will maintain
-    #   Object#__id__.
-    # * Can be a memory hog if you use many levels of transactions on many
-    #   objects.
-    #
-  module Simple
-    TRANSACTION_SIMPLE_VERSION = '1.3.0'
-
-      # Sets the Transaction::Simple debug object. It must respond to #<<.
-      # Sets the transaction debug object. Debugging will be performed
-      # automatically if there's a debug object. The generic transaction
-      # error class.
-    def self.debug_io=(io)
+  class << self
+    # Sets the Transaction::Simple debug object. It must respond to #<<.
+    # Debugging will be performed automatically if there's a debug object.
+    def debug_io=(io)
       if io.nil?
         @tdi        = nil
         @debugging  = false
       else
-        unless io.respond_to?(:<<)
-          raise TransactionError, Messages[:bad_debug_object]
-        end
+        raise Transaction::TransactionError, Transaction::Messages[:bad_debug_object] unless io.respond_to?(:<<)
         @tdi = io
         @debugging = true
       end
     end
 
-      # Returns +true+ if we are debugging.
-    def self.debugging?
-      @debugging
+    # Returns +true+ if we are debugging.
+    def debugging?
+      defined? @debugging and @debugging
     end
 
-      # Returns the Transaction::Simple debug object. It must respond to
-      # #<<.
-    def self.debug_io
+    # Returns the Transaction::Simple debug object. It must respond to #<<.
+    def debug_io
       @tdi ||= ""
       @tdi
     end
+  end
 
-      # If +name+ is +nil+ (default), then returns +true+ if there is
-      # currently a transaction open.
-      #
-      # If +name+ is specified, then returns +true+ if there is currently a
-      # transaction that responds to +name+ open.
-    def transaction_open?(name = nil)
-      if name.nil?
-        if Transaction::Simple.debugging?
-          Transaction::Simple.debug_io << "Transaction " <<
-            "[#{(@__transaction_checkpoint__.nil?) ? 'closed' : 'open'}]\n"
-        end
-        return (not @__transaction_checkpoint__.nil?)
-      else
-        if Transaction::Simple.debugging?
-          Transaction::Simple.debug_io << "Transaction(#{name.inspect}) " <<
-            "[#{(@__transaction_checkpoint__.nil?) ? 'closed' : 'open'}]\n"
-        end
-        return ((not @__transaction_checkpoint__.nil?) and @__transaction_names__.include?(name))
-      end
+  # If +name+ is +nil+ (default), then returns +true+ if there is currently
+  # a transaction open. If +name+ is specified, then returns +true+ if there
+  # is currently a transaction known as +name+ open.
+  def transaction_open?(name = nil)
+    defined? @__transaction_checkpoint__ or @__transaction_checkpoint__ = nil
+    if name.nil?
+      Transaction::Simple.debug_io << "Transaction " << "[#{(@__transaction_checkpoint__.nil?) ? 'closed' : 'open'}]\n" if Transaction::Simple.debugging?
+      return (not @__transaction_checkpoint__.nil?)
+    else
+      Transaction::Simple.debug_io << "Transaction(#{name.inspect}) " << "[#{(@__transaction_checkpoint__.nil?) ? 'closed' : 'open'}]\n" if Transaction::Simple.debugging?
+      return ((not @__transaction_checkpoint__.nil?) and @__transaction_names__.include?(name))
     end
+  end
 
-      # Returns the current name of the transaction. Transactions not
-      # explicitly named are named +nil+.
-    def transaction_name
-      if @__transaction_checkpoint__.nil?
-        raise TransactionError, Messages[:no_transaction_open]
-      end
-      if Transaction::Simple.debugging?
-        Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " <<
-          "Transaction Name: #{@__transaction_names__[-1].inspect}\n"
-      end
-      if @__transaction_names__[-1].kind_of?(String)
-        @__transaction_names__[-1].dup
-      else
-        @__transaction_names__[-1]
-      end
+  # Returns the current name of the transaction. Transactions not explicitly
+  # named are named +nil+.
+  def transaction_name
+    raise Transaction::TransactionError, Transaction::Messages[:no_transaction_open] if @__transaction_checkpoint__.nil?
+    Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " << "Transaction Name: #{@__transaction_names__[-1].inspect}\n" if Transaction::Simple.debugging?
+    if @__transaction_names__[-1].kind_of?(String)
+      @__transaction_names__[-1].dup
+    else
+      @__transaction_names__[-1]
     end
+  end
 
-      # Starts a transaction. Stores the current object state. If a
-      # transaction name is specified, the transaction will be named.
-      # Transaction names must be unique. Transaction names of +nil+ will be
-      # treated as unnamed transactions.
-    def start_transaction(name = nil)
-      @__transaction_level__ ||= 0
-      @__transaction_names__ ||= []
+  # Starts a transaction. Stores the current object state. If a transaction
+  # name is specified, the transaction will be named. Transaction names must
+  # be unique. Transaction names of +nil+ will be treated as unnamed
+  # transactions.
+  def start_transaction(name = nil)
+    @__transaction_level__ ||= 0
+    @__transaction_names__ ||= []
 
-      if name.nil?
-        @__transaction_names__ << nil
-        ss = "" if Transaction::Simple.debugging?
-      else
-        if @__transaction_names__.include?(name)
-          raise TransactionError, Messages[:unique_names]
-        end
-        name = name.dup.freeze if name.kind_of?(String)
-        @__transaction_names__ << name
-        ss = "(#{name.inspect})" if Transaction::Simple.debugging?
-      end
-
-      @__transaction_level__ += 1
+    name = name.dup.freeze if name.kind_of?(String)
 
-      if Transaction::Simple.debugging?
-        Transaction::Simple.debug_io << "#{'>' * @__transaction_level__} " <<
-          "Start Transaction#{ss}\n"
-      end
+    raise Transaction::TransactionError, Transaction::Messages[:unique_names] if name and @__transaction_names__.include?(name)
 
-      @__transaction_checkpoint__ = Marshal.dump(self)
-    end
+    @__transaction_names__ << name
+    @__transaction_level__ += 1
 
-      # Rewinds the transaction. If +name+ is specified, then the
-      # intervening transactions will be aborted and the named transaction
-      # will be rewound. Otherwise, only the current transaction is rewound.
-    def rewind_transaction(name = nil)
-      if @__transaction_checkpoint__.nil?
-        raise TransactionError, Messages[:cannot_rewind_no_transaction]
-      end
+    if Transaction::Simple.debugging?
+      ss = "(#{name.inspect})"
+      ss = "" unless ss
 
-        # Check to see if we are trying to rewind a transaction that is
-        # outside of the current transaction block.
-      if @__transaction_block__ and name
-        nix = @__transaction_names__.index(name) + 1
-        if nix < @__transaction_block__
-          raise TransactionError, Messages[:cannot_rewind_transaction_before_block]
-        end
-      end
+      Transaction::Simple.debug_io << "#{'>' * @__transaction_level__} " << "Start Transaction#{ss}\n"
+    end
 
-      if name.nil?
-        __rewind_this_transaction
-        ss = "" if Transaction::Simple.debugging?
-      else
-        unless @__transaction_names__.include?(name)
-          raise TransactionError, Messages[:cannot_rewind_named_transaction] % name.inspect
-        end
-        ss = "(#{name})" if Transaction::Simple.debugging?
+    @__transaction_checkpoint__ = Marshal.dump(self)
+  end
 
-        while @__transaction_names__[-1] != name
-          @__transaction_checkpoint__ = __rewind_this_transaction
-          if Transaction::Simple.debugging?
-            Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " <<
-              "Rewind Transaction#{ss}\n"
-          end
-          @__transaction_level__ -= 1
-          @__transaction_names__.pop
-        end
-        __rewind_this_transaction
-      end
-      if Transaction::Simple.debugging?
-        Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " <<
-          "Rewind Transaction#{ss}\n"
-      end
-      self
+  # Rewinds the transaction. If +name+ is specified, then the intervening
+  # transactions will be aborted and the named transaction will be rewound.
+  # Otherwise, only the current transaction is rewound.
+  #
+  # After each level of transaction is rewound, if the callback method
+  # #_post_transaction_rewind is defined, it will be called. It is intended
+  # to allow a complex self-referential graph to fix itself. The simplest
+  # way to explain this is with an example.
+  #
+  #   class Child
+  #     attr_accessor :parent
+  #   end
+  #
+  #   class Parent
+  #     include Transaction::Simple
+  #
+  #     attr_reader :children
+  #     def initialize
+  #       @children = []
+  #     end
+  #
+  #     def << child
+  #       child.parent = self
+  #       @children << child
+  #     end
+  #
+  #     def valid?
+  #       @children.all? { |child| child.parent == self }
+  #     end
+  #   end
+  #
+  #   parent = Parent.new
+  #   parent << Child.new
+  #   parent.start_transaction
+  #   parent << Child.new
+  #   parent.abort_transaction
+  #   puts parent.valid? # => false
+  #
+  # This problem can be fixed by modifying the Parent class to include the
+  # #_post_transaction_rewind callback.
+  #
+  #   class Parent
+  #     # Reconnect the restored children to me, instead of to the bogus me
+  #     # that was restored to them by Marshal::load.
+  #     def _post_transaction_rewind
+  #       @children.each { |child| child.parent = self }
+  #     end
+  #   end
+  #
+  #   parent = Parent.new
+  #   parent << Child.new
+  #   parent.start_transaction
+  #   parent << Child.new
+  #   parent.abort_transaction
+  #   puts parent.valid? # => true
+  def rewind_transaction(name = nil)
+    raise Transaction::TransactionError, Transaction::Messages[:cannot_rewind_no_transaction] if @__transaction_checkpoint__.nil?
+
+    # Check to see if we are trying to rewind a transaction that is
+    # outside of the current transaction block.
+    defined? @__transaction_block__ or @__transaction_block__ = nil
+    if @__transaction_block__ and name
+      nix = @__transaction_names__.index(name) + 1
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_rewind_transaction_before_block] if nix < @__transaction_block__
     end
 
-      # Aborts the transaction. Resets the object state to what it was
-      # before the transaction was started and closes the transaction. If
-      # +name+ is specified, then the intervening transactions and the named
-      # transaction will be aborted. Otherwise, only the current transaction
-      # is aborted.
-      #
-      # If the current or named transaction has been started by a block
-      # (Transaction::Simple.start), then the execution of the block will be
-      # halted with +break+ +self+.
-    def abort_transaction(name = nil)
-      if @__transaction_checkpoint__.nil?
-        raise TransactionError, Messages[:cannot_abort_no_transaction]
+    if name.nil?
+      checkpoint = @__transaction_checkpoint__
+      __rewind_this_transaction
+      @__transaction_checkpoint__ = checkpoint
+      ss = "" if Transaction::Simple.debugging?
+    else
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_rewind_named_transaction] % name.inspect unless @__transaction_names__.include?(name)
+      ss = "(#{name})" if Transaction::Simple.debugging?
+
+      while @__transaction_names__[-1] != name
+        @__transaction_checkpoint__ = __rewind_this_transaction
+        Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " << "Rewind Transaction#{ss}\n" if Transaction::Simple.debugging?
+        @__transaction_level__ -= 1
+        @__transaction_names__.pop
       end
+      checkpoint = @__transaction_checkpoint__
+      __rewind_this_transaction
+      @__transaction_checkpoint__ = checkpoint
+    end
+    Transaction::Simple.debug_io << "#{'|' * @__transaction_level__} " << "Rewind Transaction#{ss}\n" if Transaction::Simple.debugging?
+    self
+  end
 
-        # Check to see if we are trying to abort a transaction that is
-        # outside of the current transaction block. Otherwise, raise
-        # TransactionAborted if they are the same.
-      if @__transaction_block__ and name
-        nix = @__transaction_names__.index(name) + 1
-        if nix < @__transaction_block__
-          raise TransactionError, Messages[:cannot_abort_transaction_before_block]
-        end
-
-        raise TransactionAborted if @__transaction_block__ == nix
-      end
+  # Aborts the transaction. Rewinds the object state to what it was before
+  # the transaction was started and closes the transaction. If +name+ is
+  # specified, then the intervening transactions and the named transaction
+  # will be aborted. Otherwise, only the current transaction is aborted.
+  #
+  # See #rewind_transaction for information about dealing with complex
+  # self-referential object graphs.
+  #
+  # If the current or named transaction has been started by a block
+  # (Transaction::Simple.start), then the execution of the block will be
+  # halted with +break+ +self+.
+  def abort_transaction(name = nil)
+    raise Transaction::TransactionError, Transaction::Messages[:cannot_abort_no_transaction] if @__transaction_checkpoint__.nil?
+
+    # Check to see if we are trying to abort a transaction that is outside
+    # of the current transaction block. Otherwise, raise TransactionAborted
+    # if they are the same.
+    defined? @__transaction_block__ or @__transaction_block__ = nil
+    if @__transaction_block__ and name
+      nix = @__transaction_names__.index(name) + 1
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_abort_transaction_before_block] if nix < @__transaction_block__
+
+      raise Transaction::TransactionAborted if @__transaction_block__ == nix
+    end
 
-      raise TransactionAborted if @__transaction_block__ == @__transaction_level__
+    raise Transaction::TransactionAborted if @__transaction_block__ == @__transaction_level__
 
-      if name.nil?
-        __abort_transaction(name)
-      else
-        unless @__transaction_names__.include?(name)
-          raise TransactionError, Messages[:cannot_abort_named_transaction] % name.inspect
-        end
-        __abort_transaction(name) while @__transaction_names__.include?(name)
-      end
-      self
+    if name.nil?
+      __abort_transaction(name)
+    else
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_abort_named_transaction] % name.inspect unless @__transaction_names__.include?(name)
+      __abort_transaction(name) while @__transaction_names__.include?(name)
     end
 
-      # If +name+ is +nil+ (default), the current transaction level is
-      # closed out and the changes are committed.
-      #
-      # If +name+ is specified and +name+ is in the list of named
-      # transactions, then all transactions are closed and committed until
-      # the named transaction is reached.
-    def commit_transaction(name = nil)
-      if @__transaction_checkpoint__.nil?
-        raise TransactionError, Messages[:cannot_commit_no_transaction]
-      end
-      @__transaction_block__ ||= nil
-
-        # Check to see if we are trying to commit a transaction that is
-        # outside of the current transaction block. Otherwise, raise
-        # TransactionCommitted if they are the same.
-      if @__transaction_block__ and name
-        nix = @__transaction_names__.index(name) + 1
-        if nix < @__transaction_block__
-          raise TransactionError, Messages[:cannot_commit_transaction_before_block]
-        end
+    self
+  end
 
-        raise TransactionCommitted if @__transaction_block__ == nix
-      end
+  # If +name+ is +nil+ (default), the current transaction level is closed
+  # out and the changes are committed.
+  #
+  # If +name+ is specified and +name+ is in the list of named transactions,
+  # then all transactions are closed and committed until the named
+  # transaction is reached.
+  def commit_transaction(name = nil)
+    raise Transaction::TransactionError, Transaction::Messages[:cannot_commit_no_transaction] if @__transaction_checkpoint__.nil?
+    @__transaction_block__ ||= nil
+
+    # Check to see if we are trying to commit a transaction that is outside
+    # of the current transaction block. Otherwise, raise
+    # TransactionCommitted if they are the same.
+    if @__transaction_block__ and name
+      nix = @__transaction_names__.index(name) + 1
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_commit_transaction_before_block] if nix < @__transaction_block__
+
+      raise Transaction::TransactionCommitted if @__transaction_block__ == nix
+    end
 
-      raise TransactionCommitted if @__transaction_block__ == @__transaction_level__
+    raise Transaction::TransactionCommitted if @__transaction_block__ == @__transaction_level__
 
-      if name.nil?
-        ss = "" if Transaction::Simple.debugging?
-        __commit_transaction
-        if Transaction::Simple.debugging?
-          Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " <<
-            "Commit Transaction#{ss}\n"
-        end
-      else
-        unless @__transaction_names__.include?(name)
-          raise TransactionError, Messages[:cannot_commit_named_transaction] % name.inspect
-        end
-        ss = "(#{name})" if Transaction::Simple.debugging?
+    if name.nil?
+      ss = "" if Transaction::Simple.debugging?
+      __commit_transaction
+      Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " << "Commit Transaction#{ss}\n" if Transaction::Simple.debugging?
+    else
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_commit_named_transaction] % name.inspect unless @__transaction_names__.include?(name)
+      ss = "(#{name})" if Transaction::Simple.debugging?
 
-        while @__transaction_names__[-1] != name
-          if Transaction::Simple.debugging?
-            Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " <<
-              "Commit Transaction#{ss}\n"
-          end
-          __commit_transaction
-        end
-        if Transaction::Simple.debugging?
-          Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " <<
-            "Commit Transaction#{ss}\n"
-        end
+      while @__transaction_names__[-1] != name
+        Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " << "Commit Transaction#{ss}\n" if Transaction::Simple.debugging?
         __commit_transaction
       end
-
-      self
+      Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " << "Commit Transaction#{ss}\n" if Transaction::Simple.debugging?
+      __commit_transaction
     end
 
-      # Alternative method for calling the transaction methods. An optional
-      # name can be specified for named transaction support.
-      #
-      # #transaction(:start)::  #start_transaction
-      # #transaction(:rewind):: #rewind_transaction
-      # #transaction(:abort)::  #abort_transaction
-      # #transaction(:commit):: #commit_transaction
-      # #transaction(:name)::   #transaction_name
-      # #transaction::          #transaction_open?
-    def transaction(action = nil, name = nil)
-      case action
-      when :start
-        start_transaction(name)
-      when :rewind
-        rewind_transaction(name)
-      when :abort
-        abort_transaction(name)
-      when :commit
-        commit_transaction(name)
-      when :name
-        transaction_name
-      when nil
-        transaction_open?(name)
-      end
+    self
+  end
+
+  # Alternative method for calling the transaction methods. An optional name
+  # can be specified for named transaction support. This method is
+  # deprecated and will be removed in Transaction::Simple 2.0.
+  #
+  # #transaction(:start)::  #start_transaction
+  # #transaction(:rewind):: #rewind_transaction
+  # #transaction(:abort)::  #abort_transaction
+  # #transaction(:commit):: #commit_transaction
+  # #transaction(:name)::   #transaction_name
+  # #transaction::          #transaction_open?
+  def transaction(action = nil, name = nil)
+    _method = case action
+              when :start then :start_transaction
+              when :rewind then :rewind_transaction
+              when :abort then :abort_transaction
+              when :commit then :commit_transaction
+              when :name then :transaction_name
+              when nil then :transaction_open?
+              else nil
+              end
+
+    if method
+      warn "The #transaction method has been deprecated. Use #{method} instead."
+    else
+      warn "The #transaction method has been deprecated."
     end
 
-      # Allows specific variables to be excluded from transaction support.
-      # Must be done after extending the object but before starting the
-      # first transaction on the object.
-      #
-      #   vv.transaction_exclusions << "@io"
-    def transaction_exclusions
-      @transaction_exclusions ||= []
+    case method
+    when :transaction_name
+      __send__ method
+    when nil
+      nil
+    else
+      __send__ method, name
     end
+  end
 
-    class << self
-      def __common_start(name, vars, &block)
-        if vars.empty?
-          raise TransactionError, Messages[:cannot_start_empty_block_transaction]
-        end
+  # Allows specific variables to be excluded from transaction support. Must
+  # be done after extending the object but before starting the first
+  # transaction on the object.
+  #
+  #   vv.transaction_exclusions << "@io"
+  def transaction_exclusions
+    @transaction_exclusions ||= []
+  end
 
-        if block
-          begin
-            vlevel = {}
+  class << self
+    def __common_start(name, vars, &block)
+      raise Transaction::TransactionError, Transaction::Messages[:cannot_start_empty_block_transaction] if vars.empty?
 
-            vars.each do |vv|
-              vv.extend(Transaction::Simple)
-              vv.start_transaction(name)
-              vlevel[vv.__id__] = vv.instance_variable_get(:@__transaction_level__)
-              vv.instance_variable_set(:@__transaction_block__, vlevel[vv.__id__])
-            end
+      if block
+        begin
+          vlevel = {}
+
+          vars.each do |vv|
+            vv.extend(Transaction::Simple)
+            vv.start_transaction(name)
+            vlevel[vv.__id__] = vv.instance_variable_get(:@__transaction_level__)
+            vv.instance_variable_set(:@__transaction_block__, vlevel[vv.__id__])
+          end
 
-            yield(*vars)
-          rescue TransactionAborted
-            vars.each do |vv|
-              if name.nil? and vv.transaction_open?
-                loop do
-                  tlevel = vv.instance_variable_get(:@__transaction_level__) || -1
-                  vv.instance_variable_set(:@__transaction_block__, -1)
-                  break if tlevel < vlevel[vv.__id__]
-                  vv.abort_transaction if vv.transaction_open?
-                end
-              elsif vv.transaction_open?(name)
+          yield(*vars)
+        rescue Transaction::TransactionAborted
+          vars.each do |vv|
+            if name.nil? and vv.transaction_open?
+              loop do
+                tlevel = vv.instance_variable_get(:@__transaction_level__) || -1
                 vv.instance_variable_set(:@__transaction_block__, -1)
-                vv.abort_transaction(name)
+                break if tlevel < vlevel[vv.__id__]
+                vv.abort_transaction if vv.transaction_open?
               end
+            elsif vv.transaction_open?(name)
+              vv.instance_variable_set(:@__transaction_block__, -1)
+              vv.abort_transaction(name)
             end
-          rescue TransactionCommitted
-            nil
-          ensure
-            vars.each do |vv|
-              if name.nil? and vv.transaction_open?
-                loop do
-                  tlevel = vv.instance_variable_get(:@__transaction_level__) || -1
-                  break if tlevel < vlevel[vv.__id__]
-                  vv.instance_variable_set(:@__transaction_block__, -1)
-                  vv.commit_transaction if vv.transaction_open?
-                end
-              elsif vv.transaction_open?(name)
+          end
+        rescue Transaction::TransactionCommitted
+          nil
+        ensure
+          vars.each do |vv|
+            if name.nil? and vv.transaction_open?
+              loop do
+                tlevel = vv.instance_variable_get(:@__transaction_level__) || -1
+                break if tlevel < vlevel[vv.__id__]
                 vv.instance_variable_set(:@__transaction_block__, -1)
-                vv.commit_transaction(name)
+                vv.commit_transaction if vv.transaction_open?
               end
+            elsif vv.transaction_open?(name)
+              vv.instance_variable_set(:@__transaction_block__, -1)
+              vv.commit_transaction(name)
             end
           end
-        else
-          vars.each do |vv|
-            vv.extend(Transaction::Simple)
-            vv.start_transaction(name)
-          end
+        end
+      else
+        vars.each do |vv|
+          vv.extend(Transaction::Simple)
+          vv.start_transaction(name)
         end
       end
-      private :__common_start
+    end
+    private :__common_start
 
-      def start_named(name, *vars, &block)
-        __common_start(name, vars, &block)
-      end
+    # Start a named transaction in a block. The transaction will auto-commit
+    # when the block finishes.
+    def start_named(name, *vars, &block)
+      __common_start(name, vars, &block)
+    end
 
-      def start(*vars, &block)
-        __common_start(nil, vars, &block)
-      end
+    # Start a named transaction in a block. The transaction will auto-commit
+    # when the block finishes.
+    def start(*vars, &block)
+      __common_start(nil, vars, &block)
     end
+  end
 
-    def __abort_transaction(name = nil) #:nodoc:
-      @__transaction_checkpoint__ = __rewind_this_transaction
+  def __abort_transaction(name = nil) #:nodoc:
+    @__transaction_checkpoint__ = __rewind_this_transaction
 
+    if Transaction::Simple.debugging?
       if name.nil?
-        ss = "" if Transaction::Simple.debugging?
+        ss = ""
       else
-        ss = "(#{name.inspect})" if Transaction::Simple.debugging?
+        ss = "(#{name.inspect})"
       end
 
-      if Transaction::Simple.debugging?
-        Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " <<
-          "Abort Transaction#{ss}\n"
-      end
-      @__transaction_level__ -= 1
-      @__transaction_names__.pop
-      if @__transaction_level__ < 1
-        @__transaction_level__ = 0
-        @__transaction_names__ = []
-      end
+      Transaction::Simple.debug_io << "#{'<' * @__transaction_level__} " << "Abort Transaction#{ss}\n"
     end
 
-    TRANSACTION_CHECKPOINT  = "@__transaction_checkpoint__" #:nodoc:
-    SKIP_TRANSACTION_VARS   = [TRANSACTION_CHECKPOINT, "@__transaction_level__"] #:nodoc:
+    @__transaction_level__ -= 1
+    @__transaction_names__.pop
+    if @__transaction_level__ < 1
+      @__transaction_level__ = 0
+      @__transaction_names__ = []
+      @__transaction_checkpoint__ = nil
+    end
+  end
 
-    def __rewind_this_transaction #:nodoc:
-      rr = Marshal.restore(@__transaction_checkpoint__)
+  SKIP_TRANSACTION_VARS = %w(@__transaction_checkpoint__ @__transaction_level__)
 
-      begin
-        self.replace(rr) if respond_to?(:replace)
-      rescue
-        nil
-      end
+  def __rewind_this_transaction #:nodoc:
+    defined? @__transaction_checkpoint__ or @__transaction_checkpoint__ = nil
+    raise Transaction::TransactionError, Transaction::Messages[:cannot_rewind_no_transaction] if @__transaction_checkpoint__.nil?
+    rr = Marshal.restore(@__transaction_checkpoint__)
 
-      rr.instance_variables.each do |vv|
-        next if SKIP_TRANSACTION_VARS.include?(vv)
-        next if self.transaction_exclusions.include?(vv)
-        if respond_to?(:instance_variable_get)
-          instance_variable_set(vv, rr.instance_variable_get(vv))
-        else
-          instance_eval(%q|#{vv} = rr.instance_eval("#{vv}")|)
-        end
-      end
+    replace(rr) if respond_to?(:replace)
 
-      new_ivar = instance_variables - rr.instance_variables - SKIP_TRANSACTION_VARS
-      new_ivar.each do |vv|
-        if respond_to?(:instance_variable_set)
-          instance_variable_set(vv, nil)
-        else
-          instance_eval(%q|#{vv} = nil|)
-        end
-      end
+    iv = rr.instance_variables - SKIP_TRANSACTION_VARS - self.transaction_exclusions
+    iv.each do |vv|
+      next if self.transaction_exclusions.include?(vv)
 
-      if respond_to?(:instance_variable_get)
-        rr.instance_variable_get(TRANSACTION_CHECKPOINT)
-      else
-        rr.instance_eval(TRANSACTION_CHECKPOINT)
-      end
+      instance_variable_set(vv, rr.instance_variable_get(vv))
     end
 
-    def __commit_transaction #:nodoc:
-      if respond_to?(:instance_variable_get)
-        @__transaction_checkpoint__ = Marshal.restore(@__transaction_checkpoint__).instance_variable_get(TRANSACTION_CHECKPOINT)
-      else
-        @__transaction_checkpoint__ = Marshal.restore(@__transaction_checkpoint__).instance_eval(TRANSACTION_CHECKPOINT)
-      end
+    rest = instance_variables - rr.instance_variables - SKIP_TRANSACTION_VARS - self.transaction_exclusions
+    rest.each do |vv|
+      remove_instance_variable(vv)
+    end
 
-      @__transaction_level__ -= 1
-      @__transaction_names__.pop
+    _post_transaction_rewind if respond_to?(:_post_transaction_rewind)
 
-      if @__transaction_level__ < 1
-        @__transaction_level__ = 0
-        @__transaction_names__ = []
-      end
-    end
+    w, $-w = $-w, false # 20070203 OH is this very UGLY
+    res = rr.instance_variable_get(:@__transaction_checkpoint__)
+    $-w = w # 20070203 OH is this very UGLY
+    res
+  end
 
-    private :__abort_transaction
-    private :__rewind_this_transaction
-    private :__commit_transaction
+  def __commit_transaction #:nodoc:
+    defined? @__transaction_checkpoint__ or @__transaction_checkpoint__ = nil
+    raise Transaction::TransactionError, Transaction::Messages[:cannot_commit_no_transaction] if @__transaction_checkpoint__.nil?
+    old = Marshal.restore(@__transaction_checkpoint__)
+    w, $-w = $-w, false # 20070203 OH is this very UGLY
+    @__transaction_checkpoint__ = old.instance_variable_get(:@__transaction_checkpoint__)
+    $-w = w # 20070203 OH is this very UGLY
+
+    @__transaction_level__ -= 1
+    @__transaction_names__.pop
+
+    if @__transaction_level__ < 1
+      @__transaction_level__ = 0
+      @__transaction_names__ = []
+      @__transaction_checkpoint__ = nil
+    end
   end
+
+  private :__abort_transaction
+  private :__rewind_this_transaction
+  private :__commit_transaction
 end