asciidoctor-defmastership 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb46c0579286b760f1486d9458034fdabfef220e34cacae49c574f20c5e2c093
-  data.tar.gz: 5f18f5ca0b93543c936fcbdd8269e53aa0bbebdc13c80cae8cb152f236c9f3f8
+  metadata.gz: 0425e34011a043292dc14256c4649ec16f0bdade8f2a746e586c3011dc4ad1fc
+  data.tar.gz: c30c83e7c430f0b20889011ef5fd8b8fa5ff21419cd48dfef7f8be0302ca7832
 SHA512:
-  metadata.gz: 0d4a76c605cea45280dff495d465e6121bac39b24e26625f9476c0dcf3823e2fbe25fa2d287e2f8494ab9d6b708d109e7f1424211ed1f1c13c47d9f3419e1bc9
-  data.tar.gz: 777021aef8fca7a5402ba60d012f10b8d395c85dafa4ef44897068f84da03808a594ff613b6e7ba854c2ee1e0d1c0b76ed80c5fa4036f59c7276485483137308
+  metadata.gz: 8084b8fbe8836c2bcd30b8b9afc754879f53341d7b117234183be59dcdab6c6d87e5fef7f534b673f9f13283f6e4f398decd341c4c6cc185b138ee35134f118c
+  data.tar.gz: '0869b435d1224cab6ffe0637b87bedf6f9080e991b9382331d72e2238270eaa7b286997a071fc161f54249794e0afd9d8eb91b94d1f288cc654501934db1c159'

data/.gitignore

@@ -12,3 +12,4 @@
 /measurements
 *.csv
 *.gem
+/Gemfile.lock

data/.gitlab-ci.yml

@@ -0,0 +1,16 @@
+default:
+  image: ruby:2.5
+  before_script:
+    - apt-get update
+    - ruby -v
+    - which ruby
+    - gem install bundler --no-document
+    - bundle install --jobs $(nproc) "${FLAGS[@]}"
+
+rspec:
+  script:
+    - bundle exec rake spec
+
+rubocop:
+  script:
+    - bundle exec rake rubocop

data/.rubocop.yml

@@ -13,16 +13,17 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.5
   EnabledByDefault: true
   DisplayCopNames: true
 
 Style/Copyright:
-  Enabled: false
-  AutocorrectNotice: 'Copyright 2020 by Jérôme Arbez-Gindre'
+  Enabled: true
+  Notice: 'Copyright (\(c\) )?2020 Jerome Arbez-Gindre'
+  AutocorrectNotice: '# Copyright (c) 2020 Jerome Arbez-Gindre'
 
-# Lint/ConstantResolution: # not available in rubocop 0.81
-#   Enabled: false
+Lint/ConstantResolution:
+  Enabled: false
 
 # Style/DocumentationMethod:
 #   Enabled: false
@@ -42,9 +43,6 @@ Metrics/BlockLength :
     - 'spec/**/*'
     - '*.gemspec'
 
-Layout/LineLength:
-  Max: 120                      # default for rubocop later than 0.81
-
 # Security/Eval :
 #   Exclude:
 #     - 'Rakefile'
@@ -64,3 +62,10 @@ RSpec/FilePath :
 
 # RSpec/NestedGroups:
 #   Max: 4
+
+Layout/RedundantLineBreak:
+  Enabled: false
+  
+Style/DisableCopsWithinSourceCodeDirective:
+  Enabled: true
+  AllowedCops: ['Lint/InterpolationCheck']

data/Gemfile

@@ -1,3 +1,4 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 source('https://rubygems.org')

data/LICENCE

@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2020 Jérôme Arbez-Gindre, and the individual contributors
+to asciidoctor-defmastership.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/Rakefile

@@ -1,3 +1,4 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 require('bundler/gem_tasks')

data/asciidoctor-defmastership.gemspec

@@ -1,3 +1,4 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -5,12 +6,12 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require('asciidoctor/defmastership/version')
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = '>= 2.3'
+  spec.required_ruby_version = '>= 2.5'
   spec.name          = 'asciidoctor-defmastership'
   spec.version       = Asciidoctor::DefMastership::VERSION
   spec.authors       = ['Jérôme Arbez-Gindre']
   spec.email         = ['jeromearbezgindre@gmail.com']
-  spec.licenses      = 'Nonstandard'
+  spec.licenses      = ['MIT']
 
   spec.summary = %(asciidoctor extension to handle applicable
                          definition references)
@@ -35,9 +36,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('aruba')
   spec.add_development_dependency('rake')
   spec.add_development_dependency('rspec')
-  spec.add_development_dependency('rubocop', '0.81')
-  spec.add_development_dependency('rubocop-rspec', '~> 1')
+  spec.add_development_dependency('rubocop', '1.13')
+  spec.add_development_dependency('rubocop-rake', '~> 0.5')
+  spec.add_development_dependency('rubocop-rspec', '~> 2.0')
 
   spec.add_dependency('asciidoctor', '~> 2.0')
-  spec.add_dependency('defmastership', '>= 1.0.2', '< 2.0')
+  spec.add_dependency('defmastership', '>= 1.0.13', '< 2.0')
 end

data/bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 require('bundler/setup')

data/lib/asciidoctor/defmastership.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 if RUBY_ENGINE == 'opal'

data/lib/asciidoctor/defmastership/extension.rb

@@ -1,3 +1,4 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 require('asciidoctor/extensions') unless RUBY_ENGINE == 'opal'
@@ -20,6 +21,7 @@ require('asciidoctor/extensions') unless RUBY_ENGINE == 'opal'
 #   This shall be nice.
 #
 require('defmastership/constants')
+require('defmastership/parsing_state')
 
 module Asciidoctor
   module DefMastership
@@ -57,6 +59,7 @@ module Asciidoctor
         # This is a preprocessor: we need to parse tag attributes
         @parsing_is_enabled = true
         @has_url = {}
+        @parsing_state = ::DefMastership::ParsingState.new
       end
 
       # process the document
@@ -70,11 +73,10 @@ module Asciidoctor
       private
 
       def parse_and_replace(lines)
-        parsing_is_enabled = true
         lines.reduce([]) do |new_lines, line|
-          parsing_is_enabled = !parsing_is_enabled if line == '....'
+          shall_parse = @parsing_state.enabled?(line)
           filter = FILTERS.find { |onefilter| line.match(onefilter.regex) }
-          if filter && parsing_is_enabled
+          if filter && shall_parse
             new_lines + __send__(filter.apply, line, Regexp.last_match)
           else
             new_lines + [line]
@@ -89,15 +91,12 @@ module Asciidoctor
 
       def build_definition(_line, matches)
         definition_lines = []
-        if matches[:labels]
-          labels_str = labels_strings(matches[:labels]).join(' ')
-          definition_lines << ".#{matches[:reference]} #{labels_str}"
-        else
-          definition_lines << ".#{matches[:reference]}"
-        end
+        explicit_checksum_str = " [.checksum]\#(#{matches[:explicit_checksum]})\#" if matches[:explicit_checksum]
+        explicit_version_str = " [.version]\#(#{matches[:explicit_version]})\#" if matches[:explicit_version]
+        labels_str = " #{labels_strings(matches[:labels]).join(' ')}" if matches[:labels]
+        definition_lines << ".#{matches[:reference]}#{explicit_version_str}#{explicit_checksum_str}#{labels_str}"
         definition_lines <<
           "[\##{matches[:reference]}.define.#{matches[:type]}]"
-        definition_lines
       end
 
       def labels_strings(labels)
@@ -121,13 +120,15 @@ module Asciidoctor
         new_line = "[.external_reference]\#{eref-#{matches[:refname]}-prefix} "
         extref_line = extrefs.map { |ref| build_link(ref, matches) }
         @has_url[matches[:refname]]
-        [new_line + extref_line.join(', ') + '.#']
+        ["#{new_line}#{extref_line.join(', ')}.\#"]
       end
 
       def build_internal_ref(line, _matches)
-        [line.gsub(IREF_DEF_REGEXP) do
-           "<<#{Regexp.last_match[:intref]},#{Regexp.last_match[:intref]}>>"
-         end]
+        [
+          line.gsub(IREF_DEF_REGEXP) do
+            "<<#{Regexp.last_match[:intref]},#{Regexp.last_match[:intref]}>>"
+          end
+        ]
       end
 
       def attribute_setting(_line, matches)

data/lib/asciidoctor/defmastership/version.rb

@@ -1,8 +1,9 @@
+# Copyright (c) 2020 Jerome Arbez-Gindre
 # frozen_string_literal: true
 
 module Asciidoctor
   module DefMastership
-    VERSION = '1.0.0'
+    VERSION = '1.0.5'
     public_constant :VERSION
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-defmastership
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.5
 platform: ruby
 authors:
 - Jérôme Arbez-Gindre
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-16 00:00:00.000000000 Z
+date: 2021-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba
@@ -58,28 +58,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.81'
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: '0.81'
+        version: '1.13'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: asciidoctor
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +114,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.13
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -110,7 +124,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.0.13
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
@@ -125,11 +139,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".gitlab-ci.yml"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
-- Gemfile.lock
+- LICENCE
 - README.md
 - Rakefile
 - asciidoctor-defmastership.gemspec
@@ -151,7 +166,7 @@ files:
 - lib/asciidoctor/defmastership/version.rb
 homepage: https://gitlab.com/jjag/asciidoctor-defmastership/
 licenses:
-- Nonstandard
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -161,14 +176,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.5
 signing_key: 
 specification_version: 4
 summary: asciidoctor extension to handle applicable definition references

data/Gemfile.lock

@@ -1,132 +0,0 @@
-PATH
-  remote: .
-  specs:
-    asciidoctor-defmastership (1.0.0)
-      asciidoctor (~> 2.0)
-      defmastership (>= 1.0.2, < 2.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    aasm (5.1.1)
-      concurrent-ruby (~> 1.0)
-    activesupport (6.0.3.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    aruba (1.0.3)
-      childprocess (>= 2.0, < 5.0)
-      contracts (~> 0.16.0)
-      cucumber (>= 2.4, < 6.0)
-      ffi (~> 1.9)
-      rspec-expectations (~> 3.4)
-      thor (~> 1.0)
-    asciidoctor (2.0.10)
-    ast (2.4.1)
-    builder (3.2.4)
-    childprocess (4.0.0)
-    concurrent-ruby (1.1.7)
-    contracts (0.16.0)
-    cucumber (5.1.1)
-      builder (~> 3.2, >= 3.2.4)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-create-meta (~> 2.0, >= 2.0.2)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-html-formatter (~> 9.0, >= 9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-wire (~> 4.0, >= 4.0.1)
-      diff-lcs (~> 1.4, >= 1.4.4)
-      multi_test (~> 0.1, >= 0.1.2)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-core (8.0.1)
-      cucumber-gherkin (~> 15.0, >= 15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      cucumber-tag-expressions (~> 2.0, >= 2.0.4)
-    cucumber-create-meta (2.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-      sys-uname (~> 1.2, >= 1.2.1)
-    cucumber-cucumber-expressions (10.3.0)
-    cucumber-gherkin (15.0.2)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-html-formatter (9.0.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    cucumber-messages (13.1.0)
-      protobuf-cucumber (~> 3.10, >= 3.10.8)
-    cucumber-tag-expressions (2.0.4)
-    cucumber-wire (4.0.1)
-      cucumber-core (~> 8.0, >= 8.0.1)
-      cucumber-cucumber-expressions (~> 10.3, >= 10.3.0)
-      cucumber-messages (~> 13.0, >= 13.0.1)
-    defmastership (1.0.2)
-      aasm (~> 5)
-      asciidoctor (~> 2)
-      gli (~> 2)
-    diff-lcs (1.4.4)
-    ffi (1.13.1)
-    gli (2.19.2)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.4)
-    middleware (0.1.0)
-    minitest (5.14.2)
-    multi_test (0.1.2)
-    parallel (1.19.2)
-    parser (2.7.1.4)
-      ast (~> 2.4.1)
-    protobuf-cucumber (3.10.8)
-      activesupport (>= 3.2)
-      middleware
-      thor
-      thread_safe
-    rainbow (3.0.0)
-    rake (13.0.1)
-    rexml (3.2.4)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.2)
-      rspec-support (~> 3.9.3)
-    rspec-expectations (3.9.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.1)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.3)
-    rubocop (0.81.0)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.7.0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      rexml
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-rspec (1.41.0)
-      rubocop (>= 0.68.1)
-    ruby-progressbar (1.10.1)
-    sys-uname (1.2.1)
-      ffi (>= 1.0.0)
-    thor (1.0.1)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.7.0)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  aruba
-  asciidoctor-defmastership!
-  rake
-  rspec
-  rubocop (= 0.81)
-  rubocop-rspec (~> 1)
-
-BUNDLED WITH
-   2.1.4