relaton-w3c 1.14.1 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98704ba5a2584740f2b47ac2710a68ead213e027ff7a1ee319e40180210c5b34
-  data.tar.gz: 4ae2f3cee7bfef6432ed4542f49d43e7e63bd52f4c8bdba2e5e37058d3adca10
+  metadata.gz: 5a1a222450fe77ebead97e01ba3e660fb06992b2d13c6628a8089a27e5058307
+  data.tar.gz: a46a34fe7cf17baacbab2502b17bc0f3446e840a80e98b4f304c3ca5d3d255e5
 SHA512:
-  metadata.gz: 481c6d393908896813dd6f523d9b4e6f48dc15d825ff416cf8c5df70d95f29cd2013e80eb45704c126847c82b6addda8f02aeec214bc3bea0c226bd485da7d95
-  data.tar.gz: f6d8a22c1d3385c4e808b937f6d32f2c6f394f868168323f2c734d7d2a18f818e6ea304b122a6ef20766a05f9ffae8fc03b984856dca1148210e3dca2d12fa64
+  metadata.gz: cb3d82c9e735eae6f1029f473fa1c0fe63890861f13360259b7e6e3b189ba19e76ef1faa013735e6accd4887d69ad732fb6fe2c7b6cc2285e27bb8bc1982c55b
+  data.tar.gz: 0562d37dee60a531f1f23106de50df4f7e1a9e9bfd865ba0345108cbf246e0523dddb2f29763c00d2174adf62b04125a2587388b096148d516345b9bc58c49a4

data/.github/workflows/rake.yml

@@ -5,6 +5,7 @@ name: rake
 on:
   push:
     branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
 
 jobs:

data/.github/workflows/release.yml

@@ -10,8 +10,9 @@ on:
           Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
         required: true
         default: 'skip'
-  push:
-    tags: [ v* ]
+  repository_dispatch:
+    types: [ do-release ]
+
 
 jobs:
   release:

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/
 
 # rspec failure tracking
 .rspec_status

data/.rubocop.yml

@@ -7,6 +7,6 @@ require: rubocop-rails
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 2.7
 Rails:
   Enabled: false

data/Gemfile

@@ -5,3 +5,9 @@ gemspec
 
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
+
+gem "equivalent-xml"
+gem "ruby-jing"
+gem "simplecov"
+gem "vcr"
+gem "webmock"

data/grammars/basicdoc.rng

@@ -522,7 +522,6 @@
       <value>tip</value>
       <value>important</value>
       <value>caution</value>
-      <value>statement</value>
     </choice>
   </define>
   <define name="figure">

data/grammars/biblio.rng

@@ -216,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -232,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -305,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -1316,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/lib/relaton_w3c/data_fetcher.rb

@@ -21,6 +21,7 @@ module RelatonW3c
       dir = File.dirname(File.expand_path(__FILE__))
       @group_names = YAML.load_file(File.join(dir, "workgroups.yaml"))
       @index = DataIndex.create_from_file
+      @index1 = Relaton::Index.find_or_create :W3C, file: "index1.yaml"
     end
 
     #
@@ -60,6 +61,7 @@ module RelatonW3c
         end
       end
       @index.sort!.save
+      @index1.save
     end
 
     #
@@ -218,7 +220,9 @@ module RelatonW3c
       if @files.include?(file)
         warn "File #{file} already exists. Document: #{bib.docnumber}" if warn_duplicate
       else
-        @index.add bib.docnumber, file
+        pubid = PubId.parse bib.docnumber
+        @index.add pubid, file
+        @index1.add_or_update pubid.to_hash, file
         @files << file
         File.write file, c, encoding: "UTF-8"
       end

data/lib/relaton_w3c/data_index.rb

@@ -16,19 +16,21 @@ module RelatonW3c
     #
     # Add document to index or update it if already exists
     #
-    # @param [String] docnumber document number
+    # @param [RelatonW3c::PubId] pubid document number
     # @param [String] file path to document file
     #
-    def add(docnumber, file) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
-      dnparts = self.class.docnumber_to_parts docnumber
+    def add(pubid, file) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength
+      # dnparts = self.class.docnumber_to_parts docnumber
+      # pubid = PubId.parse docnumber
       rec = @index.detect { |i| i[:file] == file }
       if rec
-        rec[:code] = dnparts[:code]
-        dnparts[:stage] ? rec[:stage] = dnparts[:stage] : rec.delete(:stage)
-        dnparts[:type] ? rec[:type] = dnparts[:type] : rec.delete(:type)
-        dnparts[:date] ? rec[:date] = dnparts[:date] : rec.delete(:date)
-        dnparts[:suff] ? rec[:suff] = dnparts[:suff] : rec.delete(:suff)
+        rec[:code] = pubid.code
+        pubid.stage ? rec[:stage] = pubid.stage : rec.delete(:stage)
+        pubid.type ? rec[:type] = pubid.type : rec.delete(:type)
+        pubid.date ? rec[:date] = pubid.date : rec.delete(:date)
+        pubid.suff ? rec[:suff] = pubid.suff : rec.delete(:suff)
       else
+        dnparts = pubid.to_hash
         dnparts[:file] = file
         @index << dnparts
       end
@@ -58,19 +60,19 @@ module RelatonW3c
     #
     # @return [String] document's filename
     #
-    def search(ref) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-      dparts = self.class.docnumber_to_parts(ref)
-      return if dparts[:code].nil?
+    # def search(ref) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    #   pubid = PubId.parse(ref)
+    #   return if pubid.code.nil?
 
-      @index.detect do |parts|
-        parts[:code].match?(/^#{Regexp.escape dparts[:code]}/i) &&
-          (dparts[:stage].nil? || dparts[:stage].casecmp?(parts[:stage])) &&
-          (dparts[:type].nil? || dparts[:type].casecmp?(parts[:type]) ||
-            (parts[:type].nil? && dparts[:type] == "TR")) &&
-          (dparts[:date].nil? || dparts[:date] == parts[:date]) &&
-          (dparts[:suff].nil? || dparts[:suff].casecmp?(parts[:suff]))
-      end&.fetch(:file)
-    end
+    #   @index.detect do |parts|
+    #     parts[:code].match?(/^#{Regexp.escape pubid.code}/i) &&
+    #       (pubid.stage.nil? || pubid.stage.casecmp?(parts[:stage])) &&
+    #       (pubid.type.nil? || pubid.type.casecmp?(parts[:type]) ||
+    #         (parts[:type].nil? && pubid.type == "TR")) &&
+    #       (pubid.date.nil? || pubid.date == parts[:date]) &&
+    #       (pubid.suff.nil? || pubid.suff.casecmp?(parts[:suff]))
+    #   end&.fetch(:file)
+    # end
 
     #
     # Compare index items
@@ -120,13 +122,13 @@ module RelatonW3c
       #
       # @return [RelatonW3c::DataIndex] data index
       #
-      def create_from_repo
-        uri = URI("#{W3cBibliography::SOURCE}index-w3c.zip").open
-        resp = Zip::InputStream.new uri
-        zip = resp.get_next_entry
-        index = RelatonBib.parse_yaml(zip.get_input_stream.read, [Symbol])
-        new index: index
-      end
+      # def create_from_repo
+      #   uri = URI("#{W3cBibliography::SOURCE}index-w3c.zip").open
+      #   resp = Zip::InputStream.new uri
+      #   zip = resp.get_next_entry
+      #   index = RelatonBib.parse_yaml(zip.get_input_stream.read, [Symbol])
+      #   new index: index
+      # end
 
       #
       # Create index from a file
@@ -142,28 +144,6 @@ module RelatonW3c
                 end
         new index_file: index_file, index: index
       end
-
-      #
-      # Parse document number to parts
-      #
-      # @param [String] docnumber document number
-      #
-      # @return [Hash{Symbol=>String}] document parts
-      #
-      def docnumber_to_parts(docnumber) # rubocop:disable Metrics/MethodLength
-        %r{
-          ^(?:(?:(?<stage>WD|CRD|CR|PR|PER|REC|SPSD|OBSL|RET)|(?<type>D?NOTE|TR))-)?
-          (?<code>\w+(?:[+-][\w.]+)*?)
-          (?:-(?<date>\d{8}|\d{6}|\d{4}))?
-          (?:/(?<suff>\w+))?$
-        }xi =~ docnumber
-        entry = { code: code }
-        entry[:stage] = stage if stage
-        entry[:type] = type if type
-        entry[:date] = date if date
-        entry[:suff] = suff if suff
-        entry
-      end
     end
   end
 end

data/lib/relaton_w3c/processor.rb

@@ -50,5 +50,12 @@ module RelatonW3c
     def grammar_hash
       @grammar_hash ||= ::RelatonW3c.grammar_hash
     end
+
+    #
+    # Remove index file
+    #
+    def remove_index_file
+      Relaton::Index.find_or_create(:W3C, url: true, file: "#{W3cBibliography::INDEX}.yaml").remove_file
+    end
   end
 end

data/lib/relaton_w3c/pubid.rb

@@ -0,0 +1,54 @@
+module RelatonW3c
+  class PubId
+    PARTS = %i[code stage type date suff].freeze
+
+    PARTS.each { |part| attr_accessor part }
+
+    def initialize(**parts)
+      PARTS.each { |part| send "#{part}=", parts[part] }
+    end
+
+    #
+    # Parse document identifier.
+    #
+    # @param [String] docnumber document identifier
+    #
+    # @return [RelatonW3c::PubId] document identifier parts
+    #
+    def self.parse(docnumber) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+      %r{
+        (?:^|/)(?:(?:(?<stage>WD|CRD|CR|PR|PER|REC|SPSD|OBSL|RET)|(?<type>D?NOTE|TR))[\s/-])?
+        (?<code>\w+(?:[+-][\w.]+)*?)
+        (?:-(?<date>\d{8}|\d{6}|\d{4}))?
+        (?:/(?<suff>\w+))?(?:$|/)
+      }xi =~ docnumber
+      entry = { code: code }
+      entry[:stage] = stage if stage
+      entry[:type] = type if type && type != "TR"
+      entry[:date] = date if date
+      entry[:suff] = suff if suff
+      new(**entry)
+    end
+
+    #
+    # Compare document identifiers against Hash ID representation.
+    #
+    # @param [Hash] other hash of document identifier parts
+    #
+    # @return [Boolean] true if document identifiers are same
+    #
+    def ==(other) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+      other[:code].casecmp?(code) && other[:stage] == stage && other[:type] == type &&
+        (date.nil? || other[:date] == date) && (suff.nil? || other[:suff]&.casecmp?(suff))
+    end
+
+    #
+    # Convert docidentifier identifier to hash.
+    #
+    # @return [Hash] hash of docidentifier parts
+    #
+    def to_hash
+      PARTS.each_with_object({}) { |part, hash| hash[part] = send part if send part }
+    end
+  end
+end

data/lib/relaton_w3c/version.rb

@@ -1,3 +1,3 @@
 module RelatonW3c
-  VERSION = "1.14.1".freeze
+  VERSION = "1.14.3".freeze
 end

data/lib/relaton_w3c/w3c_bibliography.rb

@@ -6,16 +6,20 @@ module RelatonW3c
   # Class methods for search W3C standards.
   class W3cBibliography
     SOURCE = "https://raw.githubusercontent.com/relaton/relaton-data-w3c/main/"
+    INDEX = "index1"
 
     class << self
       # @param text [String]
       # @return [RelatonW3c::W3cBibliographicItem]
       def search(text) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-        ref = DataParser.parse_identifier text.sub(/^W3C\s/, "")
-        file = DataIndex.create_from_repo.search ref.gsub(" ", "-").squeeze("-")
-        return unless file
+        pubid = PubId.parse text.sub(/^W3C\s/, "")
+        index = Relaton::Index.find_or_create(
+          :W3C, url: "#{SOURCE}#{INDEX}.zip", file: "#{INDEX}.yaml", id_keys: PubId::PARTS
+        )
+        row = index.search { |r| pubid == r[:id] }.first
+        return unless row
 
-        url = "#{SOURCE}#{file}"
+        url = "#{SOURCE}#{row[:file]}"
         resp = Net::HTTP.get_response(URI.parse(url))
         return unless resp.code == "200"
 

data/lib/relaton_w3c.rb

@@ -1,10 +1,12 @@
 require "relaton_bib"
+require "relaton/index"
 require "relaton_w3c/version"
 require "relaton_w3c/w3c_bibliography"
 require "relaton_w3c/w3c_bibliographic_item"
 require "relaton_w3c/xml_parser"
 require "relaton_w3c/bibxml_parser"
 require "relaton_w3c/hash_converter"
+require "relaton_w3c/pubid"
 require "relaton_w3c/data_fetcher"
 require "relaton_w3c/data_index"
 

data/relaton_w3c.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
                        "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-wc3"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.6.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -31,17 +31,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr"
-  spec.add_development_dependency "webmock"
-
   spec.add_dependency "linkeddata", "~> 3.2.0"
   spec.add_dependency "mechanize", "~> 2.8.0"
   spec.add_dependency "rdf", "~> 3.2.0"
   spec.add_dependency "rdf-normalize", "~> 0.5.0"
   spec.add_dependency "relaton-bib", "~> 1.14.0"
+  spec.add_dependency "relaton-index", "~> 0.2.4"
   spec.add_dependency "rubyzip", "~> 2.3.0"
   spec.add_dependency "shex", "~> 0.7.0"
   spec.add_dependency "sparql", "~> 3.2.0"

metadata

@@ -1,85 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-w3c
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.14.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-02-20 00:00:00.000000000 Z
+date: 2023-06-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: equivalent-xml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-- !ruby/object:Gem::Dependency
-  name: ruby-jing
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: vcr
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: linkeddata
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.14.0
+- !ruby/object:Gem::Dependency
+  name: relaton-index
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -225,6 +169,7 @@ files:
 - lib/relaton_w3c/data_parser.rb
 - lib/relaton_w3c/hash_converter.rb
 - lib/relaton_w3c/processor.rb
+- lib/relaton_w3c/pubid.rb
 - lib/relaton_w3c/version.rb
 - lib/relaton_w3c/w3c_bibliographic_item.rb
 - lib/relaton_w3c/w3c_bibliography.rb
@@ -244,14 +189,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: 'RelatonIso: retrieve W3C Standards for bibliographic using the IsoBibliographicItem