xamplr 1.9.12 → 1.9.13

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
 :minor: 9
-:patch: 12
+:patch: 13
 :build: 

data/lib/Makefile

@@ -0,0 +1,7 @@
+
+
+ccm:
+	rm -rf ccm
+	mkdir ccm
+	#saikuro -c -w 8 -e 13 -o ccm/ -p ./admin/admin.rb -p ./admin/helpers/admin_ui_helper.rb
+	saikuro -c -w 8 -e 13 -o ccm/ -p ./xampl.rb -p ./xamplr/exceptions.rb -p ./xamplr/from-xml.rb -p ./xamplr/indexed-array.rb -p ./xamplr/iterator.rb -p ./xamplr/mixins.rb -p ./xamplr/notifications.rb -p ./xamplr/persist-to-xml.rb -p ./xamplr/persistence.rb -p ./xamplr/persister.rb -p ./xamplr/persisters/caches.rb -p ./xamplr/persisters/caching.rb -p ./xamplr/persisters/dumb.rb -p ./xamplr/persisters/filesystem.rb -p ./xamplr/persisters/in-memory.rb -p ./xamplr/persisters/mongo.rb -p ./xamplr/persisters/simple.rb -p ./xamplr/persisters/tokyo-cabinet.rb -p ./xamplr/to-ruby.rb -p ./xamplr/to-xml.rb -p ./xamplr/visitor.rb -p ./xamplr/visitors.rb -p ./xamplr/xampl-module.rb -p ./xamplr/xampl-object-internals.rb -p ./xamplr/xampl-object.rb -p ./xamplr/xampl-persisted-object.rb -p ./xamplr/xml-text.rb -p ./xamplr.rb

data/lib/xamplr/exceptions.rb

@@ -69,6 +69,18 @@ module Xampl
     end
   end
 
+  class UnexpectedExitFromTransaction < Exception
+    attr_reader :xampl
+
+    def initialize(xampl=nil)
+      @xampl = xampl
+    end
+
+    def message
+      "unexpected exit from a transaction: ROLLBACK"
+    end
+  end
+
   class UnmanagedChange < Exception
     attr_reader :xampl
 

data/lib/xamplr/from-xml.rb

@@ -33,13 +33,13 @@ module Xampl
     end
 
     def FromXML.register(tag, ns_tag, klass)
-      @@by_ns_tag[ns_tag] = [ klass ]
+      @@by_ns_tag[ns_tag] = [klass]
       a = @@by_tag[tag]
       if (nil == a) then
-        @@by_tag[tag] = [ klass ]
+        @@by_tag[tag] = [klass]
       else
         found = false
-        a.each { | thing | found = found | (thing == klass) }
+        a.each { |thing| found = found | (thing == klass) }
         a << klass unless found
       end
     end
@@ -70,7 +70,7 @@ module Xampl
                                                  LibXML::XML::Parser::Options::NOCDATA |
                                                  LibXML::XML::Parser::Options::DTDATTR |
                                                  # LibXML::XML::Parser::Options::COMPACT |
-                                                 0)
+                                         0)
       #TODO CLOSE THIS THING!!
     end
 
@@ -87,7 +87,7 @@ module Xampl
                                                    LibXML::XML::Parser::Options::NOCDATA |
                                                    LibXML::XML::Parser::Options::DTDATTR |
                                                    # LibXML::XML::Parser::Options::COMPACT) |
-                                                   0)
+                                           0)
       #TODO CLOSE THIS THING!!
     end
 
@@ -365,13 +365,13 @@ TODO -- can these ever happen?
 
       #describe_current_element_type
 
-#TODO -- get rid of this, it is for debugging only
+      begin
+#TODO -- get rid of this??
 #TODO -- really?
-begin
-      okay = @reader.read
-rescue => e
-  raise RuntimeError, "WHAT?? -- #{ e }", e.backtrace
-end
+        okay = @reader.read
+      rescue => e
+        raise RuntimeError, "WHAT?? -- #{ e }", e.backtrace
+      end
 
       @just_opened_an_element = start_element?
       @insert_end_element = (@just_opened_an_element and @reader.empty_element?)
@@ -408,7 +408,7 @@ end
       if @reader.has_attributes? then
         attribute_count = @reader.attribute_count
         @reader.move_to_first_attribute
-        attribute_count.times do | i |
+        attribute_count.times do |i|
           if @reader.namespace_declaration? then
             @reader.move_to_next_attribute
             next

data/lib/xamplr/persistence.rb

@@ -28,7 +28,7 @@ module Xampl
 
   def Xampl.disable_all_persisters
     @@persister = nil
-    @@known_persisters.each { | persister | persister.close}
+    @@known_persisters.each { |persister| persister.close }
     @@known_persisters = {}
   end
 
@@ -79,6 +79,7 @@ module Xampl
   def Xampl.enable_persister(name, kind=nil, format=nil)
     kind = kind || Xampl.default_persister_kind
     format = format || Xampl.default_persister_format
+
     @@persister = @@known_persisters[name]
 
     if @@persister then
@@ -108,7 +109,7 @@ module Xampl
 
   def Xampl.print_known_persisters
     puts "Known Persisters:: --------------------------"
-    @@known_persisters.each { | n, k | puts " #{n} #{k}" }
+    @@known_persisters.each { |n, k| puts " #{n} #{k}" }
     puts "---------------------------------------------"
   end
 
@@ -121,12 +122,14 @@ module Xampl
 
   def Xampl.drop_all_persisters(verbose=false)
     puts "Drop All Persisters:: --------------------------" if verbose
+    @@persister = nil
     @@known_persisters.each do |name, persister|
       puts " #{ name } #{ persister.class.name }" if verbose
       next if persister == @@persister
       persister.close
       persister.clear_cache
     end
+    @@known_persisters = {}
     puts "---------------------------------------------" if verbose
     GC.start
     GC.start
@@ -171,7 +174,113 @@ module Xampl
     @@verbose_transactions = v
   end
 
-  def Xampl.transaction(thing, kind=nil, automatic=true, format=nil, &block)
+  class TransactionWork
+    def self.setup_work(work)
+      begin
+        define_method(:do_work, work)
+        self.new.do_work
+      ensure
+        remove_method(:do_work)
+      end
+    end
+  end
+
+  @@abnormal_return_from_transactions_are_errors = true
+
+  def Xampl.abnormal_return_from_transactions_are_errors
+    @@abnormal_return_from_transactions_are_errors
+  end
+
+  def Xampl.abnormal_return_from_transactions_are_errors=(v)
+    @@abnormal_return_from_transactions_are_errors = v
+  end
+
+  def Xampl.transaction_as_a_method(thing, kind=nil, automatic=true, format=nil, & block)
+    #TODO -- should this be called Xampl.transaction_safe???
+    #TODO -- won't work in xampl-gen
+    return nil unless block_given?
+
+    if String === thing then
+      name = thing
+    elsif XamplObject === thing then
+      name = thing.persister.name
+    else
+      raise XamplException.new("can't base a transaction on a #{thing.class.name} (#{thing})")
+    end
+
+    work = Proc.new # get the block into a proc object
+
+    @@xampl_lock.synchronize(:EX) do
+      begin
+        initial_persister = @@persister
+        Xampl.enable_persister(name, kind, format)
+
+        original_automatic = @@persister.automatic
+
+        okay = false
+        rollback = true
+        exception = nil
+        abnormal_return = true
+        result = nil
+
+        begin
+          #TODO -- impose some rules on nested transactions/enable_persisters??
+
+          Xampl.auto_persistence(automatic)
+
+          result = TransactionWork.setup_work(work)
+
+          abnormal_return = false
+
+          Xampl.block_future_changes(true)
+          Xampl.sync
+          rollback = false
+
+          okay = true
+          return result
+        rescue => e
+          exception = e
+        ensure
+          Xampl.block_future_changes(false)
+          Xampl.auto_persistence(original_automatic)
+
+          unless okay then
+            if exception then
+              Xampl.rollback
+            elsif abnormal_return then
+              if Xampl.abnormal_return_from_transactions_are_errors then
+                Xampl.rollback
+                exception = UnexpectedExitFromTransaction.new
+              else
+                begin
+                  Xampl.block_future_changes(true)
+                  Xampl.sync
+                rescue => e
+                  exception = e
+                ensure
+                  Xampl.block_future_changes(false)
+                  Xampl.auto_persistence(original_automatic)
+
+                  Xampl.rollback if exception
+                end
+              end
+            elsif rollback then
+              # don't know how this can happen, but roll it back anyway and treat it as an unexpected exit from transaction
+              Xampl.rollback
+              exception =  UnexpectedExitFromTransaction.new
+            end
+          end
+
+          @@persister = initial_persister
+          raise exception if exception
+        end
+      end
+    end
+  end
+
+  #def Xampl.transaction_using_proc(thing, kind=nil, automatic=true, format=nil, & block)
+  def Xampl.transaction(thing, kind=nil, automatic=true, format=nil, & block)
+    # this method cannot account for returns in transactions (proc vs lambda/method issues)
     if String === thing then
       name = thing
     elsif XamplObject === thing then
@@ -260,7 +369,7 @@ module Xampl
     end
   end
 
-  def Xampl.read_only_transaction(thing, kind=nil, automatic=true, format=nil, &block)
+  def Xampl.read_only_transaction(thing, kind=nil, automatic=true, format=nil, & block)
     if String === thing then
       name = thing
     elsif XamplObject === thing then
@@ -422,11 +531,11 @@ module Xampl
   end
 
   def Xampl.sync_all
-    @@known_persisters.each{ | name, persister | persister.sync }
+    @@known_persisters.each { |name, persister| persister.sync }
   end
 
   def Xampl.close_all_persisters
-    @@known_persisters.each do | name, persister |
+    @@known_persisters.each do |name, persister|
       persister.close
     end
   end
@@ -437,7 +546,7 @@ module Xampl
   end
 
   def Xampl.rollback_all
-    @@known_persisters.values.each { | persister | persister.rollback }
+    @@known_persisters.values.each { |persister| persister.rollback }
   end
 
   def Xampl.lazy_load(xampl)
@@ -576,22 +685,22 @@ module Xampl
 
   def Xampl.query(hint=false)
     raise NoActivePersister unless @@persister
-    @@persister.query(hint) { | q | yield q }
+    @@persister.query(hint) { |q| yield q }
   end
 
   def Xampl.find_xampl(hint=false)
     raise NoActivePersister unless @@persister
-    @@persister.find_xampl(hint) { | q | yield q }
+    @@persister.find_xampl(hint) { |q| yield q }
   end
 
   def Xampl.find_meta(hint=false)
     raise NoActivePersister unless @@persister
-    @@persister.find_meta(hint) { | q | yield q }
+    @@persister.find_meta(hint) { |q| yield q }
   end
 
   def Xampl.find_pids(hint=false)
     raise NoActivePersister unless @@persister
-    @@persister.find_pids(hint) { | q | yield q }
+    @@persister.find_pids(hint) { |q| yield q }
   end
 
   def Xampl.find_mentions_of(xampl)

data/lib/xamplr/persister.rb

@@ -13,7 +13,8 @@ module Xampl
                   :cache_hits, :total_cache_hits,
                   :last_write_count,
                   :rolled_back,
-                  :expunged
+                  :expunged,
+                  :slow_sync
     attr_reader :syncing, :format
 
     def initialize(name=nil, format=nil)
@@ -34,6 +35,7 @@ module Xampl
       @total_rollback_count = 0
       @rolled_back = false
       @syncing = false
+      @slow_sync = 0.25
 
       @busy_count = 0
     end
@@ -132,12 +134,14 @@ module Xampl
     def represent(xampl, mentions=[])
       #puts "REPRESENT #{xampl} load needed: #{xampl.load_needed}"
       #      return nil if xampl.load_needed
+      rep = nil
       case xampl.default_persister_format || @format
         when nil, :xml_format then
-          return xampl.persist("", mentions)
+          rep = xampl.persist("", mentions)
         when :ruby_format then
-          return xampl.to_ruby(mentions)
+          rep = xampl.to_ruby(mentions)
       end
+      return rep
     rescue => e
       msg = "Failed to represent #{ xampl } due to: #{ e }"
       puts msg
@@ -149,11 +153,15 @@ module Xampl
       # Normally we'd expect to see the representation in the @format format, but
       # that isn't necessarily the case. Try to work out what the format might be...
 
+      #TODO -- this is a bit brutal, but it should work (it is the rule is that this is supposed to be UTF-8)
+      representation_fixed = representation.encode('UTF-8', :invalid => :replace, :undef => :replace)
+#      puts "#{ ::File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] ENCODING: #{ representation.encoding } -> #{ representation_fixed.encoding }"
+
       xampl = nil
-      if representation =~ /^</ then
-        xampl = XamplObject.realise_from_xml_string(representation, target)
+      if representation_fixed =~ /^</ then
+        xampl = XamplObject.realise_from_xml_string(representation_fixed, target)
       else
-        xampl = XamplObject.from_ruby(representation, target)
+        xampl = XamplObject.from_ruby(representation_fixed, target)
       end
       return xampl.note_realised
     end
@@ -218,7 +226,7 @@ module Xampl
 
     def put_changed(msg="")
       puts "Changed::#{msg}:"
-      @changed.each { | xampl, ignore | puts " #{xampl.tag} #{xampl.get_the_index}" }
+      @changed.each { |xampl, ignore| puts " #{xampl.tag} #{xampl.get_the_index}" }
     end
 
     def start_sync_write
@@ -268,9 +276,9 @@ module Xampl
           end
 
           duration = Time.now - duration
-          if 0.25 < duration.to_f then
+          if @slow_sync < duration.to_f then
             puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] SLOW SYNC(#{ duration.to_f }s), changed: #{ @changed.size }"
-            @changed.each do | key, value |
+            @changed.each do |key, value|
               puts "    key: #{ key.class.name }, pid: #{ key.get_the_index }"
             end
           end

data/lib/xamplr/persisters/tokyo-cabinet.rb

@@ -668,6 +668,8 @@ module Xampl
 #      puts "#{File.basename(__FILE__)}:#{__LINE__} ??: #{ klass }/#{ pid }" unless representation
       $NF_COUNT += 1
 
+      #TODO this is coming back as ASCII-8BIT rather than UTF-8!!!!!!!!!!!!!!!!!!
+#      puts "#{ ::File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] encoding #{ representation.encoding }"
       return representation
     end
 
@@ -681,6 +683,9 @@ module Xampl
       note_errors("TC[[#{ dir_path }]]:: backup error: %s\n") do
         @tc_db.copy(path)
       end
+      return true
+    rescue => e
+      return false
     end
   end
 

data/lib/xamplr/xampl-object.rb

@@ -133,7 +133,8 @@ module Xampl
 
     def to_s
       if self.persisted? then
-        "<<#{ self.class.name } #{ self.object_id } [#{ self.get_the_index }]#{ @is_changed ? ' DIRTY' : ''}>>"
+        persister_name = self.persister ? "#{ self.persister.name }/" : ''
+        "<<#{ self.class.name } #{ self.object_id } [#{ self.persister ? self.persister.name  : 'no-persister' }/#{ self.get_the_index }]#{ @is_changed ? ' DIRTY' : ''}>>"
       elsif self.indexed_by then
         "<<#{ self.class.name } #{ self.object_id } [#{ self.get_the_index }]>>"
       else

data/xamplr.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.12"
+  s.version = "1.9.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-05-19}
+  s.date = %q{2010-07-14}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
      "README.md",
      "Rakefile",
      "VERSION.yml",
+     "lib/Makefile",
      "lib/xampl.rb",
      "lib/xamplr.rb",
      "lib/xamplr/.cvsignore",

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 41
   prerelease: false
   segments: 
   - 1
   - 9
-  - 12
-  version: 1.9.12
+  - 13
+  version: 1.9.13
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -04:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,6 +69,7 @@ files:
 - README.md
 - Rakefile
 - VERSION.yml
+- lib/Makefile
 - lib/xampl.rb
 - lib/xamplr.rb
 - lib/xamplr/.cvsignore