hutch-xamplr 1.3.12 → 1.3.13

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 3
-:patch: 12
+:patch: 13

data/lib/xamplr/TODO

@@ -1 +1,2 @@
--- escaped content is being repeatedly escaped (confirm, just a suspiscion from a long time ago)
+-- use the libxml form of escape attrs (look for apos)
+

data/lib/xamplr/persist-to-xml.rb

@@ -98,6 +98,7 @@ module Xampl
 
       result.gsub!("&", "&")
       result.gsub!("<", "&lt;")
+      result.gsub!(">", "&gt;")
 
       return result
     end

data/lib/xamplr/xampl-generator.rb

@@ -1,4 +1,3 @@
-
 require 'fileutils'
 require 'getoptlong'
 
@@ -128,21 +127,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
@@ -469,6 +468,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
@@ -490,30 +498,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

@@ -183,6 +183,44 @@ module Xampl
       return persist_xml_new.start(self).done
     end
 
+    ################################################################################################
+    ################################################################################################
+    ################################################################################################
+
+    def Xampl.find_things_to_delete
+      #TODO -- one of these for XamplObject to limit search???
+      Xampl.query do | q |
+        q.add_condition('scheduled-delete', :streq, 'true')
+      end
+    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 schedule_delete_at
+      #TODO -- smarter regarding when to delete
+      if should_schedule_delete? and @scheduled_for_deletion_at then
+        [{ 'scheduled-delete' => 'true',
+           'scheduled-delete-at' => @scheduled_for_deletion_at }]
+      elsif @scheduled_for_deletion_at then
+        @scheduled_for_deletion_at = nil
+      else
+        nil
+      end
+    end
+
+    ################################################################################################
+    ################################################################################################
+    ################################################################################################
+
+
+
     def XamplObject.realise_from_xml_string(xml_string, target=nil, tokenise=true)
       xampl = FromXML.new.realise_string(xml_string, tokenise, target)
       return xampl

data/xamplr.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.3.12"
+  s.version = "1.3.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-06-25}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
     "LICENSE",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.3.12
+  version: 1.3.13
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-25 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency