recordx 0.5.3 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 918fa7b4af8c1c9290f4ec35b90ebe918a579f40d34c335deb5ff36a5146308c
-  data.tar.gz: f245347dde3b832eb8c0813e3cd428ec1c4617c7a09fb8319792c72bbc01da2b
+  metadata.gz: 843e6a429e72573650377022053a10cf879c6f151d3a43966922f1154bc0af15
+  data.tar.gz: 00ba50d0bc239fc24269421f88eb8fbaae634893d0a735a36b8392f1a411f81e
 SHA512:
-  metadata.gz: c823724e96d1221f93a3ec8cb5848868685730cdc52ed53d0ac5597958cc0e9cc5ea8e8fce722264a60d026467098a3a6c4870fc7da46f56566183bf84929756
-  data.tar.gz: f1bc3e5d9eaf39ba67a3de185a82e7806cfe17f46720aaa31b3a6a588d5be71dc053f8c48a57d77fb5ea6e9a20988fa6683cec1a61e5298814a58828de75933f
+  metadata.gz: ed493de1e9c6ea457f2eb8f35812f30c89c31b36f8993b3affb73c69fe28b458c02d40e889619d7cb4db64dfda7d351a53230f69bbebdbd6ee4158c844f7113a
+  data.tar.gz: f4d45056871fd9ea42b0006d080ac85ea7820c0a8bb3b75f66f85bbf95a2f2f54ad389c995e2e92190b8ee9452911485534000148839e83179de0bb098b1aa39

data/lib/recordx.rb

@@ -4,62 +4,69 @@
 
 
 require 'rexle'
+require 'kvx'
+require 'rxfreader'
 require 'rexle-builder'
 
 
 class RecordX
+  using ColouredText
 
   attr_reader :id, :created, :last_modified
-  
+
   class RXHash < Hash
-    
+
     def initialize(callerx)
       super()
-      @callerx = callerx 
+      @callerx = callerx
     end
 
     def []=(name, val)
       unless @callerx.send(name.to_sym) == val then
-        @callerx.send((name.to_s + '=').to_sym, val) 
+        @callerx.send((name.to_s + '=').to_sym, val)
       end
       super(name, val)
     end
-    
+
     def clone()
       self.to_h.clone
     end
   end
 
-  def initialize(x=nil, callerx=nil, id=nil, created=nil, last_modified=nil, 
+  def initialize(x=nil, callerx=nil, id=nil, created=nil, last_modified=nil,
                  debug: false)
-    
+
     @debug = debug
-    puts 'x: ' + x.inspect if @debug
+    puts ('x: ' + x.inspect).debug if @debug
 
     h = if x.is_a? Hash then x
-    
+
       x
-      
+
     elsif x.is_a? Array then
-      
+
       x.inject({}) do |r,y|
         val = y.text.is_a?(String) ? y.text.unescape : ''
         r.merge(y.name.to_sym => val)
       end
-      
+
+    elsif x.respond_to? :to_h
+
+      x.to_h
+
     else
-      
+
       x
-      
+
     end
-    
-    @callerx, @id, @created, @last_modified = callerx, id, \
-                                                         created, last_modified
+
+    @id, @created, @last_modified = id, created, last_modified
     @h = RXHash.new(self).merge h
     h.each {|name,val| attr_accessor2(name.to_s, val) }
-    
+    @callerx = callerx
+
   end
-  
+
   def [](k)      @h[k]         end
   def []=(k,v)   @h[k] = v     end
   def keys()     @h.keys       end
@@ -82,39 +89,39 @@ class RecordX
   def to_h()
     @h.clone
   end
-    
+
   def to_html(xslt: '')
 
     # This method is expected to be used within Dynarex
-    
+
     kvx = self.to_kvx
 
-    xsl_buffer = RXFHelper.read(xslt).first
+    xsl_buffer = RXFReader.read(xslt).first
     #jr100316 xslt  = Nokogiri::XSLT(xsl_buffer)
-    #jr100316 xslt.transform(Nokogiri::XML(kvx.to_xml)).to_s 
+    #jr100316 xslt.transform(Nokogiri::XML(kvx.to_xml)).to_s
     Rexslt.new(xsl_buffer, kvx.to_xml).to_s
 
   end
-  
+
   def to_kvx()
-    
-    puts 'inside to_kvx' if @debug
-    kvx = Kvx.new(@h.to_h)
-    
+
+    puts 'inside to_kvx'.info if @debug
+    kvx = Kvx.new(@h.to_h, debug: @debug)
+
     if @callerx and @callerx.summary[:recordx_type] then
       summary_fields = @callerx.summary.keys - [:recordx_type, \
                                           :format_mask, :schema, :default_key]
       summary_fields.each {|field| kvx.summary[field] = @callerx.summary[field] }
     end
-    
+
     kvx
-    
+
   end
-  
+
   def to_s()
     self.to_kvx.to_s
   end
-  
+
   def to_xml()
 
     def build(xml, h)
@@ -123,7 +130,7 @@ class RecordX
 
     xml = RexleBuilder.new
 
-    Rexle.new(xml.root { build xml, h }).xml pretty: true    
+    Rexle.new(xml.root { build xml, h }).xml pretty: true
   end
 
   def update(h)
@@ -133,16 +140,16 @@ class RecordX
   private
 
   def method_missing(method_name, *raw_args)
-        
+
     arg = raw_args.length > 0 ? raw_args.first : nil
 
     attr_accessor2(method_name[/\w+/], arg)
-    arg ? self.send(method_name, arg) : self.send(method_name)    
+    arg ? self.send(method_name, arg) : self.send(method_name)
   end
 
   def attr_accessor2(name,val=nil)
 
-    reserved_keywords = ( 
+    reserved_keywords = (
                           Object.public_methods | \
                           Kernel.public_methods | \
                           public_methods + [:method_missing]
@@ -152,13 +159,13 @@ class RecordX
     if (reserved_keywords - exceptions - @h.keys).include? name.to_sym then
       raise "recordx: reserved keyword *#{name}* can't be used as a field name"
     end
-    
+
     self.instance_eval %Q{
-      
+
       def #{name}=(s)
-        
+
         puts 'inside #{name} assignment' if @debug
-        
+
         @#{name} = s.to_s
         unless @h[:#{name}] == s.to_s then
           @h[:#{name}] =  s.to_s
@@ -167,19 +174,19 @@ class RecordX
       end
 
     }
-    
+
     # If this method has been monkey patched don't attempt to overwrite it
-    
+
     if not self.public_methods.include? name.to_sym then
-      self.instance_eval %Q{    
+      self.instance_eval %Q{
         def #{name}()
           @#{name}
         end
       }
     end
-    
+
     self.method((name + '=').to_sym).call val if val
-    
+
   end
 
-end  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: recordx
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.6.0
 platform: ruby
 authors:
 - James Robertson
@@ -11,54 +11,54 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwOTI2MjExNzA1WhcN
-  MTkwOTI2MjExNzA1WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQCqe0ns
-  PJhx/E+DCKiGs466cNHUoGbPa2cSwmezDzZykhh0oyPt1fUaX2WjxG6bwibjrSbc
-  7GbvVR1OT4y02Q1KTBQuDIiNOapVfKv2o3uOlCMildHb3vZCl2XP8l9KbiT1TBEi
-  cq7RS6xeMmSGGEN0hXcCT3eeGcRt98iJBMQAEiE3s34eGMEYX02Ns7/MblbTkPCR
-  7yohGIXKGV+Zm4APHkoFMn5iRr7Hvrw7mvnutdt07rc9Wd122E0b2bpsGukhD48o
-  Bil7gbPe2AikG0+i4uJsdc/91h5xvHCQL2NWUkcqpQJW61G5WBa0avN+o97s605r
-  vG5Sid8WYZ4sD1wuGIE9NZ39ejbxpAktPCZIeUfy+l4OECz4ZezSj5VCDDbq2V/3
-  1yihRFm/Uc+in56Yy5+gWbUIOpJ9L7ydfu+arssTqR84l3dEOzh7D+OVkLbOfC+I
-  4nYlzZ4fT/Xs52lim/JvaT93N2gbc7tOa/5uJDnsZ46Dns+bGNbioEWu0qUCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUNPgjncjw
-  88J995uuxY883D18qwUwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjIwMjIyMjAxNjMwWhcN
+  MjMwMjIyMjAxNjMwWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDJVZE6
+  Rmm1/oFA4V4PZWAz2nJZM874Ro+sqzgdo0VDvPV7G8h2xCDoOHZQK/+02255s0sQ
+  Qn3B5qhFtcKemlxEA50ilFukCpqrimHfv3gU5EM69v1eqddruX8IkZG62+KsbqzY
+  PnexVTH9pEW+blHhbjLzSaVAElh5g3ljxZE38LEreOD8lK3SQMkJR1NGp1KfHRAP
+  ptwzFYsqQTN3ZRNmIcuCuX7ubRfdDZD/OcTSVC6y0FHDe/Ozw43esloHiUcCjGm3
+  BuBBBi+r9Jetb9ejCx3g0Y8AwuB4fQtU6Nn2ywRlwc3Jr+WwZYs6j/CPhXApQGpm
+  oZu8PMcs3iDm/xLMbRTKzHG4h0yqRImRvf2CPJzifG2iDqbwIeX0ARUm01TJebep
+  3pC0jHMyqTyh0aUuwi4XPju/ay3uVuHYmKUKfy/dHmpcLC/DtX5+1ovEMmKF553Y
+  0U+J/q3/nlPPuwprBWc4kbiwVd7yAU0pIp0PyuBuowm4DGTZxnTU16oalXECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUZXBQNQsZ
+  yBUbbrLnylBogj+gbXswJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEAEVdhpKethqBVXjpCYOZwEaDBWjoImapp3nmv46d/
-  vKN0tslqoG58ArQbv5Oe1/HRmjcF8A/yZec4zT5u5ZtL19HpTWAgurslctRg6HGa
-  g/8KW7+oxRQEgJJ0In2Jjx2gc763tXLvkBqmUYNOb/jjj2s2QQuNba/+meL15Iyu
-  if0dO4sdaQQ8q+w2/wLZT+cYzjFd6pYzVsH1wxIiJ2D4nN/eqcLIQgFLyi6lCebg
-  TipAUtWe4uvxIQOS3FLd40bA8O1+uT8BQFJQFmQ9YITLiLscL+++8AHj2Ln5P/Ru
-  91fMfFMxm2GzbEVVWpjPz8RIUr0MMWfDrbhE0Or2uL9GcjSIvGd53T0+qcHEHCts
-  h5B/cRoarAMuZO2iXYS/cqU7kreNfh/4MrKSBTDNEMNssLvDm7T01T3k2HWC2CH5
-  EIi/XV4rQZuQex22BSKqX+7yWSGbOtHhEDLjsIiI0ekaUbHr3diiVoyvqoVRuBIF
-  p3MTPyzuloAgdm0fePPKwi7V
+  BgkqhkiG9w0BAQsFAAOCAYEACarv5CWButZ0p3od37VRkXaRl5DbTIJKvoS2mr2v
+  jiW+TQYVXxnPm98kUyiWaEQ6WKoSMj6vWwd4xIcAPpIzFj9QRYjkSUCEuRHlEl7X
+  jepBTwG7gvFPG017dN0tJ+KMeIYIMPkGpVS2HpdVivGP6Mi0FmVAfQQNCK9vGbKZ
+  Q2/nOEl9fVJN/T6RyGj2FastDNR19eInbKh0BEFrlT1P1JvixFN2yvEZE1WCc/j6
+  Lee70CFxZ2nbo38W+Ib9/xsH63ReblZdyZQ+rZeylCfUYW7My6nmFocOORx6FlaC
+  ui0KGYozMGHnUcUg1ugJXYgQbcZNuogYbOtfNUO4JraXvWNufVaSSC2Drs9N0hoo
+  6v5qwwlJDbWqIY77HByBTuAKnL3ieOFagNPAMpc2jqCeb87djPW4yaqf3VPiErCI
+  c2Br1Vud354zuw/XUJjWaUJE9aaj0epjLLrkLPQbv5pyjFmIepSjv2rEX/kZ2lqb
+  Puc+e2w9l3V2/PUSgRgVdvWq
   -----END CERTIFICATE-----
-date: 2018-10-02 00:00:00.000000000 Z
+date: 2022-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rexle
+  name: kvx
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.36
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.36
+        version: 1.1.0
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -83,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A kind of Hash which can also use accessor methods to store or retrieve values.