testdata 0.9.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4976cedc862558c2920f3c5a56126ba955ffd558
-  data.tar.gz: 82bba8205b37746020a0caed150a2b3ea9ea4088
+  metadata.gz: 42993343878323c49d342b13654f83ac569942ac
+  data.tar.gz: 9a381a6b441f8e1abd4f78401f0d08fa1ebea524
 SHA512:
-  metadata.gz: b6ef582472a2ccdb68d16529947a25cf683f2acb0665da06d11cd6ba430501231a47d6caca0b2914fc989f0c769beb95b2b06e29a6c4dd5087ecc5a366d0963c
-  data.tar.gz: 56223c7eeabb76f4b34941900a3c48d1e2843eb5945c9c601acc10b5ffa84e706c0b60f1fac0386bc0d795ef9623001c798cd69e713a9e1c2e24b819a6a27036
+  metadata.gz: d82e33c38e86cae40b21dd3484586f99b5f9f06fa67e29c5308ba1b101072c3c16cfe429d5e22103e324dcedbb5f01d39de4432f038d728cae9d04df5f4757d9
+  data.tar.gz: e46240242b55a6cf686f2b4711aff34510c9b94709cb9bb1076dc6f58ffc3dd9be5f281efe3e161261f1b50202391fbbc6336c8f4df384ccc1b774441ed25e8c

data/lib/testdata.rb

@@ -2,7 +2,6 @@
 
 # file: testdata.rb
 
-require 'rexml/document'
 require 'app-routes'
 require 'testdata_text'
 require 'diffy'
@@ -11,191 +10,234 @@ require 'diffy'
 class TestdataException < Exception
 end
 
-class Testdata
-  include REXML
-  include AppRoutes
+module Testdata
+  
+  class Base
+
+    include AppRoutes
+
+    attr_accessor :debug
+
+    def initialize(s, options={})
+      
+      super()
+
+      @params = {}
+
+      @success = [] # used by summary
+      @debug = false
+
+      # 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                   
+        },
+        Polyrex: proc {|x| x.to_xml}
+      }
+
+      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
 
-  attr_accessor :debug
+    def run(x=nil, debug2=nil)
+      @debug2 = debug2 ? true : false
+      @success = []
+      procs = {NilClass: :test_all, Range: :test_all, String: :test_id, Fixnum: :test_id}
 
-  def initialize(s, options={})
+      method(procs[x.class.to_s.to_sym]).call(x)
+      summary()
+    end
     
-    super()
-
-    @params = {}
-    #routes()
-
-    @success = [] # used by summary
-    @debug = false
-
-    # 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                   
-      },
-      Polyrex: proc {|x| x.to_xml}
-    }
-
-    buffer =  procs[s.class.to_s.to_sym].call(s)
+    private
+    
+    def testdata_values(id)
 
-    @doc = Document.new(buffer)
+      
 
-    o = {log: false}.merge(options)
-    @log =  o[:log] == true ? Document.new(tests) : nil
-  end
+      node = @doc.root.element "records/test[summary/path='#{id}']"
 
-  def run(x=nil, debug2=nil)
-    @debug2 = debug2 ? true : false
-    @success = []
-    procs = {NilClass: :test_all, Range: :test_all, String: :test_id, Fixnum: :test_id}
+      raise TestdataException, "Path error: node title not found" unless node
 
-    method(procs[x.class.to_s.to_sym]).call(x)
-    summary()
-  end
-  
-  private
-  
-  def testdata_values(id)
+      path_no = node.text('summary/path')
+      xpath = "records/input/summary/*"
+      input_nodes = node.xpath(xpath) #[1..-1]
+      input_values = input_nodes.map{|x| x.texts.map(&:unescape).join.strip}  + []
 
-    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)
-      r
-    end
+      input_names = input_nodes.map(&:name)
+      raise TestdataException, 'inputs not found' if input_values.empty? \
+                                                        or input_names.empty?
 
-    node = XPath.first(@doc.root, "records/test[summary/path='#{id}']")
-    raise TestdataException, "Path error: node title not found" unless node
+      summary = node.element 'summary'
+      type, desc = summary.text('type'), summary.text('description')
 
-    path_no = node.text('summary/path').to_s
+      xpath = "records/output/summary/*"
+      output_nodes = node.xpath(xpath) #[1..-1]
+      output_values = input_nodes.map{|x| x.texts.map(&:unescape).join.strip}
 
-    xpath = "records/input/summary/*"
-    input_nodes = XPath.match(node, xpath) #[1..-1]
+      [path_no, input_values, input_names, type, output_values, desc]
 
-    input_values = input_nodes.map(&stringify)  + []
+    end
 
-    input_names = input_nodes.map(&:name)
-    raise TestdataException, 'inputs not found' if input_values.empty? \
-                                                      or input_names.empty?
-    
-    summary = XPath.first node, 'summary'
-    type, desc = summary.text('type'), summary.text('description')
+    def test_all(x)
+      x ||=(0..-1)
 
-    xpath = "records/output/summary/*"
-    raw_output = XPath.match(node, xpath)
-    output_values = raw_output.length > 0 ? raw_output.map(&stringify) : []
+      break_on_fail = @doc.root.element('summary/break_on_fail/text()') == 'true'
 
-    [path_no, input_values, input_names, type, output_values, desc]
+      @doc.root.xpath("records/test/summary/path/text()")[x].each do |id|
 
-  end
+        result = test_id(id)
+        break if result == false and break_on_fail 
+      end
 
+    end
 
+    def test_id(id='')
 
-  def test_all(x)
-    x ||=(0..-1)
 
-    break_on_fail = XPath.first(@doc.root, 
-                            'summary/break_on_fail/text()') == 'true'
+      path_no, inputs, input_names, type, expected, @desc = 
+                                            testdata_values(id.to_s)
+      @inputs = inputs
+      tests() # load the routes
 
-    XPath.match(@doc.root, "records/test/summary/path/text()")[x].each do |id|
-      result = test_id(id)
-      break if result == false and break_on_fail 
-    end
-  end
+      raw_actual = run_route type
+      puts  "warning: no test route found for " + type unless raw_actual
 
-  def test_id(id='')
+      result = nil
+      @success << [nil, path_no.to_i]      
 
-    path_no, inputs, input_names, type, expected, @desc = 
-                                          testdata_values(id.to_s)
-    @inputs = inputs
-    tests() # load the routes
+      begin
 
-    raw_actual = run_route type
-    puts  "warning: no test route found for " + type unless raw_actual
+        if raw_actual then
 
-    result = nil
-    @success << [nil, path_no.to_i]      
+          a = raw_actual.is_a?(String) ? [raw_actual].flatten.map(&:strip) : raw_actual
+          b = expected.map(&:strip)
 
-    begin
+          if @debug == true or @debug2 == true then
+            
+            inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
+              .join("\n")
 
-      if raw_actual then
+            puts "\ninputs: \n" + inputs
+            puts "\ntype or description:\n %s: %s" % [type, @desc]
+            puts "\nexpected : \n  " + b.inspect
+            puts "\nactual : \n  " + a.inspect + "\n"
+          end
 
-        a = raw_actual.is_a?(String) ? [raw_actual].flatten.map(&:strip) : raw_actual
-        b = expected.map(&:strip)
-
-        if @debug == true or @debug2 == true then
+          result = a == b
           
-          inputs = input_names.zip(inputs).map{|x| '  ' + x.join(": ")}\
-            .join("\n")
+          if (@debug == true or @debug2 == true) and result == false then
 
-          puts "\ninputs: \n" + inputs
-          puts "\ntype or description:\n %s: %s" % [type, @desc]
-          puts "\nexpected : \n  " + b.inspect
-          puts "\nactual : \n  " + a.inspect + "\n"
+            # diff the expected and actual valuess
+            puts Diffy::Diff.new(a.first, b.first)
+          end
+        else
+          result = [raw_actual].compact == expected
         end
 
-        result = a == b
-        
-        if (@debug == true or @debug2 == true) and result == false then
-          # diff the expected and actual valuess
-          puts Diffy::Diff.new(a.first, b.first)
-        end
-      else
-        result = [raw_actual].compact == expected
+      rescue Exception => e  
+        err_label = e.message + " :: \n" + e.backtrace.join("\n")
+        raise TestdataException,  err_label
+        result = false
+      ensure
+        @success[-1][0] = result
+        result
       end
+    end
 
-    rescue Exception => e  
-      err_label = e.message + " :: \n" + e.backtrace.join("\n")
-      raise TestdataException,  err_label
-      result = false
-    ensure
-      @success[-1][0] = result
-      result
+    def tests(*args)
+      # override this method in the child class
     end
-  end
 
-  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]
+      method(('read_' + ext).to_sym).call(buffer)    
+    end
+      
+    def read_url(url)
+      buffer = open(url, 'UserAgent' => 'Testdata').read  
+      ext = url[/.*\/[^\.]+\.(\w+)/,1]
+      method(('read_' + ext).to_sym).call(buffer)
+    end
 
-  def read_file(s) 
-    buffer = File.open(s, 'r').read
-    ext = url[/\.(\w+)$/,1]
-    method(('read_' + ext).to_sym).call(buffer)    
-  end
+    def read_xml(buffer)
+      buffer
+    end
     
-  def read_url(url)
-    buffer = open(url, 'UserAgent' => 'Testdata').read  
-    ext = url[/.*\/[^\.]+\.(\w+)/,1]
-    method(('read_' + ext).to_sym).call(buffer)
-  end
+    def read_td(buffer)
+      TestdataText.parse buffer
+    end
 
-  def read_xml(buffer)
-    buffer
-  end
-  
-  def read_td(buffer)
-    TestdataText.parse buffer
-  end
 
+    def test(s)
+      self.add_route(s){yield(*(@inputs + [@desc]))}
+    end
 
-  def test(s)
-    #@inputs = @inputs.first if @inputs.length == 1
-    self.add_route(s){yield(*(@inputs + [@desc]))}
+    def summary()
+      success = @success.map(&:first)
+      a = @success.map(&:last).sort
+      {
+        passed: success.all?,
+        score:  [success.grep(true), success].map(&:length).join('/'),
+        failed:  @success.select{|x| x[0] == false}.map(&:last).sort
+      }
+    end
   end
 
-  def summary()
-    success = @success.map(&:first)
-    a = @success.map(&:last).sort
-    {
-      passed: success.all?,
-      score:  [success.grep(true), success].map(&:length).join('/'),
-      failed:  @success.select{|x| x[0] == false}.map(&:last).sort
-    }
-  end
-end
+  class Unit
+    
+    attr_reader :to_s
+
+    def initialize(s)
+      
+      super()
+      @to_s = ''
+    
+      buffer, _ = RXFHelper.read(s)
+
+      doc = Rexle.new(buffer)
+
+      # get the template
+      template = doc.root.xpath('summary/test_unit/text()').join.strip
+      raise 'no test_unit template found' unless template
+
+      doc.root.xpath('records/test').map do |test|
+        path, type, description = test.xpath('summary/*/text()')
+        
+        inputs = test.xpath('records/input/summary/*/text()')
+        outputs = test.xpath('records/output/summary/*/text()')
+        records = test.element('records')
+        
+        inputs = records.xpath('input/summary/*').map\
+                                            {|x| [x.name, x.texts.join.strip]}
+        inputs.each do |name, value|
+          template.sub!(/<%=\s*input\.#{name}\s*%>/, \
+                                        '"' + value.gsub('"','\"') + '"')
+        end
+
+        outputs = records.xpath('output/summary/*').map\
+                                            {|x| [x.name, x.texts.join.strip]}
+        outputs.each do |name, value|
+          template.sub!(/<%=\s*output\.#{name}\s*%>/, \
+                                        '"' + value.gsub('"','\"') + '"')
+        end
+        
+        @to_s << template + "\n"
+        
+      end
+    
+    end # end of initialize()
+  end # end of initialize()
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testdata
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 1.0.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   vWFtb5VPsjLRwClW20j7R9zEUv5XjYoyxcUn1W1xQINMVIQMtvMhouLBeWTXF7g4
   ab2xQAvsYawLTw==
   -----END CERTIFICATE-----
-date: 2014-12-27 00:00:00.000000000 Z
+date: 2015-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: app-routes
@@ -62,7 +62,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,7 +72,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement