defmastership-core 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2cf64cc0680411a81afd61f49488ffd98981f02f69b9b5298c3bbe4f96ee3cd2
-  data.tar.gz: 63662e69ecacc62a93d13b0a78e2bd92711f585d7e5a6f8d911feac3a32d02e2
+  metadata.gz: 6b95f1ad54d625a1441f1ca0220e944559232bf9f477b56e9a14c32469622928
+  data.tar.gz: 060d870d464c07cc9ae12702136d66292e39006af3c617c7bb8f42b4c7e1dc5c
 SHA512:
-  metadata.gz: 7320f2beec55cdab8dc55db5f57c3ce8be1fed5f6826cfe43fe2b81bda905057812256ed8a011f69ffccd32f78e652620dadb3beeb8982a43f182fde3eca65e2
-  data.tar.gz: 5cf045b72a06d4a9b4fe996e79a9aa3dc70d3a1e75d6021e5db253b98f2a3f5a330de324229a276b4ea473bc3043b3d87c2fb72136dae8bc004a260e2d112ea4
+  metadata.gz: 84bfd7c8d7b5ce2e15640fd450e0b8375d73608fc8b09e0b0e7cd989d1f4f10eb4d2d20cdefe9d93b1822cd3b71fc1fe63f123e489d65e3d4e281a1dc2bfeecf
+  data.tar.gz: 3fadd0ba25f82931f55198c2c0d9c1821e156352e0597ce3e3ca19857bc1ca61bbca7e119f95ea4b95574a485b7b1b455c8f7227731aada5816e068f8152423b

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/Gemfile

@@ -10,10 +10,6 @@ ruby RUBY_VERSION
 group :development do
   # needed by yard to render documentation
   gem 'asciidoctor',           '~> 2.0'
-  # cucumber steps for command line tests
-  gem 'aruba',                 '~> 2.3'
-  # bdd
-  gem 'cucumber',              '~> 9.2'
   # code duplication
   gem 'flay',                  '~> 2.13'
   # automatic test run
@@ -21,45 +17,37 @@ group :development do
   # automatic update invocation
   gem 'guard-bundler',         '~> 3.0'
   # automatic style check
-  gem 'guard-reek', '~> 1.2'
+  gem 'guard-reek',            '~> 1.2'
   # automatic tdd
   gem 'guard-rspec',           '~> 4.7'
   # automatic style check
   gem 'guard-rubocop',         '~> 1.5'
-
-  # # mutation testing
-  # plan = 'oss'
-  # key = '7oac4dMz95cTUuFPtGDfTDSQep6ZhdGW'
-  # source "https://#{plan}:#{key}@gem.mutant.dev" do
-  #   # license needed
-  #   gem 'mutant-license', '~> 0'
-  # end
-  # # mutation testing
-  # gem 'mutant-rspec', '~> 0'
+  # mutation testing
+  gem 'mutant-rspec',          '~> 0.13'
   # to parse and execute Rakefile
-  gem 'rake', '~> 13.2'
+  gem 'rake',                  '~> 13.3'
   # needed by yard to render documentation
-  gem 'rdoc', '~> 6.12'
+  gem 'rdoc',                  '~> 6.14'
   # tdd
   gem 'rspec',                 '~> 3.13'
   # code needs to be clean
-  gem 'rubocop',               '1.72'
+  gem 'rubocop',               '1.80'
   # code needs to be clean
-  gem 'rubocop-performance',   '~> 1.23'
+  gem 'rubocop-performance',   '~> 1.25'
   # test code needs to be clean
-  gem 'rubocop-rspec',         '~> 3.4'
+  gem 'rubocop-rspec',         '~> 3.6'
   # Rakefiles need to be clean
-  gem 'rubocop-rake',          '~> 0.6'
-  # detect selling code
-  gem 'reek', '~> 6.4'
+  gem 'rubocop-rake',          '~> 0.7'
+  # detect smelling code
+  gem 'reek',                  '~> 6.5'
   # my code needs to be critiqued
-  gem 'rubycritic', '~> 4.9'
+  gem 'rubycritic',            '~> 4.10'
   # Doc need to be clean
-  gem 'rubocop-yard', '~> 0.10'
+  gem 'rubocop-yard',          '~> 1.0'
   # What is tdd without code coverage ?
-  gem 'simplecov', '~> 0.22'
+  gem 'simplecov',             '~> 0.22'
   # to document code
-  gem 'yard', '~> 0.9'
+  gem 'yard',                  '~> 0.9'
 end
 
 group :debugging do

data/config/mutant.yml

@@ -8,7 +8,8 @@ integration:
     - --options=config/rspec
     - spec
 requires:
-  - defmastership
+  - defmastership/core/constants
+  - defmastership/core/parsing_state
 matcher:
   subjects:
     - 'Defmastership::Core*'

data/lib/defmastership/core/constants.rb

@@ -48,11 +48,15 @@ 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*
         (,\s*
-        ((?<summary>[^\s,\[\]][^,\[\]]*?)|("\s*(?<summary>[^""]*?)\s*"))
+        (("\s*(?<summary>[^""]*?)\s*")|(?<summary>[^\s,\[\]][^,\[\]]*?))
         \s*)?
       SUM
       public_constant :DEF_SUMMARY
@@ -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.0'
+    VERSION = '1.5.2'
     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

@@ -132,7 +132,8 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
         ',[label1]]',
         ', a nice summary,[label1]]',
         ', a nice summary]',
-        ', "a nice summary, with comma"]'
+        ', "a nice summary, with comma"]',
+        ', "a nice summary with quotation mark"]'
       ].each do |def_end|
         it { is_expected.to(match(def_end)) }
       end
@@ -142,6 +143,7 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
       it { expect(regexp.match(', a summary ]')[:summary]).to(eq('a summary')) }
       it { expect(regexp.match(', a summary ]')[:labels]).to(be_nil) }
       it { expect(regexp.match(', " a, comma " ]')[:summary]).to(eq('a, comma')) }
+      it { expect(regexp.match(', " no comma " ]')[:summary]).to(eq('no comma')) }
     end
 
     context 'when invalid definitions end' do
@@ -215,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) }
 
@@ -418,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]]') }
+    let(:one_match) { regexp.match('defs:eref[abcdef, [ABC, EDF(a~1234abcd) ]]') }
 
     context 'with valid external ref' do
       [
@@ -428,13 +463,14 @@ RSpec.describe(Defmastership::Core::DMRegexp) do
         'defs:eref[abcdef,[ABC,EDF]]',
         'defs:eref[abcdef, [ABC, EDF]   ]',
         'defs:eref[abcdef, [ABC, EDF   ]]',
-        'defs:eref[abcdef, [ABC]]'
+        'defs:eref[abcdef, [ABC]]',
+        'defs:eref[abcdef, [ABC(a~1234abcd)]]'
       ].each do |line|
         it { is_expected.to(match(line)) }
       end
 
       it { expect(one_match[:reference]).to(eq('abcdef')) }
-      it { expect(one_match[:extrefs]).to(eq('ABC, EDF')) }
+      it { expect(one_match[:extrefs]).to(eq('ABC, EDF(a~1234abcd)')) }
     end
 
     context 'with invalid external ref' do
@@ -504,8 +540,17 @@ 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')) }
     end
 
     context 'with invalid IREF_DEF' do

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership-core
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies: []
-description:
 email: jeromearbezgindre@gmail.com
 executables: []
 extensions: []
@@ -45,7 +43,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -61,8 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.7.1
 specification_version: 4
 summary: Handling of references and definitions with asciidoctor - common code
 test_files: []