xmlscan 0.3.0prea → 0.3.0preb

data/VERSION

@@ -1 +1 @@
-0.3.0prea
+0.3.0preb

data/lib/xmlscan/processor.rb

@@ -13,7 +13,9 @@ module XMLScan
     MY_METHODS = XMLScan::Visitor.instance_methods.to_a - SKIP
 
     def initialize(opts={}, mod=nil)
-      (mod ? MY_METHODS - mod.instance_methods : MY_METHODS).each do |i|
+      raise "No module" unless mod
+      STDERR << "init Element Processer #{mod}\n"
+      (MY_METHODS - mod.instance_methods).each do |i|
         self.class.class_eval %{def #{i}(d, *a) d&&(@out << d) end}, __FILE__, __LINE__
       end
       self.class.send :include, mod
@@ -35,13 +37,73 @@ module XMLScan
   class XMLProcessor
     include ElementProcessor
 
-    def self.process(file, opts={}, mod=nil)
-      raise "Not readable #{file.inspect}" unless IO===( io =
-                                             IO===file ? file : open(file) )
+    def self.process(io, opts={}, mod=nil)
+      mod ||= ElementProcessing
+      STDERR << "process #{io.inspect}, #{opts.inspect}\n"
+      io = case io
+          when String; open(io)
+          when IO, StringIO; io
+          else raise "bad type file input #{io.inspect}"
+        end
+
       visitor = new(opts, mod)
       visitor.parser.parse(io)
       visitor.pairs
     end
   end
 
+
+  module ElementProcessing
+    def on_chardata(s) @out << s end
+    def on_stag_end(name, s, h, *a)
+      if name.to_sym == @element
+        # starting a new context, first output our substitute string
+        key= h&&h[@key.to_s]||'*no-name*'
+        @tmpl = ":transclude|{{:name}}" # def: "{{:key}}"
+        STDERR << "templ #{@tmpl.inspect}\n"
+        #STDERR << "x> #{x.inspect}, #{h.inspect}, #{(!(/:\w[\w\d]*/ =~ x)) || h[$&[1..-1].to_s] }\n"
+        sub =
+          @tmpl.split('|').find {|x| !(/:\w[\w\d]*/ =~ x) ||
+          h[$&[1..-1].to_s] }.gsub(/:\w[\w\d]*/) {|m|
+            STDERR << "templ sub match #{m.inspect}, #{h[m[1..-1]]}\n"
+            h[m[1..-1]] }
+        #sub = h['transclude'] || "{{#{key}}}"
+        @out << sub
+        # then push the current context and initialize this one
+        @stack.push([@context, @out, *@ex])
+        @context = key; @out = []
+        @ex = @extras.map {|e| h[e]}
+      else @out << s end # pass through tags we aren't processing
+    end
+
+    def on_etag(name, s=nil)
+      if name.to_sym == @element
+        # output a card (name, content, type)
+        @pairs << [@context, @out, @stack[-1][0], *@ex]
+        # restore previous context from stack
+        last = @stack.pop
+        @context, @out, @ex = last.shift, last.shift, *last
+      else @out << s end
+    end
+
+    def on_stag_empty_end(name, s=nil, h={}, *a)
+      if name.to_sym == @element
+
+        key= h&&h[@key.to_s]||'*no-name*'
+        ex = @extras.map {|e| h[e]}
+        @pairs << [key, [], @context, *ex]
+      else @out << s end
+    end
+
+    attr_reader :pairs, :parser
+  end
+
+end
+ARGV.each do |a|
+  pairs = XMLScan::XMLProcessor.process(a, {:key=>:name, :element=>:card, :extras=>[:type]}, XMLScan::ElementProcessing)
+  STDOUT << "Result\n"
+  STDOUT << pairs.map do |p| n,o,c,t = p
+      "#{c&&c.size>0&&"#{c}::"||''}#{n}#{t&&"[#{t}]"}=>#{o*''}"
+    end * "\n"
+  STDOUT << "\nDone\n"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmlscan
 version: !ruby/object:Gem::Version
-  version: 0.3.0prea
+  version: 0.3.0preb
   prerelease: 5
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9220620 !ruby/object:Gem::Requirement
+  requirement: &8986000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *9220620
+  version_requirements: *8986000
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &9220120 !ruby/object:Gem::Requirement
+  requirement: &8985420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *9220120
+  version_requirements: *8985420
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &9219620 !ruby/object:Gem::Requirement
+  requirement: &8984920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *9219620
+  version_requirements: *8984920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &9219060 !ruby/object:Gem::Requirement
+  requirement: &8984420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *9219060
+  version_requirements: *8984420
 description: The fastest XML parser written in 100% pure Ruby.
 email: gerryg@inbox.com
 executables: []
@@ -65,12 +65,10 @@ files:
 - ChangeLog
 - Gemfile
 - Gemfile.lock
-- README.processor
 - README.rdoc
 - Rakefile
 - THANKS
 - VERSION
-- install.rb
 - lib/xmlscan/htmlscan.rb
 - lib/xmlscan/namespace.rb
 - lib/xmlscan/parser.rb
@@ -79,8 +77,6 @@ files:
 - lib/xmlscan/version.rb
 - lib/xmlscan/visitor.rb
 - lib/xmlscan/xmlchar.rb
-- test.rb
-- xmlcard.rb
 homepage: http://github.com/GerryG/xmlformat/
 licenses:
 - MIT
@@ -100,7 +96,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1617079850723236327
+      hash: 1414227114206674686
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/README.processor

@@ -1,33 +0,0 @@
-
-  processor = XMLScan::Processor.hash(:element=>:card, :key=>:name) do |k,h,s,|
-    h[:transclude] || "{{#{h[:name]}}}"
-  end
-
-  test_cases [
-[ '<card name="foo" transclude="{{foo|titled}}">Some
-  <card name="name">Name data</card> and &lt; &gt;
- <p>para data<b>bold</b>
-   </p><br/>
- more<card
-   name="+hello" attr="&quote;foo&quote;"> and <card name="+nested">nested twice data</card>
-  </card>
-</card>
-', {
-'foo' => 'Some
-  {{name}} and &lt; &gt;
- <p>para data<b>bold</b>
-   </p><br/>
- more{{+hello}}
-',
-'name' => 'Name data',
-'foo+hello' => ' and {{+nested}}
-  ',
-'foo+hello+nested' => 'nested twice data' } ],
-  ]
-
-  test_casts.each { |p|
-    assert processor.call(p[0]) == p[1]
-  }
-
-
-

data/install.rb

@@ -1,41 +0,0 @@
-#!/usr/bin/ruby
-#
-# install.rb
-#
-# $Id: install.rb,v 1.2 2002/12/26 21:09:38 katsu Exp $
-
-require 'rbconfig'
-require 'ftools'
-require 'find'
-require 'getoptlong'
-
-DEFAULT_DESTDIR = Config::CONFIG['sitelibdir'] || Config::CONFIG['sitedir']
-SRCDIR = File.dirname(__FILE__)
-
-
-def install_rb(from, to)
-  from = SRCDIR + '/' + from
-  Find.find(from) { |src|
-    next unless File.file? src
-    next unless /\.rb\z/ =~ src
-    dst = src.sub(/\A#{Regexp.escape(from)}/, to)
-    File.makedirs File.dirname(dst), true
-    File.install src, dst, 0644, true
-  }
-end
-
-
-destdir = DEFAULT_DESTDIR
-begin
-  GetoptLong.new([ "-d", "--destdir", GetoptLong::REQUIRED_ARGUMENT ]
-                ).each_option { |opt, arg|
-    case opt
-    when '-d' then
-      destdir = arg
-    end
-  }
-rescue
-  exit 2
-end
-
-install_rb "lib", destdir

data/test.rb

@@ -1,7 +0,0 @@
-#!/usr/bin/ruby
-$-w = true
-$LOAD_PATH.unshift 'lib'
-$LOAD_PATH.unshift 'tests'
-Dir.chdir File.dirname($0)
-require 'testall'
-load 'runtest.rb'

data/xmlcard.rb

@@ -1,48 +0,0 @@
-# encoding: UTF-8
-
-require 'xmlscan/processor'
-
-# need to make these into supplied blocks somehome
-module CustomProcessing
-  def on_chardata(s) @out << s end
-  def on_stag_end(name, s, h, *a)
-    if name.to_sym == @element
-      # starting a new context, first output our substitute string
-      key= h&&h[@key.to_s]||'*no-name*'
-      sub = h['transclude'] || "{{#{key}}}"
-      @out << sub
-      # then push the current context and initialize this one
-      @stack.push([@context, @out, *@ex])
-      @context = key; @out = []
-      @ex = @extras.map {|e| h[e]}
-    else @out << s end # pass through tags we aren't processing
-  end
-
-  def on_etag(name, s=nil)
-    if name.to_sym == @element
-      # output a card (name, content, type)
-      @pairs << [@context, @out, @stack[-1][0], *@ex]
-      # restore previous context from stack
-      last = @stack.pop
-      @context, @out, @ex = last.shift, last.shift, *last
-    else @out << s end
-  end
-
-  def on_stag_empty_end(name, s=nil, h={}, *a)
-    if name.to_sym == @element
-      # I don't think we have this case, but it is simple to add later
-      STDERR << "empty card ???: #{name}, #{s}, #{h.inspect}\n"
-    else @out << s end
-  end
-
-  attr_reader :pairs, :parser
-end
-
-ARGV.each do |a|
-  pairs = XMLScan::XMLProcessor.process(a, {:key=>:name, :element=>:card, :extras=>[:type]}, CustomProcessing)
-  STDOUT << "Result\n"
-  STDOUT << pairs.map do |p| n,o,c,t = p
-      "#{c&&c.size>0&&"#{c}::"||''}#{n}#{t&&"[#{t}]"}=>#{o*''}"
-    end * "\n"
-  STDOUT << "\nDone\n"
-end