metanorma-utils 1.3.1 → 1.4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd89605d15a5973a46c4fbc9b88c024191e6a809e4255f34db32d57bab198cc3
-  data.tar.gz: 167f7c09e8b6347c0f5990656775cba5ec5cdc05a2b715690451e3c02f80fb65
+  metadata.gz: 5d3067eb2910d94d8fdea52e4909ca6ff1691d7a1fbe11859c1c7c0163381a43
+  data.tar.gz: 633a4d5dfc20a1fd98832dee94e66ee9f974fe57e9bd0b6252793b57838a558b
 SHA512:
-  metadata.gz: 1baca64c93f1598bd4f6285ac62c912a519a36c9a9ee08dfe883fe5af0cd721983cc3be513d2dd3d8329ff9efbcc940f0f207ed40791e93556a477ac230c6bb0
-  data.tar.gz: f4a13c5846b93d6fa7262736a5e177e809ddf72340713c890a7bcddad8d2ba2526e71ee5eff0dd3900e10a6c45b0f00cf7944a30ab1343feef34d3679428e795
+  metadata.gz: 0bf2b0ee3f74b32e6dda49771df96f9f7121f32ed9eba76d89e5cba66b55a338da69b25acadd652092b3ad81fd313bc5506db3c8e2e054b9192ab7cfc59f017b
+  data.tar.gz: a1e0079091ba03bd9d173624dd43d764d409c4bf32cc75a052492b079a99a66833056ea8bf6e4f85d75d323835f2f38961de59af865fef0865b0a28492e907a5

data/.github/workflows/rake.yml

@@ -10,6 +10,6 @@ on:
 
 jobs:
   rake:
-    uses: metanorma/metanorma-build-scripts/.github/workflows/generic-rake.yml@main
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
     secrets:
       pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}

data/.github/workflows/release.yml

@@ -0,0 +1,24 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'skip'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    uses: metanorma/ci/.github/workflows/rubygems-release.yml@main
+    with:
+      next_version: ${{ github.event.inputs.next_version }}
+    secrets:
+      rubygems-api-key: ${{ secrets.METANORMA_CI_RUBYGEMS_API_KEY }}
+      pat_token: ${{ secrets.METANORMA_CI_PAT_TOKEN }}
+

data/lib/metanorma-utils.rb

@@ -1,4 +1,5 @@
 require_relative "utils/version"
+require_relative "utils/hash_transform_keys"
 require_relative "utils/main"
 require_relative "utils/image"
 require_relative "utils/log"

data/lib/utils/hash_transform_keys.rb

@@ -1,51 +1,75 @@
-class Array
-  def stringify_all_keys
-    map do |v|
-      case v
-      when Hash, Array
-        v.stringify_all_keys
-      else
-        v
+module Metanorma
+  module Utils
+    module Array
+      def stringify_all_keys
+        map do |v|
+          case v
+          when ::Hash, ::Array
+            v.stringify_all_keys
+          else
+            v
+          end
+        end
       end
-    end
-  end
 
-  def symbolize_all_keys
-    map do |v|
-      case v
-      when Hash, Array
-        v.symbolize_all_keys
-      else
-        v
+      def symbolize_all_keys
+        map do |v|
+          case v
+          when ::Hash, ::Array
+            v.symbolize_all_keys
+          else
+            v
+          end
+        end
       end
     end
   end
 end
 
-class Hash
-  def stringify_all_keys
-    result = {}
-    each do |k, v|
-      result[k.to_s] = case v
-                       when Hash, Array
-                         v.stringify_all_keys
-                       else
-                         v
-                       end
-    end
-    result
-  end
+module Metanorma
+  module Utils
+    module Hash
+      def stringify_all_keys
+        result = {}
+        each do |k, v|
+          result[k.to_s] = case v
+                           when ::Hash, ::Array
+                             v.stringify_all_keys
+                           else
+                             v
+                           end
+        end
+        result
+      end
+
+      def symbolize_all_keys
+        result = {}
+        each do |k, v|
+          result[k.to_sym] = case v
+                             when ::Hash, ::Array
+                               v.symbolize_all_keys
+                             else
+                               v
+                             end
+        end
+        result
+      end
 
-  def symbolize_all_keys
-    result = {}
-    each do |k, v|
-      result[k.to_sym] = case v
-                         when Hash, Array
-                           v.symbolize_all_keys
-                         else
-                           v
-                         end
+      def deep_merge(second)
+        merger = proc { |_, v1, v2|
+          if ::Hash === v1 && ::Hash === v2
+            v1.merge(v2, &merger)
+          elsif ::Array === v1 && ::Array === v2
+            v1 | v2
+          elsif [:undefined, nil,
+                 :nil].include?(v2)
+            v1
+          else
+            v2
+          end
+        }
+        merge(second.to_h, &merger)
+      end
     end
-    result
   end
 end

data/lib/utils/main.rb

@@ -73,17 +73,17 @@ module Metanorma
       def set_nested_value(hash, keys, new_val)
         key = keys[0]
         if keys.length == 1
-          hash[key] = if hash[key].is_a?(Array) then (hash[key] << new_val)
+          hash[key] = if hash[key].is_a?(::Array) then (hash[key] << new_val)
                       else hash[key].nil? ? new_val : [hash[key], new_val]
                       end
-        elsif hash[key].is_a?(Array)
+        elsif hash[key].is_a?(::Array)
           hash[key][-1] = {} if !hash[key].empty? && hash[key][-1].nil?
-          hash[key] << {} if hash[key].empty? || !hash[key][-1].is_a?(Hash)
+          hash[key] << {} if hash[key].empty? || !hash[key][-1].is_a?(::Hash)
           set_nested_value(hash[key][-1], keys[1..-1], new_val)
         elsif hash[key].nil? || hash[key].empty?
           hash[key] = {}
           set_nested_value(hash[key], keys[1..-1], new_val)
-        elsif hash[key].is_a?(Hash) && !hash[key][keys[1]]
+        elsif hash[key].is_a?(::Hash) && !hash[key][keys[1]]
           set_nested_value(hash[key], keys[1..-1], new_val)
         elsif !hash[key][keys[1]]
           hash[key] = [hash[key], {}]

data/lib/utils/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.3.1".freeze
+    VERSION = "1.4.0.1".freeze
   end
 end

data/spec/hash_transform_keys_spec.rb

@@ -3,6 +3,8 @@ require "utils/hash_transform_keys"
 
 RSpec.describe Metanorma::Utils do
   it "deep stringify hash but skip values" do
+    Hash.include Metanorma::Utils::Hash
+    Array.include Metanorma::Utils::Array
     result = {
       test0: :test0,
       test1: false,
@@ -27,6 +29,8 @@ RSpec.describe Metanorma::Utils do
   end
 
   it "deep symbolize hash but skip values" do
+    Hash.include Metanorma::Utils::Hash
+    Array.include Metanorma::Utils::Array
     result = {
       test0: "test0",
       test1: false,
@@ -49,4 +53,12 @@ RSpec.describe Metanorma::Utils do
     expect(result[:test4][0]).to include(:test41)
     expect(result[:test4][0][:test41]).to eq("test41")
   end
+
+  it "deep merges hashes" do
+    Hash.include Metanorma::Utils::Hash
+    hash1 = { a: [1, 2], b: "c", c: 4, e: { f: { g: "1" } } }
+    hash2 = { a: [3], b: "d", d: 5, e: { f: { h: "2" } } }
+    expect(hash1.deep_merge(hash2)).to eq({ a: [1, 2, 3], b: "d", c: 4,
+                                            d: 5, e: { f: { g: "1", h: "2" } } })
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor
@@ -300,6 +300,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - ".hound.yml"
 - ".rubocop.yml"
@@ -327,7 +328,7 @@ homepage: https://github.com/metanorma/metanorma-utils
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -342,8 +343,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.16
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: metanorma-utils
 test_files: []