polyrex 1.1.13 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b5969096e2a90c6076f804745cd2722cc88f908
-  data.tar.gz: 9f98b301dd9c402b8d3398986366aff7403500ed
+SHA256:
+  metadata.gz: ba4f6a16445a6fbd95a21f6e5a5641a7d9f5003f22fb7ed2091e89e93668d6cb
+  data.tar.gz: a240d4e392b9b09556e26009bc72c59bd3a502f8a35292204df3ac201e8d5a7e
 SHA512:
-  metadata.gz: fa339d87856a0284db91be4042c8a18cc9b20013ff023b5d3d5bfd2d003322edbf04c9962d1b5bf2ff277e8ee041d7836f5cbec535f25a9994beadd9cac7e820
-  data.tar.gz: 2d546271156b0ce4cc4e6f77fd77da81f7f148a56bee31423600d73df23ce226bb98546c734d9c68906180a9a2e5abf9665bb8d86b683024efa19b85ce62e0c2
+  metadata.gz: 732161598ed4e13790d649ba5f531e82e91c6b1d9236b12f3b9acca5cdc4f62dec2538bd3eeee6c40258f677f5b491b01d37d3d20213cd9af47a319bb436a50a
+  data.tar.gz: '028715744fce1de173a07353cc193b0481a5b6be848fce8c9c39e7be09fe601044114ae0aea2fc97680c174c72ef9fac79bfa9d05ae053763fd55bf4ea2c4ca4'

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,18 +42,23 @@ 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: false)
 
 
-    @id_counter = id_counter
+    @id_counter, @debug = id_counter, debug
     @format_masks = []
     @delimiter = '' 
 
     self.method(:schema=).call(schema) if schema  
     
-    if location then
+    if location then      
 
-      openx(location)
+      s, type = RXFHelper.read(location)
+      return import(s) if s =~ /^\<\?polyrex\b/
+      
+      @local_filepath = location if type == :file or type == :dfs
+
+      openx(s)
 
       if schema then
 
@@ -70,6 +75,7 @@ class Polyrex
     end
     
     @polyrex_xslt = RecordxXSLT.new
+    #@parent_node = @doc.root if @doc
   end
 
   def add(pxobj)
@@ -80,15 +86,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 +176,7 @@ class Polyrex
     
     buffer = yield if block_given?          
     string_parse buffer.clone, options
+
     self
   end    
   
@@ -212,9 +213,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 +224,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
   
@@ -265,6 +269,32 @@ class Polyrex
 
     make_dynarex(root)
   end
+  
+  def to_opml()
+    
+    puts '@schema: ' + @schema.inspect if @debug
+    
+    head, body = @schema.split(/(?<=\])/,2)
+    schema_body = body.gsub(/(?<=\[)[^\]]+/) do |x|
+      x.split(/\s*,\s*/).map {|field| '@' + field + ':' + field}.join(', ')
+    end
+    schema_head = head.gsub(/(?<=\[)[^\]]+/) do |x|
+      x.split(/\s*,\s*/).map {|field| field + ':' + field}.join(', ')
+    end
+
+    puts 'schema_body: ' + schema_body.inspect if @debug
+    puts 'schema_head: ' + schema_head.inspect if @debug
+    xslt_schema = schema_head.sub(/^\w+/,'opml>head') + 
+        schema_body.gsub(/\w+(?=\[)/,'outline')\
+        .sub(/\/(\w+)(?=\[)/,'/body>outline')
+        
+    puts 'xslt_schema: ' + xslt_schema.inspect if @debug
+    
+    recxslt = RecordxXSLT.new(schema: @schema, xslt_schema: xslt_schema)
+    
+    Rexslt.new(recxslt.to_xslt, self.to_xml).to_s    
+    
+  end
 
   def to_s(header: true)
 
@@ -275,11 +305,12 @@ class Polyrex
         summary = item.element 'summary'
         format_mask = summary.text('format_mask').to_s
         line = format_mask.gsub(/\[![^\]]+\]/){|x| summary.text(x[2..-2]).to_s}
+        puts 'line: ' + line.inspect if @debug
 
-        records = item.element('records').elements.to_a
+        recordsx = item.element('records').elements.to_a
         
-        if records.length > 0 then
-          line = line + "\n" + build(records, indent + 1).join("\n") 
+        if recordsx.length > 0 then
+          line = line + "\n" + build(recordsx, indent + 1).join("\n") 
         end
         ('  ' * indent) + line
       end
@@ -312,11 +343,23 @@ class Polyrex
       declaration = %Q(<?polyrex %s?>\n) % s
     end
 
-    docheader = declaration + sumry
+    docheader = declaration + "\n" + sumry
     out = build(self.records).join("\n")
     header ? docheader + "\n" + out : out
     
   end
+  
+  def to_tree()
+    
+    s = @schema.gsub(/(?<=\[)[^\]]+/) do |x|
+      x.split(/\s*,\s*/).map {|field| '@' + field + ':' + field}.join(', ')
+    end
+
+    xslt_schema = s.gsub(/\w+(?=\[)/,'item').sub(/^\w+/,'tree')                    
+    recxslt = RecordxXSLT.new(schema: @schema, xslt_schema: xslt_schema)    
+    Rexslt.new(recxslt.to_xslt, self.to_xml).to_s        
+    
+  end  
 
   def to_xslt()    
     @polyrex_xslt.schema = @schema
@@ -492,7 +535,7 @@ xsl_buffer = '
             
     end
 
-    raw_lines = buffer.strip.lines.map(&:rstrip)
+    raw_lines = buffer.lstrip.lines.map(&:chomp)
 
     raw_summary = schema[/^\w+\[([^\]]+)/,1]
 
@@ -513,7 +556,9 @@ xsl_buffer = '
     @parent_node = records.parent
     records.delete
 
-    lines = LineTree.new(raw_lines.join("\n").strip, ignore_label: true).to_a
+    puts 'raw_lines: ' + raw_lines.inspect if @debug
+    lines = LineTree.new(raw_lines.join("\n"), ignore_label: true).to_a
+    puts 'lines: ' + lines.inspect if @debug
     @parent_node.root.add format_line!( lines)
 
   end  
@@ -524,10 +569,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 +626,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 +675,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 +804,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 +817,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 +837,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.3.2
 platform: ruby
 authors:
 - James Robertson
@@ -10,88 +10,53 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwMzE3MTMwMzQ5WhcN
-  MTkwMzE3MTMwMzQ5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDB5D1x
-  ISNvSg+4OuXCG4Y+tqBVWrAlJWI8WJoklmuV7abVRJbEHSiWgkmd5HAYyfJUrtO0
-  JELlNk2KTaLJDUV5TA/se4gUVZbw4+bw81GPvfRl4xa0XXdMwzZVLKP6coryCxqe
-  CBep7jJD6a16d6Ewbh8p+mnpBOOBNc7A8aw3RUZKkO+uNUdyv0RQTYb8/FNtj7aO
-  cUR8zY+uGbdtEpjxeBorXIVGfcFHjlXIyxiVB0VnX970MND8dLJ8Ubm3OmjfhykX
-  xXpdpNpKjwzxsZOe0Sfbs1D1tDrjyh4omZzYeRBwyhFtD79MnWT6tAFQaJE8sDvP
-  zDR446MQzuPKImqnAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFMaIbFeAIfEO6gdh724pxagKOOGGMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBALZ2aN4EOqoF/ZlaLdrm
-  CoZYCjnJ1+1+GgOC/didbwwVpoDNFpACwtg4ALyB9mWVr11ni5uK/mpS/mp7Zczz
-  3t4EM2O/r45ZJsNaScjx3OnIYaYKCsL22ka9s8RSSbTn81z4+9bQ+wgRoxn1UHiM
-  DXHQiStNHZ8UmnqJhGVfAen2FL7JXsAqwyYQe7dPwXTaCxARyJFWjzwDbDNAK7fP
-  IjDmZnQD2Smm70yVWSqJYC2ej7dH9gbZ/m1f5TSib7KCreZ66jZN4Dsi4Nibs6D6
-  hCr2pfiPoS3nhbgAf3XvP4D146WaQbEgU87QlxPJLhz3yXKi7lwa9XgHQzuifNDi
-  OXU=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwNTI0MTI1MjMzWhcN
+  MjIwNTI0MTI1MjMzWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDxKAjh
+  s6uPs8gcMaoia91NWkBsYkIRp98yXB/MeTcAcK+jM3Y3jbKfbsOa1QVETY+KNZPH
+  byDLynjQE7xOQhZjMrtDB128+iWT+fCvF/OQS0tMMT5ki3qHQDJSqUfxKngwK9p2
+  TlV4EVRaejuPYwGvXxb8qmx9jrR9S3HZVQMHd6aMNAwBb1ZNkSQymWQeEoM+45Un
+  pN3XHGEd2zejUOLNrSiZbBvq5fMb/V2a6LPAfg2WvZzWSZgl4jPjVtvUZVp1BUaU
+  YAXBUsKZ77FC6jR9lb+9iVJAwDTdsI2G6pX5W8EZG0L7i9jeLMQB8bCCzu2zlAhc
+  YJ06owu1LJhPWSxm/3aw6JTKQx0hFepF4mUKHe5iRhDgsVhHNkopzOCQ4JwwHu8G
+  PDi1kUQcFVVkWxRr/m/GRQFkYVn3omgIBMWp/JB8mmevqZ5gaCKvHF55wmDpFzyJ
+  cPDfCtP/wl8wqf363VQdgiru7EcgxQFtPgx6PyMNzfouhRhkBZIY7wYgROkCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUcuJiQueO
+  q5BdutOcNGPDMgOla5kwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEA1AnaW09JSrJOdlLTeiItH/Mfj6vcAuodI4Ys3PCh
+  UfQsIJUedcMysvo+6J0M+hEYL02w6ynWahcQbzvYPr+NwV/8FqMGGAyDpBSaLtrz
+  9J4cxy4p/mq2dF2lEsCUNoSBWvDpvQI4c2w79/gpWE+w0abHyX97r3N2wWv/OiwV
+  u06GMpESpRj4RAhhy88aDhGDUfMWd+nZ20gWcs2YR1yJf/JyaDfRcOFqLMgVw35Y
+  oQhEZldZrsYsF4FNEBmH2mx2iLq6VbCyZZ3M6jsIHUEDZdrDjbs8ejPvWfEdTW+1
+  x7007qRZCfLvIsqAf7GViMWXgbiv0ZFSKgV7qtK0IgVBg0NDor3xc9w/3VLqshTZ
+  jIqQb9u4Zkhtsp+Ly/HVroN0cylu1t/el2qILTDOkyKnAikvhKpX1wujv+VVqWwd
+  rivEdfkvT/8GV5Nip0lSS+cuk20UhOdJR9QIcCJp0QL4NUik9VYljGbQbQQS6Isc
+  iIwZ6uFJfcp9SWBRrSZmlI52
   -----END CERTIFICATE-----
-date: 2018-03-17 00:00:00.000000000 Z
+date: 2021-05-24 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.1
   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.1
 - !ruby/object:Gem::Dependency
   name: polyrex-object-methods
   requirement: !ruby/object:Gem::Requirement
@@ -118,40 +83,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.6
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.30
+        version: 1.8.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.30
+        version: 1.8.19
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -178,8 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A flavour of XML for storing and retrieveing records in a Polyrex hierarchy