polyrex-schema 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0a1267e6b0dc185b3f0741de33ea13a4c01fe8
-  data.tar.gz: bfe289c07f45ce97294fd4e9bed9ec6e9170fe34
+  metadata.gz: 9661716a6acfe6957022f375d9d1a519c5fd6732
+  data.tar.gz: cf85e1603701dcd6f7530f664a30164fcdde3a09
 SHA512:
-  metadata.gz: ec19d23553f331169f3a67e75b876a5358c3810ad1f3771cba6171546cae907dd3785a23e9275b48c4bd9eb32f13ebc7280552137488c2a1ab74ecf838eca7b6
-  data.tar.gz: 6a1428fddd2294ddc0772004fc27f946fead899ae416d48e11d960c2271fda94ce7d0c757c85ab9eaa787e3f462fbcbf476190a084c36cd9db49c651a7306a09
+  metadata.gz: d8a17a4e0aa7e621635b2146f801603249ef38ba24e26a05350b05b060f59a73ae65e0c5b6251745b660d963d618dfc54173c7bc6d23b89c8e370ca33f5a1ee5
+  data.tar.gz: 7b0e015ceec7073c60f93ce373cfb2672e9899b1a1b7724f8c6746cb43719d20dfdcde180a977bb2cdb03ae189d26484b644cfbc2dc2290de95c884b756a05ca

checksums.yaml.gz.sig

@@ -1,5 +1,4 @@
-`�j��&��!�r�H
->@	�
-<,y��1�;��$��sMjq6�D���la�Į9ó�-�l����2z��{��c�b�S���.O"�B��–&�ً�ʰ�}����S��'��=O@�|M�H�p����U��)V?���K\�]:%��oܺ���\�"����'���
-%-�\a{@qU#D
-n�w�,�����Ko�^���3F�b/K����~�i���F�9�_��uC[���˩�^��4�Z�h�V�2k
+����%�Hy�S��<��C���i��q���ع!�B	[���|$�2vz�Oso�߶o���)ͯ97�ӇJ ��
+
+��=��c��~I�l�]���N�PA3��z�d
+���
��-6s��*����ҵL�䶔���K

data/lib/polyrex-schema.rb

@@ -8,63 +8,43 @@ class PolyrexSchema
 
   def initialize(s)
 
-    node = nil
-
-    s.scan(/\w+\[[^\]]*\]|\w+/).each do |x|
-
-      b1, b2 = x.split('[')
-      
-      if b2 then
-        
-        node = append_node(node, b1) do |summary|
-          
-          fields = b2.scan(/\w+(?=[,\]])/)
-          fields.each {|x| summary.add Rexle::Element.new x}
-          summary.add Rexle::Element.new('format_mask').add_text(fields.map {|x2| "[!%s]" % x2}. join(' '))
-          
-        end
-
-      else
-        node = append_node(node, x)
-      end
-    end
-
-    summary = @doc.root.element 'summary'
-    summary.add_element Rexle::Element.new('recordx_type').add_text('polyrex')
-    summary.add_element Rexle::Element.new('schema').add_text(s)
+    a = s.split('/')
 
+    r = add_node a
+    r[3] << node('recordx_type', 'polyrex') << node('schema',s)
+    @doc = Rexle.new(r)
   end
 
-  def to_s
-    @doc.to_s
+  def to_doc()
+    @doc
   end
 
-  def to_doc
-    @doc
+  def to_s()
+    @doc.to_s
   end
 
   private
 
-  def append_node(node, name)
+  def node(name, val='', *children)
+   [name, val, {}, *children]
+  end
 
-    new_node = Rexle::Element.new name
-    summary = Rexle::Element.new 'summary'
-    yield(summary) if block_given?
+  def add_node(a)
 
-    new_node.add summary
-    records = Rexle::Element.new 'records'
-    new_node.add records
+    return if a.empty?
 
-    if node.is_a? Rexle::Element then
-      node.add new_node
-    elsif node.is_a? Rexle then
-      node.root.add new_node
-    else
-      @doc = Rexle.new(new_node.xml)
-      node = @doc
-    end
+    name, raw_fields = a.shift.split('[')  
+   
+    rows = if raw_fields then
 
-    node.element('*/records')
+      fields = raw_fields.chop.split(',')
+      field_rows = fields.map {|field| node(field.strip) }
+      field_rows << node('format_mask', fields.map{|x| "[!%s]" % x}.join(' '))
+    end
 
+    node(name, '', 
+      node('summary', '', *rows), node('records', '', add_node(a))
+    )
   end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - James Robertson
@@ -10,26 +10,28 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDRDCCAiygAwIBAgIBADANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
+  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
   YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTEzMDIwNjIxMDE1MVoXDTE0MDIwNjIxMDE1MVowSDESMBAG
+  8ixkARkWAmV1MB4XDTE0MDMxODE2MTEwMFoXDTE1MDMxODE2MTEwMFowSDESMBAG
   A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
   EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAMcqGCw1ax1X+55qmYCpXWe5qN028pXo2hmhbuYOBhdCR1ZatMDlzdN7YNGm
-  U9vldqHNPEJ6SkYzbZRu5rkZ8EBzLjo0KvhnNGyBDZwy00DdkXOc1aYg5zMPmCSq
-  tC3FxgLqI62sZKs029sV3RgHCsKcOlAb6tEkj/gKV0juQO6UmhA8BGmNp58ViUav
-  DIoWnAiN6n2WGLbKCLOXktkiaiO0cLMbsVjP/RBosINAfVfEz8cxE7BUbQpCIv9T
-  KvpSCMqODJRhTHEenA/CleJJN2gXrHvj+8Rj1k1Dx8WlSz+gqGVo5P242lIwNjAk
-  fj+x6O6BmphxYmTmU6hRdX96ZtUCAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4E
-  FgQUcHMvWoWmNZONjlOGeCLfhPErJZUwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEB
-  BQUAA4IBAQA+HbwAQajcjwVtOlDjd8QyWYtY2PwKMWDtFMLirPVCEJ23Zj1BVwk8
-  eA2lGr/j/QAKI26ckknY+ffEjUrZkMp5vCq3klvVaphKk/wlAped9dFp4dbn3vlz
-  ZpMoYwfYEOqWU0lVcDBOKJWBvQK5KKVPW+qW/6w44tyfslUOhT1BQHhOcaPCuIF7
-  KOwTfE6dKeHfq4Ca9eogUCenzEqEmF6w1fmyuKNN0yClGnswr0uWeaqN45heMeGD
-  beGTlriu3KY9HJSxKVChgcCT15CmSno+zJ9Kg39GFXl5lMNeg5wihVN0tlU/NdUB
-  /3MvKYJbiVCDpwRsMfh0T8UVrl9kAn4H
+  ggEBANQqAVGLJSqOEoZ1UH0Zo7z17uZ8jqw/2d2mk8wBeV8XzrSzMepuCohWonQQ
+  DIubtgMZwOwGa5BYB4t4IU1AzjBMEUVGrtQgQvxEJu1XPeE6HAp+oCYbh2+xRR5S
+  QLYDsv94vqJkjd1i7amvwGPJDVKbzMcltuPeYIelZX822cJCMjRd896Ig3ydTXEH
+  dHRxbecgjR0IV8mfi9NIDrc1adfziUKjqugnUXjUHZDlicvKaG46KufJ1idmOW08
+  Isc3CqpZTcgy1MpVasd/NMSZGULQtg4ZKbomZYa2mLgM6bHNI8WdWKYIappu01hn
+  cVK/VZAt1VJbEJRkYc6htGLUxgMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
+  DwQEAwIEsDAdBgNVHQ4EFgQU3nJ4etC17X2zAQF/vKx+xbEzw7YwJgYDVR0RBB8w
+  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
+  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEApvtdNfgr
+  yzZYXlYckG9t6y1s8RQjJp7mzt79tjCZKLt9N+8PGHAQi+ub+FTpRMSThulgiP3G
+  12gENjIxmMyoDYP0QclKkE5NgzNmvRSVZUZkt2mxV8PIv9BwpQy8LSPc9Ts+uEOJ
+  +TvzCxGSi6ve7CWx5NpjUcfWLNl05M9n+ivqNvolLc1/8lOkhYmCmtQ0TCfgjnp0
+  caaSH68UGqO/gSpoKNJENjRGnMpgdXRXd6yxSujyFb38gMnLeQ9S+OQvH/HUW4gW
+  x3ppGgUf/zri8F8syPC4U/PhiV9ZBYGjFZDoQWr9TW6gJ1rEPuB1RYH9RPLaSYy4
+  SFJGImVxuM2M+Q==
   -----END CERTIFICATE-----
-date: 2013-12-27 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -72,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: The polyrex-schema gem creates Polyrex XML from an initial shorthand schematic