relaton-3gpp 1.10.3 → 1.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4fc1fe8ed6132c21542b695f8ecc4314a0d236bf44fcf5346610bff746e169d
-  data.tar.gz: cd5620e1236273ec5b01a27620349ee1bc0b045c88a95ff648f0347bf6e5c201
+  metadata.gz: efd99624ed1dd3f25d4add9ee68720bfe1ea3d3f11fb801615e7a9ef112581dc
+  data.tar.gz: 11c82eb476e8b1797f792fd756605ce4bd786e6ed99e11322edf52ad96017b36
 SHA512:
-  metadata.gz: a9671182e73731e62ba771fd2f39f6a7886029ff1c5f637bdfb441835e657d06aebdff787449cd6ecf6e7e0da1870240bbe5971b296e1e5a3908c2f185ea30c3
-  data.tar.gz: c8fa940b8e1875d4f597b5f0bc836c044fe1a149f965c0ddefa866ede022fcd957cdd50784b7f6ba370a1e8e8c6a6f6df80e23629adef31352d3f9cf09dc4101
+  metadata.gz: 0b2bb54e7074e9448354584f03391e0d7182c51f39fc4fffb7779712d4c062abef226eedf6a19809578ec42ee6e215b45c4acb9908dc901f5a44a6bde56536e1
+  data.tar.gz: 0a4ca6d78d6c222294330ec3e1e3d6b24d2b8ca99516e8940fae604484e0d5bfd69bf77caa751280dd79c6148e22a73d14b81f28e8743adc10543573a3b4b286

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

@@ -64,6 +64,7 @@ module Relaton3gpp
         # internal: @spec[:"For publication"] == "0",
         release: parse_release,
         contributor: parse_contributor,
+        place: ["Sophia Antipolis Cedex, France"],
       )
     end
 
@@ -133,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
 
     #
@@ -240,8 +243,12 @@ module Relaton3gpp
     # @return [Array<RelatonBib::ContributionInfo>] contributor
     #
     def parse_contributor # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      address = RelatonBib::Address.new(
+        street: ["c/o ETSI 650, route des Lucioles", "3GPP Mobile Competence Centre"],
+        postcode: "06921", city: "Sophia Antipolis Cedex", country: "France"
+      )
       org = RelatonBib::Organization.new(
-        name: "3rd Generation Partnership Project", abbreviation: "3GPP",
+        name: "3rd Generation Partnership Project", abbreviation: "3GPP", contact: [address],
       )
       contribs = [RelatonBib::ContributionInfo.new(entity: org, role: [type: "author"])]
       return contribs unless @tstatus && @tstatus[:rapporteur]

data/lib/relaton_3gpp/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Relaton3gpp
-  VERSION = "1.10.3"
+  VERSION = "1.11.0"
 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.3
+  version: 1.11.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-11 00:00:00.000000000 Z
+date: 2022-04-10 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