testdata 1.1.10 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 538ee4e9da6112785d2a5adb42574122aac61b61132b737b8a514acaad5978e9
-  data.tar.gz: 335a22cee75aa3760bd10dbf3bb3d814aafbe320f0bd4f7f1b721136743b26d6
+  metadata.gz: 5a3d6471fcd0124a4c7dccd09604348ed9b0f95097e5c445b3fcdec6e168d9e6
+  data.tar.gz: c76b3fe53e3d0324c4adec135d6a7b25861a1f0af3ebbcb9818696610d1eabe7
 SHA512:
-  metadata.gz: 5b4ead3de090642fc503b1d1a076e2632678962adf4f3a0f0e972c7b33c10965f4de040c1d9c65cf3ae54a0e194c7f557cd9a27dada6d069744f1ea6956469d4
-  data.tar.gz: e6784581fdfcfe104897f800d1866ed10375cc9425408a20d7eed146ea1775a301a558a803b229b267c5fc689367dc3ad9fe6c198a04fd5f90fa462bf462727f
+  metadata.gz: 98c83b30dee58b34f7a9886e66f54e7c7afaa41e3addeb1ad87fa6665d3c7cbc6ad038d04aa7cd1957e21b90f7b05e515b4c8b4cfdfcd75156d6da6d275bd1af
+  data.tar.gz: 9014b80ef725ac1984bd6f2678717d5ea3c74b2f8de5d914ae4e3bd6d4c79206cdc71572e363ffe7f601dd3488184f0626e3d523e85282440106369c031ccd28

data/lib/testdata.rb

@@ -7,14 +7,16 @@ require 'testdata_text'
 require 'diffyc32'
 require 'polyrex'
 require 'yaml'
+require 'rxfreader'
 
 
 class TestdataException < Exception
 end
 
 module Testdata
-  
+
   class Base
+    include RXFRead
     using ColouredText
 
     include AppRoutes
@@ -22,7 +24,7 @@ module Testdata
     attr_accessor :debug
 
     def initialize(s, options={})
-      
+
       super()
 
       @params = {}
@@ -33,14 +35,14 @@ module Testdata
       # open the testdata document
       procs = {
         String: proc {|x|
-                      
+
           if x.strip[/^</] then
             x
           elsif x[/https?:\/\//] then
             read_url x
           else
             read_file x
-          end                   
+          end
         },
         Polyrex: proc {|x| x.to_xml}
       }
@@ -48,26 +50,28 @@ module Testdata
       buffer =  procs[s.class.to_s.to_sym].call(s)
 
       @doc = Rexle.new(buffer)
-      
+
       o = {log: false}.merge(options)
 
       @log =  o[:log] == true ? Rexle.new(tests) : nil
+
+
     end
 
-    def run(raw_x=nil, debug2=nil)
-      
+    def run(raw_x=nil, debug2=nil, results_file: nil)
+
       # verify the document  has unique path numbers
-      
+
       a = @doc.root.xpath('records/test/summary/path/text()')
       duplicates = a.select{ |e| a.count(e) > 1 }.uniq
-      
+
       if duplicates.any? then
-        raise 'Duplicate path found. Path: ' + duplicates.inspect 
+        raise 'Duplicate path found. Path: ' + duplicates.inspect
       end
 
       @debug2 = debug2 ? true : false
       @success = []
-      
+
       x = if raw_x and raw_x[/\d+\.\.\d+/] then
         x, y = raw_x.split('..').map(&:to_i)
         id = Range.new(x,y)
@@ -75,15 +79,16 @@ module Testdata
         raw_x
       end
 
-      procs = {NilClass: :test_all, Range: :test_range, String: :test_id, 
+      procs = {NilClass: :test_all, Range: :test_range, String: :test_id,
                Integer: :test_id, Fixnum: :test_id}
 
       method(procs[x.class.to_s.to_sym]).call(x)
+      @results_file = results_file if raw_x.nil? and results_file
       summary()
     end
-    
+
     private
-    
+
     def testdata_values(id)
 
       node = @doc.root.element "records/test[summary/path='#{id}']"
@@ -91,7 +96,7 @@ module Testdata
 
       path_no = node.text('summary/path')
 
-      input_summary = node.element 'records/input/summary'      
+      input_summary = node.element 'records/input/summary'
       input_summary.delete 'schema | format_mask | recordx_type'
 
       input_nodes = input_summary.xpath('*') #[1..-1]
@@ -105,8 +110,8 @@ module Testdata
 
       type, desc = summary.text('type'), summary.text('description')
 
-      output_summary = node.element 'records/output/summary'      
-      output_summary.delete 'schema | format_mask | recordx_type'      
+      output_summary = node.element 'records/output/summary'
+      output_summary.delete 'schema | format_mask | recordx_type'
 
       output_nodes = output_summary.xpath('*') #[1..-1]
       output_values = output_nodes.map{|x| x.texts.map(&:unescape).join.strip}
@@ -119,32 +124,32 @@ module Testdata
       x ||=(0..-1)
 
       break_on_fail = @doc.root.element('summary/break_on_fail/text()') == 'true'
-      
+
       test_id = nil
 
       begin
-        
+
         @doc.root.xpath("records/test/summary/path/text()")[x].each do |id|
-          
+
           test_id = id
           puts 'testing id: ' + id.inspect
           result = test_id(id)
-          break if result == false and break_on_fail 
-          
+          break if result == false and break_on_fail
+
         end
-        
+
       rescue
 
         @success << [false, test_id.to_i]
       end
-      
+
 
     end
 
     def test_id(id='')
 
 
-      path_no, inputs, input_names, type, expected, @desc = 
+      path_no, inputs, input_names, type, expected, @desc =
                                             testdata_values(id.to_s)
       @inputs = inputs
 
@@ -154,7 +159,7 @@ module Testdata
       puts  "warning: no test route found for " + type unless raw_actual
 
       result = nil
-      @success << [nil, path_no.to_i]      
+      @success << [nil, path_no.to_i]
 
       begin
 
@@ -164,7 +169,7 @@ module Testdata
           b = expected.map(&:strip)
 
           if @debug == true or @debug2 == true then
-            
+
             inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
               .join("\n")
 
@@ -176,18 +181,18 @@ module Testdata
 
           result = a.join.force_encoding("UTF-8") == \
               b.join.force_encoding("UTF-8")
-          
+
           if (@debug == true or @debug2 == true) and result == false then
 
             # diff the expected and actual valuess
             puts DiffyC32.new(b.first, a.first).to_s
-  
+
           end
         else
           result = [raw_actual].compact == expected
         end
 
-      rescue Exception => e  
+      rescue Exception => e
         err_label = e.message + " :: \n" + e.backtrace.join("\n")
         raise TestdataException,  err_label
         result = false
@@ -198,15 +203,15 @@ module Testdata
     end
 
     def test_range(range)
-      
+
       a = @doc.root.xpath("records/test/summary/path/text()")
       a[range].each {|x| test_id x}
     end
-    
+
     def tests(*args)
       # override this method in the child class
     end
-    
+
     def read_rdx(buffer)
       puts 'inside read_rdf: buffer: ' + buffer.inspect
       dx = Dynarex.new
@@ -232,7 +237,7 @@ module Testdata
       dx.all.each.with_index do |x, i|
 
         px.create.test(path: (i+1).to_s, type: dx.test_type) do |create|
-          
+
           raw_inputs.each do |fld_in|
 
             create.input(fld_in[0..-4].to_sym => \
@@ -248,17 +253,17 @@ module Testdata
       end
 
       px.to_xml
-        
+
     end
 
-    def read_file(s) 
-      buffer = File.open(s, 'r').read
+    def read_file(s)
+      buffer = FileX.read(s)
       ext = s[/\.(\w+)$/,1]
-      method(('read_' + ext).to_sym).call(buffer)    
+      method(('read_' + ext).to_sym).call(buffer)
     end
-      
+
     def read_url(url)
-      buffer = open(url, 'UserAgent' => 'Testdata').read  
+      buffer = URI.open(url, 'UserAgent' => 'Testdata').read
       ext = url[/.*\/[^\.]+\.(\w+)/,1]
       method(('read_' + ext).to_sym).call(buffer)
     end
@@ -266,7 +271,7 @@ module Testdata
     def read_xml(buffer)
       buffer
     end
-    
+
     def read_td(buffer)
       puts 'buffer: ' + buffer
       TestdataText.parse buffer
@@ -278,6 +283,7 @@ module Testdata
     end
 
     def summary()
+
       success = @success.map(&:first)
       a = @success.map(&:last).sort
       h = {
@@ -285,73 +291,93 @@ module Testdata
         score:  [success.grep(true), success].map(&:length).join('/'),
         failed:  @success.select{|x| x[0] == false}.map(&:last).sort
       }
-      
+
       def h.to_s()
         passed = self[:passed] ? self[:passed].to_s.light_green : self[:passed].to_s.light_red
-        "{passed: #{passed}, score: #{self[:score]}, failed: #{self[:failed]}}"        
-        
+        "{passed: #{passed}, score: #{self[:score]}, failed: #{self[:failed]}}"
+
       end
-      
-      h
+
+      if @results_file then
+
+        dx = if FileX.exists?(@results_file) then
+          Dynarex.new @results_file
+        else
+          Dynarex.new schema: "gems/gemx(title, last_tested, passed, score)",
+              filepath: @results_file
+        end
+
+        title = @doc.root.element('summary/title/text()')
+        h2 = {title: title, last_tested: Time.now.to_s, passed: h[:passed].to_s, score: h[:score]}
+
+        dx.create(h2)
+        dx.save
+        puts 'results file saved at ' + @results_file.inspect if @debug
+
+        #puts dx.all.first
+
+      end
+
+      return h
     end
   end
 
   class Unit
-    
+
     attr_reader :to_s
 
     def initialize(s)
-      
+
       super()
       @a = []
-    
-      buffer, _ = RXFHelper.read(s)
+
+      buffer, _ = RXFReader.read(s)
 
       @doc = Rexle.new(buffer)
 
       @doc.root.xpath('records/test').map do |test|
-        
-        path, type, description = test.xpath('summary/*/text()')        
-        records = test.element('records')        
-        
+
+        path, type, description = test.xpath('summary/*/text()')
+        records = test.element('records')
+
         inputs = records.xpath('input/summary/*').map\
                                             {|x| [x.name, x.texts.join.strip]}
 
         outputs = records.xpath('output/summary/*').map\
                                             {|x| [x.name, x.texts.join.strip]}
-        
+
         @a << {type: type, in: inputs, out: outputs}
-        
+
       end
-    
+
     end # end of initialize()
-    
+
     def to_s()
 =begin
 s = %Q(
 require_relative "#{testgem}"
 require "test/unit"
- 
+
 class #{testclass} < Test::Unit::TestCase
- 
+
   def #{types[i]}
     #{@lines.join("\n    ")}
   end
-  
+
 end
 )
 =end
       #read the .rsf file
       script = @doc.root.element('summary/script/text()')
       raise 'script XML entry not found' unless script
-      
+
       if script then
-        filename = script[/[\/]+\.rsf$/] 
-        buffer, _ = RXFHelper.read(filename)
+        filename = script[/[\/]+\.rsf$/]
+        buffer, _ = RXFReader.read(filename)
       end
       #@a.group_by {|x| x[:type]}
-      
-      
+
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 1.1.10
+  version: 1.1.13
 platform: ruby
 authors:
 - James Robertson
@@ -11,31 +11,31 @@ cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTkxMDA3MDk0MTU2WhcN
-  MjAxMDA2MDk0MTU2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQC2E/7O
-  uQtSwiOjY7M3mU5cZOQeF3mNUXsYF9Sg37oHlh9a960rQ86X/JTNjw/H9GpMwxQA
-  bZCEElZUfMFTCQmxK46elKkhd1q4A1vClsYNKGwT85yO619Mqq7W7RzqsyuMN6AC
-  EvtUXz3FJ9hXtacFEXdUNMu7zuV+GMfeOXZlsORKGsI5GR9XPQ0GquyZr8sdOJh0
-  ijFDX+MPg3R2Px1NHu/iYZZeh/AHmdce4tTbQpqIE+wlc66P2NjOOZ6y3Yc2V/Mc
-  XfbQMq02FXwVVX60bTzh6KFvrYifsLQvGdW4TEY0+JOAyTUIO/WxwYDTJ+6suES7
-  r9sUEKxzJ6EHmPj3olz+86PwsOySY073euOXA3afBTvYkaVm2WVzUjBTz35+F7pv
-  Ov2mmUDkNUUD8ZftL3QZD39SWuR6QK6uBuunhEGTIXLspAMVECTeNpi8wRMafWgE
-  dVKiSjRVBBLfW2z1pmVj6U6ZTjKGeznKEG94AcApj8xVMw5sDIidyGxcW5cCAwEA
-  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUe5iftB4c
-  UGlQ0UyqEkg2Qq02Sn4wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjExMTE4MTE0NjM5WhcN
+  MjIxMTE4MTE0NjM5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDP5gcE
+  axnvctZq3xi6He1Yw6RvwVC4kjtH85FmxWqg4zw/r5iWu8LIDjMPzizceOI6ilmM
+  PuM1k6iAZmyir2T/XQXmNdPXUfjYqHGhou9nxIojdeBCQsVnx9ul9VHWKGdJ1LYB
+  4VfITvuOk1CKZlGO5ro4Kb2J/bLDIKSwmKDwVlKFXm+DXaiGLDh0RwVMoPmA+AlO
+  /00Y7EZlyQEvqMKwbXyA6wrgMWq9KQMQUlDRwKrcueY+HpBKwxJ1gTxXZZJwAxVT
+  unKf8o4uN0IkJxi9Qyslon8fPaHgy1FHVGHUFjLIzRcsVNjPkIfL/V9HDq4R5dtY
+  wbd3msOozJKRGQTBapr3RRSwy3KZsC5j2Oh1cOSJR9AwjhMSLkezTXo8v1OyngSS
+  gTloKO6gxpGccgAzad1bjRo+s75TxypsiaimlDhk74BbKGSEhtRP3LGTfGrJQRbz
+  yCSgvzTTPc39BUPAmrKtjpiLgYkK6oIIBhAROLzeEKqqnivt7aNcBWGJMnMCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUwwhGSF4b
+  LxBGkJrZ+QbD4Gc3598wJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
   c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
-  BgkqhkiG9w0BAQsFAAOCAYEATciFgyRCUKVEJFrO291gbPIEAkeCsLtCRxB0Qz7R
-  Z/7bcVTdrk8/S2VQupuuni8UGeIQuxMTIkoWshCztNrIJ77xxdvk6/WqKqyxeRyZ
-  WKp6dPBvK0CXPRnboicdgWyiJZFr8WXGHmJuRG+SIhMPjR552kTpoKuUqf/aMs0q
-  krS/PjRP7MX2lCx2ZYi6/CdwyJmI5tO4ffXBNFpfquiwAa/tzPKKpbzEFjuUdTs0
-  ByW7I/n/h2fQkhR+/hbzh/xzCuRatkvUkAHmtW1StGSbPn0Hoam6hwWp+NuuUfEU
-  tA2AMgGW5/Ft/vBLFyCfMr/9x6QJEW3VtfwqL8zie4jp2sVCrW1gdotA3+4XdaEF
-  fUI/y8o+W/4oN7aCyhUzCXTSlGzwEHLqqCYX3DFerUd+mdQhSNLYAQuJtj/4zoNc
-  U1Tt/KPr9FeWlvj5ihis4H6UPWZxY2G9k94y2W7ylWkcKNXR8i45F+nCzDL3W0Ll
-  Vt/9GDfEI95Jg3QNvXMDdzNf
+  BgkqhkiG9w0BAQsFAAOCAYEAH6QBlgGKUFJ0jpVgoi+xAQWMgkxZJbx545Ydhjkd
+  9pK0QbiF831LkB/Fax2FYyySgcqtU9aVHY4TwXWZFvhf7MnZM0YnU+2GA367ZkkH
+  HFX88FqBnbVEiYeWbNyhH+Dp/EuoNPwoJKUHOnIjey2bQttpnAr0nl+rNn6DRDBd
+  SrOX6yrJp+TKxmtlJhmcE1G3dNSQYRZOBH/0DtDTQiHU2tiOHW57+5NZmEi/uZMW
+  /cfpafSJ1tENFWQJ1pATQoaJh/6LKnoDWkhrVwSuRJtD8qpOS/wjKqqscZlxS9m/
+  +61VC+IRSjjSHUZUzBHmRsONgYITuw8psX60aEc4oi4SOJuQLunsARvYDY+NO5S0
+  q8Xb225jZx4fdmDXd/EiMLn3hjva85JsJVfrE7eS0dPhZTNv36auPeHGMUEBDKmz
+  VPCX5Cuw6OER1XAXBrbU+Yxtynmu52uURikgRGv3kNN7uFNP2ObtG4bePdjcyRyF
+  ZoODyxvFiUzKN1ar4bIjsI+l
   -----END CERTIFICATE-----
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2022-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -106,7 +106,7 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -116,9 +116,9 @@ dependencies:
         version: '1.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.3.6
 description: 
-email: james@jamesrobertson.eu
+email: digital.robertson@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -143,7 +143,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: A test framework which accepts test data in a Polyrex format.