dws-registry 0.4.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ddb57e224865e3fb5607c57cf78f0de374d5bec1
-  data.tar.gz: e853160f15ac6de49054841bec408cff55b9905d
+SHA256:
+  metadata.gz: 0d341ebac9fd10a3216588c7651caa6e2b4e28619fc3decbb4d6764c95d7f1c0
+  data.tar.gz: 613d9fc137c636f77043f4ebb58e5d1412b4f08d38f1fbf3e192e9eea1f3db14
 SHA512:
-  metadata.gz: c3a969f0e04a4a21dd2fae6ed4c496447fba9119139d3bb707d2a74016b05b24b45d668851290ea6772d4ea4b7c17271eb64ce9697ccdb16715c2175f881e6a5
-  data.tar.gz: bbf4235e42346ee4c2811956c5678f0be6e40a433dcc5d2aec7a27b2028963e52d2788765f034f38b2fcb0afb3d2a8fba3ab10091fd9316344a5d8b0480d5776
+  metadata.gz: 666c0c408e1b783b2b2da18a0843ed59350038f4493af5bbc21dd4928bb37d058e3237d7386561f0a1fcf11ef76663db1544ad9cc4f15d355ad3b9f384a79c39
+  data.tar.gz: 629d903bdc1a4d4e8cf70e9fe66937853398a04c9d58e3e9667e68ad99e1c7a9c578322a1bfcceaae7aa744b2ff6688f7f27d08c0f7b52f52809ca1540b1abfd

data/lib/dws-registry.rb

@@ -6,47 +6,76 @@ require 'time'
 require 'xml-registry'
 require 'rscript'
 require 'json'
+require 'requestor'
+require 'rxfreader'
 
 
 class DWSRegistry < XMLRegistry
-  include RXFHelperModule
-  
-  def initialize(filename='registry.xml', autosave: true)
-    
-    super()
-    
-    @autosave = autosave    
-    
+  include RXFRead
+
+  def initialize(filename='registry.xml', autosave: true, debug: false)
+
+    super(debug: debug)
+
+    @autosave = autosave
+
     if filename then
 
-      @filename = filename      
-      
+      @filename = filename
+
       if FileX.exists? filename then
         load_xml(filename)
       else
         save()
-      end      
+      end
 
     end
   end
-  
+
+  def gem_register(gemfile)
+
+    if gemfile =~ /^\w+\:\/\// then
+
+      code = Requestor.read(File.dirname(gemfile)) do |x|
+        x.require File.basename(gemfile)
+      end
+
+      eval code
+
+    else
+
+      require gemfile
+
+    end
+
+    if defined? RegGem::register then
+
+      self.import RegGem::register
+      true
+
+    else
+      nil
+    end
+
+  end
+
   def get_key(path, auto_detect_type: false)
 
     e = super path
 
     return e unless auto_detect_type
-    
+
     raw_c = e.attributes[:type]
 
     c = raw_c if raw_c
     s = e.text
 
-    return e if e.elements.length > 0 or s.nil?    
+    return e if e.elements.length > 0 or s.nil?
     return s unless c
-          
+
     h = {
       string: ->(x) {x},
-      boolean: ->(x){ 
+      boolean: ->(x){
         case x
         when 'true' then true
         when 'false' then false
@@ -59,38 +88,45 @@ class DWSRegistry < XMLRegistry
       time:   ->(x) {Time.parse x},
       json:   ->(x) {JSON.parse x}
     }
-                            
-    h[c.to_sym].call s   
-    
+
+    h[c.to_sym].call s
+
   end
 
   def set_key(path, value)
-    
+
+    if @debug then
+      puts 'inside set_key path: ' + path.inspect
+      puts '  value: '  + value.inspect
+      puts '  value.class : '  + value.class.inspect
+    end
+
     value, type = case value.class.to_s.downcase.to_sym
     when :string     then value
     when :time       then ["#%s#" % value.to_s, :time]
     when :fixnum     then [value.to_s, :number]
     when :integer    then [value.to_s, :number]
-    when :float      then [value.to_s, :number]      
+    when :float      then [value.to_s, :number]
     when :falseclass then [value.to_s, :boolean]
     when :trueclass  then [value.to_s, :boolean]
     when :array       then ["%s" % value.to_json, :json]
+    else value
     end
-    
-    e = super(path, value)    
-    
+
+    e = super(path, value)
+
     type = find_type value unless type
     e.attributes[:type] = type.to_s if type
     e.parent.attributes[:last_modified] = Time.now.to_s
-    
+
     save() if @autosave
 
     onchange = e.attributes[:onchange]
-    
+
     if onchange then
       RScript.new.run onchange.sub('$value', value).split
     end
-    
+
     e
   end
 
@@ -104,25 +140,27 @@ class DWSRegistry < XMLRegistry
     super(@filename)
   end
 
-  def import(s)      
+  def import(s)
     super(s)
     save() if @autosave
   end
-  
+
   def refresh()
-    load_xml(@filename)    
+    load_xml(@filename)
   end
-  
+
   private
-  
+
   def add_value(key, value)
     e = @doc.root.element(key)
     e.text = value
     return e
   end
-  
+
   def find_type(v)
 
+    puts 'v: ' + v.inspect if @debug
+
     if v[/^\d+$/] and v.to_i.to_s.length == v.length then :number
     elsif v[/^\d+\.\d+$/] and v.to_f.to_s.length == v.length then :number
     elsif v.downcase[/^(?:true|false|on|off|yes|no)$/] then :boolean

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dws-registry
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -10,30 +10,55 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwNTI2MTIyMzAwWhcN
-  MTkwNTI2MTIyMzAwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDhFT39
-  uF7y3GY9mhi6PN731nHxrdjgOIb/AdD0xU+S14eEX/hupKoVcMTLQ74qBR0jpXhE
-  TvWhMPHXmmxcBQJqeJR29uTbpVKmE2Q8+BBE/YwEYlZhfj9ZeKJsIwN37k5pge5i
-  PErzU/f3qEqYUcSfM/5lLL/yj090qJDvBGKtviBfwe+I4dmwuy3QLeHLDjRozI5+
-  rMPHcrFDzc2Hpk66nBDibcqwq4Oi0TcG7iY+B8vN/sCK1v61+bWuTS7Xfq03kMz1
-  Z7adf2t3p8RAY90S7dvAH9flsU/bPjzxj6uJRykqlYhcQ2DsOOKRcjZ9qCfcTZC/
-  axr33QAlXrqA8PXJAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFDnvM9mcHPNkC+/NAwQlU1pIc1pHMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAIjS7dxsmC1Zkr/kNxbK
-  U4k7p7v67ka3xktg6GQjGoVmrxVu/MRBMIQk9AP8lfBJwiDncqxKJDbrppssUSjx
-  LWDitx4rd3lfYFjP6VSTHpohH8UP2qhRkMVvdXKyRHt+Tp6KaVvvsr2LOJ8qyM5A
-  5M7ZYVtsr/7esL75iZxQNiA6NjNg6JfI/RBOrTX8Nddr0rBJx37Ku7OJUVQZZha7
-  L13gkWB8MLuOVup7BlLRwsX2OmUUQShRoVEkuakGRFISQfMW2Ro5WyWcDhHRiBVA
-  2OIP5ipuioL7Hk+Qn8RSiaAEhysfSx6KXdlDxCMWh/OraisuuCve1XSh5j/lVLse
-  4oU=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIzMTA1NzUxWhcN
+  MjMwMjIzMTA1NzUxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDTb0vH
+  MBuMaCXOK85XgvsoNui5BK0QjkmF7K3eQhHLXbjefSZf492l9JwyMn+pFuIJw0Ex
+  nmOttMWEeml7bGAzzCx467NQipWpvjI51dGOzGgV0x/gkWt8L7ARsvRpkLWlnvoP
+  N3uwKaC2jdilnSByYk9U6yk8HogVa/8wG3u74DTqe9S5hK6nRa+9HsPNFaUAA2uj
+  hZnsac/qbtAC0j1dUm8JsI+IN/fne8C4A2Yx6q/qaIKKtjDfVxU/ndE0EsqJPxKS
+  Y/r6BMDldmInLXww0uN8wBMimjvpNXNeUJWVTa30pISbJgypvaHZ7gyoayx4JJXN
+  ttPgIAC3uxvCkKzqRf5ZYISlbH+wbKboHx6JbKJyplwUIBmBX1TGQR1zreYWMrAc
+  QCF+J4Gy0TWyvE7vYMuoCYScrDOW1qgAs5h4C6uULtielzf0YtHj9d1UoCfVgX0E
+  SkLZmtqmvKwlh4pt5d31wDGRcgeZEiXwvL70EWf5/ZEYxVaOypeNSFid29sCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUowJRfw5D
+  klvChabJZhSMvL5PjF4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAX/yzO2+tSE9ILK+33Wi3AlOjkiV5EyPmbt/zN3rq
+  ZvUT2HPhRbWbm51moUDhAnqTp3/3oSwbFwuzjHKn6D8S7zWEPwCOwChL0BsBM2fH
+  fr7kvGJ99Ox4ZGvuyVZd38udW0lZd8M//6179KFDMeYWPkAE9GNznGs0kQcJJouB
+  1/o+gXSpf2IDjk5jNL6wy5eybwI6k+UU2nk8FhfO0S0qEvWyldhvMrJZPyBxAULl
+  g1o/wESBNM84moSIsI8ifCGGr587eAoi7ee8f7gX6jIx86dmEktJk45hb2P4HFLh
+  JQtv79dblSdtDmOkSPmDno62VyyZ2WFYiRBcL1iOqduY+HxMee4Y58N2v+60g15y
+  zl3twGqOmIgxT6PlWIUhLXchNfPD2Y1E0ruwYOLYF8WkVYNaARxpXp4kEs2SPGFT
+  /ArK0zi1UbowqPGV8bDI5U/tQBYydUuDyqAjSF2aZ5XSherLHoK7aBGAaJKn2gwy
+  Zkhg8x25XmgmwWK1wohJdFY4
   -----END CERTIFICATE-----
-date: 2018-05-26 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-registry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: requestor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -41,7 +66,7 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -51,9 +76,9 @@ dependencies:
         version: '0.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.5
+        version: 0.5.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -78,8 +103,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.2.22
 signing_key: 
 specification_version: 4
 summary: An XML registry which stores the Ruby data type as well as the value