kvx 0.8.0 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e453cda79bd19a566142d148a2668f74e339c1adb46739d707e04c1091ca2447
-  data.tar.gz: 697d68ced082374ee4abadb8993581a982b7f997660105e1435576f8e9c15e57
+  metadata.gz: 771c274bf56fb9f8758aee53d0112cd88e6844e542325210c707a6af52dec20e
+  data.tar.gz: f87fa3a2078e512766f1eef4a48753472105aa37c194a5d290e9f2bd54fb7cd6
 SHA512:
-  metadata.gz: 4ef708c50320556c27d288306e26d5bbdd11e7f9290d5a7169eb364c50e4f2bf906c09880d6431e57c423fc960a20aae01f4fcc3b08458355710eff276d8cf6d
-  data.tar.gz: 5eb81be50bb052b99d628b153dbd8cf91228d94765d7bb95862eeca7a9ed9319634def9fa42d3808ea9ca7abcccd1b4f9663fa791b39addc70d5c88e7c17675a
+  metadata.gz: bd1f304798404629150a18a8287670ed0102e34d67e6734e374b33f19c19e146385cb4fdd2c06f1dbed6c97969a831a20ac168b66d25e9081b4f5e20eb6e5a9d
+  data.tar.gz: b10f98724ecb9f052818b5b8c1fe6cbf841fa982772cd5c6e955d6836cc13b267085cb89dc213c38bd1a8479c5603cdf8cbf6d222464d86b187541c4799c9036

data/lib/kvx.rb

@@ -52,7 +52,10 @@ class Kvx
     }
     
     if x then
-      @body = method(h[x.class.to_s.downcase.to_sym]).call x
+      
+      sym = h[x.class.to_s.downcase.to_sym]
+      puts 'sym: ' + sym.inspect if @debug
+      @body = method(sym).call x
       methodize(@body)
     end
 
@@ -101,12 +104,25 @@ class Kvx
       end
 
       summary = [:summary, {}, *summary]
-      body = [:body, {}, *make_xml(@body)]
+      
+      # -- use the nested description Hash object if there are multiple lines
+      h = {}
+      
+      @body.each do |key, value|
+              
+        h[key] = value.is_a?(String) ? value : value[:description]
+        
+      end
+      
+      body = [:body, {}, *make_xml(h)]
       [self.class.to_s.downcase, @attributes, '', summary, body]      
       
     end    
     
-    Rexle.new a
+    puts 'a: ' + a.inspect if @debug
+    doc = Rexle.new a
+    doc.instructions = @instructions || []
+    doc
     
   end
   
@@ -124,8 +140,27 @@ class Kvx
       header += scan_to_s @summary
       header += "\n----------------------------------\n\n"
     end
+
+    # -- use the nested description Hash object if there are multiple lines
+    h = {}
     
-    header + scan_to_s(@body)
+    @body.each do |key, value|
+            
+      h[key] = if value.is_a?(String) then
+      
+        if value.lines.length < 2 then
+          value 
+        else
+          "\n" + value.lines.map {|x| '  ' + x }.join          
+        end
+        
+      else
+          "\n" + value[:description].lines.map {|x| '  ' + x }.join
+      end
+      
+    end    
+    
+    header + scan_to_s(h)
 
   end    
 
@@ -185,14 +220,24 @@ class Kvx
   end  
 
   def make_xml(h)
-    RexleBuilder.new(h).to_a[3..-1]
+    
+    puts 'inside make_xml: ' + h.inspect if @debug
+    RexleBuilder.new(h, debug: false).to_a[3..-1]
   end
   
   def parse_string(s)
     
     buffer, type = RXFHelper.read(s)
     puts ('buffer: ' + buffer.inspect).debug if @debug
-    buffer.lstrip =~ /^<\?xml/ ? xml_to_h(Rexle.new(buffer).root) : parse_to_h(buffer)
+    
+    if buffer.lstrip =~ /^<\?xml/ then
+      doc = Rexle.new(buffer)
+      @instructions = doc.instructions
+      puts '@instructions: ' + @instructions.inspect if @debug
+      xml_to_h(doc.root)
+    else
+      parse_to_h(buffer)
+    end
     
   end
   
@@ -340,6 +385,9 @@ class Kvx
   
   def xml_to_h(node)
     
+    puts 'node: ' + node.xml.inspect if @debug
+    @attributes = node.attributes.to_h
+    
     summary = node.element('summary')
     
     if summary then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kvx
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.3
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNDA2MjIwMTQ1WhcN
-  MTkwNDA2MjIwMTQ1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAh9gI
-  JY9j0QfwC1bR4tcNYI0O+fQouNQmUOXbpn8Kj7vpgN+E7uiIob44X2/sdrdpNEBD
-  VHc40GyY8MeV4ZAxabI0cujuZWBplGSEuaVMZIF68irTdxD8zS4AN1RoLDqlXKm3
-  iQq/IEyLcZdvF5PhtiPWx7XLMRlQ+UA/dq7nfjopQlrr5AYrQgX6uFbEZPKcLLns
-  7KHEg0uTg8esp0gwEUx6Z6qcD3GkYvAXCkzKxUQ8i6nxuBYhocHpL794RFxRxhBu
-  mEyp2L3LeT+n1qjQDsqdPieEfCWERRv1ab8QIBciBWpdek++1fUvfZDT13Zn6O/p
-  kfHi71jZkBGVqLpxAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFPP7tS0MGMGFFJM1E5/10giZQ3l2MCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAEihaHzi13m4NDth/Df4
-  xsczpDYlyTCzq5rpMmzp6jmaLpi4tIEhNi8TtX/VMk7hEyAD7qek2RzAsvAfi0xO
-  Pe1NFWXXsBn3rkHSQXCb9VAAD+9IlhsUcNm8rvXbtCL/PSsZcQg7hUFrl8S+JsnP
-  JdyT5iPchQM8ZktTBfh+F6wSNXeXEIwp3Jn3RCj6RltP0VH5/GFys9gEo9TN699H
-  YA2KPSiCE5CgBXgTTFAFkcY4ko43ApKnluZK+jZmiMrepSoKZOTW6sK+v9ABnVmv
-  3jLvreiNd0YuFPcPe+esHvUwxhE00qsh/ZWy9pwic9ywLOFdKbCguhaIs0sbQ2d2
-  YoI=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjEwMjIwMjI0ODU5WhcN
+  MjIwMjIwMjI0ODU5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDEZUlA
+  5Xwb1PhCpUwcey7fBjLJHAHnBg9lFLAFNGWr1QDpH166qx7w9Q9ckPeFNMiH5ZFs
+  /D9GrO+BVU3Lz5/CaL3q5eB3L8+JC+VjNiJijvynBa2TeB2aenlRqdUqvJ/RGTu0
+  9v8tWq/Mn3batCRCpuLJJ25C49hyzYts2UWetRAqfuvukJY+BoPISYntAs3g2elo
+  Za/9sY69ezCvOmwyw+B8dGXjqINlZxJKfuR3xf87uR/4vBC9DI4EE7dS1pjsyDws
+  d3e9fBWBKIMaZVdshc9rAnP6ARhWMnxYUjjqUDJiqXz5137HmWSOGWGGrnX0pfg2
+  WPVI7jN39s6Gd2nNGOgaiwlNpcNS7IPYHGU2+mDJxWSKn+suMjendpi/WSTQlLG4
+  PEZBk+B6CEy6yOLU4x5GN3US7wbwLOl0ASSAhb4vAG81pGIRYt5fGE4HdiYxDC/u
+  ixTFr3lGZyyHAZ0VMsjIoq3cpbSHxe6TiwBncq1H7z9XeEP/LzFlhdjnHR0CAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU6BARnAgl
+  1R3h9OomhJPcgy+HzWEwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAZZ3jLwdvRBNjGqxBFpwbE+6lOlMADiza+vUe5DLr
+  Pwi54Wf+IF91M56S6zxw3BQ6aIzTqltXdHMkVJokQeGqzrGfJQO5Yhnh1Y1kxRtl
+  ZXCMasMdAE6NvW+1FIT/ilZDAoeaoLcoQ4JylHW25Y/FZ9tt++6EEkDFWZn6zxxw
+  wETcFLVEdzWeyJyTnjrfVYCJMlHr+mR9gXx2Fgz8vjqCu2O39NXuJqO9BrmoxkoD
+  jGcTdRnq6g6KcNOHlJCw6jvZUHSTeTtBPUEGkSNS5L3GejW65iwHWLY/WNtI4kzQ
+  9uR/zCKdJ0zJ/N7OEpBBMg05VTSR2nBwlTmacHdL/keDUuIUDd2APddKSr5F+voZ
+  ci+ozAEgQCeqDFapyRPqMGm8fO7Sa4i4BxGnDf6G3K9P6Rg9yEzpSbGTED9U+nlX
+  m/+jxdgFjKKGxeZqunu9cp5ca9wSjjtKh/VA/3xZtPwokCa7vCMB+ZxUP0jvd++u
+  OTXy8k/zqddw/VfD/It1UUK4
   -----END CERTIFICATE-----
-date: 2018-12-23 00:00:00.000000000 Z
+date: 2021-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -38,40 +43,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   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.1
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -99,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Kvx (Keys, Values, and XML) makes it convenient to store and retrieve the