atp 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cae637faa5b243ed37ff8255c7964bc7a02d82a
-  data.tar.gz: 8144fe3263ea7b626c7097156a9014783ceecac3
+  metadata.gz: de3a4282f251dd1dca4bbc42c90514646b390ecb
+  data.tar.gz: 7b7adde092bf2c0c24b6908808de1bdfa64600fe
 SHA512:
-  metadata.gz: 40be54c02cb2b5359587c251ca16efe61fc33b79cf58465919af30aa871fff53f012c801a0317505e35bebdda18cce45b5f2382c272a9826024eb3cbc7e68524
-  data.tar.gz: 60cede7df8662ae64bcff7c46458ab9326b9e500caf2f496fd2ab15bdc79c41ce5ea2f78fe8c89e7b8ac1ea30116d2dcf8def6bc45354a4a60c7e6969955d22f
+  metadata.gz: 754e3251438749ead9645225e612753284f77dec2e468e376d2c6dba8be75e9b5f9a6374a801b7032bb0af0f0a6b6969f44a0725e6c55172f8f0a8534f4c8b42
+  data.tar.gz: cad825d6fe405ff8cfa77d941a8acec72822a99b4325df4c1bb9449b334adcb8980e93bf1ef8e048b44a80c1539eb4759d00c379ddceaaeb9a5d346e84d41abc

data/config/version.rb

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

data/lib/atp/ast/builder.rb

@@ -6,6 +6,10 @@ module ATP
       attr_reader :context
       attr_accessor :source_file, :source_line_number, :description
 
+      def initialize
+        @context = { conditions: [] }
+      end
+
       def flow
         n0(:flow)
       end

data/lib/atp/flow.rb

@@ -157,21 +157,19 @@ module ATP
     # Returns true if the test context generated from the supplied options + existing condition
     # wrappers, is different from that which was applied to the previous test.
     def context_changed?(options)
-      a = context[:conditions]
-      b = build_context(options)[:conditions]
-      !conditions_equal?(a, b)
+      a = context
+      b = build_context(options)
+      !context_equal?(a, b)
     end
 
     def context
       builder.context
     end
 
-    private
-
-    def conditions_equal?(a, b)
+    def context_equal?(a, b)
       if a.size == b.size
-        a = clean_condition(a)
-        b = clean_condition(b)
+        a = clean_condition(a[:conditions])
+        b = clean_condition(b[:conditions])
         if a.keys.sort == b.keys.sort
           a.all? do |key, value|
             value.flatten.uniq.sort == b[key].flatten.uniq.sort
@@ -180,6 +178,8 @@ module ATP
       end
     end
 
+    private
+
     def clean_condition(h)
       c = {}
       h.each do |hash|

data/lib/atp/processors/flow_id.rb

@@ -10,15 +10,27 @@ module ATP
       end
 
       def on_id(node)
-        node.updated(nil, ["#{node.value}_#{id}"])
+        if node.value =~ /^extern/
+          node
+        else
+          node.updated(nil, ["#{node.value}_#{id}"])
+        end
       end
 
       def on_test_result(node)
         tid, state, nodes = *node
         if tid.is_a?(Array)
-          tid = tid.map { |tid| "#{tid}_#{id}" }
+          tid = tid.map do |tid|
+            if tid =~ /^extern/
+              tid
+            else
+              "#{tid}_#{id}"
+            end
+          end
         else
-          tid = "#{tid}_#{id}"
+          if tid !~ /^extern/
+            tid = "#{tid}_#{id}"
+          end
         end
         node.updated(nil, [tid, state] + [process(nodes)])
       end

data/lib/atp/validators/missing_ids.rb

@@ -40,11 +40,13 @@ module ATP
       def on_test_executed(node)
         ids = node.to_a[0]
         [ids].flatten.each do |id|
-          @referenced_ids[id] ||= []
-          @referenced_ids[id] << node
-          unless @present_ids[id]
-            @referenced_early[id] ||= []
-            @referenced_early[id] << node
+          unless id =~ /^extern/
+            @referenced_ids[id] ||= []
+            @referenced_ids[id] << node
+            unless @present_ids[id]
+              @referenced_early[id] ||= []
+              @referenced_early[id] << node
+            end
           end
         end
         process_all(node)

metadata

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