allure-ruby-commons 2.21.1 → 2.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f5c3dfee7eb45d47e68dd2b3e6cea65eee99c6a65d5f26155ef63f047b2e8a6
-  data.tar.gz: 364026c97cd8be435807e5aff89a525015b79db8817b01ec7b847cdf942dca6b
+  metadata.gz: '099ba3dddaa422aadd6805174b9ea6355be15b89b0587baf39d379dfda0763ad'
+  data.tar.gz: 066eb591f740c700e09f712b86b83c28bac6fd903321d8643426872a0ba61bbe
 SHA512:
-  metadata.gz: b8d8a79fe660235dba902c1f0d1a86c799848944a645f52e2548b24fbc3e68f9c6b11ee64e57007370efde535d90580a3626cd5576179baa696147eaf1ea2e59
-  data.tar.gz: bcfa0e762321315471a07bca0925ebfde15606875036b4a1fb0e30e1eba99725c32fa7bb69cfece308ce2f5ff299b09f1008639624d2cd6cc901e85a47f88692
+  metadata.gz: c6f36b3ecdc794f0ddb952e125a9cd55600763478038dd7634ff40e7131f75f246a726bf189871f6581a4a051b5c095b605ffcc464389dcb8538eed5bcdf3cf5
+  data.tar.gz: 94efb6010db9cbca76f4136567a6c4330108ec6b2d140f36d007dcb5c64ae53fd5ed4dd05cb7184119af04d894f4eea1f5da78238bf7377c823e947d614edd56

data/lib/allure_ruby_commons/_json_helper.rb

@@ -28,6 +28,7 @@ module Allure
       define_method(:load_json) do |json|
         Oj.load_file(json, symbol_keys: true)
       rescue Oj::ParseError
+        Allure.configuration.logger.error("Failed to parse json: #{json}")
         nil
       end
     rescue LoadError
@@ -40,6 +41,7 @@ module Allure
       define_method(:load_json) do |json|
         JSON.parse(File.read(json), symbolize_names: true)
       rescue JSON::ParserError
+        Allure.configuration.logger.error("Failed to parse json: #{json}")
         nil
       end
     end

data/lib/allure_ruby_commons/model/01_jsonable.rb

@@ -6,9 +6,9 @@ module Allure
     # Return object hash represantation
     # @return [Hash]
     def to_hash
-      instance_variables.each_with_object({}) do |var, map|
-        key = camelcase(var.to_s.delete_prefix("@"))
-        value = instance_variable_get(var)
+      json_attributes.each_with_object({}) do |attribute, map|
+        key = camelcase(attribute)
+        value = send(attribute) # fetch via reader for dynamically generated attributes
         map[key] = value unless value.nil?
       end
     end
@@ -33,7 +33,7 @@ module Allure
     # Object state
     # @return [Array]
     def state
-      instance_variables.map { |var| instance_variable_get(var) }
+      json_attributes.map { |attribute| send(attribute) }
     end
 
     private
@@ -45,5 +45,12 @@ module Allure
       str = str.gsub(/(?:_+)([a-z])/) { Regexp.last_match(1).upcase }
       str.gsub(/(\A|\s)([A-Z])/) { Regexp.last_match(1) + Regexp.last_match(2).downcase }
     end
+
+    # Json attribute names
+    #
+    # @return [Array<String>]
+    def json_attributes
+      @json_attributes ||= instance_variables.map { |attribute| attribute.to_s.delete_prefix("@") }
+    end
   end
 end

data/lib/allure_ruby_commons/model/category.rb

@@ -15,5 +15,7 @@ module Allure
       @message_regex = message_regex
       @trace_regex = trace_regex
     end
+
+    attr_reader :name, :matched_statuses, :message_regex, :trace_regex
   end
 end

data/lib/allure_ruby_commons/model/test_result.rb

@@ -24,7 +24,7 @@ module Allure
 
       @name = options[:name]
       @uuid = uuid
-      @history_id = Digest::MD5.hexdigest("#{history_id}#{environment}")
+      @history_id = history_id
       @full_name = options[:full_name] || "Unnamed"
       @labels = options[:labels] || []
       @links = options[:links] || []
@@ -32,9 +32,26 @@ module Allure
     end
 
     attr_accessor :uuid,
-                  :history_id,
                   :full_name,
                   :labels,
                   :links
+
+    attr_writer :history_id
+
+    # History id
+    #
+    # @return [String]
+    def history_id
+      Digest::MD5.hexdigest("#{@history_id}#{parameters_string}")
+    end
+
+    private
+
+    # All parameters string
+    #
+    # @return [String]
+    def parameters_string
+      parameters.map { |p| "#{p.name}=#{p.value}" }.join(";")
+    end
   end
 end

data/lib/allure_ruby_commons/model/test_result_container.rb

@@ -14,6 +14,15 @@ module Allure
       @links = []
     end
 
-    attr_accessor :uuid, :name, :description, :description_html, :start, :stop, :children, :befores, :afters, :links
+    attr_accessor :uuid,
+                  :name,
+                  :description,
+                  :description_html,
+                  :start,
+                  :stop,
+                  :children,
+                  :befores,
+                  :afters,
+                  :links
   end
 end

data/lib/allure_ruby_commons/testplan.rb

@@ -28,7 +28,25 @@ module Allure
       #
       # @return [Array<Hash>]
       def tests
-        @tests ||= load_json(ENV[TESTPLAN_PATH])&.fetch(:tests) if ENV[TESTPLAN_PATH]
+        @tests ||= load_json(test_plan_path)&.fetch(:tests) if test_plan_path
+      end
+
+      # Fetch test plan path
+      #
+      # @return [<String, nil>]
+      def test_plan_path
+        return @test_plan_path if defined?(@test_plan_path)
+
+        @test_plan_path = ENV[TESTPLAN_PATH].then do |path|
+          next unless path
+          next path if File.file?(path)
+
+          json = File.join(path, "testplan.json")
+          next json if File.exist?(json)
+
+          Allure.configuration.logger.warn("'ALLURE_TESTPLAN_PATH' env var is set, but no testplan.json found!")
+          nil
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: allure-ruby-commons
 version: !ruby/object:Gem::Version
-  version: 2.21.1
+  version: 2.22.0
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-29 00:00:00.000000000 Z
+date: 2023-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -133,14 +133,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Common library for allure results generation