polyrex-schema 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7dd1f76a6cfe98730cb33f12fb1da876849e8e
-  data.tar.gz: 36199fb4a8b5baf5208dc738e6a9c1e2a9fb12f6
+  metadata.gz: 26291a8341252e4164caf31952ee7a45fbef8a8e
+  data.tar.gz: 5cb8179e93df122993ca1b42803efb082b610699
 SHA512:
-  metadata.gz: 5dc8b546b014973131fb295df13b6c858e651dadd0a47f0b0c62f6c71f8f0506a8224e5599986f732be5fd3097999caac9f33f9493760b95349b1a7182f46b26
-  data.tar.gz: b3377913c78b968c486fd30202c9af1220a1c04f75b57bff282d08157440e0c4d9ceac798f0b91786bd5004a39979a9748fcd2a0a75358b5fe043e97a3f1a5fd
+  metadata.gz: 0340e64343262982678285c90ccd4201d89bb9e31c712a0cdacc0d89a13e161656213117d1d1dd509437ff0d1dce769c21e797d8378b201e89094cd7e49a4b1b
+  data.tar.gz: 41e0a86fa1cce7c0eaa6caa678577701cf408466dbbd131df26341cb3da377628570cb0bc77d07a2fc25d2c97179f843d37991ab1ea9d24ae782418db1f9d648

data/lib/polyrex-schema.rb

@@ -1,123 +1,124 @@
-#!/usr/bin/env ruby
-
-# file: polyrex-schema.rb
-
-require 'rexle'
-
-class PolyrexSchema
-
-  def initialize(s)
-
-    s.prepend 'root/' if s[0] == '{'
-    
-    r = add_node split(s)
-    r[3] << node('recordx_type', 'polyrex') << node('schema',s)    
-    @doc = Rexle.new(r)
-  end
-
-  def to_a()    scan_to_a(@doc.root.xpath 'records/.')  end
-  def to_h()    scan_to_h(@doc.root.xpath 'records/.')  end
-  def to_doc()  @doc                                    end
-  def to_s()    @doc.to_s                               end
-
-  private
-
-  def node(name, val='', *children)
-   [name, val, {}, *children]
-  end
-
-  def add_node(a)
-
-    return if a.empty?
-
-    schema = a.join('/')
-    line = a.shift
-    raw_siblings = line[/\{.*/]
-
-    if raw_siblings then
-
-      return raw_siblings[1..-2].split(/\s*\s*;/,2)\
-                                            .map {|x| add_node split(x) + a}
-    end
-
-    name, raw_fields = line.split('[',2) 
-
-    rows = if raw_fields then
-
-      fields = raw_fields.chop.split(',')
-      field_rows = fields.map {|field| node(field.strip) }
-      field_rows << node('schema', schema)
-      field_rows << node('format_mask', fields.map{|x| "[!%s]" % x.strip}\
-                                                                  .join(' '))
-    end
-
-    children = add_node(a)
-    children = [children] if children and children[0].is_a? String
-
-    node(name, '',
-      node('summary', '', *rows), node('records', '', *children)
-    )
-  end
-
-  def scan_to_a(nodes)
-
-    nodes.map do |r|
-
-      a = r.xpath('summary/*/name()') # => ["entry", "format_mask"] 
-      fields = (a - %w(schema format_mask)).map(&:to_sym)
-      node = r.xpath 'records/.'
-
-      if node.any? then
-        children = scan_to_a(node)
-        [r.name.to_sym, *fields, children]
-      else
-        [r.name.to_sym, *fields]
-      end
-    end
-
-  end
-
-  def scan_to_h(nodes)
-
-    nodes.map do |r|
-
-      a = r.xpath('summary/*/name()') # => ["entry", "format_mask"] 
-      schema = r.text('summary/schema')
-      fields = (a - %w(schema format_mask)).map(&:to_sym)
-      node = r.xpath 'records/.'
-
-      if node.any? then
-        children = scan_to_h(node)
-        {name: r.name.to_sym, fields: fields, schema: schema, children: children}
-      else
-        {name: r.name.to_sym, fields: fields, schema: schema}
-      end
-    end
-
-  end
-
-  def split(s)
-    
+#!/usr/bin/env ruby
+
+# file: polyrex-schema.rb
+
+require 'rexle'
+
+class PolyrexSchema
+
+  def initialize(s)
+
+    s.prepend 'root/' if s[0] == '{'
+    
+    r = add_node split(s)
+    r[3] << node('recordx_type', 'polyrex') << node('schema',s)    
+    @doc = Rexle.new(r)
+  end
+
+  def to_a()    scan_to_a(@doc.root.xpath 'records/.')  end
+  def to_h()    scan_to_h(@doc.root.xpath 'records/.')  end
+  def to_doc()  @doc                                    end
+  def to_s()    @doc.to_s                               end
+
+  private
+
+  def node(name, val='', *children)
+   [name, val, {}, *children]
+  end
+
+  def add_node(a)
+
+    return if a.empty?
+
+    schema = a.join('/')
+    line = a.shift
+    raw_siblings = line[/\{.*/]
+
+    if raw_siblings then      
+      return split(raw_siblings[1..-2],';').map {|x| add_node split(x) + a}
+    end
+
+    name, raw_fields = line.split('[',2) 
+
+    rows = if raw_fields then
+
+      fields = raw_fields.chop.split(',')
+      field_rows = fields.map {|field| node(field.strip) }
+      field_rows << node('schema', schema)
+      field_rows << node('format_mask', fields.map{|x| "[!%s]" % x.strip}\
+                                                                  .join(' '))
+    end
+
+    children = add_node(a)
+    children = [children] if children and children[0].is_a? String
+
+    node(name, '',
+      node('summary', '', *rows), node('records', '', *children)
+    )
+  end
+
+  def scan_to_a(nodes)
+
+    nodes.map do |r|
+
+      a = r.xpath('summary/*/name()') # => ["entry", "format_mask"] 
+      fields = (a - %w(schema format_mask)).map(&:to_sym)
+      node = r.xpath 'records/.'
+
+      if node.any? then
+        children = scan_to_a(node)
+        [r.name.to_sym, *fields, children]
+      else
+        [r.name.to_sym, *fields]
+      end
+    end
+
+  end
+
+  def scan_to_h(nodes)
+
+    nodes.map do |r|
+
+      a = r.xpath('summary/*/name()') # => ["entry", "format_mask"] 
+      schema = r.text('summary/schema')
+      fields = (a - %w(schema format_mask)).map(&:to_sym)
+      node = r.xpath 'records/.'
+
+      if node.any? then
+        children = scan_to_h(node)
+        {name: r.name.to_sym, fields: fields, schema: schema, children: children}
+      else
+        {name: r.name.to_sym, fields: fields, schema: schema}
+      end
+    end
+
+  end
+
+  
+  # splits into levels identified by a slash (/) or a semicolon (;)
+  #
+  def split(s, separator='/')
+    
     brace_count = 0
-    
-    s.each_char.inject(['']) do |r, c|
-
-      case c
-        when '{'
-          brace_count += 1
-        when '}'
-          brace_count -= 1
-      end
-
-      if c != '/' or brace_count > 0 then
+    
+    s.each_char.inject(['']) do |r, c|
+
+      case c
+        when '{'
+          brace_count += 1
+        when '}'
+          brace_count -= 1
+      end
+
+      if c != separator or brace_count > 0 then
         r.last << c
-      else
-        c = '' if c == '/'
+      else
+        c = '' if c == separator
         r << c
       end
       r
-    end
-
-  end
-
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-schema
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   x3ppGgUf/zri8F8syPC4U/PhiV9ZBYGjFZDoQWr9TW6gJ1rEPuB1RYH9RPLaSYy4
   SFJGImVxuM2M+Q==
   -----END CERTIFICATE-----
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle