hutch-xamplr 1.3.0 → 1.3.1

data/CHANGES.txt

@@ -1,11 +1,16 @@
 
-2009-05-12
+2009-05-13 (version 1.3.1)  REPO BREAKING CHANGE
+  -- added the ability to describe a xampl object using multiple criteria. This
+     is demonstrated in the new example called 'hobbies'
+
+2009-05-12 (version 1.3.0) 
   -- confirmed to work with tokyocabinet-1.4.20 and tokyocabinet-ruby-1.23
   -- the begginings of a new employee example from DDD book
   -- enhancements and cleanup of the graphml generation (nice UML diagrams)
   -- added a new yuml generation capability (very nice UML diagrams)
   -- make xamplr-pp a prerequisite, rather than hutch-xamplr-pp
-
+  -- this was supposed to be a patch release, the 1.3.1 release was supposed to be
+     the minor release.
 
 2009-05-11
   -- lots of undocumented changes

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 1
 :minor: 3
-:patch: 0
+:patch: 1

data/examples/hobbies/hobbies.rb

@@ -0,0 +1,193 @@
+require 'rubygems'
+require 'xampl_generated_code/Hobbies'
+
+Xampl.set_default_persister_kind(:tokyo_cabinet)
+Xampl.set_default_persister_format(:xml_format)
+
+
+module Hobbies
+
+  class Hobby
+    def Hobby.indexed_attributes
+      %w{ hobby-name }
+    end
+
+    Xampl::TokyoCabinetPersister.add_lexical_indexs(Hobby.indexed_attributes)
+
+#    puts "#{ __FILE__ }:#{ __LINE__ } lexical indexes: #{ Hobby.indexed_attributes.inspect }"
+
+    def describe_yourself
+      description = {
+              'hobby-name' => self.name
+      }
+
+#      puts "#{ __FILE__ }:#{ __LINE__ } description: #{ description.inspect }"
+
+      return description
+    end
+  end
+
+  class Person
+    def Person.indexed_attributes
+      %w{ person-name person-hobby }
+    end
+
+    Xampl::TokyoCabinetPersister.add_lexical_indexs(Person.indexed_attributes)
+
+#    puts "#{ __FILE__ }:#{ __LINE__ } lexical indexes: #{ Person.indexed_attributes.inspect }"
+
+    def describe_yourself
+      description = {
+              'person-name' => self.name
+      }
+
+      additional_descriptions = []
+
+      self.hobby.each do | hobby |
+        additional_descriptions << {
+                'person-hobby' => hobby.name
+        }
+      end
+
+#      puts "#{ __FILE__ }:#{ __LINE__ } description: #{ description.inspect }, additional: #{ additional_descriptions.inspect }"
+
+      return description, additional_descriptions
+    end
+  end
+
+  start_at = Time.now
+
+  repo_name = "hobbies-#{ start_at }"
+
+  Xampl.transaction(repo_name) do
+
+    (reading = Hobby.new('reading')).name = 'reading'
+    (tv = Hobby.new('tv')).name = 'tv'
+    (birds = Hobby.new('birds')).name = 'birds'
+
+    (jack = Person.new('jack')).name = 'Jack'
+    (jill = Person.new('jill')).name = 'Jill'
+
+    jack << reading
+    jack << tv
+
+    jill << reading
+    jill << birds
+  end
+
+  #  Xampl.transaction(repo_name) do
+  #    jack = Person['jack']
+  #    jill = Person['jill']
+  #
+  #    puts jack.pp_xml
+  #    puts jill.pp_xml
+  #  end
+
+  Xampl.transaction(repo_name) do
+    people = Person.find_by_query do | q |
+      q.add_condition('person-name', :streq, 'Jill')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people named Jill"
+    puts "#{ __FILE__ }:#{ __LINE__ } WRONG!! WRONG!! WRONG!! WRONG!! WRONG!! WRONG!! WRONG!! WRONG!!" unless 0 < people.size
+  end
+
+  #NOW... look for people with hobbies
+
+  Xampl.transaction(repo_name) do
+    people = Person.find_by_query do | q |
+      q.add_condition('person-hobby', :streq, 'reading')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people with hobby 'reading'"
+    people.each { | person | puts "#{ __FILE__ }:#{ __LINE__ }     #{ person.name }"}
+
+    people = Person.find_by_query do | q |
+      q.add_condition('person-hobby', :streq, 'birds')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people with hobby 'birds'"
+    people.each { | person | puts "#{ __FILE__ }:#{ __LINE__ }     #{ person.name }"}
+  end
+
+  #NOW... change hobby of someone and search again
+
+  Xampl.transaction(repo_name) do
+    jack = Person['jack']
+#    puts "#{ __FILE__ }:#{ __LINE__ } jack before: #{ jack.pp_xml }"
+    jack.remove_hobby('reading')
+
+    birds = Hobby['birds']
+    jack << birds if birds
+  end
+
+  #NOW... look for people with hobbies
+
+  Xampl.transaction(repo_name) do
+    people = Person.find_by_query do | q |
+      q.add_condition('person-name', :streq, 'Jack')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people with name 'Jack'"
+    people.each { | person | puts "#{ __FILE__ }:#{ __LINE__ }     #{ person.name }"}
+
+    people = Person.find_by_query do | q |
+      q.add_condition('person-hobby', :streq, 'reading')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people with hobby 'reading'"
+    people.each { | person | puts "#{ __FILE__ }:#{ __LINE__ }     #{ person.name }"}
+
+    people = Person.find_by_query do | q |
+      q.add_condition('person-hobby', :streq, 'birds')
+      q.order_by('person-name')
+    end
+
+    puts "#{ __FILE__ }:#{ __LINE__ } found #{ people.size } people with hobby 'birds'"
+    people.each { | person | puts "#{ __FILE__ }:#{ __LINE__ }     #{ person.name }"}
+
+    found = Xampl.find_xampl do | q |
+      q.add_condition('person-hobby', :streq, 'birds')
+      q.order_by('person-name')
+    end
+    found.each_with_index do | xampl, i |
+      puts "#{ __FILE__ }:#{ __LINE__ } Xampl.find_xampl(#{ i }) -- #{ xampl.name }"
+    end
+
+    found = Xampl.find_xampl do | q |
+      q.add_condition('person-name', :streq, 'Jack')
+      q.order_by('person-name')
+    end
+    puts "#{ __FILE__ }:#{ __LINE__ } FOUND: #{ found.size }"
+    found.each_with_index do | xampl, i |
+      puts "#{ __FILE__ }:#{ __LINE__ } Xampl.find_xampl(#{ i }) -- #{ xampl.name }"
+    end
+
+    found = Xampl.find_pids do | q |
+       q.add_condition('person-hobby', :streq, 'birds')
+       q.order_by('person-name')
+     end
+     found.each_with_index do | xampl, i |
+       puts "#{ __FILE__ }:#{ __LINE__ } Xampl.find_pids(#{ i }) -- #{ xampl }"
+     end
+
+     found = Xampl.find_meta do | q |
+      q.add_condition('person-hobby', :streq, 'birds')
+      q.order_by('person-name')
+    end
+    found.each_with_index do | xampl, i |
+      puts "#{ __FILE__ }:#{ __LINE__ } Xampl.find_meta(#{ i }) -- #{ xampl.inspect }"
+    end
+
+  end
+
+  done_at = Time.now
+
+  p "#{ __FILE__ }:#{ __LINE__ } ran in #{ done_at - start_at }"
+
+end

data/examples/hobbies/xampl-gen.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby -w -I..
+
+if $0 == __FILE__ then
+
+  class File
+    def File.sjoin(*args)
+      File.join(args.select{ | o | o })
+    end
+  end
+
+  $LOAD_PATH.unshift('../../lib/')
+
+  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/hobbies", "Hobbies", "h")
+    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/hobbies/xml/hobby.xml

@@ -0,0 +1,3 @@
+<hobby pid=''
+       name=''
+       xmlns="http://xampl.com/hobbies"/>

data/examples/hobbies/xml/people.xml

@@ -0,0 +1,5 @@
+<person pid=''
+        name=''
+        xmlns="http://xampl.com/hobbies">
+  <hobby pid=''/>
+</person>

data/lib/xamplr/graphml-out.rb

@@ -374,8 +374,8 @@ EOS
     def write_mixin_ref_edge(edge, class_node, mixin_node)
       @out << <<EOS
         <edge id="e#{ edge }"
-              source="n#{ class_node }"
-              target="n#{ mixin_node }">
+              source="n#{ mixin_node }"
+              target="n#{ class_node }">
             <data key="d2">
                 <y:PolyLineEdge>
                     <y:Path sx="0.0"
@@ -385,8 +385,8 @@ EOS
                     <y:LineStyle color="#000000"
                                  type="line"
                                  width="1.0"/>
-                    <y:Arrows source="none"
-                              target="white_delta"/>
+                    <y:Arrows source="white_delta"
+                              target="none"/>
                     <y:EdgeLabel alignment="center"
                                  distance="2.0"
                                  fontFamily="Dialog"

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

@@ -5,7 +5,7 @@ module Xampl
   require 'xamplr/persisters/caching'
   require 'set'
 
-#  require 'ruby-prof'
+  #  require 'ruby-prof'
 
   class TokyoCabinetPersister < AbstractCachingPersister
     include TokyoCabinet
@@ -26,7 +26,7 @@ module Xampl
       return rmsg
     end
 
-    $lexical_indexes = Set.new(%w{ class pid time-stamp xampl_from xampl_to }) unless defined?($lexical_indexes)
+    $lexical_indexes = Set.new(%w{ class pid time-stamp xampl-from xampl-to xampl-place }) unless defined?($lexical_indexes)
     $numeric_indexes = Set.new unless defined?($numeric_indexes)
 
     def TokyoCabinetPersister.add_lexical_indexs(indexes)
@@ -56,7 +56,7 @@ module Xampl
     def open_tc_db
       return if @tc_db
 #      puts "#{File.basename(__FILE__)}:#{__LINE__} open tc db: #{ @filename }"
-#puts "#{File.basename(__FILE__)}:#{__LINE__} callers..."
+      #puts "#{File.basename(__FILE__)}:#{__LINE__} callers..."
       #caller(0).each { | trace | puts "   #{trace}"}
       @tc_db = TDB.new
       note_errors("TC[[#{ @filename }]]:: tuning error: %s\n") do
@@ -219,10 +219,15 @@ module Xampl
         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 result_keys, the_hint
+        return results, the_hint
       else
-        return result_keys
+        return results
       end
     end
 
@@ -255,7 +260,7 @@ module Xampl
       place = File.join(xampl.class.name.split("::"), xampl.get_the_index)
 
       query = TableQuery.new(@tc_db)
-      query.add_condition('xampl_to', :equals, place)
+      query.add_condition('xampl-to', :equals, place)
       result_keys = query.search
 
       class_cache = {}
@@ -263,7 +268,7 @@ module Xampl
         result = @tc_db[ key ]
         next unless result
 
-        mentioner = result['xampl_from']
+        mentioner = result['xampl-from']
         class_name = result['mentioned_class']
         result_class = class_cache[class_name]
         unless result_class then
@@ -331,12 +336,12 @@ module Xampl
         #        end
       end
 #      puts "               num records: #{ @tc_db.rnum() }"
-#      puts "#{ __FILE__ }:#{ __LINE__ } keys..."
-#      @tc_db.keys.each do | key |
-#        meta = @tc_db[key]
-#        meta['xampl'] = (meta['xampl'] || "no rep")[0..25]
-#        puts "         key: [#{ key }] -- #{ meta.inspect }"
-#      end
+      #      puts "#{ __FILE__ }:#{ __LINE__ } keys..."
+      #      @tc_db.keys.each do | key |
+      #        meta = @tc_db[key]
+      #        meta['xampl'] = (meta['xampl'] || "no rep")[0..25]
+      #        puts "         key: [#{ key }] -- #{ meta.inspect }"
+      #      end
     end
 
     def write(xampl)
@@ -346,8 +351,15 @@ module Xampl
       mentions = Set.new
       data = represent(xampl, mentions)
 
+      #get rid of any supplimentary indexes associated with this xampl object
       query = TableQuery.new(@tc_db)
-      query.add_condition('xampl_from', :equals, place)
+      query.add_condition('xampl-from', :equals, place)
+      note_errors("TC[[#{ @filename }]]:: failed to remove from mentions, error: %s\n") do
+        query.searchout
+      end
+
+      query = TableQuery.new(@tc_db)
+      query.add_condition('xampl-place', :equals, place)
       note_errors("TC[[#{ @filename }]]:: failed to remove from mentions, error: %s\n") do
         query.searchout
       end
@@ -358,10 +370,10 @@ module Xampl
 
         pk = @tc_db.genuid
         mention_hash = {
-                'xampl_from' => place,
+                'xampl-from' => place,
                 'mentioned_class' => xampl.class.name,
                 'pid' => xampl.get_the_index,
-                'xampl_to' => mention_place
+                'xampl-to' => mention_place
         }
 
         note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
@@ -376,15 +388,31 @@ module Xampl
               'xampl' => data
       }
 
-      hash = xampl.describe_yourself
-      if hash then
-        xampl_hash = hash.merge(xampl_hash)
+      primary_description, secondary_descriptions = xampl.describe_yourself
+      if primary_description then
+        xampl_hash = primary_description.merge(xampl_hash)
       end
 
       note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
         @tc_db.put(place, xampl_hash)
       end
 
+      if secondary_descriptions then
+        xampl_hash = {
+                'class' => xampl.class.name,
+                'pid' => xampl.get_the_index,
+                'xampl-place' => place
+        }
+        secondary_descriptions.each do | secondary_description |
+          description = secondary_description.merge(xampl_hash)
+
+          note_errors("TC[[#{ @filename }]]:: write error: %s\n") do
+            pk = @tc_db.genuid
+            @tc_db.put(pk, description)
+          end
+        end
+      end
+
       @write_count = @write_count + 1
       xampl.changes_accepted
       return true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,10 @@ files:
 - examples/employees/yuml-diagrams/yuml-simplified.txt
 - examples/employees/yuml-diagrams/yuml-with-mixins.txt
 - examples/employees/yuml-diagrams/yuml.txt
+- examples/hobbies/hobbies.rb
+- examples/hobbies/xampl-gen.rb
+- examples/hobbies/xml/hobby.xml
+- examples/hobbies/xml/people.xml
 - examples/random-people-shared-addresses/Makefile
 - examples/random-people-shared-addresses/batch-load-users.rb
 - examples/random-people-shared-addresses/find-mentions.rb
@@ -239,6 +243,8 @@ test_files:
 - examples/employees/final/xampl-gen.rb
 - examples/employees/first/xampl-gen.rb
 - examples/employees/twist/xampl-gen.rb
+- examples/hobbies/hobbies.rb
+- examples/hobbies/xampl-gen.rb
 - examples/random-people/batch-load-users.rb
 - examples/random-people/optimise.rb
 - examples/random-people/people.rb