testdata 0.8.8 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed646b83d128b47b709ffd05f34b68616b102861
-  data.tar.gz: 002905c7f3b9a2d7ee38bdfd4a12eceb24f20692
+  metadata.gz: c4acfb64c6128ab313d8cce5965ff06a0afd4075
+  data.tar.gz: 79f14e01ed47a6600e3d0f333f2b266616d432ed
 SHA512:
-  metadata.gz: cd1bed2b6230a75ffe588a6d21cbe9fedfdd63c4ca2bb44044fa7ffc030d3cbd8cd77a2e04dad2921839a79e23396ff8691a08d3d0bed45f839d64e8912a1cea
-  data.tar.gz: bd9b4c4c103148e1de90cacff324bd135787e2c2ea215f2f70cae464c2aed93934cc76c9093b28a6270bd795c3b6a595d56e2f9d80e358a0de49b332df09636a
+  metadata.gz: 901b534e449cd24c6f173139f8aa00554aa5e8679b725a929b18b0214639ffbb6a641f108834bb77a259e2c5caff718dc199681a4b04f7c9f07499351a30b3d7
+  data.tar.gz: de116d18fac601508cc40b64c7397f27adae5d1465b58e0aa4b59aa85b52b61b1ae0acc9c449b96707bb3b44daa2bc89c04756e225b79a833c03e49ea15f8278

data.tar.gz.sig

@@ -1,2 +1,2 @@
-MP������͚[��R`*�e=��"
F��"�Tm�T�	ڄ��ϙh#���F��d\�O� �@�!DQAYza�	�4���o[?��+f�
�;PA�
���Щ;��
��^6��� ��Q�9$�����������@s����B�8�����g&�
-�D�1$�/-Q�mơ?E�w���\(���=�wL!�C��sJ���P9Δ�������=Y47��M��7
+lTܮe1�߱�l]sK(@��da�/�M�μX�?:V����R�1��\�,ç,�@�
+I�>D�/B�C5���W+Z����[M]���uO[8z���bqS���^�y�(�;I/�N�^����[H�^-û�=�Z��6��Udrz���m��Yءs�	P�!�'a������"�#9_�g���[~�����@J���#�x�:XO���p
m�^}�+�L�'��G0���h(p-�pr.ɏ� P\\�TeԷ

data/lib/testdata.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 
 # file: testdata.rb
 
@@ -13,7 +13,10 @@ class Testdata
   attr_accessor :debug
 
   def initialize(s, options={})
-    @route = {}; @params = {} # used by app-routes
+    super()
+    @params = {}
+    #routes()
+
     @success = [] # used by summary
     @debug = false
 
@@ -42,7 +45,8 @@ class Testdata
 
     stringify = Proc.new do |x| 
       r = x.text.to_s.gsub(/^[\n\s]+/,'').length > 0 ? x.text : x.cdatas.join.strip
-      REXML::Text::unnormalize(r)
+      #REXML::Text::unnormalize(r)
+      r
     end
 
     node = XPath.first(@doc.root, "records/test[summary/path='#{id}']")
@@ -52,7 +56,8 @@ class Testdata
 
     xpath = "records/io/summary[type='input']/*"
     input_nodes = XPath.match(node, xpath)[1..-1]
-    input_values = input_nodes.map(&stringify)   
+    input_values = input_nodes.map(&stringify)  + []
+
     input_names = input_nodes.map(&:name)
     
     # find the type or description
@@ -70,6 +75,7 @@ class Testdata
     @debug2 = debug2 ? true : false
     @success = []
     procs = {NilClass: :test_all, Range: :test_all, String: :test_id, Fixnum: :test_id}
+
     method(procs[x.class.to_s.to_sym]).call(x)
     summary()
   end
@@ -78,14 +84,15 @@ class Testdata
     x ||=(0..-1)
 
     XPath.match(@doc.root, "records/test/summary/path/text()")[x].each do |id|
-      puts 'id : ' + id.to_s
       test_id(id)
     end
   end
 
   def test_id(id='')
 
-    path_no, @inputs, input_names, tod, expected = testdata_values(id.to_s)
+    path_no, inputs, input_names, tod, expected = testdata_values(id.to_s)
+
+    @inputs = inputs
     tests() # load the routes
     raw_actual = run_route tod
 
@@ -98,10 +105,12 @@ class Testdata
 
         a = raw_actual.is_a?(String) ? [raw_actual].flatten.map(&:strip) : raw_actual
         b = expected.map(&:strip)
-
+        #puts 'b :' + b.inspect
         if @debug == true or @debug2 == true then
-          inputs = input_names.zip(@inputs).map{|x| '  ' + x.join(": ")}\
+          
+          inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
             .join("\n")
+
           puts "\ninputs: \n" + inputs
           puts "\ntype or description:\n  " + tod
           puts "\nexpected : \n  " + b.inspect
@@ -115,8 +124,7 @@ class Testdata
 
     rescue Exception => e  
       err_label = e.message + " :: \n" + e.backtrace.join("\n")
-
-      puts err_label
+      raise 'testdata :' + err_label
       result = false
     ensure
       @success[-1][0] = result
@@ -126,7 +134,7 @@ class Testdata
   def tests(*args)
     # override this method in the child class
   end
-    
+
   def read_file(s) 
     buffer = File.open(s, 'r').read
     ext = url[/\.(\w+)$/,1]
@@ -142,11 +150,15 @@ class Testdata
   def read_xml(buffer)
     buffer
   end
+  
+  def read_td(buffer)
+    TestdataText.parse buffer
+  end
+
 
-              
   def test(s)
     @inputs = @inputs.first if @inputs.length == 1
-    get(s){yield(@inputs)}
+    self.add_route(s){yield(@inputs)}
   end
 
   def summary()
@@ -158,4 +170,4 @@ class Testdata
       failed:  @success.select{|x| x[0] == false}.map(&:last).sort
     }
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.10
 platform: ruby
 authors:
 - James Robertson
@@ -29,34 +29,34 @@ cert_chain:
   v6gR0L2xBdI+YSHZD9YesDj3p86qeGXWwmk/NFuo/Z8BugdhOC6UclzbmtvM1MCs
   +/pkQFGFkmwcWwLt2EJHryF/SPfCbewq
   -----END CERTIFICATE-----
-date: 2013-07-27 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: testdata_text
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -76,17 +76,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0.rc.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: testdata