metanorma-generic 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d02192d5be665b9aa551746323610fe9b988beebecdb2958b8c5e82db73b5af
-  data.tar.gz: 040ed75b73480fd867037665e2b6d7265b514231c4c9db9e875e6726f98087eb
+  metadata.gz: c325e9aa02cddaf26372e0199b21c55338e5abff1b8a1e8a25007567fb03b799
+  data.tar.gz: b6fc284631a359dc78e4f83744d1fbda26211b1692d74417b5a45af254b0266b
 SHA512:
-  metadata.gz: 46ecf1b3a72fa9b298c2d775b330c81604fea4224f2794422f5df8a6ca89a7ff2d7b8564eac7b2626af9f94d88d9755d55e533dc27913428ea4d73c00c6e452d
-  data.tar.gz: 1c652868d71eab1fb629726b5c3c8b2910e02d89f9ac41e532b9d3e907ac3305030105367ecf4c0dca1a06d38a953c5151cb2a938d244e6dd8c9ac14649f901d
+  metadata.gz: a0496b1c8cb2ef30e8265d08eaf4c0206f110a6687f6e2acc7d9e172e2e1975e266f9740ac628fa492d5b151ecad4a171653f9cc8704625e76359676231b6364
+  data.tar.gz: 3a4fd80dfd4fd4540950837182bf860676d4ea15f6a09cc207f64ab2025c2a54b0fa9aa84ba324585f6dcee41632ff38117b00a1dc8594c6d215e8b6779cc0e8

data/.github/workflows/rake.yml

@@ -4,7 +4,8 @@ name: rake
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main  ]
+    tags: [ v* ]
   pull_request:
 
 jobs:
@@ -31,14 +32,32 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
-      - name: Use Ruby
-        uses: ruby/setup-ruby@v1
+      - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
 
-      - name: Update gems
-        run: bundle install --jobs 4 --retry 3
+      - uses: actions/cache@v1
+        with:
+          path: vendor/bundle
+          key: bundle-${{ matrix.os }}-${{ matrix.ruby }}-${{ hashFiles('**/*.gemspec') }}
+          restore-keys: bundle-${{ matrix.os }}-${{ matrix.ruby }}
+
+      - run: bundle config set path 'vendor/bundle'
+
+      - run: bundle install --jobs 4 --retry 3
 
-      - name: Run specs
-        run: bundle exec rake
+      - run: bundle exec rake
+
+  notify:
+    name: Trigger notify workflow
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - name: Trigger notify workflow
+        uses: Sibz/github-status-action@v1
+        with:
+          authToken: ${{ secrets.GITHUB_TOKEN }}
+          context: 'tests-passed-successfully'
+          description: 'Tests passed successfully'
+          state: 'success'
+          sha: ${{ github.event.pull_request.head.sha || github.sha }}

data/README.adoc

@@ -3,9 +3,7 @@
 Formerly known as metanorma-acme
 
 image:https://img.shields.io/gem/v/metanorma-generic.svg["Gem Version", link="https://rubygems.org/gems/metanorma-generic"]
-image:https://github.com/metanorma/metanorma-generic/workflows/macos/badge.svg["Build Status (macOS)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=macos"]
-image:https://github.com/metanorma/metanorma-generic/workflows/ubuntu/badge.svg["Build Status (ubuntu)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=ubuntu"]
-image:https://github.com/metanorma/metanorma-generic/workflows/windows/badge.svg["Build Status (Windows)", link="https://github.com/metanorma/metanorma-generic/actions?workflow=windows"]
+image:https://github.com/metanorma/metanorma-generic/workflows/rake/badge.svg["Build Status", link="https://github.com/metanorma/metanorma-generic/actions?workflow=rake"]
 image:https://codeclimate.com/github/metanorma/metanorma-acme/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/metanorma/metanorma-acme"]
 image:https://img.shields.io/github/issues-pr-raw/metanorma/metanorma-generic.svg["Pull Requests", link="https://github.com/metanorma/metanorma-generic/pulls"]
 image:https://img.shields.io/github/commits-since/metanorma/metanorma-generic/latest.svg["Commits since latest",link="https://github.com/metanorma/metanorma-generic/releases"]

data/lib/asciidoctor/generic/converter.rb

@@ -35,10 +35,11 @@ module Asciidoctor
 
       def doctype(node)
         d = super
-        configuration.doctypes or return d == "article" ? "standard" : d
+        configuration.doctypes or return d == "article" ? 
+          (configuration.default_doctype || "standard") : d
         type = configuration.default_doctype ||
-          Array(configuration.doctypes).dig(0) || "standard"
-        unless Array(configuration.doctypes).include? d
+          configuration.doctypes.keys.dig(0) || "standard"
+        unless configuration.doctypes.keys.include? d
           @log.add("Document Attributes", nil,
                    "#{d} is not a legal document type: reverting to '#{type}'")
           d = type

data/lib/asciidoctor/generic/front.rb

@@ -63,6 +63,11 @@ module Asciidoctor
         end
       end
 
+      def metadata_doctype(node, xml)
+        d = doctype(node)
+        xml.doctype d, attr_code(abbreviation: configuration&.doctypes&.dig(d))
+      end
+
       EXT_STRUCT = %w(_output _attribute _list).freeze
 
       def metadata_ext_hash(node, ext, hash)

data/lib/asciidoctor/generic/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/isodoc/generic/base_convert.rb

@@ -4,14 +4,6 @@ require "fileutils"
 module IsoDoc
   module Generic
     module BaseConvert
-=begin
-      def baselocation(loc)
-        return nil if loc.nil?
-        File.expand_path(File.join(
-          File.dirname(self.class::_file || __FILE__), "..", "..", "..", loc))
-      end
-=end
-
       def cleanup(docxml)
         super
         term_cleanup(docxml)

data/lib/isodoc/generic/html_convert.rb

@@ -33,7 +33,7 @@ module IsoDoc
             configuration.html_headerfont || '"Overpass",sans-serif'
           ),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def default_file_locations(_options)
@@ -48,7 +48,7 @@ module IsoDoc
           html_doc_path("scripts.html"),
           i18nyaml: (configuration.i18nyaml.is_a?(String) ? 
                      baselocation(configuration.i18nyaml) : nil)
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
 =begin

data/lib/isodoc/generic/metadata.rb

@@ -63,6 +63,13 @@ module IsoDoc
         !(Array(stages).map { |m| m.downcase }.include? status.downcase)
       end
 
+      def doctype(isoxml, _out)
+        super
+        b = isoxml&.at(ns("//bibdata/ext/doctype#{currlang}")) || 
+          isoxml&.at(ns("//bibdata/ext/doctype#{NOLANG}")) || return
+        a = b["abbreviation"] and set(:doctype_abbr, a)
+      end
+
       def xmlhash2hash(h)
         ret = {}
         return ret if h.nil? || h[:kind] != "element"

data/lib/isodoc/generic/pdf_convert.rb

@@ -27,7 +27,7 @@ module IsoDoc
           headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' :
                        configuration.html_headerfont || '"Overpass",sans-serif'),
           monospacefont: configuration.html_monospacefont || '"Space Mono",monospace'
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def default_file_locations(_options)
@@ -40,7 +40,7 @@ module IsoDoc
             html_doc_path("html_generic_intro.html"),
           scripts_pdf: baselocation(configuration.scripts_pdf) ||
             html_doc_path("scripts.pdf.html")
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
       def googlefonts

data/lib/isodoc/generic/utils.rb

@@ -9,8 +9,9 @@ module IsoDoc
         File.join(File.dirname(__FILE__), loc)
       end
 
-       def baselocation(loc)
+      def baselocation(loc)
         return nil if loc.nil?
+        return "" if loc.empty?
         f = defined?(self.class::_file) ? (self.class::_file || __FILE__) :
           __FILE__
         File.expand_path(File.join(

data/lib/isodoc/generic/word_convert.rb

@@ -32,7 +32,7 @@ module IsoDoc
             configuration.word_headerfont ||  '"Arial",sans-serif'
           ),
           monospacefont:  configuration.word_monospacefont ||  '"Courier New",monospace'
-        }
+        }.transform_values { |v| v&.empty? ? nil : v  }
       end
 
       def default_file_locations(options)
@@ -51,15 +51,9 @@ module IsoDoc
                      baselocation(configuration.i18nyaml) : nil),
         ulstyle: "l3",
         olstyle: "l2",
-        }
+        }.transform_values { |v| v&.empty? ? nil : v }
       end
 
-=begin
-      def configuration
-        Metanorma::Generic.configuration
-      end
-=end
-
       include BaseConvert
       include Init
     end

data/lib/metanorma/generic.rb

@@ -85,6 +85,10 @@ module Metanorma
 
       def set_default_values_from_yaml_file(config_file)
         default_config_options = YAML.load(File.read(config_file))
+        if default_config_options["doctypes"]&.is_a? Array
+          default_config_options["doctypes"] = default_config_options["doctypes"].
+            each_with_object({}) { |k, m| m[k] = nil }
+        end
         CONFIG_ATTRS.each do |attr_name|
           instance_variable_set("@#{attr_name}", default_config_options[attr_name.to_s])
         end

data/lib/metanorma/generic/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Generic
-    VERSION = "1.7.2"
+    VERSION = "1.7.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-generic
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-25 00:00:00.000000000 Z
+date: 2020-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities