xamplr 1.9.5 → 1.9.6

data/README.md

@@ -18,6 +18,8 @@ For more information, see [the xampl page on xampl.com](http://xampl.com/so/xamp
 
 ## Installation:
 
+If you are a developer then install xamplr-gen:
+
 > sudo gem install xamplr-gen
 
 This will install all three gems.
@@ -28,6 +30,12 @@ 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.
 
+If you just want the runtime, then:
+
+> sudo gem install xamplr
+
+Though this would normally be done through some sort of dependency management tool (like gems).
+
 
 ## License:
 

data/VERSION.yml

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

data/lib/xamplr/persistence.rb

@@ -145,6 +145,8 @@ module Xampl
     case Xampl.default_persister_kind
       when :tokyo_cabinet then
         Xampl::TokyoCabinetPersister.add_lexical_indexs(indexes)
+      when :monto then
+        Xampl::MongoPersister.add_lexical_indexs(indexes)
       else
         raise IncompatiblePersisterConfiguration.new(Xampl.default_persister_kind, "lexical_indexes")
     end
@@ -154,6 +156,8 @@ module Xampl
     case Xampl.default_persister_kind
       when :tokyo_cabinet then
         Xampl::TokyoCabinetPersister.add_numerical_indexs(indexes)
+      when :mongo then
+        Xampl::MongoPersister.add_numerical_indexs(indexes)
       else
         raise IncompatiblePersisterConfiguration.new(Xampl.default_persister_kind, "numerical_indexs")
     end

data/lib/xamplr/persister.rb

@@ -277,10 +277,10 @@ module Xampl
         puts "SOME NOT EXPUNGED: #{ @expunged.inspect }" unless 0 == @expunged.size
         @expunged = Set.new
 
-        @total_read_count = @total_read_count + @read_count
-        @total_write_count = @total_write_count + @write_count
-        @total_cache_hits = @total_cache_hits + @cache_hits
-        @total_sync_count = @total_sync_count + 1
+        @total_read_count += @read_count
+        @total_write_count += @write_count
+        @total_cache_hits += @cache_hits
+        @total_sync_count += 1
 
         @last_cache_hits = @cache_hits
         @last_write_count = @write_count
@@ -323,12 +323,14 @@ module Xampl
       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|
-        if thing.is_changed then
-          puts "             changed: #{thing}, index: #{thing.get_the_index}"
-        else
-          puts "             UNCHANGED: #{thing}, index: #{thing.get_the_index} <<<<<<<<<<<<<<<<<<< BAD!"
+      if 0 < @changed.size then
+        printf("             changed count: %d (%d)\n", count_changed, @changed.size)
+        @changed.each do |thing, ignore|
+          if thing.is_changed then
+            puts "             changed: #{thing}, index: #{thing.get_the_index}"
+          else
+            puts "             UNCHANGED: #{thing}, index: #{thing.get_the_index} <<<<<<<<<<<<<<<<<<< BAD!"
+          end
         end
       end
     end
@@ -339,8 +341,20 @@ module Xampl
   require "xamplr/persisters/in-memory"
   require "xamplr/persisters/filesystem"
 
-  if require 'tokyocabinet' then
-    require "xamplr/persisters/tokyo-cabinet"
+  begin
+    if require 'tokyocabinet' then
+      require "xamplr/persisters/tokyo-cabinet"
+    end
+  rescue
+    # Well. No Tokyo Cabinet.
+  end
+
+  begin
+    if require 'mongo' then
+      require "xamplr/persisters/mongo"
+    end
+  rescue
+    # Well. No MongoDB.
   end
 
 end

data/lib/xamplr/persisters/filesystem.rb

@@ -30,7 +30,7 @@ module Xampl
 
       representation = represent(xampl)
       if representation then
-        File.open(place, "w")do |out|
+        File.open(place, "w") do |out|
           out.puts representation
           out.fsync
           if $is_darwin then

data/lib/xamplr/persisters/mongo.rb

@@ -0,0 +1,547 @@
+module Xampl
+
+  require 'fileutils'
+  require 'set'
+  require 'json'
+  require 'yaml'
+  require 'logger'
+
+  require 'mongo'
+
+  require 'xamplr/persisters/caching'
+
+  #  require 'ruby-prof'
+
+  class MongoPersister < AbstractCachingPersister
+#  class MongoPersister < Persister
+
+#    $lexical_indexes = Set.new(%w{ class pid time-stamp xampl-from xampl-to xampl-place }) unless defined?($lexical_indexes)
+#    $numeric_indexes = Set.new(%w{ scheduled-delete-at }) unless defined?($numeric_indexes)
+    $lexical_indexes = Set.new(%w{ class pid time-stamp }) unless defined?($lexical_indexes)
+    $numeric_indexes = Set.new(%w{ scheduled-delete-at }) unless defined?($numeric_indexes)
+
+    def MongoPersister.kind
+      :mongo
+    end
+
+    def kind
+      MongoPersister.kind
+    end
+
+    def MongoPersister.add_lexical_indexs(indexes)
+      $lexical_indexes.merge(indexes)
+    end
+
+    def MongoPersister.add_numeric_indexs(indexes)
+      $numeric_indexes.merge(indexes)
+    end
+
+    def connect(db_name, name)
+      return if @db
+      @logger = Logger.new('xampl.log')
+      @m = Mongo::Connection.new(:logger => @logger)
+
+=begin
+
+      @logger.info "connection: #{ @m }"
+      @m.database_names.each do |name|
+        @logger.info "  DB: #{ name }"
+#        puts "  DB: #{ name }"
+      end
+      @m.database_info.each do |info|
+        @logger.info "  #{ info.inspect }"
+#        puts "  #{ info.inspect }"
+      end
+
+=end
+
+      #@m.drop_database(db_name) # !!!! kill the old one
+      @db = @m.db(db_name)
+      @coll = @db[name]
+
+
+      index_info = @coll.index_information
+      existing_indexes = Set.new
+      index_info.each do | k, v |
+        existing_indexes << v.first.first
+      end
+      existing_indexes.delete("_id")
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] existing indexes: #{ existing_indexes.inspect }"
+
+      $lexical_indexes.each do | index_name |
+        mongo_index_name = "idx.#{ index_name }"
+        unless existing_indexes.include?(mongo_index_name) then
+#          puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] create index: #{ mongo_index_name }"
+          @coll.create_index(mongo_index_name)
+        end
+        existing_indexes.delete(mongo_index_name)
+      end
+      $numeric_indexes.each do | index_name |
+        mongo_index_name = "idx.#{ index_name }"
+        unless existing_indexes.include?(mongo_index_name) then
+#          puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] create index: #{ mongo_index_name }"
+          @coll.create_index(mongo_index_name)
+        end
+        existing_indexes.delete(mongo_index_name)
+      end
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] un-explained indexes: #{ existing_indexes.inspect }"
+
+
+
+      #@logger.info @db.inspect
+      nil
+    end
+
+    def initialize(name=nil, format=nil, root=File.join(".", "repo"))
+      super(root, name, format)
+
+      @format = :xml_format
+
+      connect('xampl', name)
+
+      @root_dir = File.join(root, name)
+
+      if Xampl.raw_persister_options[:write_through] then
+        @files_dir = "#{ @root_dir }/files"
+        FileUtils.mkdir_p(@files_dir) unless File.exist?(@files_dir)
+      else
+        @files_dir = nil
+      end
+    end
+
+    def setup_db
+
+#TODO -- define indexes
+#      $lexical_indexes.each do | index_name |
+#        r = @tc_db.setindex(index_name, TDB::ITLEXICAL | TDB::ITKEEP)
+#      end
+#      $numeric_indexes.each do | index_name |
+#        @tc_db.setindex(index_name, TDB::ITDECIMAL | TDB::ITKEEP)
+#      end
+    end
+
+    def close
+      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] WHO IS CALLING ME???"
+    end
+
+=begin
+
+    def query_implemented
+      true
+    end
+
+    def query(hint=false)
+      setup_db
+      query = TableQuery.new(@tc_db)
+
+      yield query
+
+      result_keys = nil
+      the_hint = nil
+      if hint then
+        result_keys, the_hint = query.search(true)
+      else
+        result_keys = query.search
+      end
+      results = result_keys.collect { | key | @tc_db[ key ] }
+
+      class_cache = {}
+      results.each do | result |
+        next unless result
+
+        class_name = result['class']
+        result_class = class_cache[class_name]
+        unless result_class then
+          class_name.split("::").each do | chunk |
+            if result_class then
+              result_class = result_class.const_get( chunk )
+            else
+              result_class = Kernel.const_get( chunk )
+            end
+          end
+
+          class_cache[class_name] = result_class
+        end
+
+        result['xampl'] = self.lookup(result_class, result['pid'])
+      end
+
+      if hint then
+        return results.uniq, the_hint
+      else
+        return results.uniq
+      end
+    end
+
+=end
+
+=begin
+
+    def find_xampl(hint=false)
+      setup_db
+      query = TableQuery.new(@tc_db)
+
+      yield query
+
+      class_cache = {}
+
+      result_keys = nil
+      the_hint = nil
+      if hint then
+        result_keys, the_hint = query.search(true)
+      else
+        result_keys = query.search
+      end
+
+      results = result_keys.collect do | key |
+        result = @tc_db[ key ]
+        next unless result
+
+        class_name = result['class']
+        result_class = class_cache[class_name]
+        unless result_class then
+          class_name.split("::").each do | chunk |
+            if result_class then
+              result_class = result_class.const_get( chunk )
+            else
+              result_class = Kernel.const_get( chunk )
+            end
+          end
+
+          class_cache[class_name] = result_class
+        end
+
+
+        self.lookup(result_class, result['pid'])
+      end
+
+      if hint then
+        return results.uniq, the_hint
+      else
+        return results.uniq
+      end
+    end
+
+    def find_pids(hint=false)
+      setup_db
+      query = TableQuery.new(@tc_db)
+
+      yield query
+
+      result_keys = nil
+      the_hint = nil
+      if hint then
+        result_keys, the_hint = query.search(true)
+      else
+        result_keys = query.search
+      end
+
+      results = result_keys.collect do |key|
+        meta = @tc_db[ key ]
+        meta['xampl-place'] || meta['place']
+      end
+
+      if hint then
+        return results.uniq, the_hint
+      else
+        return results.uniq
+      end
+    end
+
+    def find_meta(hint=false)
+      setup_db
+      query = TableQuery.new(@tc_db)
+
+      yield query
+
+      result_keys = nil
+      the_hint = nil
+      if hint then
+        result_keys, the_hint = query.search(true)
+      else
+        result_keys = query.search
+      end
+
+      results = result_keys.collect { | key | @tc_db[ key ] }
+
+      if hint then
+        return results, the_hint
+      else
+        return results
+      end
+    end
+
+    def find_mentions_of(xampl)
+      setup_db
+
+      place = File.join(xampl.class.name.split("::"), xampl.get_the_index)
+
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl-to', :equals, place)
+      result_keys = query.search
+
+      class_cache = {}
+      results = result_keys.collect do | key |
+        result = @tc_db[ key ]
+        next unless result
+
+        mentioner = result['xampl-from']
+        class_name = result['mentioned_class']
+        result_class = class_cache[class_name]
+        unless result_class then
+          class_name.split("::").each do | chunk |
+            if result_class then
+              result_class = result_class.const_get( chunk )
+            else
+              result_class = Kernel.const_get( chunk )
+            end
+          end
+
+          class_cache[class_name] = result_class
+        end
+
+        self.lookup(result_class, result['pid'])
+      end
+      return results.uniq
+    end
+
+=end
+
+    def start_sync_write
+      setup_db
+    end
+
+    def done_sync_write
+#      @logger.info "there are now #{ @coll.count } xampl cluster documents in the database"
+#      puts "there are now #{ @coll.count } xampl cluster documents in the database"
+    end
+
+
+    def do_sync_write
+      @time_stamp = Time.now.to_f.to_s
+
+      @changed.each do |xampl, ignore|
+        write(xampl)
+      end
+    rescue => e
+      #puts "------------------------------------------------------------------------"
+      #puts "MongoPersister Error:: #{ e }"
+      #puts e.backtrace.join("\n")
+      #puts "------------------------------------------------------------------------"
+      raise RuntimeError, "MongoPersister Error:: #{ e }", e.backtrace
+    end
+
+=begin
+
+    def how_indexed(xampl)
+      raise XamplException.new(:no_index_so_no_persist) unless xampl.get_the_index
+      place = File.join(xampl.class.name.split("::"), xampl.get_the_index)
+
+      setup_db
+
+      result_keys = Set.new
+
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl-place', :equals, place)
+      search_results = query.search
+      result_keys.merge( search_results)
+
+      primary = @tc_db[ place ]
+      if primary then
+        primary.delete('xampl')
+      end
+
+      results = primary ? [ primary ] : []
+      result_keys.each do | key |
+        result = @tc_db[ key ]
+        next unless result
+
+        result.delete('xampl')
+
+        results << result
+      end
+
+      results
+    end
+
+=end
+
+=begin
+
+    def remove_all_mention(root, xampl)
+      #TODO -- I THINK THIS IS WRONG... IS IT GOING WAY TOO DEEP??
+      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] in #{ root } of #{ xampl }"
+      xampl.remove_from(root)
+      root.children.each do | child |
+        remove_all_mention(child, xampl)
+      end
+    end
+
+    def expunge(xampl)
+      #NOTE -- this *must* be in a xampl transaction
+      #NOTE -- the expunge operation is in two steps and is completed in write
+
+      mentions = Xampl.find_mentions_of(xampl)
+      mentions.each do | has_a_xampl |
+        remove_all_mention(has_a_xampl, xampl)
+      end
+      xampl.changed
+      self.expunged << xampl
+
+      false
+    end
+
+=end
+
+    def write(xampl)
+      unless xampl.get_the_index then
+#        raise XamplException.new(:no_index_so_no_persist)
+        @logger.warn("trying to persist a #{ xampl.class.name } with no key")
+        return
+      end
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] #{ xampl }"
+
+      expunging = self.expunged.include?(xampl)
+      self.expunged.delete(xampl) if expunging
+
+      place_dir = xampl.class.name.split("::")
+      place = File.join( place_dir, xampl.get_the_index)
+      mentions = Set.new
+      xampl_in_xml = represent(xampl, mentions)
+      unless xampl_in_xml && 0 < xampl_in_xml.size then
+        @logger.warn "Cannot persist #{ xampl } because representation is unobtainable"
+        return
+      end
+
+=begin
+
+      #get rid of any supplimentary indexes associated with this xampl object
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl-from', :equals, place)
+      query.searchout
+
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl-place', :equals, place)
+      query.searchout
+
+=end
+
+      if expunging then
+        puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] "
+        file_place = "#{ @files_dir }/#{ place }"
+        File.delete(file_place) if File.exists?(file_place)
+        @coll.remove({ '_id' => place })
+
+        uncache(xampl)
+      else
+
+        # We can do secondary descriptions in two primary ways: include in a single document containing them
+        # in an attribute called 'secondary'; introducing a document for each secondary description that
+        # refers to the primary document. The single doc approach has some advantages but the semantics of the
+        # indexes might be different (e.g. one thing uses 'kind' as a primary and another as a secondary, then they
+        # will not be indexed in the same way). The biggest advantage is that we have fewer documents, and it is
+        # what the tokyo cabinet persister does.
+        #
+        # Will go with the single doc approach to start
+        #
+
+        single_document = {
+                '_id' => place,
+                'class' => xampl.class.name,
+                'pid' => xampl.get_the_index,
+                'time-stamp' => @time_stamp,
+                'xampl' => xampl_in_xml
+        }
+
+        if Xampl.raw_persister_options[:mentions] then
+          if 0 < mentions.size
+            single_document['mentions'] = mentions_array = []
+            mentions.each do | mention |
+              mentions_array << {
+                      'xampl-from' => place,
+                      'mentioned_class' => xampl.class.name,
+                      'pid' => xampl.get_the_index,
+                      'xampl-to' => File.join(mention.class.name.split("::"), mention.get_the_index)
+              }
+            end
+          end
+        end
+
+        if xampl.should_schedule_delete? and xampl.scheduled_for_deletion_at then
+          single_document['scheduled-delete-at'] = xampl.scheduled_for_deletion_at
+        end
+
+        primary_description, secondary_descriptions = xampl.describe_yourself
+
+        if secondary_descriptions && 0 < secondary_descriptions.size then
+          single_document['idx'] = secondary_descriptions.insert(0, primary_description)
+        else
+          single_document['idx'] = [primary_description]
+        end
+
+#        puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] \n#{ single_document.inspect }"
+
+#        @coll.update(single_document, upsert: true)
+
+#        @coll.remove({ '_id' => place })
+#        @coll.insert(single_document)
+
+        @coll.save(single_document)
+
+        begin
+          if Xampl.raw_persister_options[:write_through] then
+            place_dir = File.join( @files_dir, place_dir )
+            FileUtils.mkdir_p(place_dir) unless File.exist?(place_dir)
+            file_place = "#{ @files_dir }/#{ place }"
+            File.open(file_place, "w") do |out|
+              out.write xampl_in_xml
+              if :sync == Xampl.raw_persister_options[:write_through] then
+                out.fsync
+                if $is_darwin then
+                  out.fcntl(51, 0) # Attempt an F_FULLFSYNC fcntl to commit data to disk (darwin *ONLY*)
+                end
+              end
+            end
+            if single_document['idx'] then
+              single_document.delete('xampl')
+              File.open(file_place + ".idx", "w") do |out|
+                out.write single_document.to_yaml
+              end
+            end
+          end
+        rescue => e
+          puts "#{ File.basename __FILE__ }:#{ __LINE__ } [#{__method__}] write through failed #{ xampl }"
+        end
+
+        @write_count = @write_count + 1
+        xampl.changes_accepted
+      end
+
+      return true
+    end
+
+    def read_representation(klass, pid)
+      representation = nil
+
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] #{ klass }[#{ pid }]"
+      place = File.join(klass.name.split("::"), pid)
+      found = @coll.find_one({ '_id' => place })
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] found: #{found.class.name}/#{ found.inspect }"
+
+      if found then
+        representation = found['xampl']
+      else
+        #TODO -- enable/disable this functionality
+        # try the filesystem if it is not in the TC repository
+        filename = File.join(@root_dir, klass.name.split("::"), pid)
+        representation = File.read(filename) if File.exist?(filename)
+      end
+
+#      puts "#{File.basename(__FILE__)}:#{__LINE__} [#{ __method__ }] #{ klass }[#{ pid }] found: #{ representation.class.name }"
+      return representation
+    end
+  end
+
+  Xampl.register_persister_kind(MongoPersister)
+end
+

data/lib/xamplr/persisters/tokyo-cabinet.rb

@@ -61,7 +61,7 @@ module Xampl
       @tc_db = nil
 #      puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] file: #{ @filename }, db: #{ @tc_db.class.name }"
 
-      open_tc_db()
+      setup_db()
 
 #      note_errors("TC[[#{ @filename }]]:: optimisation error: %s\n") do
 #        @tc_db.optimize(-1, -1, -1, TDB::TDEFLATE)
@@ -175,7 +175,7 @@ module Xampl
     end
 
     def query(hint=false)
-      open_tc_db
+      setup_db
       query = TableQuery.new(@tc_db)
 
       yield query
@@ -218,7 +218,7 @@ module Xampl
     end
 
     def find_xampl(hint=false)
-      open_tc_db
+      setup_db
       query = TableQuery.new(@tc_db)
 
       yield query
@@ -263,7 +263,7 @@ module Xampl
     end
 
     def find_pids(hint=false)
-      open_tc_db
+      setup_db
       query = TableQuery.new(@tc_db)
 
       yield query
@@ -289,7 +289,7 @@ module Xampl
     end
 
     def find_meta(hint=false)
-      open_tc_db
+      setup_db
       query = TableQuery.new(@tc_db)
 
       yield query
@@ -312,7 +312,7 @@ module Xampl
     end
 
     def find_mentions_of(xampl)
-      open_tc_db
+      setup_db
 
       place = File.join(xampl.class.name.split("::"), xampl.get_the_index)
 
@@ -353,7 +353,7 @@ module Xampl
 #      puts "   2 #{ callers[2] }"
 
       @currently_syncing = true
-      open_tc_db
+      setup_db
     end
 
     def done_sync_write
@@ -427,7 +427,7 @@ module Xampl
       raise XamplException.new(:no_index_so_no_persist) unless xampl.get_the_index
       place = File.join(xampl.class.name.split("::"), xampl.get_the_index)
 
-      open_tc_db
+      setup_db
 
       result_keys = Set.new
 
@@ -635,7 +635,7 @@ module Xampl
 
       unless @tc_db then
 #        puts "#{ __FILE__ }:#{ __LINE__ } [#{__method__}] READ REP"
-        open_tc_db
+        setup_db
       end
 
       place = File.join(klass.name.split("::"), pid)
@@ -646,7 +646,7 @@ module Xampl
       #      puts "#{File.basename(__FILE__)}:#{__LINE__} TC: #{ klass }/#{ pid }" if representation
       $TC_COUNT += 1 if representation
 
-      # puts "read: #{ place }, size: #{ representation.size }"
+      #puts "read: #{ place }, size: #{ (representation || []).size }"
       # puts representation[0..100]
 
       unless representation then

data/regression/require-within-generated-code/project-generator.rb

@@ -0,0 +1,32 @@
+class ProjectGenerator
+
+  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)
+
+    [ :yuml ]
+    []
+  end
+
+  def directory
+    # return the path name to the generator's output directory
+    File.join(%w{ . xampl-generated-code })
+  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 character cases right)
+    #    2: a namespace prefix used when writing xml, optional. A generated
+    #       prefix will be used otherwise.
+
+    [
+            ['http://soldierofcode.com/ivorydocs/docmodel', 'OADocModel', 'oadocmodel_ns1'],
+            ['http://soldierofcode.com/ivorydocs', 'IvoryDocsModel', 'ivorydocsmodel_ns1'],
+    ]
+  end
+end

data/regression/require-within-generated-code/test.rb

@@ -0,0 +1,6 @@
+
+$LOAD_PATH.unshift('.')
+require 'xampl-generated-code/all.rb'
+
+puts 'hello'
+

data/regression/require-within-generated-code/xml/customers.xml

@@ -0,0 +1,17 @@
+<ivorydocs pid=""
+           xmlns="http://soldierofcode.com/ivorydocs"
+           xmlns:docs="http://soldierofcode.com/ivorydocs/docmodel">
+
+  <customer pid=""
+            login_id=""
+            login_pwd=""
+            name=""
+            email=""
+            stamp=""
+            state="">
+
+    <docs:doc pid=""/>
+
+  </customer>
+
+</ivorydocs>

data/regression/require-within-generated-code/xml/docmodel.xml

@@ -0,0 +1,49 @@
+<oadevdoc pid=""
+          xmlns="http://soldierofcode.com/ivorydocs/docmodel">
+
+  <doc pid=""
+       name=""
+       urlid=""
+       state=""
+       stamp=""
+       last-modified=""
+       version="">
+
+    <section pid=""
+             name=""
+             urlid=""
+             state=""
+             stamp=""
+             last-modified=""
+             version=""
+             doc=""
+             title=""
+             zorder=""
+             icon=""
+             tags=""
+             summary="">
+
+        <page pid=""
+              prev-page=""
+              next-page=""
+              state=""
+              stamp=""
+              last-modified=""
+              version=""
+              title=""
+              tags=""
+              section=""
+              urlid="">
+
+          <block id=""
+                 title="">
+            <![CDATA[PUT HTML HERE]]>
+          </block>
+
+        </page>
+
+      </section>
+  </doc>
+
+
+</oadevdoc>

data/xamplr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.9.5"
+  s.version = "1.9.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-02-08}
   s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
   s.extra_rdoc_files = [
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
      "lib/xamplr/persisters/dumb.rb",
      "lib/xamplr/persisters/filesystem.rb",
      "lib/xamplr/persisters/in-memory.rb",
+     "lib/xamplr/persisters/mongo.rb",
      "lib/xamplr/persisters/simple.rb",
      "lib/xamplr/persisters/tokyo-cabinet.rb",
      "lib/xamplr/persisters/tokyo-cabinet.rb.1-DB",
@@ -91,6 +92,10 @@ Gem::Specification.new do |s|
      "regression/parsing-namespaced-xml/project-generator.rb",
      "regression/parsing-namespaced-xml/simple.rb",
      "regression/parsing-namespaced-xml/xml/simple.xml",
+     "regression/require-within-generated-code/project-generator.rb",
+     "regression/require-within-generated-code/test.rb",
+     "regression/require-within-generated-code/xml/customers.xml",
+     "regression/require-within-generated-code/xml/docmodel.xml",
      "regression/tc-indexes-crossing-pid-boundaries/Makefile",
      "regression/tc-indexes-crossing-pid-boundaries/bad-idea.rb",
      "regression/tc-indexes-crossing-pid-boundaries/fail-badly.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 -05:00
+date: 2010-02-08 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,6 +72,7 @@ files:
 - lib/xamplr/persisters/dumb.rb
 - lib/xamplr/persisters/filesystem.rb
 - lib/xamplr/persisters/in-memory.rb
+- lib/xamplr/persisters/mongo.rb
 - lib/xamplr/persisters/simple.rb
 - lib/xamplr/persisters/tokyo-cabinet.rb
 - lib/xamplr/persisters/tokyo-cabinet.rb.1-DB
@@ -116,6 +117,10 @@ files:
 - regression/parsing-namespaced-xml/project-generator.rb
 - regression/parsing-namespaced-xml/simple.rb
 - regression/parsing-namespaced-xml/xml/simple.xml
+- regression/require-within-generated-code/project-generator.rb
+- regression/require-within-generated-code/test.rb
+- regression/require-within-generated-code/xml/customers.xml
+- regression/require-within-generated-code/xml/docmodel.xml
 - regression/tc-indexes-crossing-pid-boundaries/Makefile
 - regression/tc-indexes-crossing-pid-boundaries/bad-idea.rb
 - regression/tc-indexes-crossing-pid-boundaries/fail-badly.rb