relaton-iso-bib 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e5643471617a1871a10b52251f403444b783fcc4c3ccea5bb002d101dd1193d8
-  data.tar.gz: d8729ecaf1bee4908050c1ce8c220185c86bdcbecfd2e71a2580751394f4823e
+  metadata.gz: dcb10aff8412c86a24ebdc56ad3236dbb6539479d33c5ce5a974c0f331c6614f
+  data.tar.gz: 667381a5e8ab39c940dd06b5e671707e5b7fc20755ba98a2ce5b4558e230d436
 SHA512:
-  metadata.gz: '088b4e7edb2ea24090e2bd53b751ee7a2505e7670b490ab45f9edabbf185f6eaa4208e8b1cfb59adc9065f8e979bf92a7df9ff63c3157f0387a4f1a12155bc8f'
-  data.tar.gz: bdb6797ab989763eefaafb6d84b3c4d6f88fc93c3f0010aa044287fe23b2a5b6f867ae284c71e4c9913b164af5d1e25c46d1f3adb441a3f99af48318a68c7b01
+  metadata.gz: 472a1a8703fd5b9c0bfc464da7f1b1565c28986ad1ca76662ebe5ffe46f47aaca75d28f015a0be5a2e1d5c0e80af8146c666108a86bab62e8679c06e32d191be
+  data.tar.gz: 93fb843644985615a1e9c1fcf466eae8e799e437a039f71c3f381575171e97d2a480ef98da14c43c3b2891d9d8f581179f807fd92befc8bcfe2972b332bbfc78

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - 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: |

data/grammars/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">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/grammars/isostandard.rng

@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -126,24 +126,15 @@ module RelatonIsoBib
       check_doctype args[:doctype]
 
       super_args = args.select do |k|
-        %i[id docnumber language script docstatus date abstract contributor
-           edition version relation biblionote series medium place copyright
-           link fetched docid formattedref extent accesslocation classification
-           validity doctype keyword].include? k
+        %i[id title docnumber language script docstatus date abstract
+           contributor edition version relation biblionote series medium place
+           copyright link fetched docid formattedref extent accesslocation
+           classification validity doctype keyword].include? k
       end
       super super_args
 
       @type = args[:type] || "standard"
 
-      @title = args.fetch(:title, []).map do |t|
-        if t.is_a? Hash
-          # a + typed_titles(t)
-          RelatonBib::TypedTitleString.new t
-        else
-          t
-        end
-      end
-
       if args[:editorialgroup]
         @editorialgroup = if args[:editorialgroup].is_a?(Hash)
                             EditorialGroup.new(args[:editorialgroup])
@@ -158,9 +149,13 @@ module RelatonIsoBib
       @id_attribute = true
     end
 
-    # @return [String]
-    def to_xml(builder = nil, **opts)
-      super builder, **opts do |b|
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts)
+      super **opts do |b|
         if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
           editorialgroup || ics.any? || structuredidentifier || stagename ||
           block_given?)

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.4.0".freeze
+  VERSION = "1.7.0".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -41,22 +41,10 @@ module RelatonIsoBib
         )
       end
 
-      # Override RelatonBib::XMLParser.ttitle method.
-      # @param title [Nokogiri::XML::Element]
-      # @return [RelatonBib::TypedTitleString]
-      def ttitle(title)
-        return unless title
-
-        RelatonBib::TypedTitleString.new(
-          type: title[:type], content: title.text, language: title[:language],
-          script: title[:script], format: title[:format]
-        )
-      end
-
       # @TODO Organization doesn't recreated
       # @param ext [Nokogiri::XML::Element]
       # @return [RelatonIsoBib::EditorialGroup]
-      def fetch_editorialgroup(ext) # rubocop:disable Metrics/CyclomaticComplexity
+      def fetch_editorialgroup(ext) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/AbcSize,Metrics/PerceivedComplexity
         eg = ext&.at("./editorialgroup")
         return unless eg
 

data/relaton_iso_bib.gemspec

@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.4.0"
+  spec.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com