polyrex 1.1.13 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b5969096e2a90c6076f804745cd2722cc88f908
-  data.tar.gz: 9f98b301dd9c402b8d3398986366aff7403500ed
+  metadata.gz: 88cb8e71bff63b0569512e98f4fa9019cbd41be1
+  data.tar.gz: 9a2ec75e486de8da01a1a141b8f544f8953aa6e5
 SHA512:
-  metadata.gz: fa339d87856a0284db91be4042c8a18cc9b20013ff023b5d3d5bfd2d003322edbf04c9962d1b5bf2ff277e8ee041d7836f5cbec535f25a9994beadd9cac7e820
-  data.tar.gz: 2d546271156b0ce4cc4e6f77fd77da81f7f148a56bee31423600d73df23ce226bb98546c734d9c68906180a9a2e5abf9665bb8d86b683024efa19b85ce62e0c2
+  metadata.gz: 81e136370547e87c7f974ffcbcf48ccf53641901f0f4c41c6034855d3b6871ff1d075c1d9df96fc4b94ecfcfc93df9bc1737fe9285a915eba948bdcc15ce454a
+  data.tar.gz: 492653c62b318392805f21d9d3fb870467f5e5f226f059f6b1a1a9f9f647759aa74f08013c4080a2ac98fed339298602f5153ad36aa712fde1e6bab4cd6a6755

data/lib/polyrex.rb

@@ -3,10 +3,10 @@
 # file: polyrex.rb
 
 #require 'open-uri'
-require 'polyrex-schema'
+#require 'polyrex-schema'
 #require 'line-tree'
 require 'polyrex-objects'
-require 'polyrex-createobject'
+#require 'polyrex-createobject'
 require 'polyrex-object-methods'
 require 'recordx-xslt'
 #require 'rexle'
@@ -42,10 +42,10 @@ class Polyrex
   attr_accessor :summary_fields, :xslt_schema, :id_counter, 
                 :schema, :type, :delimiter, :xslt, :format_masks
 
-  def initialize(location=nil, schema: nil, id_counter: '1')
+  def initialize(location=nil, schema: nil, id_counter: '1', debug: debug)
 
 
-    @id_counter = id_counter
+    @id_counter, @debug = id_counter, debug
     @format_masks = []
     @delimiter = '' 
 
@@ -70,6 +70,7 @@ class Polyrex
     end
     
     @polyrex_xslt = RecordxXSLT.new
+    #@parent_node = @doc.root if @doc
   end
 
   def add(pxobj)
@@ -80,15 +81,9 @@ class Polyrex
     CGI.unescapeHTML(to_xml(options))
   end
 
-  def create(id: nil)
-    
-    # @create is a PolyrexCreateObject, 
-    # @parent_node is a Rexle::Element pointing to the current record
-    
-    @create.id = id || @id_counter
-    @create.record = @parent_node.name == 'records' ? \
-                     @parent_node.root : @parent_node.root.element('records')
-    @create
+  def create(id: @id_counter)
+    puts 'id: ' + id.inspect if @debug
+    @create = PolyrexCreateObject.new(id: id, record: @doc.root)
   end
 
   def delete(x=nil)
@@ -176,6 +171,7 @@ class Polyrex
     
     buffer = yield if block_given?          
     string_parse buffer.clone, options
+
     self
   end    
   
@@ -212,9 +208,10 @@ class Polyrex
   
   def records
 
-    @doc.root.xpath("records/*").map do |record|      
-      @objects_a[0].new(record)
+    @doc.root.xpath("records/*").map do |node|      
+      Kernel.const_get(node.name.capitalize).new node, id: @id_counter
     end
+    
   end
 
   def rxpath(s)
@@ -222,7 +219,9 @@ class Polyrex
     a = @doc.root.xpath s.split('/').map \
                   {|x| x.sub('[','[summary/').prepend('records/')}.join('/')
     
-    a.map {|x| @objects[x.name].new(x, id: x.attributes[:id]) }
+    a.map do |node| 
+      Kernel.const_get(node.name.capitalize).new node, id: node.attributes[:id]
+    end
 
   end
   
@@ -524,10 +523,9 @@ xsl_buffer = '
   
   def load_handlers(schema)
 
-    @create = PolyrexCreateObject.new(schema, id: @id_counter)
-    objects = PolyrexObjects.new(schema)    
+    objects = PolyrexObjects.new(schema, debug: @debug)    
     h = objects.to_h
-
+    puts 'h:  ' + h.inspect if @debug
     @objects = h.inject({}){|r,x| r.merge x[0].downcase => x[-1]}
 
     @objects_a = objects.to_a
@@ -582,12 +580,18 @@ xsl_buffer = '
         next
       end
       
+      puts '@schema: ' + @schema.inspect if @debug
+      schema_a = @schema.split('/')[1..-1]
+      
+      if @debug then
+        puts 'schema_a: ' + schema_a.inspect
+        puts 'i: ' + i.inspect
+      end
+      
       unless @format_masks[i][/^\(.*\)$/] then
 
         @field_names, field_values = RXRawLineParser.new(format_masks[i])\
                                                             .parse(line)  
-        
-        schema_a = @schema.split('/')[1..-1]
 
         @field_names = schema_a[i] ? \
             schema_a[i][/\[([^\]]+)/,1].split(/\s*,\s*/).map(&:to_sym) : \
@@ -625,7 +629,9 @@ xsl_buffer = '
 
       format_mask = @format_masks[i].to_s
 
-      schema = "%s[%s]" % [tag_name, @field_names.join(', ')]
+      index = i >= schema_a.length ? schema_a.length - 1 : i
+
+      schema = schema_a[index..-1].join('/')
       summary.add Rexle::Element.new('format_mask').add_text(format_mask)
       summary.add Rexle::Element.new('schema').add_text(schema)
       summary.add Rexle::Element.new('recordx_type').add_text('polyrex')
@@ -752,7 +758,7 @@ xsl_buffer = '
           node = #{xpath}
           
           if node then
-            @objects['#{class_name}'].new(node, id: @id, objects: @objects)
+            Kernel.const_get(node.name.capitalize).new node, id: @id
           else
             nil
           end
@@ -765,7 +771,7 @@ xsl_buffer = '
           
           if nodes then
             nodes.map do |node|
-              @objects['#{class_name}'].new(node, id: @id, objects: @objects)
+              Kernel.const_get(node.name.capitalize).new node, id: @id
             end
           else
             nil
@@ -785,7 +791,9 @@ xsl_buffer = '
   def refresh_summary()
     
     summary = @doc.root.element('summary')    
-    @summary.to_h.each do |k,v| 
+    @summary.to_h.each do |k,v|
+      
+      puts "k: %s; v: %s" % [k, v] if @debug
       e = summary.element(k.to_s)
       if e then
         e.text = v

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 1.1.13
+  version: 1.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -30,68 +30,28 @@ cert_chain:
   hCr2pfiPoS3nhbgAf3XvP4D146WaQbEgU87QlxPJLhz3yXKi7lwa9XgHQzuifNDi
   OXU=
   -----END CERTIFICATE-----
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2018-03-29 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: polyrex-schema
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: polyrex-objects
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.8
-- !ruby/object:Gem::Dependency
-  name: polyrex-createobject
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: polyrex-object-methods
   requirement: !ruby/object:Gem::Requirement