atp 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc41fbbf375fb2096a5a6448cd8cbb6a17c1acec
-  data.tar.gz: ce6ae9e83db3fb17a0e65054aa85aecaef755b47
+  metadata.gz: 8486776ce5c49ed49887188d3368b6b8c8b14547
+  data.tar.gz: e4c8f89a29f55be26629b87896a8e41d405edb92
 SHA512:
-  metadata.gz: 920d52764ac0272df6f068412252587343194f04f3931dcdaf73c1905b78ea4d7129e27cfa4560c5017cad4a2ee5274fb021c27398d0d628eb4871a54bdfebc8
-  data.tar.gz: 11f5b29de3140272e07a2f8bf98c548f009f980f895666664b43fcb98f9775ecfb5e81807167810d5cb2bf530fee8a67688b95c31c32310cee3bc1d3aff6f859
+  metadata.gz: 78b3e52cdbaccf58d4cd1e66557a8f2f093122a51d3af07212ddcc5e6d3d4a10792c98bad8bb31e7810c286654de81107ebcba5658564641fe9fdbbb18d79154
+  data.tar.gz: 7473fe3cc9a7d668733ab61ce33af26034bd8c51a53668ace3b246cd14c921fafd55f686a17bae370914ab586b3cdb2592341ee9c6cddabda0ee31f3fd3d579b

data/config/version.rb

@@ -1,7 +1,7 @@
 module ATP
   MAJOR = 0
   MINOR = 4
-  BUGFIX = 2
+  BUGFIX = 3
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/atp/ast/builder.rb

@@ -197,12 +197,22 @@ module ATP
       def test(object, options = {})
         children = [n(:object, object)]
 
-        if n = (options[:name] || options[:tname] || options[:test_name])
-          children << name(n)
+        n = (options[:name] || options[:tname] || options[:test_name])
+        unless n
+          [:name, :tname, :test_name].each do |m|
+            n ||= object.respond_to?(m) ? object.send(m) : nil
+          end
         end
-        if n = (options[:number] || options[:num] || options[:tnum] || options[:test_number])
-          children << number(n)
+        children << name(n) if n
+
+        n = (options[:number] || options[:num] || options[:tnum] || options[:test_number])
+        unless n
+          [:number, :num, :tnum, :test_number].each do |m|
+            n ||= object.respond_to?(m) ? object.send(m) : nil
+          end
         end
+        children << number(n) if n
+
         children << id(options[:id].to_s.downcase.to_sym) if options[:id]
 
         children << on_fail(options[:on_fail]) if options[:on_fail]

data/lib/atp/formatters/datalog.rb

@@ -8,7 +8,7 @@ module ATP
         str = 'Number'.ljust(15)
         str += 'Result'.ljust(9)
         str += 'Name'.ljust(55)
-        str += 'Test'.ljust(55)
+        str += 'Pattern'.ljust(55)
         str += 'ID'
         puts str
         process_all(node.children)
@@ -27,7 +27,7 @@ module ATP
           name = node.find(:object).value['Test']
         end
         str += "#{name}".ljust(55)
-        str += "#{node.find(:object).value['Test']}".ljust(55)
+        str += "#{node.find(:object).value['Pattern']}".ljust(55)
         str += "#{node.find(:id).value}"
         puts str
       end

data/lib/atp/processors/marshal.rb

@@ -3,12 +3,17 @@ module ATP
     # Makes the AST safe for Marshaling
     class Marshal < Processor
       def on_object(node)
-        if node.value.is_a?(String) || node.value.is_a?(Hash)
-          node.updated(nil, [{ 'Test' => node.value }])
-        elsif node.value.respond_to?(:to_meta)
-          node.updated(nil, [node.value.to_meta])
+        o = node.value
+        if o.is_a?(String)
+          node.updated(nil, [{ 'Test' => o }])
+        elsif o.is_a?(Hash)
+          node.updated(nil, [o])
+        elsif o.respond_to?(:to_meta) && o.to_meta && !o.to_meta.empty?
+          node.updated(nil, [o.to_meta])
         else
-          node.updated(nil, [{ 'Test' => node.value.name }])
+          meta = { 'Test' => o.name }
+          meta['Pattern'] = o.try(:pattern)
+          node.updated(nil, [meta])
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-19 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen