polyrex 1.2.0 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 88cb8e71bff63b0569512e98f4fa9019cbd41be1
-  data.tar.gz: 9a2ec75e486de8da01a1a141b8f544f8953aa6e5
+SHA256:
+  metadata.gz: 78c884051d6c0b1950f1d02849428a0a64cdc9832adcaf780e99bb45821450aa
+  data.tar.gz: 2b1a471d556dda7ba64a178aeacdf357a7047bfc8f7008bba15c3745b3f7cddb
 SHA512:
-  metadata.gz: 81e136370547e87c7f974ffcbcf48ccf53641901f0f4c41c6034855d3b6871ff1d075c1d9df96fc4b94ecfcfc93df9bc1737fe9285a915eba948bdcc15ce454a
-  data.tar.gz: 492653c62b318392805f21d9d3fb870467f5e5f226f059f6b1a1a9f9f647759aa74f08013c4080a2ac98fed339298602f5153ad36aa712fde1e6bab4cd6a6755
+  metadata.gz: a4c1bbb5c8e1d584c8dd61f65e11244ffd335dbdfcf3f21672667d98cb8926773c4cb55d3496a1e00ca4df2621d7ffcb2b4f1d34fb65164c1ad9051e635035d2
+  data.tar.gz: 02b2d2878d9c4f99f8000df5db5094bcc29a30d14ea8d8e584b4dc51672d286f6d89cfdeb1913b4b98c6fe3eef46cbe9474843b6a29cec005920f5bc7d5cba8d

data/lib/polyrex.rb

@@ -42,7 +42,7 @@ 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', debug: debug)
+  def initialize(location=nil, schema: nil, id_counter: '1', debug: false)
 
 
     @id_counter, @debug = id_counter, debug
@@ -51,9 +51,14 @@ class Polyrex
 
     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
 
@@ -114,7 +119,11 @@ class Polyrex
       
     end
     
-  end  
+  end
+
+  def export(filepath)
+    File.write filepath, to_s()
+  end
 
   def record()
     @parent_node
@@ -264,6 +273,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)
 
@@ -274,11 +309,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
@@ -311,11 +347,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
@@ -491,7 +539,7 @@ xsl_buffer = '
             
     end
 
-    raw_lines = buffer.strip.lines.map(&:rstrip)
+    raw_lines = buffer.lstrip.lines.map(&:chomp)
 
     raw_summary = schema[/^\w+\[([^\]]+)/,1]
 
@@ -512,7 +560,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  

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: polyrex
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ 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-29 00:00:00.000000000 Z
+date: 2021-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyrex-objects
@@ -41,7 +46,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,7 +56,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: polyrex-object-methods
   requirement: !ruby/object:Gem::Requirement
@@ -78,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: []
@@ -138,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