xamplr 1.9.0 → 1.9.1

data/README.md

@@ -1,18 +1,20 @@
-# xamplr
+# xamplr-gen
 
-xamplr is a set of software tools that supports development of ruby applications.
+xamplr-gen is part of a set of software tools that supports development of ruby applications.
 
-It consists of three gems hosted on gem cutter, source code on
-github.
+It consists of three gems hosted on gemcutter, source code on github.
 
-* xamplr-pp -- this is a pure ruby pull parser
-* xamplr -- this is the xampl runtime
-* xamplr-gen -- this is the code generator
+* [xamplr-pp](http://github.com/hutch/xamplr-pp) -- this is a pure ruby pull parser
+* [xamplr](http://github.com/hutch/xamplr) -- this is the xampl runtime
+* [xamplr-gen](http://github.com/hutch/xamplr-gen) -- this is the code generator
 
 There is an additional fourth github repository containing
 examples and documentation that will be coming soon.
 
-Yes, that means that there's no documentation. And no examples. I agree, this is a very bad situation.
+Yes, that means that there's no documentation. And no examples. I agree,
+this is a very bad situation.
+
+For more information, see [the xampl page on xampl.com](http://xampl.com/so/xampl/), and/or [the weblog 'So.'](http://xampl.com/so/)
 
 ## Installation:
 
@@ -20,6 +22,12 @@ Yes, that means that there's no documentation. And no examples. I agree, this is
 
 This will install all three gems.
 
+NOTE: if you have installed hutch-xamplr or hutch-xamplr-pp then
+you should uninstall them. For some reason, in certain circumstances,
+these might be loaded or partially loaded when trying to use xampl.
+If you don't you'll experience strange exceptions with hutch-xamplr
+or hutch-xamplr-pp on the stack trace.
+
 
 ## License:
 

data/VERSION.yml

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

data/lib/xamplr/TODO

@@ -1,2 +1,22 @@
--- use the libxml form of escape attrs (look for apos)
+
+-- use nokogiri, libxml, then xamplr-pp if installed
+-- type experiments
+-- mark the repo with creation parameters (so we don't loose them. We
+   are setting *defaults* and then using the *defaults* to re-open a
+   repo -- this is clearly wrong if the defaults are changed, or the
+   persister types are deliberately mixed (which is an intended thing
+   to support and was *really* handy in Java)
+-- support conversions between types:
+     - fs -> tokyo  (no loss of information)
+     - tokyo -> fs  (currently all indexing will be lost)
+     - fs, tokyo -> in-memory (well, no, won't do this)
+-- read-through support, especially handy for in-memory. Makes sense for
+   fs and tokyo repos
+-- tokyo tyrant persisters
+-- add NO-CACHE to tokyo persisters (theory is that they cache at a certain
+   level (below object level) and that this will allow sharing of the DB a
+   little better -- still don't know about multiple writers to the same repo...
+   can tyrant help here.
+-- mongo, and a couple of others might be interesting
+-- what about SQL dbs? Maybe an SQL or DataMapper version??
 

data/lib/xamplr/TYPES.txt

@@ -0,0 +1,150 @@
+x rubytypes.rb:class Class
+  rubytypes.rb:class Object
+  rubytypes.rb:class Hash
+  rubytypes.rb:class Struct
+  rubytypes.rb:class Array
+  rubytypes.rb:class Exception
+  rubytypes.rb:class String
+  rubytypes.rb:class Symbol
+  rubytypes.rb:class Range
+  rubytypes.rb:class Regexp
+  rubytypes.rb:class Time
+  rubytypes.rb:class Date
+  rubytypes.rb:class Integer
+  rubytypes.rb:class Float
+  rubytypes.rb:class Rational
+  rubytypes.rb:class Complex
+  rubytypes.rb:class TrueClass
+  rubytypes.rb:class FalseClass
+x rubytypes.rb:class NilClass 
+  
+require 'yaml'
+require 'date'
+
+def fmttime(t)
+            tz = "Z"
+            # from the tidy Tobias Peters <t-peters@gmx.de> Thanks!
+            unless t.utc?
+                utc_same_instant = t.dup.utc
+                utc_same_writing = Time.utc(t.year,t.month,t.day,t.hour,t.min,t.sec,t.usec)
+                difference_to_utc = utc_same_writing - utc_same_instant
+                if (difference_to_utc < 0) 
+                    difference_sign = '-'
+                    absolute_difference = -difference_to_utc
+                else
+                    difference_sign = '+'
+                    absolute_difference = difference_to_utc
+                end
+                difference_minutes = (absolute_difference/60).round
+                tz = "%s%02d:%02d" % [ difference_sign, difference_minutes / 60, difference_minutes % 60]
+            end
+            standard = t.strftime( "%Y-%m-%d %H:%M:%S" )
+            standard += ".%06d" % [t.usec] if t.usec.nonzero?
+            standard += " %s" % [tz]
+            standard
+end
+
+def rep(h)
+  h.each do | k, v |
+    puts "#{ k }: #{ v }/#{ v.class }"
+  end
+end
+
+class Play
+  def initialize(x)
+    @x = x
+  end
+  def to_s
+    "#<Play:#{ object_id }> :: x: #{ @x }/#{ @x.class }"
+  end
+end
+
+def go
+  h={}
+  h['time'] = Time.now
+  #h['date'] = Date.now
+  h['datetime'] = DateTime.now
+  h['int'] = 10
+  h['bigint'] = 1234567890987654321
+  h['float'] = 1.23
+  h['play'] = Play.new(Time.now)
+
+
+  rep(h)
+
+  y = YAML.dump(h)
+  puts "YAML...."
+  puts y
+  puts "....YAML"
+
+  hh = YAML.load(y)
+  rep(hh)
+
+
+  puts
+  puts
+  puts 'play a little....'
+
+  parser = YAML::Syck::Parser.new
+  ss = YAML.dump(Time.now)
+
+  puts "this should come back as a time object"
+  tt = parser.load( ss )
+  puts "tt: #{ tt }/#{ tt.class }"
+  puts "ss : [[#{ ss }]]"
+
+
+
+  puts "try to reproduce the effect"
+  #sss = Time.now.to_yaml
+  #sss = "--- #{ Time.now }\n"
+
+  sss = "--- 2009-12-31 09:57:32.810439 -05:00\n"
+  puts "sss: [[#{ sss }]]"
+  ttt = parser.load( sss )
+  puts "ttt: #{ ttt }/#{ ttt.class } <<<--- should be a Time"
+
+  sss = "--- 2009-12-31 09:57:32 -05:00\n"
+  puts "sss: [[#{ sss }]]"
+  ttt = parser.load( sss )
+  puts "ttt: #{ ttt }/#{ ttt.class } <<<--- should be a Time"
+
+  sss = "--- #{ Time.now }\n"
+  puts "sss: [[#{ sss }]]"
+  ttt = parser.load( sss )
+  puts "ttt: #{ ttt }/#{ ttt.class } <<<--- should be a Time"
+
+
+puts
+puts
+puts
+
+  p = Play.new(Time.now)
+  puts p.to_s
+  pp = p.to_yaml
+  puts "pp: [[#{ pp }]]"
+  ppp = parser.load(pp)
+  puts ppp.to_s
+
+  begin
+    puts "what if it isn't yaml?"
+    x = parser.load("hello world")
+    puts "x: [[#{x}]]/#{ x.class }"
+    x = parser.load("1234567890987654321")
+    puts "x: [[#{x}]]/#{ x.class }"
+    x = parser.load(Time.now.to_s)
+    puts "x: [[#{x}]]/#{ x.class }"
+    x = parser.load("2009-12-31 09:57:32 -05:00")
+    puts "x: [[#{x}]]/#{ x.class }"
+    x = parser.load(fmttime(Time.now))
+    puts "x: [[#{x}]]/#{ x.class } <<< uses the fmttime thing, should be a Time"
+  rescue => e
+    puts e
+    puts e.backtrace
+  end
+
+
+end
+
+go
+

data/lib/xamplr/from-xml.rb

@@ -92,10 +92,8 @@ module Xampl
         setup_parse(filename, tokenise_content, is_realising)
         element, ignore = parse_element
         return element
-      rescue Exception => e
-        puts "trouble parsing file: '#{filename}'"
-        puts "Exception: #{e}"
-        raise
+      rescue => e
+        raise RuntimeError, "trouble parsing file: '#{filename}' -- #{ e }", e.backtrace
       end
     end
 
@@ -108,10 +106,8 @@ module Xampl
         setup_parse_string(string, tokenise_content, is_realising)
         element, ignore = parse_element(nil, target)
         return element
-      rescue Exception => e
-        puts "trouble parsing string: '#{string}'"
-        puts "Exception: #{e}"
-        raise
+      rescue => e
+        raise RuntimeError, "trouble parsing string: '#{string}' -- #{ e }", e.backtrace
       end
     end
 
@@ -140,6 +136,9 @@ module Xampl
         klass_name = "{#{namespace}}#{name}"
         klasses = FromXML.registered(klass_name)
         if (0 == klasses.size) then
+          # The class has not been registered (either it was never generated, or it was never loaded)
+#          puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] @@by_ns_tag: #{ @@by_ns_tag.inspect }"
+#          puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] @@by_tag: #{ @@by_tag.inspect }"
           xml_text = XMLText.new
           xml_text.build(self)
           xml_text = parent.note_adding_text_content(xml_text, @is_realising)
@@ -263,8 +262,10 @@ TODO -- can these ever happen?
                   child = element.note_add_child(child, @is_realising) if element
                   child.append_to(element) if element and child
                 when XMLText then
+                  #TODO -- get rid of this puts
                   puts "UNRECOGNISED Well-formed XML: #{child.to_s[0..25]}..."
                 else
+                  #TODO -- get rid of this puts
                   puts "WHAT IS THIS??? #{child.class.name}"
               end
             end
@@ -358,11 +359,11 @@ TODO -- can these ever happen?
       #describe_current_element_type
 
 #TODO -- get rid of this, it is for debugging only
+#TODO -- really?
 begin
       okay = @reader.read
 rescue => e
-  puts "WHAT???? #{ e }"
-  raise e
+  raise RuntimeError, "WHAT?? -- #{ e }", e.backtrace
 end
 
       @just_opened_an_element = start_element?

data/lib/xamplr/persistence.rb

@@ -23,7 +23,6 @@ module Xampl
   end
 
   def Xampl.register_persister_kind(klass)
-    #puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] REGISTER: #{ klass.kind } --> #{ klass }"
     @@persister_kinds[klass.kind] = klass
   end
 
@@ -98,8 +97,6 @@ module Xampl
     end
 
     unless @@persister then
-#      puts "CREATE PERSISTER #{name}, format: #{format}, kind: #{kind}"
-#      puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] kinds available: #{ @@persister_kinds.keys.inspect }"
       @@persister = @@persister_kinds[kind].new(name, format)
       if (nil != name) then
         @@known_persisters[name] = @@persister
@@ -209,8 +206,7 @@ module Xampl
               # we get here if the transaction block finishes early
               if exception then
                 # the early finish was caused by an exception
-                puts "ROLLBACK(#{__LINE__}):: #{exception}" if rollback and @@verbose_transactions
-                raise exception
+                raise RuntimeError, "ROLLBACK(#{__LINE__}):: #{exception}", exception.backtrace
               else
                 # How could we have arrived at this point???
                 # Well, I don't know all the reasons, but the ones I do know are:
@@ -296,10 +292,10 @@ module Xampl
           if 0 == @changed.size then
             @changed = original_changed
 
-            if exception then
-              puts "ROLLBACK(#{__LINE__}):: #{exception}"
-              print exception.backtrace.join("\n") if exception
-            end
+            #if exception then
+            #  puts "ROLLBACK(#{__LINE__}):: #{exception}"
+            #  print exception.backtrace.join("\n") if exception
+            #end
 
             #no change so don't bother with rollback
 #            if rollback then
@@ -307,11 +303,11 @@ module Xampl
 #            end
             @@persister = initial_persister
           else
-            puts "CHANGED COUNT: #{@changed.size}"
+            #puts "CHANGED COUNT: #{@changed.size}"
             @changed = original_changed
 
-            puts "ROLLBACK(#{__LINE__}) #{exception}" if rollback
-            print exception.backtrace.join("\n")
+            #puts "ROLLBACK(#{__LINE__}) #{exception}" if rollback
+            #print exception.backtrace.join("\n")
             Xampl.rollback
 
             @@persister = initial_persister
@@ -362,14 +358,14 @@ module Xampl
         if 0 == @changed.size then
           @changed = original_changed
 
-          puts "ROLLBACK(#{__LINE__})" if rollback
+          #puts "ROLLBACK(#{__LINE__})" if rollback
           Xampl.rollback if rollback
           @@persister = initial_persister
         else
-          puts "CHANGED COUNT: #{@changed.size}"
+          #puts "CHANGED COUNT: #{@changed.size}"
           @changed = original_changed
 
-          puts "ROLLBACK(#{__LINE__})" if rollback
+          #puts "ROLLBACK(#{__LINE__})" if rollback
           Xampl.rollback
 
           @@persister = initial_persister
@@ -420,10 +416,6 @@ module Xampl
     @@persister.sync
   end
 
-  def Xampl.version(stream)
-    @@persister.version(stream) if nil != @@persister
-  end
-
   def Xampl.sync_all
     @@known_persisters.each{ | name, persister | persister.sync }
   end

data/lib/xamplr/persister.rb

@@ -25,6 +25,7 @@ module Xampl
       @write_count = 0
       @total_write_count = 0
       @last_write_count = 0
+      @last_cache_hits = 0
       @total_sync_count = 0
       @total_rollback_count = 0
       @rolled_back = false
@@ -146,12 +147,6 @@ module Xampl
       end
     end
 
-    def version(stream)
-      raise XamplException.new(:unimplemented)
-      # catch(:refuse_to_version) do
-      # end
-    end
-
     def write(xampl)
       raise XamplException.new(:unimplemented)
     end
@@ -230,6 +225,7 @@ module Xampl
     end
 
     def sync
+      @last_sync_time = Time.now
       #raise XamplException.new(:live_across_rollback) if @rolled_back
       begin
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] SYNC changed: #{@changed.size}" if 0 < @changed.size
@@ -273,8 +269,10 @@ module Xampl
         @total_cache_hits = @total_cache_hits + @cache_hits
         @total_sync_count = @total_sync_count + 1
 
-        @read_count = 0
+        @last_cache_hits = @cache_hits
         @last_write_count = @write_count
+        @cache_hits = 0
+        @read_count = 0
         @write_count = 0
 
         self.sync_done()
@@ -284,6 +282,7 @@ module Xampl
         busy(false)
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] **** SYNCING IS FALSE"
         @syncing = false
+        @last_sync_time = Time.now - @last_sync_time
       end
     end
 
@@ -306,10 +305,10 @@ module Xampl
     end
 
     def print_stats
-      printf("SYNC:: TOTAL cache_hits: %d, reads: %d, writes: %d\n",
-             @total_cache_hits, @total_read_count, @total_write_count)
-      printf("             cache_hits: %d, reads: %d, last writes: %d\n",
-             @cache_hits, @read_count, @last_write_count)
+      printf("SYNC[%s]:: TOTAL cache_hits: %d, reads: %d, writes: %d\n",
+             self.name, @total_cache_hits, @total_read_count, @total_write_count)
+      printf("             cache_hits: %d, reads: %d, writes: %d, time: %fms \n",
+             @last_cache_hits, @read_count, @last_write_count, @last_sync_time)
       printf("             syncs: %d\n", @total_sync_count)
       printf("             changed count: %d (%d)\n", count_changed, @changed.size)
       @changed.each do |thing, ignore|

data/lib/xamplr/persisters/caching.rb

@@ -83,7 +83,6 @@ module Xampl
     end
 
     def write_to_cache(xampl)
-      # puts "WRITE TO CACHE (#{xampl})"
       return Xampl.store_in_cache(@cache, xampl, self) { xampl }
     end
 
@@ -92,9 +91,10 @@ module Xampl
       if xampl then
         if target and target != xampl then
 
-          puts "#{File.basename(__FILE__)} #{__LINE__} CACHE CONFLICT:: klass: #{ klass }, pid: #{ pid }, target: #{ target }, cached: #{ xampl }"
-          dump(@cache)
-          caller(0).each { | trace | puts "  #{trace}"}
+          #TODO -- report this better
+          #puts "#{File.basename(__FILE__)} #{__LINE__} CACHE CONFLICT:: klass: #{ klass }, pid: #{ pid }, target: #{ target }, cached: #{ xampl }"
+          #dump(@cache)
+          #caller(0).each { | trace | puts "  #{trace}"}
 
           target.invalidate
           raise XamplException.new(:cache_conflict)
@@ -147,12 +147,12 @@ module Xampl
         #puts "ABSTRACT_READ[#{__LINE__}]:: klass: #{klass} pid: #{pid} target: #{target}"
         xampl = realise(representation, target)
         return nil unless xampl
-      rescue Exception => e
-        puts "FAILED TO READ -- persister: #{name} klass: #{klass} pid: #{pid} target: #{target}"
-        puts "Exception: #{e}"
-        print e.backtrace.join("\n")
-        #sleep 10
-        raise e
+      rescue => e
+        raise RuntimeError, "FAILED TO READ -- persister: #{name} klass: #{klass} pid: #{pid} target: #{target}\n#{ e }", e.backtrace
+        #puts "FAILED TO READ -- persister: #{name} klass: #{klass} pid: #{pid} target: #{target}"
+        #puts "Exception: #{e}"
+        #print e.backtrace.join("\n")
+        #raise e
       end
 
       #      puts "#{File.basename(__FILE__)} #{__LINE__} STORE IN CACHE:: xampl: #{xampl }, persister: #{ self }"