defmastership-core 1.4.1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07bc53590b73e2833caaecb1bae8cfecd87a1ecef94fbe7ecb9b5eb6ea89d828
-  data.tar.gz: adf941d0a7655906428a6b0841780bae626e222284a192cae4e2c7af6dd25dec
+  metadata.gz: e305c214cf30723ae670f46f1bf3ffbe4d00b1867581e1db5be79f2ab8155a35
+  data.tar.gz: b00c8a4e447f269176696da0b743d184e594ffd5a8fb0a0b83787343917a4846
 SHA512:
-  metadata.gz: 21867b6159f14e934248174adff6d253b36f55d19f50528e3ccd0fda55afa2bb391a27a339d0b3b9d9e92b0c4fe427e512a0cc666e895e1089e289678f8b52cb
-  data.tar.gz: a5efb633dd49c4cc0593cb9a1e8e1d2177b45680e78c89f457f55efd62b0156de913db8ff7bd07e710a35dc41226ac9604584008f113224cc68d0051285dee35
+  metadata.gz: 847be19dfe955889f38c8e07c23c5fe297d84aec7d0cd3b81a2a6d2188ab3f8cfc5c6d4330a17969b14068baa73524b85a37fe469136b720c6d2f7bd71e99be0
+  data.tar.gz: 4645b59b7d0ed3b7497b5e38dc9a29c7fcb32c54a622bdc7cba22dede1be05719b818c991727aae4ff229ec2e46ab58834c74b5b449eea4ed4f30bf48cdab957

data/.gitlab-ci.yml

@@ -28,17 +28,6 @@ yard documentation:
     paths:
       - doc
 
-unit tests ruby2.7:
-  image: ruby:2.7
-  before_script:
-    - apt-get update
-    - ruby -v
-    - which ruby
-    - gem install bundler -v 2.4.22 --no-document
-    - bundle install --jobs $(nproc) "${FLAGS[@]}"
-  script:
-    - bundle exec rake test:spec
-
 unit tests ruby3.0:
   image: ruby:3.0
   script:

data/Gemfile

@@ -7,80 +7,48 @@ gemspec
 
 ruby RUBY_VERSION
 
-# rubocop:disable Metrics/BlockLength
 group :development do
   # needed by yard to render documentation
   gem 'asciidoctor',           '~> 2.0'
-  # cucumber steps for command line tests
-  gem 'aruba',                 '~> 2.2'
-  # bdd
-  gem 'cucumber',              '~> 9.2'
-
   # code duplication
   gem 'flay',                  '~> 2.13'
-
   # automatic test run
   gem 'guard',                 '~> 2.19'
   # automatic update invocation
   gem 'guard-bundler',         '~> 3.0'
-  if RUBY_VERSION >= '3.0'
-    # automatic style check
-    gem 'guard-reek', '~> 1.2'
-  end
+  # automatic style check
+  gem 'guard-reek',            '~> 1.2'
   # automatic tdd
   gem 'guard-rspec',           '~> 4.7'
   # automatic style check
   gem 'guard-rubocop',         '~> 1.5'
-
-  # if RUBY_VERSION >= '3.0'
-  #   # 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'
-  # end
+  # mutation testing
+  gem 'mutant-rspec',          '~> 0.13'
   # to parse and execute Rakefile
-  gem 'rake', '~> 13.2'
-
-  if RUBY_VERSION >= '3.0'
-    # needed by yard to render documentation
-    gem 'rdoc', '~> 6.1O'
-  end
+  gem 'rake',                  '~> 13.3'
+  # needed by yard to render documentation
+  gem 'rdoc',                  '~> 6.14'
   # tdd
   gem 'rspec',                 '~> 3.13'
-  # # to test performances
-  # gem 'rspec-benchmark',       '~> 0'
   # code needs to be clean
-  gem 'rubocop',               '1.69'
+  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.3'
+  gem 'rubocop-rspec',         '~> 3.6'
   # Rakefiles need to be clean
-  gem 'rubocop-rake',          '~> 0.6'
-
-  if RUBY_VERSION >= '3.0'
-    # detect selling code
-    gem 'reek', '~> 6.3'
-    # my code needs to be critiqued
-    gem 'rubycritic', '~> 4.9'
-    # Doc need to be clean
-    gem 'rubocop-yard', '~> 0.10'
-  end
-
+  gem 'rubocop-rake',          '~> 0.7'
+  # detect smelling code
+  gem 'reek',                  '~> 6.5'
+  # my code needs to be critiqued
+  gem 'rubycritic',            '~> 4.10'
+  # Doc need to be clean
+  gem 'rubocop-yard',          '~> 1.0'
   # What is tdd without code coverage ?
-  gem 'simplecov', '~> 0.22'
-
-  if RUBY_VERSION >= '3.0'
-    # to document code
-    gem 'yard', '~> 0.9'
-  end
+  gem 'simplecov',             '~> 0.22'
+  # to document code
+  gem 'yard',                  '~> 0.9'
 end
-# rubocop:enable Metrics/BlockLength
 
 group :debugging do
   # Sometimes, we need to debug

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/config/rubocop.yml

@@ -16,7 +16,7 @@ require:
   - rubocop-yard
 
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   EnabledByDefault: true
   DisplayCopNames: true
 

data/defmastership-core.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.metadata = {
     'rubygems_mfa_required' => 'true'
   }
-  spec.required_ruby_version = '>= 2.7'
+  spec.required_ruby_version = '>= 3.0'
   spec.name = 'defmastership-core'
   spec.version = Defmastership::Core::VERSION
   spec.author = 'Jérôme Arbez-Gindre'

data/lib/defmastership/core/constants.rb

@@ -15,7 +15,7 @@ module Defmastership
       end
 
       # [Regexp] to match a single line comment
-      SINGLE_LINE_COMMENT = %r{^//[^/]}.freeze
+      SINGLE_LINE_COMMENT = %r{^//[^/]}
       public_constant :SINGLE_LINE_COMMENT
 
       # [Regexp] match the definition keyword
@@ -23,11 +23,11 @@ module Defmastership
       public_constant :DEF_KEYWORD
 
       # [Regexp] match a definition type
-      DEF_TYPE = ",\\s*#{an_id('type')}\\s*"
+      DEF_TYPE = ",\\s*#{an_id('type')}\\s*".freeze
       public_constant :DEF_TYPE
 
       # [Regexp] match all text before the definition's reference
-      DEF_BEFORE_REF = <<~"BEF"
+      DEF_BEFORE_REF = <<~"BEF".freeze
         ^
         \\s*
         \\[
@@ -52,7 +52,7 @@ module Defmastership
       DEF_SUMMARY = <<~'SUM'
         \s*
         (,\s*
-        ((?<summary>[^\s,\[\]][^,\[\]]*?)|("\s*(?<summary>[^""]*?)\s*"))
+        (("\s*(?<summary>[^""]*?)\s*")|(?<summary>[^\s,\[\]][^,\[\]]*?))
         \s*)?
       SUM
       public_constant :DEF_SUMMARY
@@ -62,7 +62,7 @@ module Defmastership
       public_constant :DEF_LABELS
 
       # [Regexp] match all text after the definition's reference
-      DEF_AFTER_REF = <<~"AFT"
+      DEF_AFTER_REF = <<~"AFT".freeze
         \\s*
         #{DEF_SUMMARY}
         #{DEF_LABELS}
@@ -94,26 +94,26 @@ module Defmastership
 
       # [Regexp] match a asciidcotor attribute definition
       VARIABLE_DEF = /^\s*:#{an_id('varname')}:\s+
-                   (?<value>\S.*\S)\s*$/x.freeze
+                   (?<value>\S.*\S)\s*$/x
       public_constant :VARIABLE_DEF
 
       # [Regexp] match a asciidcotor attribute use
-      VARIABLE_USE = /{#{an_id('varname')}}/x.freeze
+      VARIABLE_USE = /{#{an_id('varname')}}/x
       public_constant :VARIABLE_USE
 
       # [Regexp] match an external cross reference type configuration
       EREF_CONFIG = /^\s*:eref-#{an_id('reference')}-(?<symb>prefix|url):\s*
-                   \s*(?<value>\S.*\S)\s*/x.freeze
+                   \s*(?<value>\S.*\S)\s*/x
       public_constant :EREF_CONFIG
       # [Regexp] match an external cross reference use
       EREF_DEF = /^\s*
                defs:eref\[
                \s*#{an_id('reference')}\s*,
-               \s*\[\s*(?<extrefs>[^\]]+?)\s*\]\s*\]/x.freeze
+               \s*\[\s*(?<extrefs>[^\]]+?)\s*\]\s*\]/x
       public_constant :EREF_DEF
 
       # [Regexp] match an asciidoc block delimiter
-      BLOCK = /^--\s*$/.freeze
+      BLOCK = /^--\s*$/
       public_constant :BLOCK
 
       # [Regexp] match the begining of an internal cross reference
@@ -131,21 +131,21 @@ module Defmastership
 
       # [Regexp] match an attribute configuration
       ATTR_CONFIG = /\s*:attr-#{an_id('attr')}-prefix:
-                      \s+(?<prefix>.+?)\s*$/x.freeze
+                      \s+(?<prefix>.+?)\s*$/x
       public_constant :ATTR_CONFIG
       # [Regexp] match an attribute use
       ATTR_SET = /\s*
                 defs:attribute\[
                 \s*#{an_id('attr')}\s*,
-                \s*(?<value>.+?)\s*\]/x.freeze
+                \s*(?<value>.+?)\s*\]/x
       public_constant :ATTR_SET
 
       # [Regexp] match an empty line
-      EMPTY_LINE = /^\s*$/.freeze
+      EMPTY_LINE = /^\s*$/
       public_constant :EMPTY_LINE
 
       # [Regexp] match everything
-      WHATEVER = //.freeze
+      WHATEVER = //
       public_constant :WHATEVER
 
       # [Regexp] match asciidoc include statement keyword

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.4.1'
+    VERSION = '1.5.1'
     public_constant :VERSION
   end
 end

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
@@ -418,7 +420,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 +430,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

metadata

@@ -1,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: defmastership-core
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.1
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-04 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
@@ -54,15 +51,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !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: []