hutch-xamplr 1.0.2 → 1.0.3

data/lib/xamplr/templates/element_mixed.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::XamplWithMixedContent
-    
+
     @@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
@@ -68,7 +75,7 @@
     @@to_yaml_properties     = [
 |
 | end
-| 
+|
 |@element.attribute_child.each{ | attribute |
 |
                                  "@#{attribute.name}",
@@ -76,8 +83,8 @@
 |}
 |
                                  "@children"
-                               ] 
-  
+                               ]
+
     def to_yaml_properties
 |
 |if @element.persisted then
@@ -152,7 +159,7 @@
 |
 | else
 |
-  
+
     def initialize
       super
 |
@@ -187,7 +194,7 @@
 
       changed
     end
-  
+
     def clear_non_persistent_index_attributes
 |
 |@element.attribute_child.each{ | attribute |
@@ -199,11 +206,11 @@
 |}
 |
     end
-  
+
     def append_to(other)
       other.add_#{@element.attribute_name}(self)
     end
-  
+
 |
 |if @element.persisted then
 |
@@ -232,11 +239,11 @@
     def #{@element.class_name}.tag
       @@tag
     end
-  
+
     def #{@element.class_name}.ns
       @@ns
     end
-  
+
     def #{@element.class_name}.ns_tag
       @@ns_tag
     end
@@ -244,19 +251,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
@@ -264,11 +271,11 @@
     def safe_name
       @@safe_name
     end
-  
+
     def module_name
       @@module_name
     end
-  
+
     def attributes
       @@attributes
     end
@@ -279,30 +286,30 @@
     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_simple.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::XamplWithSimpleContent
-  
+
     @@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,7 +82,7 @@
 |}
 |
                                  "@_content"
-                               ] 
+                               ]
 
     def to_yaml_properties
 |
@@ -151,7 +158,7 @@
 |
 | else
 |
-  
+
     def initialize
       super
 |
@@ -185,7 +192,7 @@
 
       changed
     end
-  
+
     def clear_non_persistent_index_attributes
 |
 |@element.attribute_child.each{ | attribute |
@@ -197,11 +204,11 @@
 |}
 |
     end
-  
+
     def append_to(other)
       other.add_#{@element.attribute_name}(self)
     end
-  
+
 |
 |if @element.persisted then
 |
@@ -230,11 +237,11 @@
     def #{@element.class_name}.tag
       @@tag
     end
-  
+
     def #{@element.class_name}.ns
       @@ns
     end
-  
+
     def #{@element.class_name}.ns_tag
       @@ns_tag
     end
@@ -242,19 +249,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
@@ -262,11 +269,11 @@
     def safe_name
       @@safe_name
     end
-  
+
     def module_name
       @@module_name
     end
-  
+
     def attributes
       @@attributes
     end
@@ -277,30 +284,30 @@
     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/{bench-cache.rb → test-support/bench-cache.rb}

@@ -9,7 +9,7 @@ include XamplExample
 require "benchmark"
 include Benchmark
 
-require 'persister/fsdb'
+#require 'persister/fsdb'
 require 'wee-cache/cache'
 
 class LRUCache < Cache::StorageCache

data/lib/xamplr/{bench2.rb → test-support/bench2.rb}

@@ -9,7 +9,7 @@ include XamplExample
 require "benchmark"
 include Benchmark
 
-require 'persister/fsdb'
+#require 'persister/fsdb'
 
 module Bench
 
@@ -32,10 +32,10 @@ module Bench
         Xampl.enable_persister("bench2_no_rollback_filesystem", :filesystem)
         writes += Bench.no_rollbacks(count_things, count)
       }
-      x.report("fsdb") {
-        Xampl.enable_persister("bench2_no_rollback_fsdb", :fsdb)
-        Bench.no_rollbacks(count_things, count)
-      }
+#      x.report("fsdb") {
+#        Xampl.enable_persister("bench2_no_rollback_fsdb", :fsdb)
+#        Bench.no_rollbacks(count_things, count)
+#      }
     end
     puts "   writes: #{writes}"
 
@@ -54,10 +54,10 @@ module Bench
         Xampl.enable_persister("bench2_rollback_filesystem", :filesystem)
         writes += Bench.rollbacks(count_things, count)
       }
-      x.report("fsdb") {
-        Xampl.enable_persister("bench2_rollback_fsdb", :fsdb)
-        Bench.rollbacks(count_things, count)
-      }
+#      x.report("fsdb") {
+#        Xampl.enable_persister("bench2_rollback_fsdb", :fsdb)
+#        Bench.rollbacks(count_things, count)
+#      }
     end
     puts "   writes: #{writes}"
   end

data/lib/xamplr/{test.rb → test-support/test.rb}

@@ -1455,80 +1455,80 @@ class TestXampl < Test::Unit::TestCase
     pp_xml = root.pp_xml
   end
 
-  def test_fsdb_extension_persistence_basics
-    require 'persister/fsdb'
-    stuff = Stuff.new
-    thing = Thing.new
-    thing << stuff
-
-    thing.pid = "thing"
-
-    assert_xampl_exception(:name_required){
-      Xampl.enable_persister(nil, :fsdb)
-    }
-
-    pname = "test_fsdb_extension_persistence_basics" << Time.now.strftime("%Y%m%d-%H%M-%S") << rand.to_s
-    Xampl.enable_persister(pname, :fsdb)
-
-    stuff = Stuff.new
-    thing = Thing.new
-    thing.pid = "thing"
-    thing << stuff
-
-    assert_nil(Xampl.lookup(Thing, "thing"))
-
-    assert(nil == thing.persister)
-    assert(thing.is_changed)
-    assert_equal(0, Xampl.count_changed)
-
-    Xampl.introduce_to_persister(thing)
-
-    assert(thing.persister)
-    assert_equal(1, Xampl.count_changed)
-    assert_same(thing, Xampl.lookup(Thing, "thing"), "cannot lookup new stuff")
-
-    #Xampl.print_stats
-
-    assert_equal(1, Xampl.count_changed)
-    writes = Xampl.sync
-    assert_equal(1, writes)
-    assert_equal(0, Xampl.count_changed)
-    assert(Xampl.lookup(Thing, "thing"))
-
-    thing2 = Xampl.lookup(Thing, "thing")
-    assert_same(thing, thing2, "cannot lookup cached stuff")
-
-    Xampl.clear_cache
-
-    found = Xampl.lookup(Thing, "thing")
-    assert_not_same(thing, found)
-    assert(thing === found)
-
-    Xampl.clear_cache
-
-    # now, changing thing will affect the DB -- VERY SUBTLE POSSIBLIITY OF BUG!
-    thing.new_stuff
-    assert_equal(2, thing.stuff.size)
-    assert_equal(1, found.stuff.size)
-
-    writes = Xampl.sync
-
-    assert_equal(2, thing.stuff.size)
-    assert_equal(1, found.stuff.size)
-
-    found2 = Xampl.lookup(Thing, "thing")
-
-    assert_equal(2, thing.stuff.size)
-    assert_equal(1, found.stuff.size)
-    assert_equal(2, found2.stuff.size)
-
-    assert(!(found === found2))
-    assert(thing === found2)
-
-    assert_not_equal(found, found2)
-
-    #Xampl.print_stats
-  end
+#  def test_fsdb_extension_persistence_basics
+#    require 'persister/fsdb'
+#    stuff = Stuff.new
+#    thing = Thing.new
+#    thing << stuff
+#
+#    thing.pid = "thing"
+#
+#    assert_xampl_exception(:name_required){
+#      Xampl.enable_persister(nil, :fsdb)
+#    }
+#
+#    pname = "test_fsdb_extension_persistence_basics" << Time.now.strftime("%Y%m%d-%H%M-%S") << rand.to_s
+#    Xampl.enable_persister(pname, :fsdb)
+#
+#    stuff = Stuff.new
+#    thing = Thing.new
+#    thing.pid = "thing"
+#    thing << stuff
+#
+#    assert_nil(Xampl.lookup(Thing, "thing"))
+#
+#    assert(nil == thing.persister)
+#    assert(thing.is_changed)
+#    assert_equal(0, Xampl.count_changed)
+#
+#    Xampl.introduce_to_persister(thing)
+#
+#    assert(thing.persister)
+#    assert_equal(1, Xampl.count_changed)
+#    assert_same(thing, Xampl.lookup(Thing, "thing"), "cannot lookup new stuff")
+#
+#    #Xampl.print_stats
+#
+#    assert_equal(1, Xampl.count_changed)
+#    writes = Xampl.sync
+#    assert_equal(1, writes)
+#    assert_equal(0, Xampl.count_changed)
+#    assert(Xampl.lookup(Thing, "thing"))
+#
+#    thing2 = Xampl.lookup(Thing, "thing")
+#    assert_same(thing, thing2, "cannot lookup cached stuff")
+#
+#    Xampl.clear_cache
+#
+#    found = Xampl.lookup(Thing, "thing")
+#    assert_not_same(thing, found)
+#    assert(thing === found)
+#
+#    Xampl.clear_cache
+#
+#    # now, changing thing will affect the DB -- VERY SUBTLE POSSIBLIITY OF BUG!
+#    thing.new_stuff
+#    assert_equal(2, thing.stuff.size)
+#    assert_equal(1, found.stuff.size)
+#
+#    writes = Xampl.sync
+#
+#    assert_equal(2, thing.stuff.size)
+#    assert_equal(1, found.stuff.size)
+#
+#    found2 = Xampl.lookup(Thing, "thing")
+#
+#    assert_equal(2, thing.stuff.size)
+#    assert_equal(1, found.stuff.size)
+#    assert_equal(2, found2.stuff.size)
+#
+#    assert(!(found === found2))
+#    assert(thing === found2)
+#
+#    assert_not_equal(found, found2)
+#
+#    #Xampl.print_stats
+#  end
 
   def test_simple_extension_persistence_basics
     stuff = Stuff.new