relaton-ogc 0.7.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 825f9e550edb2f2119b70aaf7e424c02fd1b9695ecf8081e1e0e88a01a106a53
-  data.tar.gz: b50c486112e2f586e18c29f4408899afb753a633c56b33113f6695bf207c9091
+  metadata.gz: f3ddbbd3fbb620c1eb932bd410c25d02349c266a7c3c9b4c02fb00d533577d56
+  data.tar.gz: c9c0bdd631188a83cc6a221fb5d889869cfbfbcedd458f7ec92f9e1ce12a872b
 SHA512:
-  metadata.gz: a515557d33b97d7c77dbb0a9a2a5f49c67db5fcd232fb361d37c8f0da1a57ead3b1e67331d5633c6d9fcb19c253dfbf1262e3acfb3d70751e7d708659851a6f6
-  data.tar.gz: 95f90948d2282ac5d2d98503d27eb308f2594df5c5dcebf72641575d614dd57614f26729f49d27bddd098ea22b21d950e52d505757fee6bfaf89f34fac401d41
+  metadata.gz: 2e0a84f2f9022969682d32bc1387bf089bfec3cb731a038a4897240a63bc56fa0f3e148d1fddd5815b168182d41895b2187b671574ec0c848fb8c9cb1af33e11
+  data.tar.gz: ae4453edd0c6f3cb473796b6c99aff64f38dc06722a02e5e12986fd79f88e945bcc3f9b2b5c2da6514a1e6b691e97d0efe82bb5be9dd6c86f8c385bc621fdb64

data/grammars/basicdoc.rng

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="biblio.rng"/>
   <start>
     <ref name="document"/>
   </start>
-  <include href="biblio.rng" />
   <define name="document">
     <element name="document">
       <optional>
@@ -42,12 +42,6 @@
         <data type="ID"/>
       </attribute>
     </optional>
-    <optional>
-      <attribute name="language"/>
-    </optional>
-    <optional>
-      <attribute name="script"/>
-    </optional>
     <optional>
       <ref name="section-title"/>
     </optional>
@@ -194,14 +188,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <attribute name="inequality">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
       <ref name="stem"/>
       <optional>
         <ref name="dl"/>
@@ -255,9 +241,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
       <optional>
         <attribute name="lang"/>
       </optional>
@@ -302,15 +285,9 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="summary"/>
-      </optional>
       <optional>
         <attribute name="uri">
           <data type="anyURI"/>
@@ -336,9 +313,12 @@
   </define>
   <define name="tname">
     <element name="name">
-      <oneOrMore>
-        <ref name="PureTextElement"/>
-      </oneOrMore>
+      <text/>
+    </element>
+  </define>
+  <define name="tclass">
+    <element name="name">
+      <text/>
     </element>
   </define>
   <define name="thead">
@@ -437,12 +417,6 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <ref name="tname"/>
-      </optional>
       <oneOrMore>
         <choice>
           <ref name="formula"/>
@@ -506,26 +480,18 @@
           <data type="boolean"/>
         </attribute>
       </optional>
-      <optional>
-        <attribute name="subsequence"/>
-      </optional>
-      <optional>
-        <attribute name="class"/>
-      </optional>
       <optional>
         <ref name="source"/>
       </optional>
       <optional>
         <ref name="tname"/>
       </optional>
+      <optional>
+        <ref name="tclass"/>
+      </optional>
       <choice>
         <ref name="image"/>
-        <ref name="video"/>
-        <ref name="audio"/>
         <ref name="pre"/>
-        <oneOrMore>
-          <ref name="paragraph-with-footnote"/>
-        </oneOrMore>
         <zeroOrMore>
           <ref name="figure"/>
         </zeroOrMore>
@@ -812,9 +778,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -823,7 +786,7 @@
     </element>
   </define>
   <define name="video">
-    <element name="video">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -853,9 +816,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>
@@ -867,7 +827,7 @@
     </element>
   </define>
   <define name="audio">
-    <element name="audio">
+    <element name="image">
       <attribute name="id">
         <data type="ID"/>
       </attribute>
@@ -881,9 +841,6 @@
       <optional>
         <attribute name="alt"/>
       </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
       <optional>
         <attribute name="longdesc">
           <data type="anyURI"/>

data/grammars/biblio.rng

@@ -49,11 +49,17 @@
   </define>
   <define name="stage">
     <element name="stage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
   <define name="substage">
     <element name="substage">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -82,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -92,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -115,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -130,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>
@@ -452,9 +478,14 @@
     <attribute name="bibitemid">
       <data type="IDREF"/>
     </attribute>
-    <zeroOrMore>
-      <ref name="locality"/>
-    </zeroOrMore>
+    <choice>
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="localityStack"/>
+      </zeroOrMore>
+    </choice>
     <optional>
       <ref name="date"/>
     </optional>
@@ -469,6 +500,25 @@
       <ref name="BibItemLocality"/>
     </element>
   </define>
+  <define name="localityStack">
+    <element name="localityStack">
+      <zeroOrMore>
+        <ref name="locality"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="sourceLocality">
+    <element name="sourceLocality">
+      <ref name="BibItemLocality"/>
+    </element>
+  </define>
+  <define name="sourceLocalityStack">
+    <element name="sourceLocalityStack">
+      <zeroOrMore>
+        <ref name="sourceLocality"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemLocality">
     <attribute name="type">
       <ref name="LocalityType"/>
@@ -611,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -737,6 +787,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -969,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">
@@ -989,38 +1051,63 @@
   </define>
   <define name="DocRelationType">
     <choice>
-      <value>obsoletes</value>
-      <value>obsoletedBy</value>
-      <value>supersedes</value>
-      <value>supersededBy</value>
-      <value>updates</value>
-      <value>updatedBy</value>
-      <value>complements</value>
-      <value>derivedFrom</value>
-      <value>translatedFrom</value>
-      <value>hasTranslation</value>
-      <value>adoptedFrom</value>
-      <value>equivalent</value>
-      <value>identical</value>
-      <value>nonequivalent</value>
-      <value>includedIn</value>
       <value>includes</value>
-      <value>instance</value>
-      <value>instanceOf</value>
-      <value>partOf</value>
+      <value>includedIn</value>
       <value>hasPart</value>
-      <value>hasDraft</value>
-      <value>draftOf</value>
+      <value>partOf</value>
       <value>merges</value>
+      <value>mergedInto</value>
       <value>splits</value>
-      <value>amends</value>
-      <value>amendedBy</value>
-      <value>corrects</value>
-      <value>correctedBy</value>
-      <value>revises</value>
-      <value>revisedBy</value>
+      <value>splitInto</value>
+      <value>instance</value>
+      <value>hasInstance</value>
+      <value>exemplarOf</value>
+      <value>hasExemplar</value>
+      <value>manifestationOf</value>
+      <value>hasManifestation</value>
+      <value>reproductionOf</value>
+      <value>hasReproduction</value>
+      <value>reprintOf</value>
+      <value>hasReprint</value>
+      <value>expressionOf</value>
+      <value>hasExpression</value>
+      <value>translatedFrom</value>
+      <value>hasTranslation</value>
+      <value>arrangementOf</value>
+      <value>hasArrangement</value>
+      <value>abridgementOf</value>
+      <value>hasAbridgement</value>
+      <value>annotationOf</value>
+      <value>hasAnnotation</value>
+      <value>draftOf</value>
+      <value>hasDraft</value>
+      <value>editionOf</value>
+      <value>hasEdition</value>
+      <value>updates</value>
+      <value>updatedBy</value>
+      <value>derivedFrom</value>
+      <value>derives</value>
       <value>describes</value>
       <value>describedBy</value>
+      <value>catalogues</value>
+      <value>cataloguedBy</value>
+      <value>hasSuccessor</value>
+      <value>successorOf</value>
+      <value>adaptedFrom</value>
+      <value>hasAdaptation</value>
+      <value>adoptedFrom</value>
+      <value>adoptedAs</value>
+      <value>reviewOf</value>
+      <value>hasReview</value>
+      <value>commentaryOf</value>
+      <value>hasCommentary</value>
+      <value>related</value>
+      <value>complements</value>
+      <value>complementOf</value>
+      <value>obsoletes</value>
+      <value>obsoletedBy</value>
+      <value>cited</value>
+      <value>isCitedIn</value>
     </choice>
   </define>
   <define name="docrelation">
@@ -1028,12 +1115,30 @@
       <attribute name="type">
         <ref name="DocRelationType"/>
       </attribute>
+      <optional>
+        <element name="description">
+          <ref name="FormattedString"/>
+        </element>
+      </optional>
       <element name="bibitem">
         <ref name="BibliographicItem"/>
       </element>
-      <zeroOrMore>
-        <ref name="locality"/>
-      </zeroOrMore>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
+      <choice>
+        <zeroOrMore>
+          <ref name="sourceLocality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="sourceLocalityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="version">

data/grammars/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -129,6 +137,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -305,6 +316,21 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
+  <define name="concept">
+    <element name="concept">
+      <optional>
+        <attribute name="term"/>
+      </optional>
+      <choice>
+        <ref name="eref"/>
+        <ref name="xref"/>
+        <ref name="termref"/>
+      </choice>
+    </element>
+  </define>
   <define name="BasicBlock" combine="choice">
     <choice>
       <ref name="requirement"/>
@@ -884,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">
@@ -911,7 +945,10 @@
   </define>
   <define name="origin">
     <element name="origin">
-      <ref name="erefType"/>
+      <choice>
+        <ref name="erefType"/>
+        <ref name="termref"/>
+      </choice>
     </element>
   </define>
   <define name="modification">
@@ -919,6 +956,15 @@
       <ref name="paragraph"/>
     </element>
   </define>
+  <define name="termref">
+    <element name="termref">
+      <attribute name="base"/>
+      <attribute name="target"/>
+      <optional>
+        <text/>
+      </optional>
+    </element>
+  </define>
   <define name="structuredidentifier">
     <element name="structuredidentifier">
       <optional>

data/grammars/ogc.rng

@@ -75,10 +75,6 @@
         <value>profile</value>
         <value>profile-with-extension</value>
         <value>general</value>
-        <value>encoding</value>
-        <value>extension</value>
-        <value>profile</value>
-        <value>profile-with-extension</value>
       </choice>
     </element>
   </define>

data/lib/relaton_ogc/hit_collection.rb

@@ -16,7 +16,11 @@ module RelatonOgc
     def initialize(ref, year = nil)
       super
       @array = from_json(ref).sort_by do |hit|
-        hit.hit["date"] ? Date.parse(hit.hit["date"]) : Date.new
+        begin
+          hit.hit["date"] ? Date.parse(hit.hit["date"]) : Date.new
+        rescue ArgumentError
+          Date.parse "0000-01-01"
+        end
       end.reverse
     end
 
@@ -27,7 +31,9 @@ module RelatonOgc
     #
     # @param docid [String]
     def from_json(docid, **_opts)
-      ref = docid.sub /^OGC\s/, ""
+      ref = docid.sub(/^OGC\s/, "").strip
+      return [] if ref.empty?
+
       data.select do |_k, doc|
         doc["type"] != "CC" && doc["identifier"].include?(ref)
       end.map { |_k, h| Hit.new(h, self) }

data/lib/relaton_ogc/scrapper.rb

@@ -90,7 +90,7 @@ module RelatonOgc
       # @param type [String]
       # @return [String]
       def fetch_type(type)
-        TYPES[type.sub(/^D-/, "")]
+        TYPES[type.sub(/^D-/, "")] || { type: "other" }
       end
 
       # @param stage [String]

data/lib/relaton_ogc/version.rb

@@ -1,3 +1,3 @@
 module RelatonOgc
-  VERSION = "0.7.1".freeze
+  VERSION = "1.1.0".freeze
 end

data/relaton_ogc.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "RelatonOgc: retrieve OGC Standards for bibliographic "\
                        "use using the OgcBibliographicItem model"
-  spec.description   = "RelatonIso: retrieve ISO Standards for bibliographic "\
-                       "use using the IsoBibliographicItem model"
+  spec.description   = "RelatonOgc: retrieve OGC Standards for bibliographic "\
+                       "use using the OgcBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ogc"
   spec.license       = "BSD-2-Clause"
 
@@ -36,5 +36,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "faraday", "~> 1.0.0"
-  spec.add_dependency "relaton-iso-bib", ">= 0.9.1"
+  spec.add_dependency "relaton-iso-bib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-ogc
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-02 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -168,17 +168,17 @@ dependencies:
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
-description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
+        version: 1.1.0
+description: 'RelatonOgc: retrieve OGC Standards for bibliographic use using the OgcBibliographicItem
   model'
 email:
 - open.source@ribose.com