polyrex-createobject 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8df933a84a5bc4b2f260cb13a5d35e5c4adee7e
-  data.tar.gz: 74f16989cc0631bda68d0794bd8ee4ddedb17b6f
+  metadata.gz: d775e35504720ac98162324d077add3f9c101513
+  data.tar.gz: 950c2cdce548c151d1962c86bdd5650e4e375755
 SHA512:
-  metadata.gz: 105618f26c0e8972516adbe752a777633b30d4c029b75d48d791fa8552fc8948e12208e5519052c5618d0689311f3d2daa03a371fb6866f10d2e1ae697972c1f
-  data.tar.gz: 6b5a666779aa1af289f21d0dfca8006c52e4ce37ef1e9d1b92ea037c6afa7695ca8789119624541fe3ca8315825c8a72a279af521d8836f26249d88f129ddac2
+  metadata.gz: b3d044f58eb656f6a392389d72b02620f60a5f428a7a4cdecefd603f19b2ba98fc3b783a159dc3ed6e58c4475bb53aa25864bd794b1c02a61800d881695b655f
+  data.tar.gz: 4e06f448472dbd830ed41ed0ce5d628a9a7bff4868f9b2012143995f6abe3a6619f85011c244f6843b18b3ab85c1d49ee661e1abf022f2caa2fe3f9f9030ea7c

data/lib/polyrex-createobject.rb

@@ -13,27 +13,40 @@ class PolyrexCreateObject
   attr_reader :obj
 
 
-  def initialize(schema, id: '1', order: 'ascending')
+  def initialize(schema=nil, id: nil, order: 'ascending', record: nil,
+                 debug: false)
 
-    @@id, @order = id, order.to_s
+    @order = order.to_s
+    @id = id
 
+    if @debug then
+      puts 'inside PolyrexCreateObject: record: ' + record.xml.inspect
+      puts 'record.text' + record.text('summary/schema')
+    end
+    
+    @parent_node = record ? record.element('records') : record
+    schema = record.text('summary/schema')
+    puts ': schema: ' + schema.inspect if @debug
     raise "missing schema" unless schema
 
-    @schema = schema[/\/(.*)$/,1]
 
+    @schema = schema =~ /\// ? schema[/\/(.*)$/,1] : schema
+    
     a = PolyrexSchema.new(schema).to_a
-        
+    puts 'a: ' + a.inspect if @debug
+    
     a.each do |rec|
 
       @obj = attach_create_handlers(rec)
-
+      puts '@obj: ' + @obj.inspect if @debug
+      
       @obj.class_eval do 
         def record=(node)
           @parent_node = node
         end
       end
 
-      self.instance_eval %Q( def #{@obj.name.downcase}(h={}, id=@@id, &blk)
+      self.instance_eval %Q( def #{@obj.name.downcase}(h={}, id=@id, &blk)
 
         local_schema = @schema
 
@@ -43,24 +56,20 @@ class PolyrexCreateObject
                                                   local_schema[/\\/.*$/].to_s]            
         end
 
-        new_parent = create_node(@parent_node, local_schema, h, id).element('records')
-
-        obj = @obj.new 
-        obj.record = new_parent
-        obj.instance_variable_set(:@schema, @schema[/\\/(.*$)/,1])
+        new_parent = create_node(@parent_node, local_schema, h, id)
         
         if block_given? then
-          blk.call obj
+          yield(PolyrexCreateObject.new(id: id, record: new_parent))
         else
-          obj
+          self
         end
       end
       )
     end
   end
   
-  def id=(s)  @@id = s; self end
-  def id() @@id end
+  def id=(s)  @id = s; self end
+  def id() @id end
   
   def record=(node)
     @parent_node = node
@@ -87,16 +96,16 @@ class PolyrexCreateObject
     record.root.xpath('records/*').each(&:delete)
 
     if id then
-      @@id.succ!
+      @id.succ!
     else
-      if @@id.to_i.to_s == @@id.to_s then
-        @@id.succ!
+      if @id.to_i.to_s == @id.to_s then
+        @id.succ!
       else
-        @@id = @parent_node.element('count(//@id)').to_i + 2
+        @id = @parent_node.element('count(//@id)').to_i + 2
       end
     end
 
-    record.root.add_attribute({'id' => @@id.to_s.clone})
+    record.root.add_attribute({'id' => @id.to_s.clone})
 
     if params.length > 0 then
       a = child_schema[/[^\[]+(?=\])/].split(',')
@@ -142,12 +151,12 @@ class PolyrexCreateObject
         record.root.xpath('records/*').each(&:delete)
      
         if id then
-          @@id.succ!
+          @id.succ!
         else
-          if @@id.to_i.to_s == @@id.to_s then
-            @@id.succ!
+          if @id.to_i.to_s == @id.to_s then
+            @id.succ!
           else
-            @@id = @parent_node.element('count(//@id)').to_i + 2
+            @id = @parent_node.element('count(//@id)').to_i + 1
           end
         end
 
@@ -169,7 +178,7 @@ class PolyrexCreateObject
 
       define_method cname do |h, id=nil, &blk|
 
-        id ||= @@id
+        id ||= @id
 
         local_schema = @parent_node.parent.text('summary/schema')[/\/(.*$)/,1]
 
@@ -217,7 +226,7 @@ class PolyrexCreateObject
 
             define_method remaining.name.downcase.to_sym do |h, id=nil, &blk|
 
-              id ||= @@id
+              id ||= @id
               local_schema = @parent_node.parent.text('summary/schema')[/\/(.*$)/,1]
               if local_schema[0] == '{' then
 
@@ -246,4 +255,4 @@ class PolyrexCreateObject
     return klass
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex-createobject
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   jRgMXtv8iLFoWeilpwsM5UFNluVBef95Iw6oXMaxdoZaPfZ8KSp+IJe1ct8JNDmi
   1uMwHDSm6dYjQA==
   -----END CERTIFICATE-----
-date: 2017-12-05 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-schema
@@ -39,20 +39,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.2
+        version: 0.5.1
   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.2
+        version: 0.5.1
 description: 
 email: james@jamesrobertson.eu
 executables: []