hutch-xamplr 1.0.5 → 1.1.0

data/lib/xamplr/xampl-persisted-object.rb

@@ -0,0 +1,122 @@
+module Xampl
+
+  module XamplPersistedObject
+    include XamplObject
+
+    attr_reader :persister
+    attr_accessor :load_needed
+
+    def persist_required
+      return true
+    end
+
+    def accessed
+      raise XamplIsInvalid.new(self) if invalid
+      # TODO -- why do I need to get rid of this line, alternatively, why
+      # is this next line even there? Well, because accessed is now called
+      # differently. But???
+      #raise NoActivePersister unless @persister
+
+      if @load_needed and @persister then
+        raise NoActivePersister.new unless @persister
+
+        if nil == Xampl.persister then
+          #raise UnmanagedChange.new(self)
+          if not @persister.syncing then
+            Xampl.read_only(@persister) do
+              Xampl.lazy_load(self)
+            end
+          else
+            puts "LOAD NEEDED(2): REFUSED (persister: #{@persister.name})"
+            puts "                pid: #{self.get_the_index} #{self}"
+            caller(0).each { | trace | puts "  #{trace}"}
+          end
+        elsif Xampl.persister != @persister then
+          raise MixedPersisters.new(@persister, self)
+        elsif Xampl.persister == @persister then
+          if not @persister.syncing then
+            Xampl.lazy_load(self)
+          else
+            puts "LOAD NEEDED(3): REFUSED (persister: #{@persister.name})"
+            puts "                pid: #{self.get_the_index} #{self}"
+            caller(0).each { | trace | puts "  #{trace}"}
+          end
+        else
+          puts "LOAD NEEDED(4): REFUSED (persister: #{@persister.name})"
+          puts "                pid: #{self.get_the_index} #{self}"
+          caller(0).each { | trace | puts "  #{trace}"}
+        end
+      else
+        puts "LOAD NEEDED(5): REFUSED (persister: #{@persister})" if @load_needed
+        puts "                pid: #{self.get_the_index} #{self}" if @load_needed
+        caller(0).each { | trace | puts "  #{trace}"} if @load_needed
+      end
+    end
+
+    def changed
+      #puts "CHANGED: is_changed #{@is_changed} xampl #{self}"
+      unless Xampl.persister then
+        raise UnmanagedChange.new(self)
+      end
+      if @persister then
+        if Xampl.persister != @persister then
+          raise UnmanagedChange.new(self)
+        end
+        if @persister.block_changes then
+          raise BlockedChange.new(self)
+        end
+      end
+      unless @is_changed then
+        @is_changed = true
+        if @persister then
+          @persister.has_changed self
+        end
+      end
+    end
+
+    def force_load
+      @load_needed = true
+      @is_changed = false
+      @persister.has_not_changed(self) if @persister
+      self.clear_non_persistent_index_attributes
+      methods = self.methods.grep(/init_.*_as_child/)
+      methods.each do |method_name|
+        self.send(method_name)
+      end
+      @children = []
+    end
+
+    def reset_contents
+      self.clear_non_persistent_index_attributes
+      self.methods.grep(/init_.*_as_child/).each do |method_name|
+        self.send(method_name)
+      end
+      @children = []
+    end
+
+    def introduce_persister(persister)
+      #accessed
+      if @persister and (@persister != persister) then
+        raise AlreadyKnownToPersister.new(self, persister)
+      end
+      @persister = persister
+      return true
+    end
+
+    def init_xampl_object
+      super
+      @persister = nil
+      @load_needed = false
+      if (Xampl.persister and Xampl.persister.automatic) then
+        Xampl.persister.introduce(self)
+      else
+        introduce_persister(nil)
+      end
+    end
+
+    def describe_yourself
+      nil
+    end
+  end
+
+end

data/lib/xamplr/xml-text.rb

@@ -0,0 +1,117 @@
+module Xampl
+
+  class XMLText
+    attr_accessor  :namespaces, :prefix_ns_map, :ns, :first_text, :text
+
+    def initialize
+      @namespaces = []
+      @prefix_ns_map = {}
+      @first_text = nil
+      @text = nil
+      @ns = nil
+    end
+
+    def start_element(pp, depth)
+      @namespaces = {}
+      @namespaces[pp.namespace] = pp.namespace
+
+      depth += 1
+
+      if @first_text then
+        @text << "<" << pp.qname
+
+        pp.attributeCount.times do |i|
+          @text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
+
+          prefix = pp.attributePrefix(i)
+          if prefix then
+            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
+          end
+        end
+      else
+        @first_text = "<" << pp.qname
+
+        pp.attributeCount.times do |i|
+          @first_text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
+
+          prefix = pp.attributePrefix(i)
+          if prefix then
+            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
+          end
+        end
+        @text = ""
+      end
+
+      prefix = pp.prefix
+      if prefix then
+        @prefix_ns_map[prefix] = pp.namespace
+      end
+
+      if @ns != pp.namespace then
+        @text << " xmlns='" << pp.namespace << "'"
+      end
+
+      @text << ">"
+
+      return depth
+    end
+
+    def end_element(pp, depth)
+      depth -= 1
+
+      @text << "</"
+      @text << pp.prefix << ":" if pp.prefix
+      @text << pp.name << ">"
+
+      return depth
+    end
+
+    def to_s
+      @text
+    end
+
+    def to_xml(xml_printer=nil)
+      @text
+    end
+
+    def build(pp)
+      @namespaces = {}
+      @first_text = nil
+      @text = nil
+
+      depth = start_element(pp, 0)
+
+      while true
+        raise XamplException.new("unexpected end of document") if pp.endDocument?
+
+        case pp.nextEvent
+        when Xampl_PP::START_DOCUMENT
+          raise XamplException.new("unexpected start of document")
+        when Xampl_PP::END_DOCUMENT
+          raise XamplException.new("unexpected end of document")
+        when Xampl_PP::START_ELEMENT
+          depth = start_element(pp, depth)
+        when Xampl_PP::END_ELEMENT
+          depth = end_element(pp, depth)
+          break if depth <= 0
+        when Xampl_PP::TEXT, Xampl_PP::CDATA_SECTION, Xampl_PP::ENTITY_REF
+          @text << pp.text
+          #when Xampl_PP::IGNORABLE_WHITESPACE
+          #when Xampl_PP::PROCESSING_INSTRUCTION
+          #when Xampl_PP::COMMENT
+          #when Xampl_PP::DOCTYPE
+        end
+      end
+
+      @namespaces = @namespaces.keys
+
+      @prefix_ns_map.sort.each do |prefix, ns|
+        @first_text << " xmlns:" << prefix << "='" << ns << "'"
+      end
+      @first_text << @text
+      @text = @first_text
+      @first_text = nil
+    end
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: hutch-xamplr
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Bob Hutchison
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-05-04 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.1.3
+    version: 
 description: 
 email: hutch@recursive.ca
 executables: []
@@ -46,6 +56,9 @@ files:
 - 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/results.write.BASELINE
+- examples/random-people-shared-addresses/results.write.NEW_ATTR_ENCODING
+- examples/random-people-shared-addresses/settings.rb
 - 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
@@ -57,9 +70,19 @@ files:
 - examples/random-people/query2.rb
 - examples/random-people/random-names.csv
 - examples/random-people/rawtc.rb
+- examples/random-people/settings.rb
 - examples/random-people/what-to-query-on.rb
 - examples/random-people/xampl-gen.rb
 - examples/random-people/xml/people.xml
+- examples/read-testing/Makefile
+- examples/read-testing/load.rb
+- examples/read-testing/read.rb
+- examples/read-testing/results.read.BASELINE
+- examples/read-testing/results.read.FAST
+- examples/read-testing/rrr.rb
+- examples/read-testing/settings.rb
+- examples/read-testing/xampl-gen.rb
+- examples/read-testing/xml/text.xml
 - examples/tokyo-cabinet-experimental/expt-query.rb
 - examples/tokyo-cabinet-experimental/expt-query2.rb
 - examples/tokyo-cabinet-experimental/expt-query3.rb
@@ -73,6 +96,8 @@ files:
 - lib/xamplr.rb
 - lib/xamplr/README-POSSIBLE-PROBLEMS
 - lib/xamplr/TODO
+- lib/xamplr/exceptions.rb
+- lib/xamplr/from-xml-orig.rb
 - lib/xamplr/from-xml.rb
 - lib/xamplr/gen-elements.xml
 - lib/xamplr/gen.elements.xml
@@ -86,36 +111,34 @@ files:
 - lib/xamplr/my.gen.elements.xml
 - lib/xamplr/notifications.rb
 - lib/xamplr/obsolete/fsdb.rb
+- lib/xamplr/persist-to-xml.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/in-memory.rb
-- lib/xamplr/persister/simple.rb
-- lib/xamplr/persister/subversion.rb
-- lib/xamplr/persister/tokyo-cabinet.rb
-- lib/xamplr/rac.sh
-- lib/xamplr/rac_gen.sh
+- lib/xamplr/persister.rb
+- lib/xamplr/persisters/caches.rb
+- lib/xamplr/persisters/caching.rb
+- lib/xamplr/persisters/filesystem.rb
+- lib/xamplr/persisters/in-memory.rb
+- lib/xamplr/persisters/simple.rb
+- lib/xamplr/persisters/tokyo-cabinet.rb
 - lib/xamplr/simpleTemplate/danger.rx
-- lib/xamplr/simpleTemplate/input-c.r4
+- lib/xamplr/simpleTemplate/obsolete/input-c.r4
+- lib/xamplr/simpleTemplate/obsolete/play.r6.txt
+- lib/xamplr/simpleTemplate/obsolete/play_more.r6.txt
+- lib/xamplr/simpleTemplate/obsolete/test001.r5
+- lib/xamplr/simpleTemplate/obsolete/test002.r5
+- lib/xamplr/simpleTemplate/obsolete/test003.r5
 - lib/xamplr/simpleTemplate/old/r6.000.rb
 - lib/xamplr/simpleTemplate/old/r6.001.rb
 - lib/xamplr/simpleTemplate/play.r6
-- lib/xamplr/simpleTemplate/play.r6.txt
 - lib/xamplr/simpleTemplate/play_more.r6
-- lib/xamplr/simpleTemplate/play_more.r6.txt
 - lib/xamplr/simpleTemplate/play_noblanks.r6
 - lib/xamplr/simpleTemplate/playq.r6
 - lib/xamplr/simpleTemplate/r6.rb
 - lib/xamplr/simpleTemplate/simple-template.rb
-- lib/xamplr/simpleTemplate/test001.r5
-- lib/xamplr/simpleTemplate/test002.r5
-- lib/xamplr/simpleTemplate/test003.r5
 - lib/xamplr/templates/child.template
 - lib/xamplr/templates/child_indexed.template
-- lib/xamplr/templates/child_indexed.template.000
 - lib/xamplr/templates/child_modules.template
 - lib/xamplr/templates/element_classes.template
 - lib/xamplr/templates/element_data.template
@@ -145,9 +168,14 @@ files:
 - lib/xamplr/to-xml.rb
 - lib/xamplr/version.rb
 - lib/xamplr/visitor.rb
+- lib/xamplr/visitors.rb
 - lib/xamplr/xampl-generator.rb
 - lib/xamplr/xampl-hand-generated.rb
+- lib/xamplr/xampl-module.rb
+- lib/xamplr/xampl-object-internals.rb
 - lib/xamplr/xampl-object.rb
+- lib/xamplr/xampl-persisted-object.rb
+- lib/xamplr/xml-text.rb
 - lib/xamplr/xml/document.xml
 - lib/xamplr/xml/elements.xml
 - lib/xamplr/xml/elements000.xml
@@ -191,6 +219,7 @@ test_files:
 - examples/random-people/query.rb
 - examples/random-people/query2.rb
 - examples/random-people/rawtc.rb
+- examples/random-people/settings.rb
 - examples/random-people/what-to-query-on.rb
 - examples/random-people/xampl-gen.rb
 - examples/random-people-shared-addresses/batch-load-users.rb
@@ -200,8 +229,14 @@ test_files:
 - 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/settings.rb
 - examples/random-people-shared-addresses/what-to-query-on.rb
 - examples/random-people-shared-addresses/xampl-gen.rb
+- examples/read-testing/load.rb
+- examples/read-testing/read.rb
+- examples/read-testing/rrr.rb
+- examples/read-testing/settings.rb
+- examples/read-testing/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/persister/subversion.rb

@@ -1,61 +0,0 @@
-module Xampl
-
-  require 'xamplr/version'
-
-  require "fileutils"
-  require "xamplr/persister/caching"
-
-  class SubversionPersister < AbstractCachingPersister
-
-    def initialize(name=nil, format=nil, root=File.join(".", "repo"))
-      super(root, name, format)
-    end
-
-    def SubversionPersister.kind
-      :subversion
-    end
-
-    def kind
-      SubversionPersister.kind
-    end
-
-    def version(stream)
-      catch(:refuse_to_version) do
-        Version.new(@repo_name, @repo_root).make(stream)
-      end
-    end
-
-
-    def write(xampl)
-      #raise XamplException.new(:no_index_so_no_persist) unless xampl.get_the_index or xampl.ignore_when_no_index
-      raise XamplException.new("no_index_so_no_persist [#{xampl.class.name}]") unless xampl.get_the_index or xampl.ignore_when_no_index
-      return unless xampl.get_the_index
-
-      place = File.join(@root_dir, xampl.class.name.split("::"))
-
-      FileUtils.mkdir_p(place) unless File.exist?(place)
-
-      place = File.join(place, xampl.get_the_index)
-
-      representation = represent(xampl)
-      if representation then
-        File.open(place, "w"){ | out |
-          out.puts representation
-        }
-        @write_count = @write_count + 1
-      end
-      xampl.changes_accepted
-      return true
-    end
-
-    def read_representation(klass, pid)
-      place = File.join(@root_dir, klass.name.split("::"), pid)
-
-      return nil unless File.exist?(place)
-      return File.read(place)
-    end
-  end
-
-  Xampl.register_persister_kind(SubversionPersister)
-end
-