relaton-iso-bib 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: efda33daf07e8cf9cd2a4627171c675d3b09f6ddcc58741cd73b66c4afb0fc4d
-  data.tar.gz: 8e60cea3c7d0544c813908260d5c4f29c8629c88092aa4519c88fdc1cc75e48b
+  metadata.gz: cb745444f966f6ef9c2b2d393319f1904fd9e639d985ce1723daed9314dc4eaa
+  data.tar.gz: 519e52105d3cebe757d9f40c08ddc421d4f00aaca163b7ea3fd601f0239a1b74
 SHA512:
-  metadata.gz: e59da78d3a06d407f90253c8b379f84b1116fe20b46cce9f11a362fc38759fdb49a26c10a5db187a77f7767405f20abad32d6478a9efec8cd8f81bd0798f9165
-  data.tar.gz: f1fd291047ed8f422cf980d33e570f76e43529da3597a569c6b4141c61277980a2f267096e151abafc7639b0748c250954010a7b254253db208a46e7c9ff5a93
+  metadata.gz: e8857658ecca25247a27cd79947332f114c7e1cfc50a5c18e9921db82194ba5ce62c34e84e69ca7823245d0804169271ed7c0d13fa2f7d8313eb20c2ea1bb7c8
+  data.tar.gz: f68965904d03379280d67551afbc7cb3f90c871ca919eb0fd0a0ac402e7005ad128781e4aab0f43d2b5a7e8bc427f973484b752245cdfd361e098e17a07ff1cf

data/grammars/biblio.rng

@@ -767,6 +767,8 @@
       <value>unchanged</value>
       <value>circulated</value>
       <value>adapted</value>
+      <value>vote-started</value>
+      <value>vote-ended</value>
     </choice>
   </define>
   <define name="bdate">
@@ -1019,38 +1021,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">

data/grammars/isodoc.rng

@@ -129,6 +129,9 @@
             </choice>
           </attribute>
         </optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
         <optional>
           <ref name="section-title"/>
         </optional>
@@ -303,11 +306,11 @@
         <ref name="paragraph"/>
       </element>
     </define>
-    <define name="TextElement" combine="choice">
-      <ref name="concept"/>
-    </define>
   </include>
   <!-- end overrides -->
+  <define name="TextElement" combine="choice">
+    <ref name="concept"/>
+  </define>
   <define name="concept">
     <element name="concept">
       <optional>

data/lib/relaton_iso_bib/iso_bibliographic_item.rb

@@ -35,7 +35,7 @@ module RelatonIsoBib
     #   @return [Array<RelatonIsoBib::TypedTitleString>]
 
     # @return [String, NilClass]
-    attr_reader :doctype
+    attr_reader :doctype, :stagename
 
     # @return [RelatonIsoBib::EditorialGroup]
     attr_reader :editorialgroup
@@ -67,6 +67,7 @@ module RelatonIsoBib
     # @param validity [RelatonBib:Validity, NilClass]
     # @param docid [Array<RelatonBib::DocumentIdentifier>]
     # @param structuredidentifier [RelatonIsoBib::StructuredIdentifier]
+    # @param stagename [String, NilClass]
     #
     # @param title [Array<Hash>]
     # @option title [String] :title_intro
@@ -158,6 +159,7 @@ module RelatonIsoBib
       @structuredidentifier = args[:structuredidentifier]
       @doctype ||= args[:doctype]
       @ics = args.fetch(:ics, []).map { |i| i.is_a?(Hash) ? Ics.new(i) : i }
+      @stagename = args[:stagename]
       @id_attribute = true
     end
     # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity
@@ -243,7 +245,8 @@ module RelatonIsoBib
       end
       super builder, **opts do |b|
         if opts[:bibdata] && (doctype || respond_to?(:committee) && committee ||
-          editorialgroup || ics.any? || structuredidentifier || block_given?)
+          editorialgroup || ics.any? || structuredidentifier || stagename ||
+          block_given?)
           b.ext do
             b.doctype doctype if doctype
             b.docsubtype docsubtype if respond_to?(:docsubtype) && docsubtype
@@ -255,6 +258,7 @@ module RelatonIsoBib
             end
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
+            b.stagename stagename if stagename
             yield b if block_given?
           end
         end
@@ -268,6 +272,7 @@ module RelatonIsoBib
       hash["ics"] = single_element_array(ics) if ics&.any?
       hash["structuredidentifier"] = structuredidentifier.to_hash if structuredidentifier
       hash["doctype"] = doctype if doctype
+      hash["stagename"] = stagename if stagename
       hash
     end
 

data/lib/relaton_iso_bib/version.rb

@@ -1,3 +1,3 @@
 module RelatonIsoBib
-  VERSION = "1.0.0".freeze
+  VERSION = "1.0.1".freeze
 end

data/lib/relaton_iso_bib/xml_parser.rb

@@ -17,6 +17,7 @@ module RelatonIsoBib
         data[:editorialgroup] = fetch_editorialgroup ext
         data[:ics] = fetch_ics ext
         data[:structuredidentifier] = fetch_structuredidentifier ext
+        data[:stagename] = ext.at("./stagename")&.text
         data
       end
 

data/relaton_iso_bib.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov"
 
   spec.add_dependency "isoics", "~> 0.1.6"
-  spec.add_dependency "relaton-bib", "~> 1.0.0"
+  spec.add_dependency "relaton-bib", ">= 1.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso-bib
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -140,16 +140,16 @@ dependencies:
   name: relaton-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.3
 description: 'RelatonIsoBib: Ruby ISOXMLDOC impementation.'
 email:
 - open.source@ribose.com