polyrex-objects 0.7.10 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72f503d7863321fe795d5b313cb6e419fb8d2e86
-  data.tar.gz: d58c45be59880853f71c6b7483313c0a1cd810de
+  metadata.gz: 938c943b17c79b6cce510fb7b3a1f3d91f3325e2
+  data.tar.gz: 41c1271c95f4b366fe738dd9ad8f26ec9b13c8ee
 SHA512:
-  metadata.gz: 0b80d4d432164e99dad3679fe1917b44157bf83f6e287952635d5132895ab894e6da1171ef0da6954666c059316723add45938cdc01e5ab2141ca127ca6958e2
-  data.tar.gz: bc0aa1579047a5758af253968c206b936e93f0c906a6f50a754777b1d878798d957e7c193aafdb05e0a178c06086f38c8a28ff8ebfbae6a4b20d5358fe3a8123
+  metadata.gz: 11b2cadddffeef0a1a7ad1fa510b2e81fc4836908c1e1448a70119f449955d24f7e855885c7a761e5215ada38997a5e1ff8ea5474cc043c1b562994294ac74f4
+  data.tar.gz: ca9ace6a2501f35eb57493f6d3ddd6322c538fba01052643876d38dc66b615342b42898c70ceb3f262facbb7f1f1d147cbb461f1784c70771b9d794b9088785e

data/lib/polyrex-objects.rb

@@ -134,6 +134,7 @@ EOF
 
     @node = node
     @@id = id
+    @schema = schema
 
     if schema then
 
@@ -143,49 +144,18 @@ EOF
 
       a.each do |x|
 
-        name, raw_fields = x.split('[')
-
-        if raw_fields then
-          fields = raw_fields.chop.split(',').map &:strip
-          @class_names << name.capitalize
-
-          classx = []  
-          classx << "class #{name.capitalize} < PolyrexObject"
-          classx << "def initialize(node=nil, id='0')"
-          classx << "  node ||= Rexle.new('<#{name}><summary/><records/></#{name}>').root"
-          classx << "  super(node,id)"
-
-          classx << "  a = node.xpath('summary/*',&:name)"
-          classx << "  yaml_fields = a - (#{fields}  + %w(format_mask))"
-          classx << "yaml_fields.each do |field|"
-          classx << %q(instance_eval "def #{field}; YAML.load(@node.element('summary/#{field}/text()')); end")
-          classx << "end"
-
-          classx << "@fields = %i(#{fields.join(' ')})"          
-          classx << "@create = PolyrexCreateObject.new('#{schema}', @@id)"
-          classx << "end"
-
-          fields.each do |field|
-            classx << "def #{field}"
-            classx << "  if @node.element('summary/#{field}').nil? then"
-            classx << "    @node.element('summary').add Rexle::Element.new('#{field}')"
-            classx << "  end"
-            classx << "  node = @node.element('summary/#{field}/text()')"
-            classx << "  node ? node.clone : ''"
-            classx << "end"
-            classx << "def #{field}=(text)"
-            classx << "  if @node.element('summary/#{field}').nil? then"
-            classx << "    @node.element('summary').add Rexle::Element.new('#{field}', text)"
-            classx << "  else"
-            classx << "    @node.element('summary/#{field}').text = text"
-            classx << "  end"
-            classx << "end"
-          end
-
-          classx << "end"          
+        r = x[/[^\{]+(?=\})/]
 
-          eval classx.join("\n")
+        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)
         end
+
       end
 
       if @class_names.length < 2 then
@@ -214,6 +184,61 @@ EOF
     end
   end
 
+  def to_a
+    @class_names.map {|x| eval(x)}
+  end
+  
+  def to_h
+    Hash[self.to_a.map {|x| [x.name[/\w+$/], x]}]
+  end
+  
+  private
+
+  def make_class(name, raw_fields)
+
+    if raw_fields then
+      fields = raw_fields.chop.split(',').map &:strip
+      @class_names << name.capitalize
+
+      classx = []  
+      classx << "class #{name.capitalize} < PolyrexObject"
+      classx << "def initialize(node=nil, id='0')"
+      classx << "  node ||= Rexle.new('<#{name}><summary/><records/></#{name}>').root"
+      classx << "  super(node,id)"
+
+      classx << "  a = node.xpath('summary/*',&:name)"
+      classx << "  yaml_fields = a - (#{fields}  + %w(format_mask))"
+      classx << "yaml_fields.each do |field|"
+      classx << %q(instance_eval "def #{field}; YAML.load(@node.element('summary/#{field}/text()')); end")
+      classx << "end"
+
+      classx << "@fields = %i(#{fields.join(' ')})"          
+      classx << "@create = PolyrexCreateObject.new('#{@schema}', @@id)"
+      classx << "end"
+
+      fields.each do |field|
+        classx << "def #{field}"
+        classx << "  if @node.element('summary/#{field}').nil? then"
+        classx << "    @node.element('summary').add Rexle::Element.new('#{field}')"
+        classx << "  end"
+        classx << "  node = @node.element('summary/#{field}/text()')"
+        classx << "  node ? node.clone : ''"
+        classx << "end"
+        classx << "def #{field}=(text)"
+        classx << "  if @node.element('summary/#{field}').nil? then"
+        classx << "    @node.element('summary').add Rexle::Element.new('#{field}', text)"
+        classx << "  else"
+        classx << "    @node.element('summary/#{field}').text = text"
+        classx << "  end"
+        classx << "end"
+      end
+
+      classx << "end"          
+
+      eval classx.join("\n")
+    end
+  end
+
   def make_def_records(class_name, i=0)
 
     eval "#{class_name}.class_eval { 
@@ -255,13 +280,6 @@ EOF
 
   end
 
-  def to_a
-    @class_names.map {|x| eval(x)}
-  end
-  
-  def to_h
-    Hash[self.to_a.map {|x| [x.name[/\w+$/], x]}]
-  end
-  
+
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-objects
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.8.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   C0ZUhP8IAGCVW8QD8AfZ/AgqUdh+zTRqKdhEyhXCjYyVXqNHnD02NbyGmQvgd9SD
   XfuuGzQ3E4Mh5w==
   -----END CERTIFICATE-----
-date: 2014-06-29 00:00:00.000000000 Z
+date: 2014-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-createobject
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.15
+        version: 0.5.2
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -72,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.2
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="