relaton-omg 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccf81741270b79ea6fd9fd1b9c043a36d1ea78d91f2779a2d4404bd7d20373c3
-  data.tar.gz: 5772e9a5b0b6a689e67f42a765b7eae4bf7b34f0560a66378cbc33d7cff52631
+  metadata.gz: bd4e8a789f4c1e5802bd5624316c2e8b454b1f5b0e0eb98db65ff5aebf0396f0
+  data.tar.gz: b18bcf491a31d4ae72225eb575e698e5fe57da04f96bd9d0d84afcec9be42eb4
 SHA512:
-  metadata.gz: 99bd5f83d21d321e36091a14ddd722ef85cc7b668c96e4749b11f33abcdc65854878e7f7b4f6541d6e1e3f12ac662177334ce3f5e17eadf91d414eeb5c623fca
-  data.tar.gz: 8fd6ccb365593ea48cff978eef827d2befbd3a63fc9b54e450b997a1c045523beaa3435a693fc2f03522e42d37836fcd1f572f059b5b62c508fb5cc14a59a2bb
+  metadata.gz: 0554f97818d7c0fce8faa682d6a618910ff014c04563cc0333024b4925f1f20209994c7174a2d0f9df9e5d8facd4b9eb82941865a835657426fc7e77b01c5116
+  data.tar.gz: 104dda7962b4846bf162708bce0aa745f816a2ffe4e6f768a65224e20f3b30788f89c77d2d26cfea3ed9f28db440f843f87cb34e3562fc396658851f8d0d911d

data/.github/workflows/ubuntu.yml

@@ -29,4 +29,5 @@ jobs:
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |
+          unset JAVA_TOOL_OPTIONS
           bundle exec rake

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

data/README.adoc

@@ -36,6 +36,7 @@ Or install it yourself as:
 [source,ruby]
 ----
 require 'relaton_omg'
+=> true
 
 item = RelatonOmg::OmgBibliography.search 'OMG AMI4CCM 1.0'
 => #<RelatonOmg::OmgBibliographicItem:0x007fda17eab2f0
@@ -52,7 +53,7 @@ RelatonOmg::OmgBibliography.search 'OMG 1111'
 [source,ruby]
 ----
 item.to_xml
-=><bibitem id="AMI4CCM1.0">
+=>"<bibitem id="AMI4CCM1.0">
     <fetched>2020-02-17</fetched>
     <title type="main" format="text/plain" language="en" script="Latn">Asynchronous Method Invocation for CCM</title>
     <uri type="src">https://www.omg.org/spec/AMI4CCM/1.0/</uri>
@@ -87,7 +88,7 @@ item = RelatonOmg::OmgBibliographicItem.from_xml 'spec/fixtures/omg_ami4ccm_1_0.
 === Create bibliographic item form Hash
 [source,ruby]
 ----
-hash = YAML.load_file 'spec/fixtures/omg_ami4ccm_1_0.xml'
+hash = YAML.load_file 'spec/fixtures/omg_ami4ccm_1_0.yaml'
 => {"id"=>"AMI4CCM1.0",
 ...
 
@@ -106,7 +107,7 @@ item = RelatonOmg::OmgBibliographicItem.from_yaml 'spec/fixtures/omg_ami4ccm_1_0
 
 == Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/metanorma/relaton-ietf.
+Bug reports and pull requests are welcome on GitHub at https://github.com/relaton/relaton-ietf.
 
 == License
 

data/grammars/biblio.rng

@@ -88,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"/>
@@ -98,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
@@ -121,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"/>
@@ -136,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>
@@ -512,7 +532,7 @@
   </define>
   <define name="LocalityType">
     <data type="string">
-      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|locality:[a-zA-Z0-9_]+</param>
+      <param name="pattern">section|clause|part|paragraph|chapter|page|whole|table|annex|figure|note|list|example|volume|issue|time|anchor|locality:[a-zA-Z0-9_]+</param>
     </data>
   </define>
   <define name="referenceFrom">
@@ -641,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -767,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">
@@ -999,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">
@@ -1019,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">

data/lib/relaton_omg/omg_bibliographic_item.rb

@@ -1,16 +1,6 @@
 module RelatonOmg
   class OmgBibliographicItem < RelatonBib::BibliographicItem
     # @return [String, NilClass]
-    attr_reader :doctype
-
-    # @param doctype [String]
-    # @param keyword [Array<String>]
-    def initialize(**args)
-      @doctype = args.delete :doctype
-      # @keyword = args.delete(:keyword) || []
-      super
-    end
-
     class << self
       # @param file [String] path to YAML file
       # @return [RelatonOmg::OmgBibliographicItem]
@@ -36,20 +26,7 @@ module RelatonOmg
     # @option opts [Symbol, NilClass] :date_format (:short), :full
     def to_xml(builder = nil, **opts)
       opts[:date_format] ||= :short
-      super builder, **opts do |b|
-        # if opts[:bibdata]
-        #   b.ext do
-        #     b.doctype doctype if doctype
-        #   end
-        # end
-      end
-    end
-
-    # @return [Hash]
-    def to_hash
-      hash = super
-      hash["doctype"] = doctype if doctype
-      hash
+      super
     end
   end
 end

data/lib/relaton_omg/version.rb

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

data/lib/relaton_omg/xml_parser.rb

@@ -3,26 +3,21 @@ require "nokogiri"
 module RelatonOmg
   class XMLParser < RelatonBib::XMLParser
     class << self
-      def from_xml(xml)
-        doc = Nokogiri::XML(xml)
-        doc.remove_namespaces!
-        item = doc.at("/bibitem|/bibdata")
-        if item
-          RelatonOmg::OmgBibliographicItem.new(item_data(item))
-        else
-          warn "[relato-omg] can't find bibitem or bibdata element in the XML"
-        end
-      end
-
       private
 
-      def item_data(ietfitem)
-        data = super
-        # ext = ietfitem.at "./ext"
-        # return data unless ext
+      # def item_data(ietfitem)
+      #   data = super
+      #   ext = ietfitem.at "./ext"
+      #   return data unless ext
+
+      #   data[:doctype] = ext.at("./doctype")&.text
+      #   data
+      # end
 
-        # data[:doctype] = ext.at("./doctype")&.text
-        data
+      # @param item_hash [Hash]
+      # @return [RelatonOmg::OmgBibliographicItem]
+      def bib_item(item_hash)
+        OmgBibliographicItem.new item_hash
       end
     end
   end

data/relaton_omg.gemspec

@@ -37,5 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-bib", "~> 1.0.0"
+  spec.add_dependency "relaton-bib", "~> 1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-omg
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.0
 description: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'
 email:
@@ -201,7 +201,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/relaton/relaton-ogn
   source_code_uri: https://github.com/relaton/relaton-ogn
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -217,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: 'RelatonOmg: retrieve OMG Standards for bibliographic using the IsoBibliographicItem
   model'