hutch-xamplr 1.0.2 → 1.0.3

data/lib/xamplr/to-ruby.rb

@@ -1,13 +1,15 @@
+
 module Xampl
 
   class RubyPrinter
 
     $USE_A_PROC = false
 
-    def initialize
+    def initialize(mentions=nil)
       @obj_count = 0
       @map = {}
       @lookup_map={}
+      @mentions = mentions
     end
 
     def show_attributes(thing, name, depth)
@@ -23,7 +25,7 @@ module Xampl
           out << indent << "#{name}.#{accessor} = #{value.inspect}\n"
         end
       else
-        thing.attributes.each{ | attribute |
+        thing.attributes.each do |attribute|
           value = thing.instance_variable_get(attribute[0])
 
           if value then
@@ -35,7 +37,7 @@ module Xampl
               out << indent << "#{name}.instance_variable_set(:#{attribute[0]}, #{value.inspect})\n"
             end
           end
-        }
+        end
       end
       return out
     end
@@ -44,15 +46,16 @@ module Xampl
       out = ""
       indent = "    " + ("  " * depth)
 
-      #TODO -- is this getting the changed flag right?
-      return out << indent << "#{name}.load_needed = true\n" if thing.persist_required and (1 < depth)
+      if thing.persist_required and (1 < depth) then
+        return out << indent << "#{name}.load_needed = true\n"
+      end
 
       if (!thing.kind_of? XamplWithMixedContent) and
               (!thing.kind_of? XamplWithoutContent) and
               thing._content then
         out << indent << "#{name} << #{thing._content.inspect}\n"
       end
-      thing.children.each{ | child |
+      thing.children.each do |child|
         if child.kind_of? XamplObject then
           cname = "v_#{child.safe_name}_#{@obj_count += 1}"
 
@@ -70,7 +73,7 @@ module Xampl
         else
           out << indent << "#{name} << #{child.inspect}\n"
         end
-      }
+      end
       return out
     end
 
@@ -87,13 +90,13 @@ module Xampl
           out << "      " << "xampl.#{accessor} = #{value.inspect}\n"
         end
       else
-        thing.attributes.each{ | attribute |
+        thing.attributes.each do |attribute|
           value = thing.instance_variable_get(attribute[0])
 
           if value then
             out << "      " << "xampl.instance_variable_set(:#{attribute[0]}, #{value.inspect})\n"
           end
-        }
+        end
       end
       return out
     end
@@ -101,7 +104,7 @@ module Xampl
     def show_children_flat(thing, name, depth)
       out = ""
 
-      thing.children.each{ | child |
+      thing.children.each do |child|
         if child.kind_of? XamplObject and (nil == @map[child]) then
           cname = "v_#{child.safe_name}_#{@obj_count += 1}"
 
@@ -113,6 +116,7 @@ module Xampl
           if 0 < cout.size then
             if child.persist_required then
               out << "    " << "#{cname} = #{child.class.to_s}['#{child.get_the_index}']\n"
+              @mentions << child if @mentions
             else
               out << "    " << "#{cname} = #{child.class.to_s}.new { | xampl |\n"
               out << cout
@@ -123,7 +127,7 @@ module Xampl
           end
           out << show_children_flat(child, cname, 1 + depth) unless child.persist_required
         end
-      }
+      end
       return out
     end
 
@@ -149,18 +153,18 @@ module Xampl
               thing._content then
         out << "    " << "#{name} << #{thing._content.inspect}\n"
       end
-      thing.children.each{ | child |
+      thing.children.each do |child|
         if child.kind_of? XamplObject then
           out << "    " << "#{name} << #{@lookup_map[child]}\n"
         else
           out << "    " << "#{name} << #{child.inspect}\n"
         end
-      }
-      thing.children.each{ | child |
+      end
+      thing.children.each do |child|
         if child.kind_of? XamplObject then
           out << show_children_stitch(child, 1 + depth)
         end
-      }
+      end
       return out
     end
 

data/lib/xamplr/to-xml.rb

@@ -1,3 +1,4 @@
+
 module Xampl
 
   class XMLPrinter
@@ -69,12 +70,12 @@ module Xampl
     def attribute(xampl)
       @attr_list = []
       if (nil != xampl.attributes) then
-        xampl.attributes.each{ | attr_spec |
+        xampl.attributes.each do |attr_spec|
           prefix = (2 < attr_spec.length) ? register_ns(attr_spec[2]) : ""
           value = xampl.instance_variable_get(attr_spec[0])
           @attr_list << " " << prefix << attr_spec[1] << "='" << attr_esc(value) << "'" \
                 unless nil == value
-        }
+        end
       end
     end
 
@@ -144,9 +145,9 @@ module Xampl
 
     def define_ns
       result = ""
-      ns_to_prefix.each{ | ns, prefix |
+      ns_to_prefix.each do |ns, prefix|
         result = sprintf("%s xmlns:%s='%s'", result, prefix[0..-2], ns)
-      }
+      end
       return result
     end
 

data/lib/xamplr/visitor.rb

@@ -1,3 +1,4 @@
+
 module Xampl
 
   class Visitor
@@ -439,14 +440,16 @@ module Xampl
   end
 
   class PersistXML < Visitor
-    attr_accessor :ns_to_prefix, :start_body, :body, :out
+    attr_accessor :ns_to_prefix, :start_body, :body, :out, :mentions
 
-    def initialize(out="")
+    def initialize(out="", mentions=nil)
       super()
 
       @out = out
       @was_attr = false
 
+      @mentions = mentions
+
       @ns_to_prefix = {}
       @start_body = nil
       @body = ""
@@ -552,6 +555,7 @@ module Xampl
         @was_attr = true if 0 < attr_defn.size
       else
         if xampl.persist_required then
+          @mentions << xampl if @mentions
           @no_children = true
           persist_attribute(xampl)
         else

data/lib/xamplr/xampl-object.rb

@@ -133,9 +133,9 @@ module Xampl
       return true
     end
 
-    def to_ruby
+    def to_ruby(mentions=nil)
       accessed
-      return RubyPrinter.new.to_ruby(self)
+      return RubyPrinter.new(mentions).to_ruby(self)
     end
 
     module XamplRubyDefinition
@@ -211,10 +211,8 @@ module Xampl
       return result
     end
 
-    def persist(out="", rules=nil)
-      #rules = XMLPrinter.new(out, true) if nil == rules
-      #return to_xml(out, rules)
-      return PersistXML.new("").start(self).done
+    def persist(out="", mentions=nil, rules=nil)
+      return PersistXML.new(out, mentions).start(self).done
     end
 
     def XamplObject.realise_from_xml_string(xml_string, target=nil, tokenise=true)
@@ -449,9 +447,6 @@ module Xampl
     end
 
     def to_xml(xml_printer=nil)
-      # xml_printer should be an XMLPrinter (and it knows about
-      # namespace prefixes)
-
       @text
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-16 00:00:00 -07:00
+date: 2009-04-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,10 +32,23 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- CHANGES.txt
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- examples/random-people-shared-addresses/Makefile
+- examples/random-people-shared-addresses/batch-load-users.rb
+- examples/random-people-shared-addresses/find-mentions.rb
+- examples/random-people-shared-addresses/find-people-by-address.rb
+- examples/random-people-shared-addresses/optimise.rb
+- examples/random-people-shared-addresses/people.rb
+- examples/random-people-shared-addresses/query.rb
+- examples/random-people-shared-addresses/query2.rb
+- examples/random-people-shared-addresses/random-names.csv
+- examples/random-people-shared-addresses/what-to-query-on.rb
+- examples/random-people-shared-addresses/xampl-gen.rb
+- examples/random-people-shared-addresses/xml/people.xml
 - examples/random-people/Makefile
 - examples/random-people/batch-load-users.rb
 - examples/random-people/optimise.rb
@@ -58,15 +71,7 @@ files:
 - lib/xampl.rb
 - lib/xamplr-generator.rb
 - lib/xamplr.rb
-- lib/xamplr/BUGS
-- lib/xamplr/CHANGES
-- lib/xamplr/Makefile
-- lib/xamplr/REQUIREMENTS
 - lib/xamplr/TODO
-- lib/xamplr/bench-cache.rb
-- lib/xamplr/bench-script.rb
-- lib/xamplr/bench.rb
-- lib/xamplr/bench2.rb
 - lib/xamplr/from-xml.rb
 - lib/xamplr/gen-elements.xml
 - lib/xamplr/gen.elements.xml
@@ -79,13 +84,13 @@ files:
 - lib/xamplr/mixins.rb
 - lib/xamplr/my.gen.elements.xml
 - lib/xamplr/notifications.rb
+- lib/xamplr/obsolete/fsdb.rb
 - lib/xamplr/persistence.rb
 - lib/xamplr/persistence.rb.more_thread_safe
 - lib/xamplr/persistence.rb.partially_thread_safe
 - lib/xamplr/persister/caches.rb
 - lib/xamplr/persister/caching.rb
 - lib/xamplr/persister/filesystem.rb
-- lib/xamplr/persister/fsdb.rb
 - lib/xamplr/persister/in-memory.rb
 - lib/xamplr/persister/simple.rb
 - lib/xamplr/persister/subversion.rb
@@ -107,7 +112,6 @@ files:
 - lib/xamplr/simpleTemplate/test001.r5
 - lib/xamplr/simpleTemplate/test002.r5
 - lib/xamplr/simpleTemplate/test003.r5
-- lib/xamplr/sqlite/sqlite-play.rb
 - lib/xamplr/templates/child.template
 - lib/xamplr/templates/child_indexed.template
 - lib/xamplr/templates/child_indexed.template.000
@@ -118,19 +122,24 @@ files:
 - lib/xamplr/templates/element_mixed.template
 - lib/xamplr/templates/element_simple.template
 - lib/xamplr/templates/package.template
-- lib/xamplr/test-cache.rb
-- lib/xamplr/test-data/binding.xml
-- lib/xamplr/test-data/example.xml
-- lib/xamplr/test-data/internationalization-utf8.txt
-- lib/xamplr/test-data/labels.xml
-- lib/xamplr/test-data/labels001.xml
-- lib/xamplr/test-deep-change.rb
-- lib/xamplr/test-elements.rb
-- lib/xamplr/test-indexed-array.rb
-- lib/xamplr/test-misc.rb
-- lib/xamplr/test-names.rb
-- lib/xamplr/test-rollback.rb
-- lib/xamplr/test.rb
+- lib/xamplr/test-support/Makefile
+- lib/xamplr/test-support/bench-cache.rb
+- lib/xamplr/test-support/bench-script.rb
+- lib/xamplr/test-support/bench.rb
+- lib/xamplr/test-support/bench2.rb
+- lib/xamplr/test-support/test-cache.rb
+- lib/xamplr/test-support/test-data/binding.xml
+- lib/xamplr/test-support/test-data/example.xml
+- lib/xamplr/test-support/test-data/internationalization-utf8.txt
+- lib/xamplr/test-support/test-data/labels.xml
+- lib/xamplr/test-support/test-data/labels001.xml
+- lib/xamplr/test-support/test-deep-change.rb
+- lib/xamplr/test-support/test-elements.rb
+- lib/xamplr/test-support/test-indexed-array.rb
+- lib/xamplr/test-support/test-misc.rb
+- lib/xamplr/test-support/test-names.rb
+- lib/xamplr/test-support/test-rollback.rb
+- lib/xamplr/test-support/test.rb
 - lib/xamplr/to-ruby.rb
 - lib/xamplr/to-xml.rb
 - lib/xamplr/version.rb
@@ -183,6 +192,15 @@ test_files:
 - examples/random-people/rawtc.rb
 - examples/random-people/what-to-query-on.rb
 - examples/random-people/xampl-gen.rb
+- examples/random-people-shared-addresses/batch-load-users.rb
+- examples/random-people-shared-addresses/find-mentions.rb
+- examples/random-people-shared-addresses/find-people-by-address.rb
+- examples/random-people-shared-addresses/optimise.rb
+- examples/random-people-shared-addresses/people.rb
+- examples/random-people-shared-addresses/query.rb
+- examples/random-people-shared-addresses/query2.rb
+- examples/random-people-shared-addresses/what-to-query-on.rb
+- examples/random-people-shared-addresses/xampl-gen.rb
 - examples/tokyo-cabinet-experimental/expt-query.rb
 - examples/tokyo-cabinet-experimental/expt-query2.rb
 - examples/tokyo-cabinet-experimental/expt-query3.rb

data/lib/xamplr/BUGS

@@ -1,3 +0,0 @@
-
--- an element with the same name as a ruby keyword will likely fail miserably
-

data/lib/xamplr/CHANGES

@@ -1,16 +0,0 @@
-
-
--- the accessed method will now fail outside of the persistence manager (as
-   it should have been doing all along)
--- the accessed method will try to access the persistence manager if it can
-   to try and lazy load a xampl object
-
--- replaced s.to_s with s.dup.to_s in content_esc and attribute_esc in
-   to_xml and pp_xml, because s.to_s returns itself when it is a string
-   and this caused the escaping to change the original string.
-
--- fixed the ensure* method for non-indexed children (no longer aliased with
-   new* so no longer does this create a new child each time it is called)
-
--- ATTENTAION: if you are accessing attributes directly in an opened xampl class
-   then DO NOT FAIL to call accessed

data/lib/xamplr/REQUIREMENTS

@@ -1,2 +0,0 @@
-
-

data/lib/xamplr/sqlite/sqlite-play.rb

@@ -1,14 +0,0 @@
-#require 'sqlite3'
-
-require "rubygems"
-require_gem "sqlite3-ruby"
-
-
-db = SQLite3::Database.new( "test.db" )
-db.execute( "create table test ( foo int, bar text, baz int );" )
-db.execute( "insert into test ( foo, bar, baz ) values ( 1, 'test', 3 );" )
-puts "EXECUTE ----------------------------------------"
-db.execute( "select * from test" ) { |row| puts row.join( ',' ) }
-puts "EXECUTE2 ---------------------------------------"
-db.execute2( "select * from test" ) { |row| puts row.join( ',' ) }
-