allure-ruby-commons 2.13.6.3 → 2.13.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6782a168ec07eb3daccfcb0513a9e40bd7da0db4ef59894d9b2ae5c2d299ae2
-  data.tar.gz: 843b87b5733e14c8bbe2a4af21618c47e567d5c351755a22aa07c2ab5470a8a2
+  metadata.gz: a51c9949322455ac55cd973f942ba0392f51171fad89f23d0e16cbe16224014b
+  data.tar.gz: 7b4c8ccfca17187f553e9f5192a19fbe23dc84c780b73d057a29da9eed92ed61
 SHA512:
-  metadata.gz: e6ed4a935fcd9de7bcadac3186f5c1f3f31d58fa3337a6c161496ec19104493368aaf7aa9a47d96062c50c2c65542397adc2fd00137564b8a858c13e26d3d001
-  data.tar.gz: 34d541038f9e832cb7d012663676b8c08d20dc23cf1c0721cd848e20cb37350549a3dd12afa0c4969d004ea4ead82e7a3885d1f43ff9617ef6bba109b4e9bd6c
+  metadata.gz: e71a93d78c8efdfd477953644f58a1495fa6baca06592ddd5206c4abfc088d292a8f3a61ae72fe98d4db589144d4c0c8194a18a9e675cbecaeeb98d80265079b
+  data.tar.gz: 6d44b2fed79aa4258cfca49e4f0bc709f2aef144292fa6760191772eae4d4a4b763510f9ded50c8b146df635a44d80bf6725ac059843839f030ecd649553ad2c

data/lib/allure-ruby-commons.rb

@@ -3,6 +3,7 @@
 
 require "require_all"
 require "uuid"
+
 require_rel "allure_ruby_commons/**/*rb"
 
 # Namespace for classes that handle allure report generation and different framework adaptors
@@ -169,7 +170,7 @@ module Allure
       lifecycle.start_test_step(StepResult.new(name: name, stage: Stage::RUNNING))
       yield
       lifecycle.update_test_step { |step| step.status = Status::PASSED }
-    rescue => e
+    rescue StandardError => e
       lifecycle.update_test_step do |step|
         step.status = ResultUtils.status(e)
         step.status_details = ResultUtils.status_details(e)

data/lib/allure_ruby_commons/allure_lifecycle.rb

@@ -5,13 +5,13 @@ require "forwardable"
 
 module Allure
   # Main class for creating and writing allure results
-  class AllureLifecycle
+  class AllureLifecycle # rubocop:disable Metrics/ClassLength
     extend Forwardable
 
     def initialize
       @test_context = []
       @step_context = []
-      @logger = Logger.new(STDOUT, level: Config.instance.logging_level)
+      @logger = Logger.new($stdout, level: Config.instance.logging_level)
       @file_writer = FileWriter.new
     end
 
@@ -204,13 +204,13 @@ module Allure
     # @param [Boolean] test_case add attachment to current test case
     # @return [void]
     def add_attachment(name:, source:, type:, test_case: false)
-      attachment = ResultUtils.prepare_attachment(name, type) || begin
-        return logger.error { "Can't add attachment, unrecognized mime type: #{type}" }
-      end
-      executable_item = (test_case && @current_test_case) || current_executable
-      executable_item&.attachments&.push(attachment) || begin
-        return logger.error { "Can't add attachment, no test, step or fixture is running" }
-      end
+      attachment = ResultUtils.prepare_attachment(name, type)
+      return logger.error { "Can't add attachment, unrecognized mime type: #{type}" } unless attachment
+
+      executable_item = test_case ? @current_test_case : current_executable
+      return logger.error { "Can't add attachment, no test, step or fixture is running" } unless executable_item
+
+      executable_item.attachments.push(attachment)
       logger.debug { "Adding attachment '#{name}' to '#{executable_item.name}'" }
       write_attachment(source, attachment)
     end

data/lib/allure_ruby_commons/file_writer.rb

@@ -18,17 +18,14 @@ module Allure
     # @param [Allure::TestResult] test_result
     # @return [void]
     def write_test_result(test_result)
-      write("#{test_result.uuid}#{TEST_RESULT_SUFFIX}", JSON.generate(test_result, max_nesting: false))
+      write("#{test_result.uuid}#{TEST_RESULT_SUFFIX}", Oj.dump(test_result))
     end
 
     # Write test result container
     # @param [Allure::TestResultContainer] test_container_result
     # @return [void]
     def write_test_result_container(test_container_result)
-      write(
-        "#{test_container_result.uuid}#{TEST_RESULT_CONTAINER_SUFFIX}",
-        JSON.generate(test_container_result, max_nesting: false),
-      )
+      write("#{test_container_result.uuid}#{TEST_RESULT_CONTAINER_SUFFIX}", Oj.dump(test_container_result))
     end
 
     # Write allure attachment file
@@ -55,7 +52,7 @@ module Allure
       if categories.is_a?(File)
         copy(categories.path, CATEGORIES_FILE)
       else
-        write(CATEGORIES_FILE, categories.to_json)
+        write(CATEGORIES_FILE, Oj.dump(categories))
       end
     end
 

data/lib/allure_ruby_commons/model/jsonable.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require "json"
+require "oj"
 
 module Allure
   # General jsonable object implementation
   class JSONable
-    # Return object has represantation
-    # @param [Array<Object>] _options
+    Oj.default_options = { mode: :custom, use_to_hash: true, ascii_only: true }
+
+    # Return object hash represantation
     # @return [Hash]
-    def as_json(*_options)
+    def to_hash
       instance_variables.each_with_object({}) do |var, map|
         key = camelcase(var.to_s.delete_prefix("@"))
         value = instance_variable_get(var)
@@ -16,13 +17,6 @@ module Allure
       end
     end
 
-    # Convert object to json string
-    # @param [Array<Object>] options
-    # @return [String]
-    def to_json(*options)
-      as_json.to_json(*options)
-    end
-
     # Object comparator
     # @param [JSONable] other
     # @return [Booelan]

metadata

@@ -1,83 +1,77 @@
 --- !ruby/object:Gem::Specification
 name: allure-ruby-commons
 version: !ruby/object:Gem::Version
-  version: 2.13.6.3
+  version: 2.13.6.4
 platform: ruby
 authors:
 - Andrejs Cunskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: uuid
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: require_all
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: require_all
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
-  name: mime-types
+  name: uuid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '2.3'
 description: Utilities allowing to implement allure result generation by other test
   frameworks
 email: andrejs.cunskis@gmail.com