relaton-iev 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53aaa66f833891f4c0a076e87b6cf851c4bd5963aaa6f5f3339ea6cc173343c2
-  data.tar.gz: 7e5a255631d0896e81db01c8a80707682b7c60aef7b4b942e7b31fcabf2fce3e
+  metadata.gz: 306f391fd8e1cfae0e07ce81a1d942b38a33d4d31066ef5f05352a5e71bf7d93
+  data.tar.gz: 97829207f221e0733c4569bfd7d652cadb46772d2629a037e90c229f11fa235a
 SHA512:
-  metadata.gz: fb89a78e27b507e3efff673361b66fe8baa69ecea089f9b1b640f685355a683518b8c06cda1ebe13dae49f27ff4571ec5891579315179978373c5d3129133aee
-  data.tar.gz: 20299b00f1f857f5fa0f63f029b10a491a26df3e238c9cf20b240077ff9312499aac5db95e5359c4e168ed5c1485d259584f3e3c84cbc66cd9fe11459fb707b2
+  metadata.gz: ca6c941e514afa7d7320a3bc8f7105ac1023c714073822e83cd2c0bb7fe8204e6b559bbdc5ac9fdc488e270abbaabedb51893ecd8d5dcc655f8a4207427cf85e
+  data.tar.gz: 63b83ae7da519fe7764f2817b1f85d28ba50466785cea67e587c40c958924f5fcd0517a1639f40f4bfc45edad30631a028dbacd0ffaada935f60e7b78f3f84a3

data/.github/workflows/defaults.yml

@@ -0,0 +1,61 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
+name: defaults
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  test-nix:
+    name: Test on Ruby ${{ matrix.ruby }} *nix
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ macos-latest, ubuntu-latest ]
+        ruby: [ '2.6', '2.5', '2.4' ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@master
+      - name: Use Ruby
+        uses: actions/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          architecture: 'x64'
+      - name: Update gems
+        run: |
+          source doctypes.env
+          gem install metanorma-cli metanorma-$TYPE
+      - name: Use Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '8'
+      - name: Install Puppeteer
+        run: |
+          npm install -g puppeteer
+      - name: Use Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '2.7'
+          architecture: 'x64'
+      - name: Install xml2rfc
+        run: |
+          pip install xml2rfc
+      - name: Metanorma compile
+        run: |
+          source doctypes.env
+          for template in $DOCTYPES
+          do
+            metanorma new test/$template --type $TYPE --doctype $template --template . --overwrite
+            if [ -f test/${template}/document.adoc ]
+            then
+              metanorma compile test/${template}/document.adoc
+            else
+              for docfile in test/${template}/*.adoc
+              do
+                metanorma compile $docfile
+              done
+            fi
+          done

data/.github/workflows/windows.yml

@@ -1,14 +1,19 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: windows
 
-on: [push]
+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:
@@ -21,10 +26,38 @@ jobs:
       - name: Update gems
         shell: pwsh
         run: |
-          gem install bundler -v "~> 2"
-          bundle config --local path vendor/bundle
-          bundle update
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
+          $docTypes = ConvertFrom-StringData (Get-Content ./doctypes.env -Raw)
+          gem install metanorma-cli metanorma-$($docTypes.TYPE)
+      - name: Use Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: '8'
+      - name: Install Puppeteer
+        shell: pwsh
+        run: |
+          npm install -g puppeteer
+      - name: Use Python
+        uses: actions/setup-python@v1
+        with:
+          python-version: '2.7'
+          architecture: 'x64'
+      - name: Install xml2rfc
+        run: |
+          pip install xml2rfc
+      - name: Metanorma compile
+        shell: pwsh
         run: |
-          bundle exec rake
+          $ErrorActionPreference = "Stop" <# https://stackoverflow.com/a/16334189/902217 #>
+          $docTypes = ConvertFrom-StringData (Get-Content ./doctypes.env -Raw)
+          $docTypes.DOCTYPES.Split(" ") | % {
+            $t = $_.Trim('"')
+            & cmd /c "metanorma new result\$t --type $($docTypes.TYPE) --doctype $t --template . --overwrite 2>&1"
+            $doc = "result\$t\document.adoc"
+            if (Test-Path -Path $doc) {
+              & cmd /c "metanorma compile $doc 2>&1"
+            } else {
+              Get-ChildItem ".\result\$t" -Filter *.adoc | % {
+                & cmd /c "metanorma compile $_.FullName 2>&1"
+              }
+            }
+          }

data/bin/rspec

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+  
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "pathname"
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path(
+  "../../Gemfile", Pathname.new(__FILE__).realpath
+)
+
+require "rubygems"
+require "bundler/setup"
+
+load Gem.bin_path("rspec-core", "rspec")
+

data/lib/relaton_iev.rb

@@ -37,8 +37,8 @@ module RelatonIev
         new_iev = ""
         parts.sort.each do |p|
           hit = bibdb&.fetch("IEC 60050-#{p}", nil, keep_year: true) || next
-          new_iev += hit.to_xml.sub(/ id="[^"]+"/, %{ id="IEC60050-#{p}"})
           date = hit.date[0].on.year
+          new_iev += refsIev2iec60050part1(xmldoc, p, hit)
           xmldoc.xpath("//*[@citeas = 'IEC 60050-#{p}:2011']").each do |x|
             x["citeas"] = x["citeas"].sub(/:2011$/, ":#{date}")
           end
@@ -46,6 +46,19 @@ module RelatonIev
         iev.replace(new_iev)
       end
 
+      def refsIev2iec60050part1(xmldoc, p, hit)
+        date = hit.date[0].on.year
+        return "" if already_contains_ref(xmldoc, p, date)
+        id = xmldoc.at("//bibitem[@id = 'IEC60050-#{p}']") ? "-1" : ""
+        hit.to_xml.sub(/ id="[^"]+"/, %{ id="IEC60050-#{p}#{id}"})
+      end
+
+      def already_contains_ref(xmldoc, p, date)
+        xmldoc.at("//bibliography//bibitem[not(ancestor::bibitem)]/"\
+                  "docidentifier[@type = 'IEC']"\
+                  "[text() = 'IEC 60050-#{p}:#{date}']")
+      end
+
       # @param xmldoc [Nokogiri::XML::Document]
       # @param bibdb [Relaton::Db, NilClass]
       # @return [Nokogiri::XML::Element]

data/lib/relaton_iev/version.rb

@@ -1,3 +1,3 @@
 module RelatonIev
-  VERSION = "0.1.3".freeze
+  VERSION = "0.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iev
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-12 00:00:00.000000000 Z
+date: 2020-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -157,6 +157,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/defaults.yml"
 - ".github/workflows/macos.yml"
 - ".github/workflows/ubuntu.yml"
 - ".github/workflows/windows.yml"
@@ -168,6 +169,7 @@ files:
 - README.adoc
 - Rakefile
 - bin/console
+- bin/rspec
 - bin/setup
 - lib/relaton_iev.rb
 - lib/relaton_iev/version.rb