hutch-xamplr 1.0.2 → 1.0.3

data/examples/random-people-shared-addresses/what-to-query-on.rb

@@ -0,0 +1,82 @@
+$LOAD_PATH.unshift("xampl_generated_code")
+
+require 'set'
+require 'fastercsv'
+require 'RandomPeople'
+require 'people'
+
+Xampl.set_default_persister_kind(:tokyo_cabinet)
+Xampl.set_default_persister_format(:xml_format)
+
+module RandomPeople
+  arr_of_arrs = FasterCSV.read("random-names.csv")
+
+  surnames = Set.new
+  cities = Set.new
+  states = Set.new
+  email_domains = Set.new
+
+  arr_of_arrs.each do | row |
+    surname = row[1]
+    city = row[3]
+    state = row[4]
+
+    surnames << surname
+    cities << city
+    states << state
+
+    email = row[6]
+    domain = email.split("@")
+    if 2 == domain.size then
+      email_domains << domain[1]
+    end
+
+  end
+
+  puts "surnames: #{ surnames.size }"
+  puts "cities: #{ cities.size }"
+  puts "states: #{ states.size }"
+  puts "email_domains: #{ email_domains.size }"
+
+  puts "STATES:"
+  puts states.to_a.sort.inspect
+
+  puts "EMAIL DOMAINS:"
+  puts email_domains.to_a.sort.inspect
+
+  #GivenName,Surname,StreetAddress,City,State,ZipCode,EmailAddress,TelephoneNumber
+  #<people pid='' xmlns="http://xampl.com/people">
+  #    <person pid=''
+  #            given-name=''
+  #            surname=''
+  #            street-address=''
+  #            city=''
+  #            state=''
+  #            postal-code=''
+  #            email=''
+  #            phone=''/>
+  #</people>
+
+#  Xampl.transaction("random-people") do
+#
+#    people = People.new('people')
+#
+#    arr_of_arrs.each_with_index do | row, i |
+#      person = people.new_person("person-#{ i }")
+#      person.given_name = row[0]
+#      person.surname = row[1]
+#      person.street_address = row[2]
+#      person.city = row[3]
+#      person.state = row[4]
+#      person.postal_code = row[5]
+#      person.email = row[6]
+#      person.phone = row[7]
+#    end
+#  end
+#
+#  processed_at = Time.now
+#
+#  p counts
+#  p "parsed in #{ parsed_at - start_at }, counted in: #{ counted_at - parsed_at }, processed in: #{ processed_at - counted_at }"
+
+end

data/examples/random-people-shared-addresses/xampl-gen.rb

@@ -0,0 +1,36 @@
+#!/usr/bin/env ruby -w -I..
+
+if $0 == __FILE__ then
+
+  class File
+    def File.sjoin(*args)
+      File.join(args.select{ | o | o })
+    end
+  end
+
+  require 'xamplr-generator'
+
+  include XamplGenerator
+  include Xampl
+
+  Xampl.transaction("setup", :in_memory) do
+    directory = File.sjoin(".", "xampl_generated_code")
+
+    options = Xampl.make(Options) do |options|
+      options.new_index_attribute("pid").persisted = true
+      options.new_index_attribute("id")
+
+      options.resolve("http://xampl.com/people", "RandomPeople", "p")
+    end
+
+    filenames = Dir.glob("./xml/**/*.xml")
+
+    generator = Generator.new
+    generator.go(:options => options,
+                 :filenames => filenames,
+                 :directory => directory)
+
+    #puts generator.print_elements("./generated-elements.xml")
+    exit!
+  end
+end

data/examples/random-people-shared-addresses/xml/people.xml

@@ -0,0 +1,14 @@
+<people pid=''
+        xmlns="http://xampl.com/people">
+    <person pid=''
+            given-name=''
+            surname=''
+            email=''
+            phone=''>
+        <address pid=''
+                 street-address=''
+                 city=''
+                 state=''
+                 postal-code=''/>
+    </person>
+</people>

data/lib/xamplr/TODO

@@ -1,3 +1 @@
--- add a way of ignoring namespaces (e.g. xhtml) during load and comprehension
-     (have this for pp_xml)
--- escaped content is being repeatedly escaped
+-- escaped content is being repeatedly escaped (confirm, just a suspiscion from a long time ago)

data/lib/xamplr/persistence.rb

@@ -518,6 +518,10 @@ module Xampl
     @@persister.find_pids(hint) { | q | yield q } if @@persister
   end
 
+  def Xampl.find_mentions_of(xampl)
+    @@persister.find_mentions_of(xampl) if @@persister
+  end
+
   class Persister
     attr_accessor :name,
                   :automatic,
@@ -636,14 +640,14 @@ module Xampl
       @@persister.introduce(new_xampl)
     end
 
-    def represent(xampl)
+    def represent(xampl, mentions)
       #puts "REPRESENT #{xampl} load needed: #{xampl.load_needed}"
       #      return nil if xampl.load_needed
       case xampl.default_persister_format || @format
       when nil, :xml_format then
-        return xampl.persist
+        return xampl.persist("", mentions)
       when :ruby_format then
-        return xampl.to_ruby
+        return xampl.to_ruby(mentions)
       when :yaml_format then
         return xampl.as_yaml
       end

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

@@ -15,17 +15,16 @@ module Xampl
       unless result then
         rmsg = sprintf(msg, @tc_db.errmsg(@tc_db.ecode))
         STDERR.printf(rmsg)
-#        STDERR.printf("CODE: " + @tc_db.ecode)
-        puts "---------"
+        STDERR.puts "---------"
         caller(0).each do |trace|
           STDERR.puts(trace)
         end
-        puts "---------"
+        STDERR.puts "---------"
       end
       return rmsg
     end
 
-    $lexical_indexes = Set.new(%w{ class pid time-stamp }) unless defined?($lexical_indexes)
+    $lexical_indexes = Set.new(%w{ class pid time-stamp xampl_from xampl_to }) unless defined?($lexical_indexes)
     $numeric_indexes = Set.new unless defined?($numeric_indexes)
 
     def TokyoCabinetPersister.add_lexical_indexs(indexes)
@@ -64,6 +63,7 @@ module Xampl
       end
 
       # Don't care if there are errors (in fact, if the index exists a failure is the expected thing)
+
       $lexical_indexes.each do | index_name |
         @tc_db.setindex(index_name, TDB::ITLEXICAL | TDB::ITKEEP)
       end
@@ -193,7 +193,6 @@ module Xampl
       else
         return results
       end
-
     end
 
     def find_pids(hint=false)
@@ -215,7 +214,6 @@ module Xampl
       else
         return result_keys
       end
-
     end
 
     def find_meta(hint=false)
@@ -239,7 +237,40 @@ module Xampl
       else
         return results
       end
+    end
+
+    def find_mentions_of(xampl)
+      open_tc_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['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
     end
 
     def do_sync_write
@@ -281,7 +312,31 @@ 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)
-      data = represent(xampl)
+      mentions = Set.new
+      data = represent(xampl, mentions)
+
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl_from', :equals, place)
+      note_errors("TC:: failed to remove from mentions, error: %s\n") do
+        query.searchout
+      end
+
+      mentions.each do | mention |
+        mention_place = File.join(mention.class.name.split("::"), mention.get_the_index)
+        #TODO -- will repeadedly changing a persisted xampl object fragment the TC db?
+
+        pk = @tc_db.genuid
+        mention_hash = {
+                'xampl_from' => place,
+                'class' => xampl.class.name,
+                'pid' => xampl.get_the_index,
+                'xampl_to' => mention_place
+        }
+
+        note_errors("TC:: write error: %s\n") do
+          @tc_db.put(pk, mention_hash)
+        end
+      end
 
       xampl_hash = {
               'class' => xampl.class.name,
@@ -427,6 +482,14 @@ module Xampl
       end
     end
 
+    #
+    #  Performs the search and removes whatever's found
+    #
+
+    def searchout
+      r = @query.searchout
+    end
+
     # limits the search
 
     def setlimit(max=nil, skip=nil)

data/lib/xamplr/templates/element_data.template

@@ -5,7 +5,7 @@
 |if @element.persisted then
 |
     include Xampl::XamplPersistedObject
-  
+
     @@default_persister_format = nil
 
     def default_persister_format
@@ -18,6 +18,14 @@
       @@default_persister_format = format
     end
 
+    def #{@element.class_name}.find_by_query
+      things = Xampl.find_xampl do | q |
+         q.add_condition('class', :equals, self.name)
+         yield(q)
+       end
+    end
+
+
 |
 |else
 |
@@ -78,7 +86,7 @@
 |
                                  "@children",
                                  "@_content"
-                               ] 
+                               ]
 
     def to_yaml_properties
 |
@@ -154,7 +162,7 @@
 |
 | else
 |
-  
+
     def initialize
       super
 |
@@ -183,7 +191,7 @@
 |
 |}
 |
-  
+
       yield(self) if block_given?
       init_hook
 
@@ -201,11 +209,11 @@
 |}
 |
     end
-  
+
     def append_to(other)
       other.add_#{@element.attribute_name}(self)
     end
-  
+
 |
 |if @element.persisted then
 |
@@ -234,11 +242,11 @@
     def #{@element.class_name}.tag
       @@tag
     end
-  
+
     def #{@element.class_name}.ns
       @@ns
     end
-  
+
     def #{@element.class_name}.ns_tag
       @@ns_tag
     end
@@ -246,19 +254,19 @@
     def #{@element.class_name}.safe_name
       @@safe_name
     end
-  
+
     def #{@element.class_name}.module_name
       @@module_name
     end
-  
+
     def tag
       @@tag
     end
-  
+
     def ns
       @@ns
     end
-  
+
     def ns_tag
       @@ns_tag
     end
@@ -266,45 +274,45 @@
     def safe_name
       @@safe_name
     end
-  
+
     def module_name
       @@module_name
     end
-  
+
     def attributes
       @@attributes
     end
 |
 |if @element.indexed_by_attr
 |
-  
+
     def indexed_by
       :#{@element.indexed_by_attr}
     end
-  
+
     def get_the_index
       @#{@element.indexed_by_attr}
     end
-  
+
     def set_the_index(index)
       @#{@element.indexed_by_attr} = index
     end
 |
 |end
 |
-   
+
     def substitute_in_visit(visitor)
       return visitor.substitute_in_visit_#{@element.attribute_name}(self) || self
     end
-   
+
     def before_visit(visitor)
       visitor.before_visit_#{@element.attribute_name}(self)
     end
-   
+
     def visit(visitor)
       visitor.visit_#{@element.attribute_name}(self)
     end
-   
+
     def after_visit(visitor)
       visitor.after_visit_#{@element.attribute_name}(self)
     end

data/lib/xamplr/templates/element_empty.template

@@ -4,7 +4,7 @@
 |if @element.persisted then
 |
     include Xampl::XamplPersistedObject
-  
+
     @@default_persister_format = nil
 
     def default_persister_format
@@ -17,6 +17,13 @@
       @@default_persister_format = format
     end
 
+    def #{@element.class_name}.find_by_query
+      things = Xampl.find_xampl do | q |
+         q.add_condition('class', :equals, self.name)
+         yield(q)
+       end
+    end
+
 |
 |else
 |
@@ -25,7 +32,7 @@
 |end
 |
     include Xampl::XamplWithoutContent
-  
+
     @@tag = "#{element.name}"
     @@ns = "#{@element.namespace}"
     @@ns_tag = "{#{@element.namespace}}#{element.name}"
@@ -59,7 +66,7 @@
 |
 
     @@to_yaml_properties = [ "@#{@element.indexed_by_attr}" ]
-    @@to_yaml_properties_all = [ 
+    @@to_yaml_properties_all = [
 
 |
 |else
@@ -75,8 +82,8 @@
 |
 |}
 |
-                               ] 
-  
+                               ]
+
     def to_yaml_properties
 |
 |if @element.persisted then
@@ -160,7 +167,7 @@
 |
 | else
 |
-  
+
     def initialize
       super
 |
@@ -194,7 +201,7 @@
 
       changed
     end
-  
+
     def clear_non_persistent_index_attributes
 |
 |@element.attribute_child.each{ | attribute |
@@ -206,11 +213,11 @@
 |}
 |
     end
-  
+
     def append_to(other)
       other.add_#{element.attribute_name}(self)
     end
-  
+
 |
 |if @element.persisted then
 |
@@ -239,11 +246,11 @@
     def #{@element.class_name}.tag
       @@tag
     end
-  
+
     def #{@element.class_name}.ns
       @@ns
     end
-  
+
     def #{@element.class_name}.ns_tag
       @@ns_tag
     end
@@ -251,19 +258,19 @@
     def #{@element.class_name}.safe_name
       @@safe_name
     end
-  
+
     def #{@element.class_name}.module_name
       @@module_name
     end
-  
+
     def tag
       @@tag
     end
-  
+
     def ns
       @@ns
     end
-  
+
     def ns_tag
       @@ns_tag
     end
@@ -271,11 +278,11 @@
     def safe_name
       @@safe_name
     end
-  
+
     def module_name
       @@module_name
     end
-  
+
     def attributes
       @@attributes
     end
@@ -286,11 +293,11 @@
     def indexed_by
       :#{@element.indexed_by_attr}
     end
-  
+
     def get_the_index
       @#{@element.indexed_by_attr}
     end
-  
+
     def set_the_index(index)
       @#{@element.indexed_by_attr} = index
     end
@@ -301,15 +308,15 @@
     def substitute_in_visit(visitor)
       return visitor.substitute_in_visit_#{@element.attribute_name}(self) || self
     end
-   
+
     def before_visit(visitor)
       visitor.before_visit_#{@element.attribute_name}(self)
     end
-   
+
     def visit(visitor)
       visitor.visit_#{@element.attribute_name}(self)
     end
-   
+
     def after_visit(visitor)
       visitor.after_visit_#{@element.attribute_name}(self)
     end