relaton-3gpp 1.10.4 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 141136c7526afc99951c96b2b7f393d18c4e7a597e967657b7f5dabfc9c54450
-  data.tar.gz: 5d7977198895cec13a7b6205712f42e16f6e407b13a2ca30de6e3dafe8917f54
+  metadata.gz: e7475b654d91e5fb573c5d37f71b10fb5ae54b426b4d2899a2a20b8973e9a3d5
+  data.tar.gz: cb65139f2f08e3c95db99ab13593ce545e6c579e0f8bfe14377ccc65f153af3b
 SHA512:
-  metadata.gz: 1f02c6ab9a9b0237935db773876c16d86d4cf47be05f8d1b7c016067d6588e2e5f8db6e747f1c3c1f1e7461f32b0098befd9d297ed154b488fe719517369ac1c
-  data.tar.gz: 89404e6346bfcdedfde1485b799fe392c0dc793fda39e0e104a81246e43fea6f5ddce5a243e3fa368366ccd4bc21f3b55df91a07c72540ed84775a28d4c874ab
+  metadata.gz: da4ea63ea3f33ba232f8e36123454cf78ae2b19067c3fbb794d1af4c0dc2c3cb7165456c3c82ec3e20fcb08b8ed55c9d40572654a76e157c9aa337fa0b7d8c0b
+  data.tar.gz: 4c89b36586680f499e4305b7e23600e50fa2a3f2e14f6b932d8fce7fcd4472a2f25f7a98dca3df47382eff5b03c84e3f9a00ff8811b36d9a40bbdda6193fe7e1

data/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </define>
+    <define name="localityStack">
+      <element name="localityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="sourceLocalityStack">
+      <element name="sourceLocalityStack">
+        <optional>
+          <attribute name="connective">
+            <choice>
+              <value>and</value>
+              <value>or</value>
+              <value>from</value>
+              <value>to</value>
+              <value/>
+            </choice>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_3gpp/hash_converter.rb

@@ -12,7 +12,7 @@ module Relaton3gpp
       end
 
       # @param item_hash [Hash]
-      # @return [RelatonBib::BibliographicItem]
+      # @return [Relaton3gpp::BibliographicItem]
       def bib_item(item_hash)
         BibliographicItem.new(**item_hash)
       end

data/lib/relaton_3gpp/parser.rb

@@ -134,16 +134,18 @@ module Relaton3gpp
     # @return [Array<RelatonBib::BibliographicDate>] date
     #
     def parse_date
-      d = []
-      if @row[:completed]
-        cd = Date.parse(@row[:completed]).to_s
-        d << RelatonBib::BibliographicDate.new(type: "created", on: cd)
+      dates = { completed: "created", ACHIEVED_DATE: "published" }.each_with_object([]) do |(k, t), d|
+      # if @row[:completed]
+        next unless @row[k]
+
+        cd = Date.parse(@row[k]).to_s
+        d << RelatonBib::BibliographicDate.new(type: t, on: cd)
       end
       if @spec[:"title verified"]
         td = Date.parse(@spec[:"title verified"]).to_s
-        d << RelatonBib::BibliographicDate.new(type: "confirmed", on: td)
+        dates << RelatonBib::BibliographicDate.new(type: "confirmed", on: td)
       end
-      d
+      dates
     end
 
     #
@@ -248,7 +250,8 @@ module Relaton3gpp
       org = RelatonBib::Organization.new(
         name: "3rd Generation Partnership Project", abbreviation: "3GPP", contact: [address],
       )
-      contribs = [RelatonBib::ContributionInfo.new(entity: org, role: [type: "author"])]
+      roles = [{ type: "author" }, { type: "publisher" }]
+      contribs = [RelatonBib::ContributionInfo.new(entity: org, role: roles)]
       return contribs unless @tstatus && @tstatus[:rapporteur]
 
       aff = []

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.10.4"
+  VERSION = "1.11.1"
 end

data/relaton_3gpp.gemspec

@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "mdb", "~> 0.5.0"
   spec.add_dependency "net-ftp", "~> 0.1.0"
-  spec.add_dependency "relaton-bib", "~> 1.10.1"
+  spec.add_dependency "relaton-bib", "~> 1.11.0"
   spec.add_dependency "rubyzip", "~> 2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-3gpp
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement