hiptest-publisher 1.18.0 → 1.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: baa4e4f8cd0e3988cc9ab2a42ea0574252662eadc92241365d9e3c4727c6c7de
-  data.tar.gz: aa84ae8c99f14975ba9e1c5edaf80d88630ffe23bb0be29003cd432d9f25b175
+  metadata.gz: 72feb2ab6699c43b1e7db2704110ceb6a38ac0f5baaa14e0a21127988f7f66b1
+  data.tar.gz: a1885c484be7b91155c38c6ecc1e62010cc1060b3bc91922a1adcacc0af657eb
 SHA512:
-  metadata.gz: 1e7a9d3e93ac0516e6a9fb89e4871452926082bedc81bdde2209060df2587f739159d9412ce4dfd6c6eb986c02640caf8136ae08d4fb7d0985d042a72525d3dc
-  data.tar.gz: bc4191ba3cabe8cd7a7d996151dd5851661544f6ad78d0cb425b4be1f720419272258164d9d828c5ba42eacd9956095f71040b216e3d2bb2767a449d04d72b88
+  metadata.gz: 68e786fca0b041eb333b3be646d323917b9ffb0065517817143e0589c5feb767437b96706ff26047d706b2b39840f0d5f303c8f784c034dec8104d190394e92b
+  data.tar.gz: 6498a773930f218a251b3549819d70273c919fe919643e589733978003705503f1327b306a09ea72d064bce0602cfa5672c88e48d8b8da5bd9ace003a92d8ee1

data/lib/hiptest-publisher/node_modifiers/gherkin_adder.rb

@@ -74,7 +74,8 @@ module Hiptest
         call.chunks = []
         call.extra_inlined_arguments = []
 
-        call_chunks = call.is_a?(Hiptest::Nodes::Call) ? call.children[:actionword].split("\"", -1) : call.children[:actionword_name].split("\"", -1)
+        actionword_name = call.is_a?(Hiptest::Nodes::Call) ? call.children[:actionword] : call.children[:actionword_name]
+        call_chunks = actionword_name.split("\"", -1)
 
         call_chunks.each_slice(2) do |text, inline_parameter_name|
           call.chunks << {

data/lib/hiptest-publisher/node_modifiers/uid_call_reference_adder.rb

@@ -16,7 +16,10 @@ module Hiptest
       def update_uid_calls
         @project.each_sub_nodes(Hiptest::Nodes::UIDCall) do |uid_call|
           index = @indexer.get_index(uid_call.children[:uid])
-          next if index.nil?
+          if index.nil?
+            uid_call.children[:actionword_name] = "Unknown actionword with UID: #{uid_call.children[:uid]}"
+            next
+          end
 
           uid_call.children[:actionword_name] = index[:actionword].children[:name]
           uid_call.children[:library_name] = index[:library].children[:name] unless index[:library].nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiptest-publisher
 version: !ruby/object:Gem::Version
-  version: 1.18.0
+  version: 1.18.1
 platform: ruby
 authors:
 - Hiptest R&D
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-02 00:00:00.000000000 Z
+date: 2019-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -255,7 +255,6 @@ files:
 - lib/hiptest-publisher/formatters/console_formatter.rb
 - lib/hiptest-publisher/formatters/diff_displayer.rb
 - lib/hiptest-publisher/formatters/reporter.rb
-- lib/hiptest-publisher/gherkin_adder.rb
 - lib/hiptest-publisher/handlebars_helper.rb
 - lib/hiptest-publisher/indexers/actionword_indexer.rb
 - lib/hiptest-publisher/indexers/actionword_uid_indexer.rb

data/lib/hiptest-publisher/gherkin_adder.rb

@@ -1,238 +0,0 @@
-require 'hiptest-publisher/actionword_indexer'
-require 'hiptest-publisher/nodes'
-
-module Hiptest
-  class GherkinAdder
-    def self.add(project)
-      GherkinAdder.new(project).update_calls
-    end
-
-    def initialize(project)
-      @project = project
-      @indexer = ActionwordIndexer.new(project)
-      @annotations_counter = AnnotationsCounter.new
-
-      @special_params = ['__free_text', '__datatable']
-    end
-
-    def update_calls
-      @project.each_sub_nodes(Hiptest::Nodes::Scenario, Hiptest::Nodes::Actionword, Hiptest::Nodes::Test, Hiptest::Nodes::Folder) do |item|
-        @last_annotation = nil
-        item.each_sub_nodes(Hiptest::Nodes::Call) do |call|
-          set_call_chunks(call)
-          call.children[:gherkin_text] ||= "#{text_annotation(call)} #{prettified(call)}"
-
-          if actionword = get_actionword(call)
-            @annotations_counter.increment(actionword, code_annotation(call))
-            set_actionwords_chunks(actionword)
-
-            actionword.children[:gherkin_pattern] ||= pattern(actionword)
-            actionword.children[:parameters_ordered_by_pattern] ||= order_parameters_by_pattern(actionword)
-          end
-        end
-      end
-
-      @annotations_counter.actionwords.each do |actionword|
-        actionword.children[:gherkin_annotation] = @annotations_counter.most_used_annotation(actionword) || "Given"
-        actionword.children[:gherkin_used_annotations] = @annotations_counter.all_used_annotations(actionword).any? ? @annotations_counter.all_used_annotations(actionword) :['Given']
-      end
-    end
-
-    def annotation(call)
-      call.children[:annotation].capitalize if call.children[:annotation]
-    end
-
-    def text_annotation(call)
-      annotation(call) || "*"
-    end
-
-    def code_annotation(call)
-      call_annotation = annotation(call)
-      if call_annotation
-        if ["And", "But"].include?(call_annotation)
-          call_annotation = @last_annotation || "Given"
-        end
-        @last_annotation = call_annotation
-      end
-    end
-
-    def prettified(call)
-      base = call.chunks.map {|chunk| chunk[:value]}.join("\"").strip
-      call.extra_inlined_arguments.each do |chunk|
-        base += " \"#{chunk[:value]}\""
-      end
-
-      base
-    end
-
-    def set_call_chunks(call)
-      all_arguments = all_valued_arguments_for(call)
-      inline_parameter_names = []
-      extra_inlined_arguments = []
-
-      call.chunks = []
-      call.extra_inlined_arguments = []
-
-      call_chunks = call.children[:actionword].split("\"", -1)
-      call_chunks.each_slice(2) do |text, inline_parameter_name|
-        call.chunks << {
-          value: text,
-          is_argument: false
-        }
-
-        if all_arguments.has_key?(inline_parameter_name)
-          inline_parameter_names << inline_parameter_name.clone
-          value = all_arguments[inline_parameter_name]
-          inline_parameter_name.replace(value)
-
-          call.chunks << {
-            value: inline_parameter_name,
-            is_argument: true
-          }
-        else
-          call.chunks << {
-            value: inline_parameter_name,
-            is_argument: false
-          } unless inline_parameter_name.nil?
-        end
-      end
-
-      missing_parameter_names = all_arguments.keys - inline_parameter_names - @special_params
-      call.extra_inlined_arguments = missing_parameter_names.map do |missing_parameter_name|
-        {
-          value: all_arguments[missing_parameter_name],
-          is_argument: true
-        }
-      end
-    end
-
-    def pattern(actionword)
-      patterned = actionword.chunks.map {|chunk| chunk[:value]}.join("\"")
-      actionword.extra_inlined_parameters.each do |param|
-        patterned += " \"#{param[:value]}\""
-      end
-
-      "^#{patterned.strip}$"
-    end
-
-    def set_actionwords_chunks(actionword)
-      name = actionword.children[:name]
-      actionword_parameters = evaluated_map(actionword.children[:parameters])
-      name_chunks = name.split("\"", -1)
-      inline_parameter_names = []
-
-      actionword.chunks = []
-      actionword.extra_inlined_parameters = []
-
-      name_chunks.each_slice(2) do |text, inline_parameter_name|
-        actionword.chunks << {
-          value: text.gsub(/[.|()\\.+*?\[\]{}^$]/) { |c| "\\#{c}" },
-          is_parameter: false
-        }
-
-        inline_parameter_names << inline_parameter_name if inline_parameter_name
-        if actionword_parameters.has_key?(inline_parameter_name)
-          actionword.chunks << {
-            value: "(.*)",
-            name: inline_parameter_name,
-            is_parameter: true
-          }
-        else
-          actionword.chunks << {
-            value: inline_parameter_name,
-            is_parameter: false
-          } if inline_parameter_name
-        end
-      end
-      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - @special_params
-
-      missing_parameter_names.each do |missing_parameter_name|
-        actionword.extra_inlined_parameters << {
-          value: "(.*)",
-          name: missing_parameter_name,
-          is_parameter: true
-        }
-      end
-    end
-
-    def order_parameters_by_pattern(actionword)
-      inline_parameter_names = actionword.children[:name].scan(/\"(.*?)\"/).flatten
-      actionword_parameters = {}
-      actionword.children[:parameters].map {|p| actionword_parameters[p.children[:name]] = p}
-
-      missing_parameter_names = actionword_parameters.keys - inline_parameter_names - @special_params
-      [inline_parameter_names, missing_parameter_names, @special_params].flatten.map do |name|
-        actionword_parameters[name]
-      end.compact
-    end
-
-    def all_valued_arguments_for(call)
-      evaluated_call_arguments = evaluated_map(call.children[:arguments])
-      evaluated_actionword_parameters = evaluated_map(get_actionword_parameters(call))
-      names = evaluated_actionword_parameters.keys
-
-      hash_array = names.map { |name|
-        value = evaluated_call_arguments[name] || evaluated_actionword_parameters[name] || ""
-        [name, value]
-      }
-      Hash[hash_array]
-    end
-
-    def get_actionword_parameters(call)
-      actionword = get_actionword(call)
-      actionword && actionword.children[:parameters] || []
-    end
-
-    def get_actionword(call)
-      actionword = @indexer.get_index(call.children[:actionword])
-      actionword && actionword[:actionword] || nil
-    end
-
-    def evaluated_map(named_values)
-      hash_array = named_values.map do |named_value|
-        name = named_value.children[:name]
-        value = evaluate(named_value.children[:value] || named_value.children[:default])
-        [name, value]
-      end
-      Hash[hash_array]
-    end
-
-    def evaluate(value)
-      if value.nil?
-        nil
-      elsif Hiptest::Nodes::Variable === value
-        "<#{value.children[:name]}>"
-      elsif value.children[:chunks]
-        value.children[:chunks].map {|chunk| evaluate(chunk) }.join('')
-      elsif value.children[:value]
-        value.children[:value]
-      else
-        nil
-      end
-    end
-  end
-
-  class AnnotationsCounter
-    def initialize
-      @counts_by_actionword = Hash.new {|counts, actionword| counts[actionword] = Hash.new(0) }
-    end
-
-    def actionwords
-      @counts_by_actionword.keys
-    end
-
-    def increment(actionword, annotation)
-      counts = @counts_by_actionword[actionword]
-      counts[annotation] += 1 if annotation
-    end
-
-    def most_used_annotation(actionword)
-      max = @counts_by_actionword[actionword].values.max
-      @counts_by_actionword[actionword].key(max)
-    end
-
-    def all_used_annotations(actionword)
-      @counts_by_actionword[actionword].keys
-    end
-  end
-end