metanorma-utils 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06b8911f4c03cb97f4a358a3d5bfeb3931f49bf205a06ff486f1897cf4413ab7
-  data.tar.gz: a1d15ab7db12270bec314abff49b6cd16e6150c13142e6ac338df19f46c5e2a1
+  metadata.gz: a9d571e05d246f09dafc63c5a131a26ab77394134815c52d817477c8440b5efd
+  data.tar.gz: 1a110bf8e0cbed652db35fe1a3de3795c2564b9c57d5c627ad6b94493e98b581
 SHA512:
-  metadata.gz: 0b69767957d3f54acd8f85b023d876097561f83e6c606051dbde0889ff7e37cf368839424576164a7fe81698eef0417cfe2a6ea019ee04f591e8e10295c00d7f
-  data.tar.gz: c3203ed0411f37c048c558777d51955866e507c79454d686a80f4d9ab392e11f6f5332e03541d5d34cba77f779ad01275102a52127f517f4dd8eb06e626e501b
+  metadata.gz: 9ffdd78c66d3bafed88f984f9d56f6cdd7a0a8fe5bbfa772d2feaba0d1af37112781a8fc00765b1c1708ec1d06de875fc9aaf9b3fb174b9ad1f732fcb21c76ba
+  data.tar.gz: 50f999d01bf00141eeffe84470053b1f7c4c89c881eb69c118333b056e573408d744b24f39d19d396dbc13aca62e96a2890d8da06b8c46b0213bb171828cdd52

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/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Utils
-    VERSION = "1.3.0".freeze
+    VERSION = "1.4.0".freeze
   end
 end

data/lib/utils/xml.rb

@@ -54,6 +54,13 @@ module Metanorma
             .gsub("—", "\u0097")
         end
       end
+
+      def ns(xpath)
+        xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
+          .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
+          .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]* ?=)}, "[xmlns:\\1")
+          .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/-]*[/\[\]])}, "[xmlns:\\1")
+      end
     end
   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

data/spec/xml_spec.rb

@@ -66,4 +66,10 @@ RSpec.describe Metanorma::Utils do
       <div class="paragraph"><p>A</p></div><div class="paragraph"><p>B</p></div>
     OUTPUT
   end
+
+  it "applies namespace to xpath" do
+    expect(Metanorma::Utils.ns("//ab/Bb/c1-d[ancestor::c][d = 'x'][e/f]"))
+      .to be_equivalent_to("//xmlns:ab/xmlns:Bb/xmlns:c1-d[ancestor::xmlns:c]"\
+                           "[xmlns:d = 'x'][xmlns:e/xmlns:f]")
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-utils
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 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: []