polyrex-schema 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 41d6b677f06024f5b63bfece90cc404016c8ee0b
-  data.tar.gz: ab7587fed11359d0db0eeb4c111fe79845b155fa
+  metadata.gz: 29b9fb069d346a9ed3ea8e80c78f89c9a6693b16
+  data.tar.gz: 174201bd0242d9eacf25fb4f6285bfcfc87ced34
 SHA512:
-  metadata.gz: 03a01ce1bffc687d33ccdebb207b2324aa9027c4ca106ac368ea064853fbb8b64166cae4bc2285d74e930e697002791ee1ca552c4fdbd05816321976c947b3c3
-  data.tar.gz: 9ec6232ee12ec15f1a6904f88d98dfe53076b545ac47436293422d7eb1e8afd8f7153856d8e62c8de23495185a23c52db5815602142b9e94432ecd4857fd3230
+  metadata.gz: c1df8edd790749daa04abb404921ee12f8033cdafaa805ef66026ea6df496fa406929eb3d222011ea84332b35e417418b1c7aef23d100c0f411d6757ff6efce2
+  data.tar.gz: 7605377416173826f08e495d0263f378003af0acc01ed7e948143d442744799707c68b3b59a26b1e85c1c8c6463dbf517a4b8454073603d09461aea30727bc22

data/lib/polyrex-schema.rb

@@ -9,7 +9,8 @@ class PolyrexSchema
   def initialize(s)
 
     s.prepend 'root/' if s[0] == '{'
-    a = s.split('/')
+
+    a = s.scan(/(\{[^\}]+\})|(\w+[^\/]*)\/|\/(.*)/).flatten(1).compact
 
     r = add_node a
     r[3] << node('recordx_type', 'polyrex') << node('schema',s)
@@ -43,15 +44,18 @@ class PolyrexSchema
     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*;/).map{|x| add_node [x] + a}
+      r = raw_siblings[1..-2].split(/\s*\s*;/).map do |x| 
+
+        a2 = x.scan(/(\{[^\}]+\})|(\w+[^\/]*)\/|\/(.*)|(.+)/).flatten(1).compact
+        add_node a2 + a
+      end
+
+      return r
     end
 
     name, raw_fields = line.split('[',2) 
@@ -78,7 +82,7 @@ class PolyrexSchema
     nodes.map do |r|
 
       a = r.xpath('summary/*/name()') # => ["entry", "format_mask"] 
-      fields = (a - ["format_mask"]).map(&:to_sym)
+      fields = (a - %w(schema format_mask)).map(&:to_sym)
       node = r.xpath 'records/.'
 
       if node.any? then

data.tar.gz.sig

@@ -1 +1 @@
-̺[��'��'_�R�R'��⺼�0��'걀�����, �&D�N'���㡙G(ku�����/D�>A?�Ɋ'Jo#�%JO\��_
-l�dw��I�1h�����:��B;k:�a��m� V\�%�e�7��8i���K�V���g��CV������,57y
+

metadata

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