xamplr 1.3.15 → 1.9.0

data/LICENSE

@@ -1,3 +1,3 @@
-Copyright (c) 2009 Bob Hutchison
+Copyright (c) 2002-2010 Bob Hutchison
 
 see COPYING

data/README.md

@@ -0,0 +1,33 @@
+# xamplr
+
+xamplr is a set of software tools that supports development of ruby applications.
+
+It consists of three gems hosted on gem cutter, source code on
+github.
+
+* xamplr-pp -- this is a pure ruby pull parser
+* xamplr -- this is the xampl runtime
+* xamplr-gen -- this is the code generator
+
+There is an additional fourth github repository containing
+examples and documentation that will be coming soon.
+
+Yes, that means that there's no documentation. And no examples. I agree, this is a very bad situation.
+
+## Installation:
+
+> sudo gem install xamplr-gen
+
+This will install all three gems.
+
+
+## License:
+
+xamplr-pp and xamlpr are both licensed under the LGPLv3.
+
+xamplr-gen is licensed under AGPLv3
+
+An alternative license may be negotiated, contact me (hutch@xampl.com)
+
+Copyright (c) 2002-2010 Bob Hutchison.
+

data/Rakefile

@@ -6,12 +6,12 @@ begin
   Jeweler::Tasks.new do |gem|
     gem.name = "xamplr"
     gem.summary = %Q{xamplr is the ruby version of xampl}
+    gem.description = %Q{xamplr is the ruby version of xampl.}
     gem.email = "hutch@recursive.ca"
     gem.homepage = "http://github.com/hutch/xamplr"
     gem.authors = ["Bob Hutchison"]
-    gem.rubyforge_project = 'xampl'
 
-    gem.add_dependency('xamplr-pp', '>=1.1.2')
+    gem.add_dependency('xamplr-pp', '>=1.2.0')
     gem.add_dependency('libxml-ruby', '>=1.1.3')
 
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 1
-:minor: 3
-:patch: 15
+:minor: 9
+:patch: 0
 :build: 

data/lib/xamplr.rb

@@ -31,6 +31,7 @@ module Xampl
   require 'xamplr/visitor'
   require 'xamplr/persist-to-xml'
   require 'xamplr/visitors'
+  require 'xamplr/iterator'
 
 end
 

data/lib/xamplr/iterator.rb

@@ -0,0 +1,123 @@
+require 'set'
+
+module Xampl
+
+  class Iterator
+    attr_accessor :on_seen, :on_cycle, :exhausted, :alive
+
+    def Iterator.create(xampl, options={})
+      iterator = Iterator.new(options)
+      fib = Fiber.new do
+        iterator.consider(xampl)
+        iterator.alive = false
+        iterator.set_fiber(nil)
+      end
+      iterator.set_fiber(fib)
+      iterator
+    end
+
+    def initialize(options)
+      case options[:cycle]
+        when :stop, :error, :ignore, :notify, :notify_then_stop
+          @on_cycle = options[:cycle]
+        else
+          @on_cycle = :notify_then_stop
+      end
+
+      case options[:seen]
+        when :stop, :error, :ignore, :notify, :notify_then_stop
+          @on_seen = options[:seen]
+        else
+          @on_seen = :notify_then_stop
+      end
+
+      @exhausted = false
+      @visiting = Hash.new 0
+      @visited = Set.new
+      @alive = true
+    end
+
+    def set_fiber(fib)
+      @fib = fib
+    end
+
+    def next(control={})
+      return nil, { :done => true } unless alive
+      @fib.resume(control)
+    end
+
+    def no_children
+      return nil, { :done => true } unless alive
+      @fib.resume(:no_children => true)
+    end
+
+    def stop
+      return nil, { :done => true } unless alive
+      @fib.resume(:stop => true)
+    end
+
+    def ignore
+      return nil, { :done => true } unless alive
+      @fib.resume(:ignore => true)
+    end
+
+    def terminate
+      @alive = false
+      @fib = nil
+      return nil, { :done => true }
+    end
+
+    def consider(xampl)
+      stop_after_reporting = false
+      notices={}
+
+      cycle = (1 < (@visiting[xampl] += 1))
+      if cycle then
+        case on_cycle
+          when :stop
+            return
+          when :ignore
+          when :notify, :notify_then_stop
+            stop_after_reporting = true
+            notices[:cycling] = true
+          when :error
+            throw "cycle on :#{ xampl }"
+        end
+      else
+        if @visited.member?(xampl) then
+          case on_seen
+            when :stop
+              return
+            when :ignore
+            when :notify, :notify_then_stop
+              stop_after_reporting = true
+              notices[:seen] = true
+            when :error
+              throw "aleady seen :#{ xampl }"
+          end
+        end
+      end
+
+      @visited << xampl
+
+      notices[:opening] = true
+      notices[:closing] = false
+
+      control = (Fiber.yield(xampl, notices) || {})
+
+      notify_on_close = control[:notify_on_close]
+
+      if !control[:continue] && !control[:ignore] && (control[:stop] || control[:no_children] || stop_after_reporting)
+        Fiber.yield(xampl, { opening: false, closing: true }) if notify_on_close
+        return
+      end
+
+      xampl.children.each do | child |
+        consider(child)
+      end
+
+      Fiber.yield(xampl, { opening: false, closing: true }) if notify_on_close
+    end
+  end
+end
+

data/lib/xamplr/xml-text.rb

@@ -23,9 +23,9 @@ module Xampl
         pp.attributeCount.times do |i|
           @text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
 
-          prefix = pp.attributePrefix(i)
+          prefix = pp.attribute_prefix(i)
           if prefix then
-            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
+            @prefix_ns_map[prefix] = pp.attribute_namespace(i)
           end
         end
       else
@@ -34,9 +34,9 @@ module Xampl
         pp.attributeCount.times do |i|
           @first_text << " " << pp.attributeQName(i) << "='" << pp.attributeValue(i) << "'"
 
-          prefix = pp.attributePrefix(i)
+          prefix = pp.attribute_prefix(i)
           if prefix then
-            @prefix_ns_map[prefix] = pp.attributeNamespace(i)
+            @prefix_ns_map[prefix] = pp.attribute_namespace(i)
           end
         end
         @text = ""
@@ -113,5 +113,5 @@ module Xampl
       @first_text = nil
     end
   end
-  
+
 end

data/xamplr.gemspec

@@ -5,18 +5,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{xamplr}
-  s.version = "1.3.15"
+  s.version = "1.9.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Bob Hutchison"]
-  s.date = %q{2009-12-13}
-  s.default_executable = %q{xampl-gen}
+  s.date = %q{2009-12-27}
+  s.description = %q{xamplr is the ruby version of xampl.}
   s.email = %q{hutch@recursive.ca}
-  s.executables = ["xampl-gen"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc",
-     "README.rdoc.orig"
+     "README.md"
   ]
   s.files = [
     ".document",
@@ -25,121 +23,10 @@ Gem::Specification.new do |s|
      "COPYING",
      "LICENSE",
      "Makefile",
-     "README.rdoc",
-     "README.rdoc.orig",
+     "README.md",
      "Rakefile",
      "VERSION.yml",
-     "bin/xampl-gen",
-     "docs/intro/.gitignore",
-     "docs/intro/example1/example1.rb",
-     "docs/intro/example1/xml/hello.xml",
-     "docs/intro/example2/example2.rb",
-     "docs/intro/example2/project-generator.rb",
-     "docs/intro/example2/xml/hello.xml",
-     "docs/intro/example3/example3.rb",
-     "docs/intro/example3/example3a.rb",
-     "docs/intro/example3/generated.png",
-     "docs/intro/example3/grab-yuml.rb",
-     "docs/intro/example3/greeter.rb",
-     "docs/intro/example3/greeting.rb",
-     "docs/intro/example3/project-generator.rb",
-     "docs/intro/example3/xml/greeter.xml",
-     "docs/intro/example4/example4.rb",
-     "docs/intro/example4/example4a.rb",
-     "docs/intro/example4/grab-yuml.rb",
-     "docs/intro/example4/greeter.rb",
-     "docs/intro/example4/greeting.rb",
-     "docs/intro/example4/project-generator.rb",
-     "docs/intro/example4/xml/greeter.xml",
-     "docs/intro/grab-yuml.rb",
-     "docs/intro/project-generator.rb",
-     "docs/intro/xampl.lyx",
-     "docs/intro/xampl.pdf",
-     "examples/employees/final-xampl/xampl-gen.rb",
-     "examples/employees/final-xampl/xml/ddd-final-xampl.xml",
-     "examples/employees/final/xampl-gen.rb",
-     "examples/employees/final/xml/ddd-final.xml",
-     "examples/employees/first/xampl-gen.rb",
-     "examples/employees/first/xml/ddd-first.xml",
-     "examples/employees/twist/twist.graphml",
-     "examples/employees/twist/xampl-gen.rb",
-     "examples/employees/twist/xml/twist.xml",
-     "examples/employees/xamplr-twist.xml",
-     "examples/employees/yuml-diagrams/DDD-final-approach.graphml",
-     "examples/employees/yuml-diagrams/DDD-final-xampl-approach.graphml",
-     "examples/employees/yuml-diagrams/DDD-ideal-final-approach.graphml",
-     "examples/employees/yuml-diagrams/ddd-final.png",
-     "examples/employees/yuml-diagrams/ddd-final.yuml",
-     "examples/employees/yuml-diagrams/ddd-first.png",
-     "examples/employees/yuml-diagrams/ddd-first.yuml",
-     "examples/employees/yuml-diagrams/final-yed.png",
-     "examples/employees/yuml-diagrams/first-yed.png",
-     "examples/employees/yuml-diagrams/twist.png",
-     "examples/employees/yuml-diagrams/twist.yuml",
-     "examples/employees/yuml-diagrams/xamplr-final-no-mixins.png",
-     "examples/employees/yuml-diagrams/xamplr-final-simplified.png",
-     "examples/employees/yuml-diagrams/xamplr-final-with-mixins.png",
-     "examples/employees/yuml-diagrams/yuml-simplified.txt",
-     "examples/employees/yuml-diagrams/yuml-with-mixins.txt",
-     "examples/employees/yuml-diagrams/yuml.txt",
-     "examples/hobbies/Makefile",
-     "examples/hobbies/hobbies.rb",
-     "examples/hobbies/project-generator.rb",
-     "examples/hobbies/xampl-gen.rb",
-     "examples/hobbies/xml/hobby.xml",
-     "examples/hobbies/xml/people.xml",
-     "examples/random-people-shared-addresses/.gitignore",
-     "examples/random-people-shared-addresses/Makefile",
-     "examples/random-people-shared-addresses/batch-load-users-profiled.rb",
-     "examples/random-people-shared-addresses/batch-load-users-safe.rb",
-     "examples/random-people-shared-addresses/batch-load-users.rb",
-     "examples/random-people-shared-addresses/find-mentions.rb",
-     "examples/random-people-shared-addresses/find-people-by-address.rb",
-     "examples/random-people-shared-addresses/optimise.rb",
-     "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/random-names.csv",
-     "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",
-     "examples/random-people/.gitignore",
-     "examples/random-people/Makefile",
-     "examples/random-people/batch-load-users.rb",
-     "examples/random-people/optimise.rb",
-     "examples/random-people/people.rb",
-     "examples/random-people/query.rb",
-     "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/.gitignore",
-     "examples/read-testing/Makefile",
-     "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/read-testing/xml/text.xml",
-     "examples/tokyo-cabinet-experimental/.gitignore",
-     "examples/tokyo-cabinet-experimental/expt-query.rb",
-     "examples/tokyo-cabinet-experimental/expt-query2.rb",
-     "examples/tokyo-cabinet-experimental/expt-query3.rb",
-     "examples/tokyo-cabinet-experimental/expt-reader.rb",
-     "examples/tokyo-cabinet-experimental/expt.rb",
-     "examples/tokyo-cabinet-experimental/xampl-gen.rb",
-     "examples/tokyo-cabinet-experimental/xml/tcx.xml",
-     "examples/write-testing/README",
-     "examples/write-testing/RESULTS.home",
-     "examples/write-testing/RESULTS.raconteur",
-     "examples/write-testing/write-speed-test.rb",
-     "lib/xampl-generator.rb",
      "lib/xampl.rb",
-     "lib/xamplr-generator.rb",
      "lib/xamplr.rb",
      "lib/xamplr/.cvsignore",
      "lib/xamplr/README-POSSIBLE-PROBLEMS",
@@ -147,19 +34,10 @@ Gem::Specification.new do |s|
      "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",
-     "lib/xamplr/generate-elements.rb",
-     "lib/xamplr/generator.rb",
-     "lib/xamplr/graphml-out.rb",
-     "lib/xamplr/handwritten/example.rb",
-     "lib/xamplr/handwritten/hand-example.rb",
-     "lib/xamplr/handwritten/test-handwritten.rb",
      "lib/xamplr/indexed-array.rb",
+     "lib/xamplr/iterator.rb",
      "lib/xamplr/mixins.rb",
-     "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",
@@ -174,31 +52,6 @@ Gem::Specification.new do |s|
      "lib/xamplr/persisters/tokyo-cabinet.rb.1-DB",
      "lib/xamplr/persisters/tokyo-cabinet.rb.N-DB",
      "lib/xamplr/persisters/tokyo-cabinet.rb.NICE-TRY",
-     "lib/xamplr/simpleTemplate/danger.rx",
-     "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_more.r6",
-     "lib/xamplr/simpleTemplate/play_noblanks.r6",
-     "lib/xamplr/simpleTemplate/playq.r6",
-     "lib/xamplr/simpleTemplate/r6.rb",
-     "lib/xamplr/simpleTemplate/simple-template.rb",
-     "lib/xamplr/templates/.cvsignore",
-     "lib/xamplr/templates/child.template",
-     "lib/xamplr/templates/child_indexed.template",
-     "lib/xamplr/templates/child_modules.template",
-     "lib/xamplr/templates/element_classes.template",
-     "lib/xamplr/templates/element_data.template",
-     "lib/xamplr/templates/element_empty.template",
-     "lib/xamplr/templates/element_mixed.template",
-     "lib/xamplr/templates/element_simple.template",
-     "lib/xamplr/templates/package.template",
      "lib/xamplr/test-support/Makefile",
      "lib/xamplr/test-support/bench-cache.rb",
      "lib/xamplr/test-support/bench-script.rb",
@@ -222,9 +75,6 @@ Gem::Specification.new do |s|
      "lib/xamplr/version.rb",
      "lib/xamplr/visitor.rb",
      "lib/xamplr/visitors.rb",
-     "lib/xamplr/xampl-cl-gen.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",
@@ -236,8 +86,6 @@ Gem::Specification.new do |s|
      "lib/xamplr/xml/example.xml",
      "lib/xamplr/xml/options.xml",
      "lib/xamplr/xml/uche.xml",
-     "lib/xamplr/yEd-sample.graphml",
-     "lib/xamplr/yuml-out.rb",
      "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",
@@ -257,65 +105,22 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/hutch/xamplr}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = %q{xampl}
   s.rubygems_version = %q{1.3.5}
   s.summary = %q{xamplr is the ruby version of xampl}
-  s.test_files = [
-    "examples/employees/final/xampl-gen.rb",
-     "examples/employees/final-xampl/xampl-gen.rb",
-     "examples/employees/first/xampl-gen.rb",
-     "examples/employees/twist/xampl-gen.rb",
-     "examples/hobbies/hobbies.rb",
-     "examples/hobbies/project-generator.rb",
-     "examples/hobbies/xampl-gen.rb",
-     "examples/random-people/batch-load-users.rb",
-     "examples/random-people/optimise.rb",
-     "examples/random-people/people.rb",
-     "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-profiled.rb",
-     "examples/random-people-shared-addresses/batch-load-users-safe.rb",
-     "examples/random-people-shared-addresses/batch-load-users.rb",
-     "examples/random-people-shared-addresses/find-mentions.rb",
-     "examples/random-people-shared-addresses/find-people-by-address.rb",
-     "examples/random-people-shared-addresses/optimise.rb",
-     "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",
-     "examples/tokyo-cabinet-experimental/expt-reader.rb",
-     "examples/tokyo-cabinet-experimental/expt.rb",
-     "examples/tokyo-cabinet-experimental/xampl-gen.rb",
-     "examples/write-testing/write-speed-test.rb"
-  ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.1.2"])
+      s.add_runtime_dependency(%q<xamplr-pp>, [">= 1.2.0"])
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     else
-      s.add_dependency(%q<xamplr-pp>, [">= 1.1.2"])
+      s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
       s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     end
   else
-    s.add_dependency(%q<xamplr-pp>, [">= 1.1.2"])
+    s.add_dependency(%q<xamplr-pp>, [">= 1.2.0"])
     s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
   end
 end