polyrex-schema 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 525963053e50db80e18bb8795c34470553012143
-  data.tar.gz: 8716384cb4673f6a37d14d3e9190849e0dac8684
+  metadata.gz: af7dd1f76a6cfe98730cb33f12fb1da876849e8e
+  data.tar.gz: 36199fb4a8b5baf5208dc738e6a9c1e2a9fb12f6
 SHA512:
-  metadata.gz: 8f6e16d034e80574719bc6814b27d7ed998a53b1d3b68458f92679e05ebbd32bb64e9674e5f3dee17d09ced68006d27062a14a2ba381f6f2ccf763d58ced061c
-  data.tar.gz: 89f515edde9c6b0d959adda07afaa651c79c358dbfba3d88a258af94550f0ef3c0d51237836c102952cfb9d422e88ef8edbdd3a59311c3be776dca55226c1f6b
+  metadata.gz: 5dc8b546b014973131fb295df13b6c858e651dadd0a47f0b0c62f6c71f8f0506a8224e5599986f732be5fd3097999caac9f33f9493760b95349b1a7182f46b26
+  data.tar.gz: b3377913c78b968c486fd30202c9af1220a1c04f75b57bff282d08157440e0c4d9ceac798f0b91786bd5004a39979a9748fcd2a0a75358b5fe043e97a3f1a5fd

data/lib/polyrex-schema.rb

@@ -9,29 +9,16 @@ class PolyrexSchema
   def initialize(s)
 
     s.prepend 'root/' if s[0] == '{'
-
-    a = s.scan(/(\{[^\}]+\})|(\w+[^\/]*)\/|\/(.*)|(.+)/).flatten(1).compact
-
-    r = add_node a
-    r[3] << node('recordx_type', 'polyrex') << node('schema',s)
+    
+    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
+  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
 
@@ -49,14 +36,8 @@ class PolyrexSchema
 
     if raw_siblings then
 
-      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
+      return raw_siblings[1..-2].split(/\s*\s*;/,2)\
+                                            .map {|x| add_node split(x) + a}
     end
 
     name, raw_fields = line.split('[',2) 
@@ -115,4 +96,28 @@ class PolyrexSchema
 
   end
 
+  def split(s)
+    
+    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
+        r.last << c
+      else
+        c = '' if c == '/'
+        r << c
+      end
+      r
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-schema
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   x3ppGgUf/zri8F8syPC4U/PhiV9ZBYGjFZDoQWr9TW6gJ1rEPuB1RYH9RPLaSYy4
   SFJGImVxuM2M+Q==
   -----END CERTIFICATE-----
-date: 2014-08-09 00:00:00.000000000 Z
+date: 2014-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -80,10 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: The polyrex-schema gem creates Polyrex XML from an initial shorthand schematic
   string.
 test_files: []
-has_rdoc: