xamplr 1.9.9 → 1.9.10

data/VERSION.yml

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

data/lib/xamplr/persistence.rb

@@ -324,57 +324,58 @@ module Xampl
   end
 
   def Xampl.read_only(target_persister)
-    #TODO -- EXCLUSIVE ACCESS TO THE PERSISTER!!!
-    name = target_persister.name
+    @@xampl_lock.synchronize(:EX) do
+      name = target_persister.name
 
-    if block_given? then
-      initial_persister = @@persister
-      Xampl.enable_persister(name, target_persister.kind, target_persister.format)
-
-      rollback = true
-      original_automatic = @@persister.automatic
-      original_changed = @changed
-      @changed = {}
-      begin
-        Xampl.auto_persistence(false)
-        #Xampl.block_future_changes(true)
-
-        yield
-        rollback = false
-      ensure
-        ####        Xampl.auto_persistence(original_automatic)
-        ####        #Xampl.block_future_changes(false)
-        ####
-        ####        if 0 < @changed.size then
-        ####          puts "CHANGED COUNT: #{@changed.size}"
-        ####          raise BlockedChange.new(target_persister)
-        ####        end
-        ####
-        ####        @changed = original_changed
-        ####
-        ####        puts "ROLLBACK(#{__LINE__})" if rollback
-        ####			  Xampl.rollback if rollback
-        ####	      @@persister = initial_persister
-
-        Xampl.auto_persistence(original_automatic)
-        #Xampl.block_future_changes(false)
-
-        if 0 == @changed.size then
-          @changed = original_changed
-
-          #puts "ROLLBACK(#{__LINE__})" if rollback
-          Xampl.rollback if rollback
-          @@persister = initial_persister
-        else
-          #puts "CHANGED COUNT: #{@changed.size}"
-          @changed = original_changed
-
-          #puts "ROLLBACK(#{__LINE__})" if rollback
-          Xampl.rollback
-
-          @@persister = initial_persister
-
-          raise BlockedChange.new(target_persister)
+      if block_given? then
+        initial_persister = @@persister
+        Xampl.enable_persister(name, target_persister.kind, target_persister.format)
+
+        rollback = true
+        original_automatic = @@persister.automatic
+        original_changed = @changed
+        @changed = {}
+        begin
+          Xampl.auto_persistence(false)
+          #Xampl.block_future_changes(true)
+
+          yield
+          rollback = false
+        ensure
+          ####        Xampl.auto_persistence(original_automatic)
+          ####        #Xampl.block_future_changes(false)
+          ####
+          ####        if 0 < @changed.size then
+          ####          puts "CHANGED COUNT: #{@changed.size}"
+          ####          raise BlockedChange.new(target_persister)
+          ####        end
+          ####
+          ####        @changed = original_changed
+          ####
+          ####        puts "ROLLBACK(#{__LINE__})" if rollback
+          ####			  Xampl.rollback if rollback
+          ####	      @@persister = initial_persister
+
+          Xampl.auto_persistence(original_automatic)
+          #Xampl.block_future_changes(false)
+
+          if 0 == @changed.size then
+            @changed = original_changed
+
+            #puts "ROLLBACK(#{__LINE__})" if rollback
+            Xampl.rollback if rollback
+            @@persister = initial_persister
+          else
+            #puts "CHANGED COUNT: #{@changed.size}"
+            @changed = original_changed
+
+            #puts "ROLLBACK(#{__LINE__})" if rollback
+            Xampl.rollback
+
+            @@persister = initial_persister
+
+            raise BlockedChange.new(target_persister)
+          end
         end
       end
     end

data/lib/xamplr/xampl-persisted-object.rb

@@ -36,12 +36,16 @@ module Xampl
           raise MixedPersisters.new(@persister, self)
         elsif Xampl.persister == @persister then
           if not @persister.syncing then
-            Xampl.lazy_load(self)
+            Xampl.read_only(@persister) do
+              Xampl.lazy_load(self)
+            end
           else
             puts "LOAD NEEDED(3): BAD IDEA, but load anyway (persister: #{@persister.name})"
             puts "                #{self.class.name}"
             puts "                pid: #{self.get_the_index}"
-            Xampl.lazy_load(self)
+            Xampl.read_only(@persister) do
+              Xampl.lazy_load(self)
+            end
 #            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
 #            puts "                #{self.class.name}"
 #            puts "                pid: #{self.get_the_index}"

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.9"
+  s.version = "1.9.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-03-14}
+  s.date = %q{2010-03-18}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-14 00:00:00 -05:00
+date: 2010-03-18 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency