kvx 0.7.2 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f572275e01e83e1946e4f50a76c5f22d72681827bea7663fe953d305a93183f
-  data.tar.gz: 46ac5784d8415a7624cc3d1bfec9b2b10ddc00c58d5f9162a906faf0d0bd91a3
+  metadata.gz: 682f52238fb054d8d2eb1f53d25782d1b5cbdbce7da2431a3d1a107e6a8518a9
+  data.tar.gz: 1579826620b98ad2a70e1924b5220321e03cf9427f712eb3ce4b4719de5b9af3
 SHA512:
-  metadata.gz: d2e1c5b2380ae0ba9230fe2ab605d500f85c7a222effd02581e6d6fca93d57ea876b612f0963810c45e83ff78cbe38d1b4055fb53ffd65ae0a6488f2c85c02aa
-  data.tar.gz: 9941e95f40d7f2b5303a4dd32a2164110d9150af29ad8ba35257a0cc49c4719007ed2bc8cf5a12885ee39ed22dcaf5562809cb496d370b3003b4a4a49caa0a26
+  metadata.gz: 42807b79e8a251eaaa4c317b50863d0a58903d5777fcf7bd4148085911235c3f98a579cd6f8d2f55b67cb86d98b5771bcaedaf39be33ecf8375501fe046abfd6
+  data.tar.gz: 3157e3be4a3fe98219b13b38b94427a84885a379366f44b7cbad928675fc0c44d6935a94292e5ba38c11e3ef3bb43821778da0dbcd6243a508eaca3bdf69d284

data/lib/kvx.rb

@@ -6,6 +6,20 @@ require 'line-tree'
 require 'rxfhelper'
 require 'rexle-builder'
 
+module RegGem
+
+  def self.register()
+'
+hkey_gems
+  doctype
+    kvx
+      require kvx
+      class Kvx
+      media_type kvx
+'      
+  end
+end
+
 ###
 # Kvx does the following:
 #
@@ -15,11 +29,12 @@ require 'rexle-builder'
 
 class Kvx
   include RXFHelperModule
+  using ColouredText
 
   attr_accessor :attributes, :summary
   attr_reader :to_h
 
-  def initialize(x, attributes: {}, debug: false)
+  def initialize(x=nil, attributes: {}, debug: false)
 
     @header = false
     @identifier = 'kvx'
@@ -36,15 +51,26 @@ class Kvx
       :"rexle::element::value" => :parse_string
     }
     
-    @body = method(h[x.class.to_s.downcase.to_sym]).call x
+    if x then
+      
+      sym = h[x.class.to_s.downcase.to_sym]
+      puts 'sym: ' + sym.inspect if @debug
+      @body = method(sym).call x
+      methodize(@body)
+    end
 
   end
+  
+  def import(s)
+    @body = parse_string(s)
+    methodize(@body)
+  end
     
   def item()
     @body
   end
   
-  alias body item
+  alias body item  
   
   def save(filename)
     FileX.write filename, self.to_s
@@ -83,7 +109,9 @@ class Kvx
       
     end    
     
-    Rexle.new a
+    doc = Rexle.new a
+    doc.instructions = @instructions
+    doc
     
   end
   
@@ -91,7 +119,7 @@ class Kvx
     
     header = ''
     
-    if @header or @summary.any? then
+    if @header or (@summary and @summary.any?) then
       
       attr = @attributes ? ' ' + @attributes\
                                        .map {|x| "%s='%s'" % x }.join(' ') : ''
@@ -162,14 +190,32 @@ 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 if @debug
-    buffer.lstrip =~ /^<\?xml/ ? xml_to_h(Rexle.new(buffer).root) : parse_to_h(buffer)
+    puts ('buffer: ' + buffer.inspect).debug if @debug
+    
+    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
+  
+  def methodize(h)
+    
+    h.each do |k,v|
+      define_singleton_method(k){v} unless self.methods.include? k
+    end    
     
   end
 
@@ -226,10 +272,10 @@ class Kvx
   
   def scan_to_h(txt)
 
-    puts 'inside scan_to_h' if @debug
+    puts ('inside scan_to_h').info if @debug
     raw_a = LineTree.new(txt.gsub(/(^-*$)|(#.*)/,'').strip, 
                                               ignore_blank_lines: @ignore_blank_lines).to_a
-    puts 'raw_a: ' + raw_a.inspect if @debug
+    puts ('raw_a: ' + raw_a.inspect).debug if @debug
     
     # if there are any orphan lines which aren't nested underneath a 
     #   label, they will be fixed using the following statement
@@ -246,7 +292,7 @@ class Kvx
     @body = a.inject({}) do |r, line|
            
       s = line.shift
-      puts 's: ' + s.inspect
+      puts ('s: ' + s.inspect).debug if @debug
       
       if line.join.length > 0 then 
 
@@ -289,7 +335,7 @@ class Kvx
 
     end
     
-    puts '@body: ' + @body.inspect
+    puts ('@body: ' + @body.inspect).debug if @debug
     @body
 
   end     
@@ -309,6 +355,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.7.2
+  version: 0.9.1
 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
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkwODE1MTY1NjM2WhcN
+  MjAwODE0MTY1NjM2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC6K+Kz
+  ybTob3TbRSTALvfrmAyCyc05LGgxBgTA/6ykxggtrw3V70p+6OFX4g9ReH2VIgKD
+  3cTf5DrsXYaZGobKl/r0G97lXnz7rh/3mWXgUcmsendVmVv6xbVZVqupBX3Sm8T0
+  3lkqzZMKI13/et6ggIhAhV5aGMmS0y53keS22NfQvOuRZ7bHHfCpIba3d9RyeX07
+  GTIvSHzqYuO25zeag+acDTWfJZzGGtdoapig23PH8VtWsO3vS59HIie7GmmZKeQO
+  ApLnhrtgtI65489vRKjO26AxDMY+i+k4YLQAR3W0ckGRkLtelztqTTBY7nLWiTUN
+  NsOSnpVAU5MSf7motYKD6op3eYOzZlhTe/o4wJmCwp7N0oIAnfrcMPhOsrjDJ6+l
+  LdfKWKU17onB48cF0G3Qc74m51/072wt5xxEISP/IqvaY/uchFkX9fWjZoL8+IR6
+  KSDMEmEtWX+6QcEykWX2DQCGOAo2j6TvLC0upfIKe2lznGgpnIYr/HHI8pECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUrRGBNC9u
+  Vef0qbebM6xKI6i6950wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAIVCVx1F5zCIaU/nSY7m6T7hIKvk2FbdsCC+T8g5+
+  61+1vgg31FalXJlo/KMV879HxNHMvz99/wEFs7XfUEZy0yEXlv/7UNXYcIqMhI7A
+  WbFBbSQk6XqFVhlaToApdvxkOJKE6LCiVBpi8JpUcBdgwbb4nU3ClN+Fys0fDSSY
+  PlCrgzODwsgZB16XM5SJ8SIPvmGNU7i2kxopRvEoKzFkuRcR437MofYrROxuh4mS
+  xOKIAmDkVNBZm7F+GBxWV3dFlhBD0WkFZ5u7mFC8ETK7aGwfz65gcv/zZuiC2aAH
+  KzKMbj6nwMsGquFqseU2SwmpvyyP/hhqYYgV/6gHf8ZrSM0YH+2ESruR/fxla6yj
+  FpNMxFEOQ/xVXHve//AgIZBQlUDG55q0lhWZ2c0S/z12iD4cPFNW4PJ4wJDji6O4
+  KUxK0Cu0STvwoV6DE5WnnZSur8LrUOi7l9Nk6viqnO36QEwToCPb1F2eqzGV+jI1
+  WeCuyBYkl+4fwV5cb7w7t9YY
   -----END CERTIFICATE-----
-date: 2018-08-12 00:00:00.000000000 Z
+date: 2020-06-11 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.6'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.8
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.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.6'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.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