umbrellio-utils 0.3.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e701149e2cc866576a584afb0ce4f0260def90172435574b54a76fa360cccc6f
-  data.tar.gz: 3ade3ca53aeb50fcab231798611f1810875e483e55eacdbfd31d111b161977b7
+  metadata.gz: 0f1da3d7102c650b1eab97c3bcd0e1b591ce801cd6d059fd587d08973584caec
+  data.tar.gz: a0c872a73093def0f6619ef4470483246509b1354ae9b2d18cef072b57468de7
 SHA512:
-  metadata.gz: 66a5e895a307e11876af84245aa5efd02c8826643bf4ef15ef897222e47c26bbc44acfc33d8f174e776656a41389257eb7aceaa9efdbe243067db0b3fa7638d7
-  data.tar.gz: 2e7a2a4a186c4d4f5772bafced3d3486b97fbe25a75316ca473f901798eecba57e9b8c2170f23b4a868b2f77ac233b1de946df7b1d23ab7fa260764de8375835
+  metadata.gz: 152ec5b9c0664c3c25726f94f9feac298465ed8d779057d27ad19e58cd5b18f614871857467cf5452ca5aa904a640ed84789a9442feef2924807943f0bf9b692
+  data.tar.gz: f6d80689b65a50b82bdadc32d3a4ee391e4c18be22111e5e20204cf5401d91ebcabdfd358520d04201d405835bb79debee639ed0fb8e034e2845f1599cdcce92

data/.github/workflows/test.yml

@@ -32,7 +32,6 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
   specs:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
 
     env:
       FULL_TEST_COVERAGE_CHECK: false
@@ -44,10 +43,6 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [2.6, 2.7]
-        experimental: [false]
-        include:
-          - ruby: head
-            experimental: true
 
 
     steps:

data/Gemfile.lock

@@ -1,20 +1,21 @@
 PATH
   remote: .
   specs:
-    umbrellio-utils (0.3.1)
+    umbrellio-utils (0.4.2)
       memery (~> 1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.1)
+    activesupport (6.1.4.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    bundler-audit (0.8.0)
+    awesome_print (1.9.2)
+    bundler-audit (0.9.0.1)
       bundler (>= 1.2.0, < 3)
       thor (~> 1.0)
     ci-helper (0.4.2)
@@ -23,25 +24,34 @@ GEM
       umbrellio-sequel-plugins (~> 0.4)
     coderay (1.1.3)
     colorize (0.8.1)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.4.4)
-    docile (1.3.5)
-    dry-inflector (0.2.0)
+    docile (1.4.0)
+    dry-inflector (0.2.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    memery (1.4.0)
+    json (2.6.1)
+    memery (1.4.1)
       ruby2_keywords (~> 0.0.2)
     method_source (1.0.0)
     minitest (5.14.4)
-    parallel (1.20.1)
-    parser (3.0.1.0)
+    nokogiri (1.12.5-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.12.5-x86_64-linux)
+      racc (~> 1.4)
+    nori (2.6.0)
+    parallel (1.21.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
-    pry (0.14.0)
+    pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
+    racc (1.6.0)
     rack (2.2.3)
     rainbow (3.0.0)
-    rake (13.0.3)
+    rake (13.0.6)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -53,23 +63,26 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
+    rspec-json_matcher (0.1.6)
+      awesome_print
+      json
     rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
     rspec-support (3.10.2)
-    rubocop (1.11.0)
+    rubocop (1.17.0)
       parallel (~> 1.10)
       parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.2.0, < 2.0)
+      rubocop-ast (>= 1.7.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.4.1)
-      parser (>= 2.7.1.5)
-    rubocop-config-umbrellio (1.11.0.40)
-      rubocop (= 1.11.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    rubocop-config-umbrellio (1.17.0.53)
+      rubocop (= 1.17.0)
       rubocop-performance (= 1.10.0)
       rubocop-rails (= 2.9.1)
       rubocop-rake (= 0.5.1)
@@ -90,27 +103,32 @@ GEM
     rubocop-sequel (0.2.0)
       rubocop (~> 1.0)
     ruby-progressbar (1.11.0)
-    ruby2_keywords (0.0.4)
-    sequel (5.43.0)
+    ruby2_keywords (0.0.5)
+    semantic_logger (4.8.2)
+      concurrent-ruby (~> 1.0)
+    sequel (5.49.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov-lcov (0.8.0)
-    simplecov_json_formatter (0.1.2)
-    symbiont-ruby (0.6.0)
+    simplecov_json_formatter (0.1.3)
+    symbiont-ruby (0.7.0)
     thor (1.1.0)
+    timecop (0.9.4)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    umbrellio-sequel-plugins (0.4.0.164)
+    umbrellio-sequel-plugins (0.5.1.27)
       sequel
-      symbiont-ruby (>= 0.6)
-    unicode-display_width (2.0.0)
+      symbiont-ruby
+    unicode-display_width (2.1.0)
     yard (0.9.26)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.1)
 
 PLATFORMS
+  arm64-darwin-20
+  x86_64-darwin-20
   x86_64-linux
 
 DEPENDENCIES
@@ -118,14 +136,19 @@ DEPENDENCIES
   bundler
   bundler-audit
   ci-helper
+  nokogiri
+  nori
   pry
   rake
   rspec
+  rspec-json_matcher
   rubocop-config-umbrellio
+  semantic_logger
   simplecov
   simplecov-lcov
+  timecop
   umbrellio-utils!
   yard
 
 BUNDLED WITH
-   2.2.15
+   2.2.31

data/lib/umbrellio_utils/database.rb

@@ -67,7 +67,9 @@ module UmbrellioUtils
       type = model.db_schema[primary_key][:db_type]
 
       DB.drop_table?(temp_table_name)
-      DB.create_table(temp_table_name) { column primary_key, type, primary_key: true }
+      DB.create_table(temp_table_name, unlogged: true) do
+        column primary_key, type, primary_key: true
+      end
 
       insert_ds = dataset.select(Sequel[model.table_name][primary_key])
       DB[temp_table_name].insert(insert_ds)

data/lib/umbrellio_utils/parsing.rb

@@ -21,7 +21,7 @@ module UmbrellioUtils
       xml.xpath("//@*").remove if remove_attributes
 
       tags_converter = snakecase ? -> (tag) { tag.snakecase.to_sym } : -> (tag) { tag.to_sym }
-      nori = Nori.new(convert_tags_to: tags_converter)
+      nori = Nori.new(convert_tags_to: tags_converter, convert_dashes_to_underscores: false)
       nori.parse(xml.to_xml(save_with: Nokogiri::XML::Node::SaveOptions::NO_DECLARATION))
     end
 

data/lib/umbrellio_utils/semantic_logger/tiny_json_formatter.rb

@@ -0,0 +1,87 @@
+# frozen_string_literal: true
+
+module UmbrellioUtils
+  # Namespace for the differrent appenders and formatters for the SemanticLogger library.
+  # @see https://logger.rocketjob.io/ Semantic Logger documentation.
+  module SemanticLogger
+    # Simple JSON formatter, represented as callable object.
+    # @example Using of formatter
+    #   formatter = UmbrellioUtils::SemanticLogger::TinyJsonFormatter.new
+    #   SemanticLogger.add_appender(io: $stdout, formatter: formatter)
+    class TinyJsonFormatter
+      # Hash with default field names in the output JSON.
+      DEFAULT_NAMES_MAPPING = {
+        severity: :severity,
+        name: :name,
+        thread_fingerprint: :thread_fingerprint,
+        message: :message,
+        tags: :tags,
+        named_tags: :named_tags,
+        time: :time,
+      }.freeze
+
+      # Returns a new instance of the {UmbrellioUtils::SemanticLogger::TinyJsonFormatter}.
+      # @param [Hash] custom_names_mapping mapping from default field names to custom ones.
+      # @option custom_names_mapping [Symbol] :severity custom name for the `severity` field.
+      # @option custom_names_mapping [Symbol] :name custom name for the `name` field.
+      # @option custom_names_mapping [Symbol] :thread_fingerprint
+      #   custom name for the thread_fingerprint field.
+      # @option custom_names_mapping [Symbol] :message custom name for the `message` field.
+      # @option custom_names_mapping [Symbol] :tags custom name for the `tags` field.
+      # @option custom_names_mapping [Symbol] :named_tags custom name for the `named_tags` field.
+      # @option custom_names_mapping [Symbol] :time custom name for the `time` field.
+      # @example Use custom name for the `message` and `time` fields
+      #   UmbrellioUtils::SemanticLogger::TinyJsonFormatter.new(
+      #     time: :timestamp, message: :note,
+      #   ) #=> <UmbrellioUtils::SemanticLogger::TinyJsonFormatter:0x000>
+      # @return [UmbrellioUtils::SemanticLogger::TinyJsonFormatter]
+      #   a new instance of the {UmbrellioUtils::SemanticLogger::TinyJsonFormatter}
+      def initialize(**custom_names_mapping)
+        self.field_names = { **DEFAULT_NAMES_MAPPING, **custom_names_mapping }.freeze
+      end
+
+      # Formats log structure into the JSON string.
+      # @param log [SemanticLogger::Log] log's data structure.
+      # @param logger [SemanticLogger::Logger] active logger.
+      # @return [String] data
+      def call(log, _logger)
+        data = build_data_for(log)
+        data.to_json
+      end
+
+      private
+
+      # @!attribute field_names
+      #   @return [Hash<Symbol, Symbol>] the mapping from default field names to the new ones.
+      attr_accessor :field_names
+
+      # Builds hash with data from log.
+      # @return [Hash] the hash, which will be converted to the JSON later.
+      def build_data_for(log)
+        field_names.values_at(*DEFAULT_NAMES_MAPPING.keys).zip(pack_data(log)).to_h
+      end
+
+      # Builds an [Array] with all the required fields, which are arranged
+      # in the order of the declaration of keys
+      # in the {UmbrellioUtils::SemanticLogger::TinyJsonFormatter::DEFAULT_NAMES_MAPPING}.
+      # @return [Array] an array with serialized data.
+      def pack_data(log)
+        [
+          log.level.upcase,
+          log.name,
+          thread_fingerprint_for(log),
+          log.message,
+          log.tags,
+          log.named_tags,
+          log.time.utc.iso8601(3),
+        ]
+      end
+
+      # Calculates MD5 fingerprint for the thread, in which the log was made.
+      # @return [String] truncated `MD5` hash.
+      def thread_fingerprint_for(log)
+        Digest::MD5.hexdigest("#{log.thread_name}#{Process.pid}")[0...8]
+      end
+    end
+  end
+end

data/lib/umbrellio_utils/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UmbrellioUtils
-  VERSION = "0.3.1"
+  VERSION = "0.4.2"
 end

data/lib/umbrellio_utils.rb

@@ -5,8 +5,6 @@ require "memery"
 module UmbrellioUtils
   GLOBAL_MUTEX = Mutex.new
 
-  Dir["#{__dir__}/*/*.rb"].each { |file_path| require_relative(file_path) }
-
   extend self
 
   def included(othermod)
@@ -47,3 +45,21 @@ module UmbrellioUtils
     GLOBAL_MUTEX.owned? ? yield : GLOBAL_MUTEX.synchronize(&block)
   end
 end
+
+require_relative "umbrellio_utils/cards"
+require_relative "umbrellio_utils/checks"
+require_relative "umbrellio_utils/constants"
+require_relative "umbrellio_utils/control"
+require_relative "umbrellio_utils/database"
+require_relative "umbrellio_utils/formatting"
+require_relative "umbrellio_utils/http_client"
+require_relative "umbrellio_utils/misc"
+require_relative "umbrellio_utils/parsing"
+require_relative "umbrellio_utils/passwords"
+require_relative "umbrellio_utils/random"
+require_relative "umbrellio_utils/request_wrapper"
+require_relative "umbrellio_utils/rounding"
+require_relative "umbrellio_utils/semantic_logger/tiny_json_formatter"
+require_relative "umbrellio_utils/store"
+require_relative "umbrellio_utils/vault"
+require_relative "umbrellio_utils/version"

data/umbrellio_utils.gemspec

@@ -33,11 +33,16 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "bundler-audit"
   spec.add_development_dependency "ci-helper"
+  spec.add_development_dependency "nokogiri"
+  spec.add_development_dependency "nori"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rspec-json_matcher"
   spec.add_development_dependency "rubocop-config-umbrellio"
+  spec.add_development_dependency "semantic_logger"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-lcov"
+  spec.add_development_dependency "timecop"
   spec.add_development_dependency "yard"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: umbrellio-utils
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.2
 platform: ruby
 authors:
 - JustAnotherDude
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-08 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: memery
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: nori
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-json_matcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-config-umbrellio
   requirement: !ruby/object:Gem::Requirement
@@ -136,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: semantic_logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +220,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +282,7 @@ files:
 - lib/umbrellio_utils/random.rb
 - lib/umbrellio_utils/request_wrapper.rb
 - lib/umbrellio_utils/rounding.rb
+- lib/umbrellio_utils/semantic_logger/tiny_json_formatter.rb
 - lib/umbrellio_utils/store.rb
 - lib/umbrellio_utils/vault.rb
 - lib/umbrellio_utils/version.rb
@@ -238,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.18
+rubygems_version: 3.2.31
 signing_key:
 specification_version: 4
 summary: A set of utilities that speed up development