xamplr 1.2.0 → 1.3.15

data/lib/xamplr/templates/.cvsignore

@@ -0,0 +1,3 @@
+nice-try
+old
+.cvs.log

data/lib/xamplr/templates/child_indexed.template

@@ -30,7 +30,7 @@
 
       return existing if existing == #{element.attribute_name}
 
-			self.remove_#{element.attribute_name}(index) if existing
+      self.remove_#{element.attribute_name}(index) if existing
 
       @children << #{element.attribute_name}
       @#{element.attribute_name}_child[index] = #{element.attribute_name}
@@ -62,7 +62,7 @@
       accessed
 
       #{element.attribute_name} = @#{element.attribute_name}_child[index]
-		  return #{element.attribute_name} if #{element.attribute_name} 
+      return #{element.attribute_name} if #{element.attribute_name} 
 
 |
 |if @element.persisted then
@@ -75,14 +75,14 @@
 
       yield(#{element.attribute_name}) if block_given?
       return add_#{element.attribute_name}(#{element.attribute_name})
-		end
+    end
 
     def remove_#{element.attribute_name}(index)
       accessed
-			changed
-	    unless String === index or Symbol === index then
+      changed
+      unless String === index or Symbol === index then
         index = index.get_the_index
-			end
+      end
       #{element.attribute_name} = @#{element.attribute_name}_child.delete(index) if index
       @children.delete(#{element.attribute_name})
     end

data/lib/xamplr/templates/element_data.template

@@ -6,6 +6,7 @@
 |
     include Xampl::XamplPersistedObject
 
+    #supports class based over-ride of persister format
     @@default_persister_format = nil
 
     def default_persister_format
@@ -90,7 +91,7 @@
 
     def #{attribute.name}=(v)
       accessed
-			# This is kind of optimistic, I think you are in trouble if you do this
+      # This is kind of optimistic, I think you are in trouble if you do this
       Xampl.auto_uncache(self) if @#{attribute.name}
       @#{attribute.name} = v
       changed

data/lib/xamplr/templates/element_empty.template

@@ -5,6 +5,7 @@
 |
     include Xampl::XamplPersistedObject
 
+    #supports class based over-ride of persister format
     @@default_persister_format = nil
 
     def default_persister_format
@@ -83,18 +84,9 @@
       @#{attribute.name}
     end
 
-    def xxx#{attribute.name}=(v)
-      accessed
-			# This is kind of optimistic, I think you are in trouble if you do this
-      Xampl.auto_uncache(self) if @#{attribute.name}
-      @#{attribute.name} = v
-      changed
-      Xampl.auto_cache(self) if v
-    end
-
     def #{attribute.name}=(v)
       accessed
-			# This is kind of optimistic, I think you are in trouble if you do this
+      # This is kind of optimistic, I think you are in trouble if you do this
       Xampl.auto_uncache(self) if @#{attribute.name}
       @#{attribute.name} = v
       changed

data/lib/xamplr/templates/element_mixed.template

@@ -5,6 +5,7 @@
 |
     include Xampl::XamplPersistedObject
 
+    #supports class based over-ride of persister format
     @@default_persister_format = nil
 
     def default_persister_format
@@ -85,7 +86,7 @@
 
     def #{attribute.name}=(v)
       accessed
-			# This is kind of optimistic, I think you are in trouble if you do this
+      # This is kind of optimistic, I think you are in trouble if you do this
       Xampl.auto_uncache(self) if @#{attribute.name}
       @#{attribute.name} = v
       changed

data/lib/xamplr/templates/element_simple.template

@@ -5,6 +5,7 @@
 |
     include Xampl::XamplPersistedObject
 
+    #supports class based over-ride of persister format
     @@default_persister_format = nil
 
     def default_persister_format
@@ -85,7 +86,7 @@
 
     def #{attribute.name}=(v)
       accessed
-			# This is kind of optimistic, I think you are in trouble if you do this
+      # This is kind of optimistic, I think you are in trouble if you do this
       Xampl.auto_uncache(self) if @#{attribute.name}
       @#{attribute.name} = v
       changed

data/lib/xamplr/templates/package.template

@@ -1,7 +1,13 @@
+|
+| unless 'XamplAdHoc' == package_name
+|
 module #{package_name}
+|
+| end
+|
 
   require "xamplr"
-	include Xampl
+  include Xampl
 
 |
 | @required_packages.each_key{ | required_package_name |
@@ -23,4 +29,10 @@ module #{package_name}
 | end
 |
 #{place}
+|
+| unless 'XamplAdHoc' == package_name
+|
 end
+|
+| end
+|

data/lib/xamplr/visitor.rb

@@ -118,12 +118,13 @@ module Xampl
       after_visit(xampl)
       return self
 
-    rescue  => e
-      puts "visit failed !!!!! #{ e }"
-      e.backtrace.each do | trace |
-        puts "  #{trace}"
-        break if /actionpack/ =~ trace
-      end
+    #rescue  => e
+    #  puts "visit failed !!!!! #{ e }"
+    #  e.backtrace.each do | trace |
+    #    puts "  #{trace}"
+    #    break if /actionpack/ =~ trace
+    #  end
+    #  raise e
 
     ensure
       n = @visiting[xampl]

data/lib/xamplr/visitors.rb

@@ -320,7 +320,8 @@ module Xampl
       @pid_translations_old_to_new = translate_pids
       @pid_translations_new_to_old = translate_pids.invert
 
-      @persisted_xampl_found = { @current_root.get_the_index => root }
+#      @persisted_xampl_found = { @current_root.get_the_index => root }
+      @persisted_xampl_found = { (@current_root || root).get_the_index => root } #TODO -- is root ever okay here?
       @copies_by_old_pid = {}
 
       while true do

data/lib/xamplr/xampl-cl-gen.rb

@@ -0,0 +1,89 @@
+
+require 'xamplr-generator'
+
+include XamplGenerator
+include Xampl
+
+class ProjectGenerator
+
+  def directory
+    File.join(%w{ . xampl_generated_code })
+  end
+
+  def filenames
+    Dir.glob("./xml/**/*.xml")
+  end
+
+  def print_base_filename
+    File.join(%w{ . generated })
+  end
+
+  def print_options
+    # return an array containing any (or none) of:
+    #    :schema    -- a schema-like xml representation of the generated code
+    #    :graphml   -- a graphml file describing the class model (compatible with yEd)
+    #    :yuml      -- a yuml file that represents a simplified class model (compatible with yUML)
+
+    # [:schema, :graphml, :yuml]
+    []
+  end
+
+  def print
+    nil
+  end
+
+  def persisted_attributes
+    %w{ pid }
+  end
+
+  def indexed_attributes
+    %w{ id }
+  end
+
+  def resolve_namespaces
+    # any array of arrays
+    # each sub-array:
+    #    0: a string or an array of strings, containing xml namespaces found in the example xml files
+    #       an empty string is the default namespace
+    #    1: a ruby Module name (get the cases right)
+    #    2: a namespace prefix used when writing xml, optional. A generated prefix will be used otherwise.
+    []
+  end
+
+  def generate
+
+#      Xampl.set_default_persister_kind(:simple)
+    Xampl.set_default_persister_kind(:in_memory)
+#      Xampl.set_default_persister_kind(:filesystem)
+#      Xampl.set_default_persister_kind(:tokyo_cabinet)
+#      Xampl.set_default_persister_format(:xml_format)
+
+    Xampl.transaction("project-generation") do
+
+      options = Options.new do | opts |
+        persisted_attributes.each do | pattr |
+          opts.new_index_attribute(pattr).persisted = true
+        end
+
+        indexed_attributes.each do | iattr |
+          opts.new_index_attribute(iattr)
+        end
+
+        resolve_namespaces.each do | namespace, ruby_module_name, output_ns_prefix |
+          opts.resolve(namespace, ruby_module_name, output_ns_prefix)
+        end
+
+      end
+
+      generator = Generator.new('generator')
+      generator.go(:options => options,
+                   :filenames => filenames,
+                   :directory => directory)
+
+      puts generator.print_elements(print_base_filename, print_options)
+
+      Xampl.rollback
+    end
+  end
+end
+

data/lib/xamplr/xampl-generator.rb

@@ -1,12 +1,13 @@
-
 require 'fileutils'
 require 'getoptlong'
+require 'set'
 
 module XamplGenerator
   require "xamplr"
   require "xamplr/xampl-hand-generated"
   require "xamplr/simpleTemplate/simple-template"
   require "xamplr/graphml-out.rb"
+  require "xamplr/yuml-out.rb"
 
   class Attribute
     attr_accessor :tag_name
@@ -44,14 +45,14 @@ module XamplGenerator
             "xamplr/templates/package.template",
     ]
 
-    def initialize(options = nil, *predefined_elements)
+    def initialize(options_in = nil, *predefined_elements)
       @elements_map = {}
       @xpp = nil
       @templates = nil
       @generated_package_map = nil
 
-      if options then
-        @options = options
+      if options_in then
+        @options = options_in
       else
         @options = Xampl.make(Options) do |options|
           options.new_index_attribute("id")
@@ -127,21 +128,21 @@ module XamplGenerator
 
       while not @xpp.endDocument? do
         case @xpp.nextEvent
-        when Xampl_PP::START_ELEMENT
-          element_stack.push current_element unless nil == current_element
-          current_element = start_element(current_element)
-        when Xampl_PP::END_ELEMENT
-          current_element = element_stack.pop
-        when Xampl_PP::TEXT,
-                Xampl_PP::CDATA_SECTION,
-                Xampl_PP::ENTITY_REF
-          if current_element then
-            text = @xpp.text
-            if (nil != @xpp.text) then
-              text = text.strip
-              current_element.found_text_content if 0 < text.size
+          when Xampl_PP::START_ELEMENT
+            element_stack.push current_element unless nil == current_element
+            current_element = start_element(current_element)
+          when Xampl_PP::END_ELEMENT
+            current_element = element_stack.pop
+          when Xampl_PP::TEXT,
+                  Xampl_PP::CDATA_SECTION,
+                  Xampl_PP::ENTITY_REF
+            if current_element then
+              text = @xpp.text
+              if (nil != @xpp.text) then
+                text = text.strip
+                current_element.found_text_content if 0 < text.size
+              end
             end
-          end
         end
       end
     end
@@ -224,6 +225,14 @@ module XamplGenerator
 
       ensure_templates
 
+      module_names = Set.new
+      @elements_map.each do |ns, elements|
+        elements.element_child.each do |element|
+          module_names << element.package
+          break
+        end
+      end
+
       lookup_element = {}
       @elements_map.each do |ns, elements|
         elements.element_child.each do |element|
@@ -240,6 +249,12 @@ module XamplGenerator
           @templates.element = element
           @templates.package_name = element.package
 
+          if element.class_name == element.package then
+            puts "ERROR: Class #{ element.package } is in a module with the same name -- this NOT going to work"
+          elsif module_names.member?(element.class_name)
+            puts "WARNING: a Class and a Module have the same name (#{ element.package }) -- this is highly unlikely to work"
+          end
+
           @templates.child_modules(place)
         end
       end
@@ -292,7 +307,11 @@ module XamplGenerator
       end
     end
 
-    def print_elements(filename)
+    def print_elements(base_filename, print_options=nil)
+      return unless base_filename
+      return unless print_options
+      return if 0 == print_options.size
+
       root = Elements.new
       @elements_map.each_value do |elements|
         elements.element_child.each do |element|
@@ -300,13 +319,20 @@ module XamplGenerator
         end
       end
 
-      File.open(filename, "w") do |out|
-        root.pp_xml(out)
+      print_options.each do | print_option |
+        case print_option
+          when :schema then
+            File.open("#{base_filename}.xml", "w") do |out|
+              root.pp_xml(out)
+            end
+          when :graphml then
+            graphml_out = GraphMLOut.new(@elements_map)
+            graphml_out.write_graph_ml(base_filename)
+          when :yuml then
+            yuml_out = YUMLOut.new(@elements_map)
+            yuml_out.write_yuml(base_filename)
+        end
       end
-
-      graphml_out = GraphMLOut.new(@elements_map)
-      graphml_out.write_graph_ml(filename)
-
     end
 
     def go(args, &eval_context)
@@ -362,7 +388,8 @@ module XamplGenerator
       name.gsub!(/[A-Z]/, "_\\&")
       name.gsub!(/__+/, "_")
       class_name = ""
-      name.each("_") do |chunk|
+      #name.each("_") do |chunk|
+      name.split("_").each do |chunk|
         class_name << chunk.capitalize
       end
       class_name.gsub!("_", "")
@@ -464,6 +491,15 @@ module XamplGenerator
             end
           end
         end
+
+        if self.persisted then
+          attribute = Attribute.new
+          attribute.name = 'scheduled_for_deletion_at'
+          attribute.tag_name = 'scheduled-for-deletion-at'
+          attribute.namespace = nil
+          self.add_attribute(attribute)
+        end
+
       end
     end
   end
@@ -485,30 +521,30 @@ module XamplGenerator
 
     opts.each do |opt, arg|
       case opt
-      when "--help" then
-        puts "--help, -h          :: this help message"
-        puts "--options, -o       :: xml file seting the generation options"
-        puts "--elements, -e      :: xml file providing a hint 'schema' (very optional)"
-        puts "--gen:options, -O   :: write an xml file describing the options used (default gen-options.xml)"
-        puts "--gen:elements, -E  :: write an xml file describing the 'schema' (default gen-elements.xml)"
-        puts "--directory, -o     :: where to write the generated files (default #{directory})"
-        puts "--version, -o       :: what version of xampl is this?"
-        exit
-      when "--version" then
-        puts "version 0.0.0"
-        exit
-      when "--directory"
-        directory = arg
-      when "--options"
-        puts "sorry, cannot read options yet"
-      when "--elements"
-        puts "sorry, cannot read elements yet"
-      when "--gen:options"
-        write_options = (arg and (0 < arg.length)) ? arg : "gen-options.xml"
-      when "--gen:elements"
-        write_elements = (arg and (0 < arg.length)) ? arg : "gen-elements.xml"
-      else
-        puts "  #{opt} #{arg}"
+        when "--help" then
+          puts "--help, -h          :: this help message"
+          puts "--options, -o       :: xml file seting the generation options"
+          puts "--elements, -e      :: xml file providing a hint 'schema' (very optional)"
+          puts "--gen:options, -O   :: write an xml file describing the options used (default gen-options.xml)"
+          puts "--gen:elements, -E  :: write an xml file describing the 'schema' (default gen-elements.xml)"
+          puts "--directory, -o     :: where to write the generated files (default #{directory})"
+          puts "--version, -o       :: what version of xampl is this?"
+          exit
+        when "--version" then
+          puts "version 0.0.0"
+          exit
+        when "--directory"
+          directory = arg
+        when "--options"
+          puts "sorry, cannot read options yet"
+        when "--elements"
+          puts "sorry, cannot read elements yet"
+        when "--gen:options"
+          write_options = (arg and (0 < arg.length)) ? arg : "gen-options.xml"
+        when "--gen:elements"
+          write_elements = (arg and (0 < arg.length)) ? arg : "gen-elements.xml"
+        else
+          puts "  #{opt} #{arg}"
       end
     end
 

data/lib/xamplr/xampl-object.rb

@@ -128,6 +128,24 @@ module Xampl
       return true
     end
 
+    def indexed_by
+      nil
+    end
+
+    def to_s
+      if self.persisted? then
+        "<<#{ self.class.name } #{ self.object_id } [#{ self.get_the_index }]#{ @is_changed ? ' DIRTY' : ''}>>" 
+      elsif self.indexed_by then
+        "<<#{ self.class.name } #{ self.object_id } [#{ self.get_the_index }]>>"
+      else
+        "<<#{ self.class.name } #{ self.object_id }>>"
+      end
+    end
+
+    def inspect
+      self.to_s
+    end
+
     def to_ruby(mentions=nil)
       accessed
       return RubyPrinter.new(mentions).to_ruby(self)
@@ -183,6 +201,32 @@ module Xampl
       return persist_xml_new.start(self).done
     end
 
+    ################################################################################################
+    ################################################################################################
+    ################################################################################################
+
+    def Xampl.find_things_to_delete(scheduled_before=Time.now.to_i)
+      things = Xampl.query do | q |
+        q.add_condition('scheduled-delete-at', :lte, scheduled_before)
+      end
+      things
+    end
+
+    def should_schedule_delete?
+      #puts "Xampl#should_schedule_delete? is NOT IMPLEMENTED FOR: #{ self.class.name }"
+      false
+    end
+
+    def schedule_a_deletion_if_needed(at=Time.now.to_i)
+      @scheduled_for_deletion_at = should_schedule_delete? ? at.to_s : nil #TODO -- necessary??
+    end
+
+    ################################################################################################
+    ################################################################################################
+    ################################################################################################
+
+
+
     def XamplObject.realise_from_xml_string(xml_string, target=nil, tokenise=true)
       xampl = FromXML.new.realise_string(xml_string, tokenise, target)
       return xampl
@@ -197,6 +241,13 @@ module Xampl
     end
   end
 
+    def Xampl.from_xml_string(xml_string, tokenise=true)
+      return FromXML.new.parse_string(xml_string, tokenise)
+    end
+
+    def Xampl.from_xml_file(file_name, tokenise=true)
+      return FromXML.new.parse(file_name, tokenise)
+    end
 
 end
 

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

@@ -37,9 +37,14 @@ module Xampl
           if not @persister.syncing then
             Xampl.lazy_load(self)
           else
-            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
-            puts "                pid: #{self.get_the_index} #{self}"
-            caller(0).each { | trace | puts "  #{trace}"}
+            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)
+#            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
+#            puts "                #{self.class.name}"
+#            puts "                pid: #{self.get_the_index}"
+#            caller(0).each { | trace | puts "  #{trace}"}
           end
         else
           puts "LOAD NEEDED(4): REFUSED (persister: #{@persister.name})"
@@ -53,8 +58,12 @@ module Xampl
       end
     end
 
+    def changed?
+      @is_changed = true
+    end
+
     def changed
-      #puts "CHANGED: is_changed #{@is_changed} xampl #{self}"
+#      puts "CHANGED: is_changed #{@is_changed} xampl #{self}"
       unless Xampl.persister then
         raise UnmanagedChange.new(self)
       end