polyrex-objects 0.8.2 → 0.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba02ab30e8b04e7f0020b3549a108510cfcda922
-  data.tar.gz: d3685720b0aeafd03860d3f2055aa61c9dbd66ed
+  metadata.gz: b68af1bbeb21405d07f581ef6673bbfbf749424f
+  data.tar.gz: 7a5acc327b212f827aaebdaa0349a0f8a1dc86b9
 SHA512:
-  metadata.gz: fffd44cbdb918767f751e0672f68fcdd4e3cbb2883b7701120c6a4d4f8aacc9123754427d70091589c4f3fad62c0ba9dcd60228895490c44fd67da355adcb3f2
-  data.tar.gz: 41b14bec9e9043d06b70f650f598fe7dd22e89e41f8360370e12d1151cd14dc6bba8c7918f04976673c915d4031c7a73d45e6745b6d40a687d7a9c382c352394
+  metadata.gz: 91e961df58842c4c435e4564b82ac55be85c7b143ba7a3cb88073d90763d1b689f4db9b4a23ba9760360efcbb2feffe603cecfbbee45919e4240b8a68027d8fe
+  data.tar.gz: 7b87fe4e590ab7df862322467046982f9df38442c70673dbf7bb553307bf838158802ff7eadcc073fdc2bdff10560be3b3b469c0cbcb7fc98d748fbb2bb45af9

data/lib/polyrex-objects.rb

@@ -139,28 +139,20 @@ EOF
     @schema = schema
 
     if schema then
-
-      #a = schema.split('/')
-      #a.shift
-      a = schema.scan(/\w+\[[^\]]+\]/)
+  
       @class_names = []
 
-      a.each do |x|
-
-        r = x[/[^\{]+(?=\})/]
-
-        if r then
-          r.split(/\s*;\s*/).each do |s|
-            name, raw_fields = s.split('[')
-            make_class(name, raw_fields)
-          end
-        else
-          name, raw_fields = x.split('[')
-          make_class(name, raw_fields)
+      h = PolyrexSchema.new(schema).to_h
+  
+      scan = -> (a) do
+        a.each do |x|
+          make_class(x[:name], x[:fields], x[:schema])
+          scan.call(x[:children]) if x[:children]
         end
-
       end
 
+      scan.call h
+
       if @class_names.length < 2 then
         make_def_records(@class_names.first)
       else
@@ -188,7 +180,7 @@ EOF
   end
 
   def to_a
-    @class_names.map {|x| eval(x)}
+    @class_names.map {|x| eval(x.to_s)}
   end
   
   def to_h
@@ -197,10 +189,10 @@ EOF
   
   private
 
-  def make_class(name, raw_fields)
+  def make_class(name, fields, schema=@schema)
+
+    if fields then
 
-    if raw_fields then
-      fields = raw_fields.chop.split(',').map &:strip
       @class_names << name.capitalize
 
       classx = []  

data.tar.gz.sig

@@ -1 +1 @@
-���c峀Q*�l�?�=WS�F�N����hͮ׻^���T1����l�}B�{3�ƃ}"՗1/gfYH�fc����%��d��G�K�g��ka4{fq�r8��g�T�Z��!��+C1�T�Ե6�s/ꌉ�C�s��2����9|��j�4qߦ����:�H�4y�m���JZr�ZG���۲������W
+�@����U��}w��]��`�B4!o�%���|Nx��� �<����\~�i�h��+�pAS���Sj�Ec��[�rTv����C�FQ֟�(�6�z�
7�dJ�m�F���XP�� #�w����[����^���

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-objects
 version: !ruby/object:Gem::Version
-  version: 0.8.2
+  version: 0.8.3
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   C0ZUhP8IAGCVW8QD8AfZ/AgqUdh+zTRqKdhEyhXCjYyVXqNHnD02NbyGmQvgd9SD
   XfuuGzQ3E4Mh5w==
   -----END CERTIFICATE-----
-date: 2014-08-03 00:00:00.000000000 Z
+date: 2014-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-createobject