metanorma-gb 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 031a1821b8f3b4510e1411068cbbe18ca5e1dc5d69d0072fc87e9dc009aeb796
-  data.tar.gz: 75aabd60d69f737c2ecdfdda8abb1e438d01adf55f259be346793932db80c419
+  metadata.gz: d0904d633c3104d966a17882b682f011810d46dae9b832b47e3fdf05e64f140e
+  data.tar.gz: fcc98b428a33d7c89007486fc49fb23ee9fede9c114ac8c635a04cea894bcc85
 SHA512:
-  metadata.gz: a5e63ce13f2bf2e792336c7ccd16c595b831af86f0750f16d0fdf877ebc7e5889c708bfd22295b99f7b321c0933cf8a51ec67da5e62b3c8ca95c5d01142e81a3
-  data.tar.gz: f44544a34db3b2bc9709c6366e272c8cc0e3b888fe51f741a64f285ff24cd92fe40815ed2341fac5a9e0bcd330b4a641b7797228723fe44ce98fe9eee353a36e
+  metadata.gz: eedc83eeaa4b7e7a0fdf9150812a8332fc5ce4760dd0f124c998d9baaf63ca432d9191129dbf3800683c55fce28bb00ddb0ed8eadcd9576ac30b54e6dac9383d
+  data.tar.gz: 72365bff0d1d9098fbc1ade88faf2ee42c59fed446414ecff347c170c7c78b24891716cb3f9c8d4fb08820e7e3eb380f7d3ab2ff9bd06264328fd2ea4fe32a31

data/.rubocop.yml

@@ -3,13 +3,8 @@
 # All project-specific additions and overrides should be specified in this file.
 
 inherit_from:
-  # Thoughtbot's style guide from: https://github.com/thoughtbot/guides
-  - ".rubocop.tb.yml"
-  # Overrides from Ribose
-  - ".rubocop.ribose.yml"
+  - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  DisplayCopNames: false
-  StyleGuideCopsOnly: false
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.3
 Rails:
   Enabled: true

data/README.adoc

@@ -152,27 +152,6 @@ Any `/Z` or `/T` suffix (indicating "recommended" and "guidelines" mandate) is
 ignored unless the `:mandate:` attribute is not given. Any `Q/` or `T/` prefix for social and enterprise
 standards is ignored unless the `:scope:` attribute is not given.
 
-`:issued-date:`::
-The date on which the GB standard was issued (authorised for publication by the issuing authority).
-
-`:published-date:`::
-The date on which the GB standard was published (distributed by the publisher).
-
-`:implemented-date:`::
-The date on which the GB standard became active.
-
-`:created-date:`::
-The date on which the first version of the GB standard was created.
-
-`:updated-date:`::
-The date on which the current version of the GB standard was updated.
-
-`:obsoleted-date:`::
-The date on which the GB standard was obsoleted/revoked.
-
-`:confirmed-date:`::
-The date on which the GB standard was reviewed and approved by the issuing authority.
-
 `:library-ics:`::
 The ICS (International Categorization for Standards) number for the GB standard. There may be more than one ICS for a document; if so, they should be comma-delimited. (Unlike the case for ISO, the ICS identifier is output to the front page of the GB standard.)
 

data/lib/asciidoctor/gb/biblio.rng

@@ -476,6 +476,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>
@@ -637,6 +640,8 @@
           <value>transmitted</value>
           <value>copied</value>
           <value>unchanged</value>
+          <value>circulated</value>
+          <text/>
         </choice>
       </attribute>
       <choice>
@@ -673,6 +678,11 @@
       <text/>
     </element>
   </define>
+  <define name="docnumber">
+    <element name="docnumber">
+      <text/>
+    </element>
+  </define>
   <define name="bclassification">
     <element name="classification">
       <optional>

data/lib/asciidoctor/gb/converter.rb

@@ -178,7 +178,8 @@ module Asciidoctor
       end
 
       def fetch_ref(xml, code, year, **opts)
-        code = "CN(#{code})" if !/^CN\(/.match(code) && /^#{GBCODE}[^A-Za-z]/.match(code)
+        code = "CN(#{code})" if !/^CN\(/.match(code) &&
+          /^#{GBCODE}[^A-Za-z]/.match(code)
         hit = @bibdb&.fetch(code, year, opts)
         return nil if hit.nil?
         xml.parent.add_child(Asciidoctor::Standoc::Utils::smart_render_xml(hit))
@@ -196,13 +197,16 @@ module Asciidoctor
       end
 
       def docidentifier_cleanup(xmldoc)
-        id = xmldoc.at("//bibdata/docidentifier/project-number") or return
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'gb']") or return
         scope = xmldoc.at("//gbscope")&.text
         prefix = xmldoc.at("//gbprefix")&.text
-        mandate = xmldoc.at("//gbmandate")&.text || "mandatory"
-        idtext = @agencyclass.docidentifier(scope, prefix, mandate,
-                                            nil, id.text) || return
-        id.content = idtext.gsub(/\ /, " ")
+        mand = xmldoc.at("//gbmandate")&.text || "mandatory"
+        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
+        id.content = idtext&.gsub(/\ /, " ")
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'gb-structured']/"\
+                       "project-number") or return
+        idtext = @agencyclass.docidentifier(scope, prefix, mand, nil, id.text)
+        id.content = idtext&.gsub(/\ /, " ")
       end
 
       def committee_cleanup(xmldoc)

data/lib/asciidoctor/gb/front.rb

@@ -97,7 +97,7 @@ module Asciidoctor
 
       def get_scope(node)
         node.attr("scope") and return node.attr("scope")
-        scope = if %r{^[TQ]/}.match? node.attr("prefix")
+        scope = if %r{^[TQ]/}.match node.attr("prefix")
                   m = node.attr("prefix").split(%{/})
                   mandate = m[0] == "T" ? "social-group" :
                     m[0] == "Q" ? "enterprise" : nil
@@ -124,8 +124,8 @@ module Asciidoctor
       def get_mandate(node)
         node.attr("mandate") and return node.attr("mandate")
         p = node.attr("prefix")
-        mandate = %r{/T}.match?(p) ? "recommended" :
-          %r{/Z}.match?(p) ? "guidelines" : nil
+        mandate = %r{/T}.match(p) ? "recommended" :
+          %r{/Z}.match(p) ? "guidelines" : nil
         if mandate.nil?
           mandate = "mandatory"
           warn "GB: no mandate supplied, defaulting to mandatory"
@@ -149,23 +149,6 @@ module Asciidoctor
         end
       end
 
-      def metadata_date1(node, xml, type)
-        date = node.attr("#{type}-date")
-        date and xml.date **{ type: type } do |d|
-          d.on date
-        end
-      end
-
-      DATETYPES = %w{ published accessed created implemented obsoleted
-                      confirmed updated issued 
-      }.freeze
-
-      def metadata_date(node, xml)
-        DATETYPES.each do |t|
-          metadata_date1(node, xml, t)
-        end
-      end
-
       def metadata_gblibraryids(node, xml)
         ccs = node.attr("library-ccs")
         ccs and ccs.split(/, ?/).each do |l|
@@ -189,6 +172,36 @@ module Asciidoctor
         metadata_contributor1(node, xml, "issuer", "issuer")
       end
 
+      def iso_id(node, xml)
+        return unless node.attr("docnumber")
+        part = node.attr("partnumber")
+        dn = add_id_parts(node.attr("docnumber"), part, nil)
+        dn = id_stage_prefix(dn, node)
+        xml.docidentifier dn, **attr_code(type: "gb")
+        xml.docidentifier **attr_code(type: "gb-structured") do |i|
+          i.project_number node.attr("docnumber"),
+            **attr_code(part: part)
+        end
+      end
+
+      def add_id_parts(dn, part, subpart)
+        dn += ".#{part}" if part
+        dn += ".#{subpart}" if subpart
+        dn
+      end
+
+      def id_stage_prefix(dn, node)
+        if node.attr("docstage") && node.attr("docstage").to_i < 60
+          abbr = IsoDoc::Gb::Metadata.new("en", "Latn", {}).
+            stage_abbrev(node.attr("docstage"), node.attr("iteration"),
+                         node.attr("draft"))
+          dn = "/#{abbr} #{dn}" # prefixes added in cleanup
+        else
+          dn += "-#{node.attr("copyright-year")}" if node.attr("copyright-year")
+        end
+        dn
+      end
+
       def metadata(node, xml)
         title node, xml
         metadata_source(node, xml)

data/lib/asciidoctor/gb/gbstandard.rng

@@ -93,6 +93,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -160,6 +163,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/asciidoctor/gb/isodoc.rng

@@ -1034,6 +1034,9 @@
     <zeroOrMore>
       <ref name="docidentifier"/>
     </zeroOrMore>
+    <optional>
+      <ref name="docnumber"/>
+    </optional>
     <zeroOrMore>
       <ref name="bdate"/>
     </zeroOrMore>

data/lib/asciidoctor/gb/isostandard.rng

@@ -84,6 +84,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>
@@ -163,6 +166,9 @@
       <zeroOrMore>
         <ref name="docidentifier"/>
       </zeroOrMore>
+      <optional>
+        <ref name="docnumber"/>
+      </optional>
       <zeroOrMore>
         <ref name="bdate"/>
       </zeroOrMore>

data/lib/asciidoctor/gb/validate.rb

@@ -21,10 +21,10 @@ module Asciidoctor
         scope = root&.at("//gbscope")&.text
         case scope
         when "social-group"
-          /^[A-Za-z]{3,6}$/.match? prefix or
+          /^[A-Za-z]{3,6}$/.match(prefix) or
             warn("#{prefix} is improperly formatted for social standards")
         when "enterprise"
-          /^[A-Z0-9]{3,}$/.match? prefix or
+          /^[A-Z0-9]{3,}$/.match(prefix) or
             warn("#{prefix} is improperly formatted for enterprise standards")
         when "sector"
           %w(AQ BB CB CH CJ CY DA DB DL DZ EJ FZ GA GH GM GY HB HG HJ HS HY
@@ -104,7 +104,7 @@ module Asciidoctor
       def norm_bibitem_style(root)
         root.xpath(NORM_BIBITEMS).each do |b|
           if b.at(Asciidoctor::Standoc::Converter::ISO_PUBLISHER_XPATH).nil?
-            unless /^#{GBCODE}(?![A-Z])/.match? b.at("./docidentifier").text
+            unless /^#{GBCODE}(?![A-Z])/.match(b.at("./docidentifier").text)
               Asciidoctor::Standoc::Utils::warning(b, NORM_ISO_WARN, b.text)
             end
           end

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -121,7 +121,7 @@ module IsoDoc
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
         parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == ","
         parts.map do |p|
-          /\s*\[MODIFICATION\]/.match?(p) ? l10n(", #{@modified_lbl} — ") : p
+          /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} — ") : p
         end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 

data/lib/isodoc/gb/gbwordconvert.rb

@@ -100,32 +100,6 @@ module IsoDoc
         out.parent.add_child(ENDLINE)
       end
 
-      def generate_header(filename, dir)
-        return unless @header
-        template = Liquid::Template.parse(File.read(@header, encoding: "UTF-8"))
-        meta = @meta.get
-        meta[:filename] = filename
-        params = meta.map { |k, v| [k.to_s, v] }.to_h
-        File.open("header.html", "w:utf-8") { |f| f.write(template.render(params)) }
-        FileUtils.cp @common.fileloc(File.join('html', 'blank.png')), "blank.png"
-        @files_to_delete << "blank.png"
-        @files_to_delete << "header.html"
-        "header.html"
-      end
-
-      def header_strip(h)
-        h = h.to_s.gsub(%r{<br/>}, " ").sub(/<\/?h[12][^>]*>/, "")
-        h1 = to_xhtml_fragment(h.dup)
-        h1.traverse do |x|
-          x.replace(" ") if x.name == "span" &&
-            /mso-tab-count/.match?(x["style"])
-          x.remove if x.name == "span" && x["class"] == "MsoCommentReference"
-          x.remove if x.name == "a" && x["epub:type"] == "footnote"
-          x.replace(x.children) if x.name == "a"
-        end
-        from_xhtml(h1)
-      end
-
       def word_cleanup(docxml)
         word_preface(docxml)
         word_annex_cleanup(docxml)

data/lib/isodoc/gb/gbwordrender.rb

@@ -121,7 +121,7 @@ module IsoDoc
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
         parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == ","
         parts.map do |p|
-          /\s*\[MODIFICATION\]/.match?(p) ? l10n(", #{@modified_lbl} — ") : p
+          /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} — ") : p
         end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 

data/lib/isodoc/gb/html/htmlcompliantstyle.scss

@@ -974,7 +974,7 @@ ul, ol {margin-left: 2em;}
   }
 
   ul > li > p:first-child:before {
-    content: "—";
+    content: "\2014";
     display: inline-block;
     width: 1em;
     margin-left: -1.5em;

data/lib/isodoc/gb/html/htmlstyle.scss

@@ -620,7 +620,7 @@ ul li {
   }
 
   ul > li > p:first-child:before {
-    content: "?~@~T";
+    content: "\2014";
     display: inline-block;
     width: 1em;
     margin-left: -1.5em;

data/lib/isodoc/gb/metadata.rb

@@ -126,14 +126,8 @@ module IsoDoc
       end
 
       def docid1(isoxml, _out)
-        dn = docnumber(isoxml)
-        docstatus = get[:stage]
-        if docstatus
-          abbr = stage_abbrev(docstatus.to_s, isoxml.at(ns("//bibdata/status/iteration")),
-                              isoxml.at(ns("//version/draft")))
-          (docstatus.to_i < 60) && dn = abbr + " " + dn
-        end
-        set(:docnumber, dn)
+        dn = isoxml.at(ns("//bibdata/docidentifier[@type = 'gb']"))
+        set(:docnumber, dn&.text)
       end
 
       def docid(isoxml, _out)
@@ -174,7 +168,7 @@ module IsoDoc
         issuer = isoxml&.at(ns("//bibdata/contributor[role/@type = 'issuer']/"\
                                "organization/name"))&.text || "GB"
         @agencies = GbAgencies::Agencies.new(@lang, @labels, issuer)
-        set(:docidentifier, @agencies.docidentifier(nil, nil, nil, docyear, get[:docnumber]))
+        set(:docidentifier, get[:docnumber])
         set(:issuer, issuer)
         set(:standard_class, standard_class(scope, prefix, mandate))
         set(:standard_agency, @agencies.standard_agency(scope, prefix, mandate))

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.0.7"
+    VERSION = "1.0.8"
   end
 end

data/metanorma-gb.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "metanorma-iso", "~> 1.0.1"
   spec.add_dependency "isodoc", "~> 0.9.1"
   spec.add_dependency "twitter_cldr"
-  spec.add_dependency "gb-agencies", "~> 0.0.1"
+  spec.add_dependency "gb-agencies", "~> 0.0.4"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "byebug", "~> 9.1"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-27 00:00:00.000000000 Z
+date: 2018-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement