relaton-omg 0.3.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 588d16f496e4d1df988613e6cd302e20e6f3aa3b48f7d6d5d46e8c6191cf752b
-  data.tar.gz: 69466695ba98cba4faae19800287f695c39675fc76f7e8b30ad3d99a653661e5
+  metadata.gz: ccf81741270b79ea6fd9fd1b9c043a36d1ea78d91f2779a2d4404bd7d20373c3
+  data.tar.gz: 5772e9a5b0b6a689e67f42a765b7eae4bf7b34f0560a66378cbc33d7cff52631
 SHA512:
-  metadata.gz: cf13c12e4042b31c582e9866384aa1fb362a8cb81a534c2d85da811e080ba46e37a2e62dce30f7094478fa58b6c5385da05fbb2e4f58a4064ddc7d88a5db1cba
-  data.tar.gz: 52e2898239af082b0a9d2f7fad544fa758561ae7eeb2f9a6c50d965d711a56c72184a222785b69f9726ccaecb7467272b3eb68d4e62c16e658d7254bc8c05d57
+  metadata.gz: 99bd5f83d21d321e36091a14ddd722ef85cc7b668c96e4749b11f33abcdc65854878e7f7b4f6541d6e1e3f12ac662177334ce3f5e17eadf91d414eeb5c623fca
+  data.tar.gz: 8fd6ccb365593ea48cff978eef827d2befbd3a63fc9b54e450b997a1c045523beaa3435a693fc2f03522e42d37836fcd1f572f059b5b62c508fb5cc14a59a2bb

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>
@@ -452,9 +458,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 +480,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"/>
@@ -703,21 +733,11 @@
   </define>
   <define name="TypedTitleString">
     <optional>
-      <attribute name="type">
-        <ref name="TitleType"/>
-      </attribute>
+      <attribute name="type"/>
     </optional>
     <ref name="FormattedString"/>
   </define>
-  <define name="TitleType">
-    <choice>
-      <value>alternative</value>
-      <value>original</value>
-      <value>unofficial</value>
-      <value>subtitle</value>
-      <value>main</value>
-    </choice>
-  </define>
+  <!-- TitleType = ( "alternative" | "original" | "unofficial" | "subtitle" | "main" ) -->
   <define name="TypedUri">
     <optional>
       <attribute name="type"/>
@@ -1038,12 +1058,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/lib/relaton_omg/version.rb

@@ -1,3 +1,3 @@
 module RelatonOmg
-  VERSION = "0.3.0".freeze
+  VERSION = "1.0.0".freeze
 end

data/relaton_omg.gemspec

@@ -1,4 +1,4 @@
-require_relative 'lib/relaton_omg/version'
+require_relative "lib/relaton_omg/version"
 
 Gem::Specification.new do |spec|
   spec.name          = "relaton-omg"
@@ -6,9 +6,9 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonOmg: retrieve OMG Standards for bibliographic use"\
+  spec.summary       = "RelatonOmg: retrieve OMG Standards for bibliographic "\
                        "using the IsoBibliographicItem model"
-  spec.description   = "RelatonOmg: retrieve OMG Standards for bibliographic use"\
+  spec.description   = "RelatonOmg: retrieve OMG Standards for bibliographic "\
                        "using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/relaton/relaton-ogn"
   spec.license       = "BSD-2-Clause"
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"
@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 0.9.0"
+  spec.add_dependency "relaton-bib", "~> 1.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-30 00:00:00.000000000 Z
+date: 2020-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -156,15 +156,15 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
-description: 'RelatonOmg: retrieve OMG Standards for bibliographic useusing the IsoBibliographicItem
+        version: 1.0.0
+description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
 - open.source@ribose.com
@@ -219,6 +219,6 @@ requirements: []
 rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: 'RelatonOmg: retrieve OMG Standards for bibliographic useusing the IsoBibliographicItem
+summary: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 test_files: []