defmastership-core 1.5.1 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e305c214cf30723ae670f46f1bf3ffbe4d00b1867581e1db5be79f2ab8155a35
-  data.tar.gz: b00c8a4e447f269176696da0b743d184e594ffd5a8fb0a0b83787343917a4846
+  metadata.gz: 87ef2f8df723ddacc30b17efb600a7cfacde2566599dce03becfe3fe2cbe2b9a
+  data.tar.gz: 2d646e28f1792c32040dd005e16587bf4cfdd06e41fcc71eeca405a7912e592b
 SHA512:
-  metadata.gz: 847be19dfe955889f38c8e07c23c5fe297d84aec7d0cd3b81a2a6d2188ab3f8cfc5c6d4330a17969b14068baa73524b85a37fe469136b720c6d2f7bd71e99be0
-  data.tar.gz: 4645b59b7d0ed3b7497b5e38dc9a29c7fcb32c54a622bdc7cba22dede1be05719b818c991727aae4ff229ec2e46ab58834c74b5b449eea4ed4f30bf48cdab957
+  metadata.gz: 9d937b2b863453035dc44671a218f35ebcd0fb7a835475ad33adf408c8a199a34ab57c5343d8381965c26965c11eb7c45be66a634a3013687bdcd1bedeac0304
+  data.tar.gz: a683dee22f180c43bc611be760b25e17980286fe6009e6fbeb29006b1bda495bfa86d152c2b0a06eaaa5f3420a8e89a2b8e7a4bb320bd42d60fa5992234d7cad

data/.gitlab-ci.yml

@@ -28,16 +28,6 @@ yard documentation:
     paths:
       - doc
 
-unit tests ruby3.0:
-  image: ruby:3.0
-  script:
-    - bundle exec rake test:spec
-
-unit tests ruby3.1:
-  image: ruby:3.1
-  script:
-    - bundle exec rake test:spec
-
 unit tests ruby3.2:
   image: ruby:3.2
   script:

data/config/rubocop.yml

@@ -9,7 +9,7 @@
 #
 # See https://github.com/rubocop-hq/rubocop/blob/master/manual/configuration.md
 
-require:
+plugins:
   - rubocop-performance
   - rubocop-rspec
   - rubocop-rake

data/lib/defmastership/core/constants.rb

@@ -40,7 +40,7 @@ module Defmastership
 
       # [Regexp] match optional explicit version and explicit checksum
       DEF_VERSION_AND_CHECKSUM = '(?<version_and_checksum>' \
-                                 '\((?<explicit_version>[^~]+)?(?<explicit_checksum>~\h+)?\)' \
+                                 '\((?<explicit_version>[^~]+?)?(?<explicit_checksum>~\h+?)?\)' \
                                  ')?'
       public_constant :DEF_VERSION_AND_CHECKSUM
 
@@ -48,6 +48,10 @@ module Defmastership
       REFERENCE = an_id('reference').freeze
       public_constant :REFERENCE
 
+      # [Regexp] match reference with optional version and checksum
+      REF_WITH_OPT_VER_CHK = "\\s*#{REFERENCE}#{DEF_VERSION_AND_CHECKSUM}\\s*".freeze
+      public_constant :REF_WITH_OPT_VER_CHK
+
       # [Regexp] match defintion summary
       DEF_SUMMARY = <<~'SUM'
         \s*
@@ -79,10 +83,7 @@ module Defmastership
         #{DEF_KEYWORD}
         #{DEF_TYPE}
         ,
-        \\s*
-        #{REFERENCE}
-        #{DEF_VERSION_AND_CHECKSUM}
-        \\s*
+        #{REF_WITH_OPT_VER_CHK}
         #{DEF_SUMMARY}
         #{DEF_LABELS}
         \\s*
@@ -124,7 +125,7 @@ module Defmastership
       public_constant :IREF_DEF_AFT
       # [Regexp] match an internal cross reference
       IREF_DEF = Regexp.new(
-        "#{IREF_DEF_BEF}#{an_id('intref')}#{IREF_DEF_AFT}",
+        "#{IREF_DEF_BEF}#{an_id('intref')}#{DEF_VERSION_AND_CHECKSUM}#{IREF_DEF_AFT}",
         Regexp::EXTENDED
       )
       public_constant :IREF_DEF

data/lib/defmastership/core/version.rb

@@ -5,7 +5,7 @@ module Defmastership
   # Common to defmastership and asciidoctor-defmastership
   module Core
     # [String] Gem version
-    VERSION = '1.5.1'
+    VERSION = '1.5.3'
     public_constant :VERSION
   end
 end

data/spec/spec_helper.rb

@@ -13,9 +13,8 @@ SimpleCov.start do
   add_filter 'vendor'
   add_filter 'set_join_hack'
 
-  minimum_coverage 100
-
   enable_coverage :branch
+  minimum_coverage line: 100, branch: 100
 end
 
 RSpec::Matchers.define(:matchdata_including) do |h|

data/spec/unit/defmastership/core/dm_regexp_spec.rb

@@ -217,6 +217,39 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
     end
   end
 
+  describe 'REF_WITH_OPT_VER_CHK' do
+    subject(:regexp) { Regexp.new("^#{described_class::REF_WITH_OPT_VER_CHK}$", Regexp::EXTENDED) }
+
+    [
+      'abc',
+      '_abc_efg_',
+      '-abc-efg-',
+      'REFERENCE-0001',
+      'REFERENCE-0001(a)',
+      'REFERENCE-0001(~1234abcd)',
+      'REFERENCE-0001(a~1234abcd)'
+    ].each do |line|
+      it { is_expected.to(match(line)) }
+    end
+
+    it { expect(regexp.match('the_ref')[:reference]).to(eq('the_ref')) }
+    it { expect(regexp.match('the_ref')[:version_and_checksum]).to(be_nil) }
+    it { expect(regexp.match('the_ref')[:explicit_version]).to(be_nil) }
+    it { expect(regexp.match('the_ref')[:explicit_checksum]).to(be_nil) }
+    it { expect(regexp.match('the_ref(a)')[:reference]).to(eq('the_ref')) }
+    it { expect(regexp.match('the_ref(a)')[:version_and_checksum]).to(eq('(a)')) }
+    it { expect(regexp.match('the_ref(a)')[:explicit_version]).to(eq('a')) }
+    it { expect(regexp.match('the_ref(a)')[:explicit_checksum]).to(be_nil) }
+    it { expect(regexp.match('the_ref(~abcd)')[:reference]).to(eq('the_ref')) }
+    it { expect(regexp.match('the_ref(~abcd)')[:version_and_checksum]).to(eq('(~abcd)')) }
+    it { expect(regexp.match('the_ref(~abcd)')[:explicit_version]).to(be_nil) }
+    it { expect(regexp.match('the_ref(~abcd)')[:explicit_checksum]).to(eq('~abcd')) }
+    it { expect(regexp.match('the_ref(z~abcd)')[:reference]).to(eq('the_ref')) }
+    it { expect(regexp.match('the_ref(z~abcd)')[:version_and_checksum]).to(eq('(z~abcd)')) }
+    it { expect(regexp.match('the_ref(z~abcd)')[:explicit_version]).to(eq('z')) }
+    it { expect(regexp.match('the_ref(z~abcd)')[:explicit_checksum]).to(eq('~abcd')) }
+  end
+
   describe 'DEF_SUMMARY' do
     subject(:regexp) { Regexp.new("^#{described_class::DEF_SUMMARY}$", Regexp::EXTENDED) }
 
@@ -420,7 +453,7 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
   describe 'EREF_DEF' do
     subject(:regexp) { described_class::EREF_DEF }
 
-    let(:one_match) { regexp.match('defs:eref[abcdef, [ABC, EDF(a~1234abcd)]]') }
+    let(:one_match) { regexp.match('defs:eref[abcdef, [ABC, EDF(a~1234abcd) ]]') }
 
     context 'with valid external ref' do
       [
@@ -507,8 +540,19 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
       it { is_expected.to(match('   defs:iref[   bla_bla]')) }
       it { is_expected.to(match('   defs:iref[   bla_bla   ]')) }
       it { is_expected.to(match('   defs:iref[   bla_bla   ]   ')) }
+      it { is_expected.to(match('   defs:iref[   bla_bla(c~abcd1234)   ]   ')) }
 
       it { expect(regexp.match('   defs:iref[   bla_bla   ]   ')[:intref]).to(eq('bla_bla')) }
+      it { expect(regexp.match('   defs:iref[   bla_bla   ]   ')[:version_and_checksum]).to(be_nil) }
+      it { expect(regexp.match('   defs:iref[   bla_bla   ]   ')[:explicit_version]).to(be_nil) }
+      it { expect(regexp.match('   defs:iref[   bla_bla   ]   ')[:explicit_checksum]).to(be_nil) }
+
+      it { expect(regexp.match('defs:iref[bla(c~abcd1234)]')[:intref]).to(eq('bla')) }
+      it { expect(regexp.match('defs:iref[bla(c~abcd1234)]')[:version_and_checksum]).to(eq('(c~abcd1234)')) }
+      it { expect(regexp.match('defs:iref[bla(c~abcd1234)]')[:explicit_version]).to(eq('c')) }
+      it { expect(regexp.match('defs:iref[bla(c~abcd1234)]')[:explicit_checksum]).to(eq('~abcd1234')) }
+      it { expect(regexp.match('defs:iref[bla(c)] defs:iref[bla(c~abcd1234)]')[:explicit_version]).to(eq('c')) }
+      it { expect(regexp.match('defs:iref[bla(~abcd1234)] defs:iref[bla(c)')[:explicit_checksum]).to(eq('~abcd1234')) }
     end
 
     context 'with invalid IREF_DEF' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: defmastership-core
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.5.3
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.1
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor - common code
 test_files: []