relaton-ecma 1.7.pre2 → 1.10.0

data/grammars/reqt.rng

@@ -30,9 +30,22 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
@@ -40,17 +53,31 @@
       <attribute name="filename"/>
     </optional>
     <optional>
-      <ref name="reqtitle"/>
+      <attribute name="model"/>
     </optional>
     <optional>
-      <ref name="label"/>
+      <attribute name="type"/>
     </optional>
     <optional>
-      <ref name="subject"/>
+      <attribute name="tag"/>
     </optional>
     <optional>
-      <ref name="reqinherit"/>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
     </optional>
+    <optional>
+      <ref name="reqtitle"/>
+    </optional>
+    <optional>
+      <ref name="label"/>
+    </optional>
+    <zeroOrMore>
+      <ref name="subject"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="reqinherit"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -61,6 +88,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -81,17 +109,23 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -119,6 +153,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -135,6 +175,24 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_ecma/processor.rb

@@ -26,8 +26,7 @@ module RelatonEcma
     # @param hash [Hash]
     # @return [RelatonBib::BibliographicItem]
     def hash_to_bib(hash)
-      item_hash = ::RelatonBib::HashConverter.hash_to_bib(hash)
-      ::RelatonBib::BibliographicItem.new item_hash
+      ::RelatonBib::BibliographicItem.new hash
     end
 
     # Returns hash of XML grammar

data/lib/relaton_ecma/scrapper.rb

@@ -1,15 +1,13 @@
 module RelatonEcma
   module Scrapper
-    ENDPOINT = "https://www.ecma-international.org/publications/standards/".freeze
+    ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-ecma/master/data/".freeze
 
     class << self
       # @param code [String]
       # @return [RelatonBib::BibliographicItem]
-      def scrape_page(code) # rubocop:disable Metrics/AbcSize
-        num = /\d+$/.match(code).to_s.rjust 3, "0"
-        url = ENDPOINT + code.capitalize.sub(/\d+$/, num) + ".htm"
-        doc = Nokogiri::HTML OpenURI.open_uri url
-        parse_page doc, code, url
+      def scrape_page(code)
+        url = "#{ENDPOINT}#{code.gsub(/[\/\s]/, '_').upcase}.yaml"
+        parse_page url
       rescue OpenURI::HTTPError => e
         return if e.io.status.first == "404"
 
@@ -18,81 +16,11 @@ module RelatonEcma
 
       private
 
-      # @param doc [Nokogiri::HTML::Document]
-      # @param code [String]
       # @param url [String]
       # @retrurn [RelatonBib::BibliographicItem]
-      def parse_page(doc, code, url)
-        RelatonBib::BibliographicItem.new(
-          type: "standard", docid: fetch_docid(code), language: ["en"], script: ["Latn"],
-          link: fetch_link(doc, url), title: fetch_title(doc), abstract: fetch_abstract(doc),
-          date: fetch_date(doc), relation: fetch_relation(doc), place: ["Geneva"],
-          edition: fetch_edition(doc), doctype: "document"
-        )
-      end
-
-      # @param code [String]
-      # @return [Array<RelatonBib::DocumentIdentifier>]
-      def fetch_docid(code)
-        [RelatonBib::DocumentIdentifier.new(type: "ECMA", id: code)]
-      end
-
-      # @param doc [Nokogiri::HTM::Document]
-      # @param url [String]
-      # @return [Array<RelatonBib::TypedUri>]
-      def fetch_link(doc, url)
-        link = [RelatonBib::TypedUri.new(type: "src", content: url)]
-        ref = doc.at('//div[@class="ecma-item-content-wrapper"]/span/a')
-        link << RelatonBib::TypedUri.new(type: "doi", content: ref[:href]) if ref
-        link
-      end
-
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<Hash>]
-      def fetch_title(doc)
-        doc.xpath('//p[@class="ecma-item-short-description"]').map do |t|
-          { content: t.text.strip, language: "en", script: "Latn" }
-        end
-      end
-
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<RelatonBib::FormattedString>]
-      def fetch_abstract(doc)
-        a = doc.xpath('//div[@class="ecma-item-content"]/p').map do |a|
-          a.text.strip.squeeze(" ").gsub /\r\n/, ""
-        end.join "\n"
-        return [] if a.empty?
-
-        [RelatonBib::FormattedString.new(content: a, language: "en", script: "Latn")]
-      end
-
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<RelatonBib::BibliographicDate>]
-      def fetch_date(doc)
-        doc.xpath('//p[@class="ecma-item-edition"]').map do |d|
-          date = d.text.split(", ").last
-          RelatonBib::BibliographicDate.new type: "published", on: date
-        end
-      end
-
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [String]
-      def fetch_edition(doc)
-        doc.at('//p[@class="ecma-item-edition"]')&.text&.match(/^\d+(?=th)/)&.to_s
-      end
-
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<Hash>]
-      def fetch_relation(doc) # rubocop:disable Metrics/AbcSize
-        doc.xpath("//ul[@class='ecma-item-archives']/li").map do |rel|
-          ref, ed, on = rel.at("span").text.split ", "
-          fref = RelatonBib::FormattedRef.new content: ref, language: "en", script: "Latn"
-          date = []
-          date << RelatonBib::BibliographicDate.new(type: "published", on: on) if on
-          link = rel.xpath("span/a").map { |l| RelatonBib::TypedUri.new type: "doi", content: l[:href] }
-          bibitem = RelatonBib::BibliographicItem.new formattedref: fref, edition: ed.match(/^\d+/).to_s, link: link
-          { type: "updates", bibitem: bibitem }
-        end
+      def parse_page(url)
+        doc = OpenURI.open_uri url
+        RelatonBib::BibliographicItem.from_hash YAML.safe_load(doc)
       end
     end
   end

data/lib/relaton_ecma/version.rb

@@ -1,3 +1,3 @@
 module RelatonEcma
-  VERSION = "1.7.pre2".freeze
+  VERSION = "1.10.0".freeze
 end

data/lib/relaton_ecma.rb

@@ -1,5 +1,6 @@
 require "nokogiri"
 require "open-uri"
+require "yaml"
 require "relaton_bib"
 require "relaton_ecma/version"
 require "relaton_ecma/scrapper"

data/relaton_ecma.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   DESCRIPTION
   spec.homepage      = "https://github.com/metanorma/relaton-ecma"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
 
@@ -27,15 +27,15 @@ Gem::Specification.new do |spec| # rubocop:disable Metrics/BlockLength
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "debase"
+  # spec.add_development_dependency "debase"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "ruby-debug-ide"
+  # spec.add_development_dependency "ruby-debug-ide"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.7.0"
+  spec.add_dependency "relaton-bib", "~> 1.10.0"
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ecma
 version: !ruby/object:Gem::Version
-  version: 1.7.pre2
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: debase
-  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: equivalent-xml
   requirement: !ruby/object:Gem::Requirement
@@ -66,20 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-debug-ide
-  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: ruby-jing
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
 description: "RelatonEcma: retrieve ECMA Standards for bibliographic use \nusing the
   BibliographicItem model.\n"
 email:
@@ -158,9 +130,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
@@ -168,7 +138,6 @@ files:
 - LICENSE.txt
 - README.adoc
 - Rakefile
-- bin/console
 - bin/rspec
 - bin/setup
 - grammars/basicdoc.rng
@@ -194,14 +163,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIetf: retrieve ECMA Standards for bibliographic use using the BibliographicItem

data/.github/workflows/macos.yml

@@ -1,34 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
-          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,33 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          unset JAVA_TOOL_OPTIONS
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,35 +0,0 @@
-# Auto-generated by Cimas: Do not edit it manually!
-# See https://github.com/metanorma/cimas
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ '**' ]
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          architecture: 'x64'
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle update
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "relaton_ecma"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start(__FILE__)