relaton-cen 1.13.0 → 1.14.1

data/grammars/biblio.rng

@@ -33,9 +33,10 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
-  <start>
-    <ref name="bibitem"/>
-  </start>
+  <!-- start = bibitem -->
+  <define name="BibData">
+    <ref name="BibliographicItem"/>
+  </define>
   <define name="status">
     <element name="status">
       <ref name="stage"/>
@@ -73,8 +74,14 @@
       <text/>
     </element>
   </define>
-  <define name="script">
+  <define name="locale">
     <a:documentation>ISO-639</a:documentation>
+    <element name="locale">
+      <text/>
+    </element>
+  </define>
+  <define name="script">
+    <a:documentation>ISO-3166</a:documentation>
     <element name="script">
       <text/>
     </element>
@@ -93,6 +100,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -136,6 +146,9 @@
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
     </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
     <optional>
       <attribute name="script"/>
     </optional>
@@ -158,27 +171,30 @@
   </define>
   <define name="contributor">
     <element name="contributor">
-      <zeroOrMore>
+      <oneOrMore>
         <ref name="role"/>
-      </zeroOrMore>
+      </oneOrMore>
       <ref name="ContributorInfo"/>
     </element>
   </define>
   <define name="role">
     <element name="role">
-      <optional>
-        <attribute name="type">
-          <choice>
-            <value>author</value>
-            <value>performer</value>
-            <value>publisher</value>
-            <value>editor</value>
-            <value>adapter</value>
-            <value>translator</value>
-            <value>distributor</value>
-          </choice>
-        </attribute>
-      </optional>
+      <attribute name="type">
+        <choice>
+          <value>author</value>
+          <value>performer</value>
+          <value>publisher</value>
+          <value>editor</value>
+          <value>adapter</value>
+          <value>translator</value>
+          <value>distributor</value>
+          <value>realizer</value>
+          <value>owner</value>
+          <value>authorizer</value>
+          <value>enabler</value>
+          <value>subject</value>
+        </choice>
+      </attribute>
       <zeroOrMore>
         <ref name="roledescription"/>
       </zeroOrMore>
@@ -200,6 +216,9 @@
       <optional>
         <ref name="fullname"/>
       </optional>
+      <zeroOrMore>
+        <ref name="credential"/>
+      </zeroOrMore>
       <zeroOrMore>
         <ref name="affiliation"/>
       </zeroOrMore>
@@ -216,6 +235,11 @@
       <ref name="FullNameType"/>
     </element>
   </define>
+  <define name="credential">
+    <element name="credential">
+      <text/>
+    </element>
+  </define>
   <define name="FullNameType">
     <choice>
       <group>
@@ -289,7 +313,9 @@
       <zeroOrMore>
         <ref name="affiliationdescription"/>
       </zeroOrMore>
-      <ref name="organization"/>
+      <optional>
+        <ref name="organization"/>
+      </optional>
     </element>
   </define>
   <define name="affiliationname">
@@ -500,6 +526,17 @@
   </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>
@@ -512,6 +549,17 @@
   </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>
@@ -614,6 +662,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -650,6 +701,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -705,6 +759,9 @@
         <ref name="BibItemType"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="schema-version"/>
+    </optional>
     <optional>
       <ref name="fetched"/>
     </optional>
@@ -741,6 +798,9 @@
     <zeroOrMore>
       <ref name="language"/>
     </zeroOrMore>
+    <zeroOrMore>
+      <ref name="locale"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="script"/>
     </zeroOrMore>
@@ -854,6 +914,15 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="language"/>
+    </optional>
+    <optional>
+      <attribute name="locale"/>
+    </optional>
+    <optional>
+      <attribute name="script"/>
+    </optional>
     <data type="anyURI"/>
   </define>
   <define name="DateType">
@@ -882,6 +951,7 @@
       <value>vote-started</value>
       <value>vote-ended</value>
       <value>announced</value>
+      <value>stable-until</value>
     </choice>
   </define>
   <define name="bdate">
@@ -930,6 +1000,9 @@
       <optional>
         <attribute name="language"/>
       </optional>
+      <optional>
+        <attribute name="locale"/>
+      </optional>
       <optional>
         <attribute name="script"/>
       </optional>
@@ -1253,7 +1326,7 @@
       <value>commentaryOf</value>
       <value>hasCommentary</value>
       <value>related</value>
-      <value>complements</value>
+      <value>hasComplement</value>
       <value>complementOf</value>
       <value>obsoletes</value>
       <value>obsoletedBy</value>

data/grammars/relaton-cen-compile.rng

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="basicdoc.rng"/>
+  <include href="relaton-cen.rng"/>
+  <start>
+    <choice>
+      <ref name="bibitem"/>
+      <ref name="bibdata"/>
+    </choice>
+  </start>
+</grammar>

data/grammars/relaton-cen.rng

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="biblio-standoc.rng"/>
+</grammar>

data/grammars/relaton-iso-compile.rng

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+  <include href="basicdoc.rng"/>
+  <include href="relaton-iso.rng"/>
+  <start>
+    <choice>
+      <ref name="bibitem"/>
+      <ref name="bibdata"/>
+    </choice>
+  </start>
+</grammar>

data/grammars/relaton-iso.rng

@@ -0,0 +1,225 @@
+<?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-standoc.rng">
+    <define name="BibDataExtensionType">
+      <optional>
+        <attribute name="schema-version"/>
+      </optional>
+      <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
+      <optional>
+        <ref name="horizontal"/>
+      </optional>
+      <ref name="editorialgroup"/>
+      <optional>
+        <ref name="approvalgroup"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="ics"/>
+      </zeroOrMore>
+      <ref name="structuredidentifier"/>
+      <optional>
+        <ref name="stagename"/>
+      </optional>
+      <optional>
+        <ref name="updates_document_type"/>
+      </optional>
+    </define>
+    <define name="bdate">
+      <element name="date">
+        <attribute name="type">
+          <choice>
+            <ref name="BibliographicDateType"/>
+            <text/>
+          </choice>
+        </attribute>
+        <choice>
+          <group>
+            <element name="from">
+              <ref name="ISO8601Date"/>
+            </element>
+            <optional>
+              <element name="to">
+                <ref name="ISO8601Date"/>
+              </element>
+            </optional>
+          </group>
+          <element name="on">
+            <choice>
+              <ref name="ISO8601Date"/>
+              <value>--</value>
+              <value>–</value>
+            </choice>
+          </element>
+        </choice>
+      </element>
+    </define>
+    <define name="organization">
+      <element name="organization">
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
+        <optional>
+          <ref name="abbreviation"/>
+        </optional>
+        <optional>
+          <ref name="uri"/>
+        </optional>
+        <zeroOrMore>
+          <ref name="org-identifier"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="contact"/>
+        </zeroOrMore>
+        <optional>
+          <ref name="technical-committee"/>
+        </optional>
+        <optional>
+          <ref name="subcommittee"/>
+        </optional>
+        <optional>
+          <ref name="workgroup"/>
+        </optional>
+        <optional>
+          <ref name="secretariat"/>
+        </optional>
+      </element>
+    </define>
+    <define name="DocumentType">
+      <choice>
+        <value>international-standard</value>
+        <value>technical-specification</value>
+        <value>technical-report</value>
+        <value>publicly-available-specification</value>
+        <value>international-workshop-agreement</value>
+        <value>guide</value>
+        <value>amendment</value>
+        <value>technical-corrigendum</value>
+        <value>directive</value>
+      </choice>
+    </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
+      </choice>
+    </define>
+    <define name="structuredidentifier">
+      <element name="structuredidentifier">
+        <optional>
+          <attribute name="type"/>
+        </optional>
+        <group>
+          <ref name="documentnumber"/>
+          <optional>
+            <ref name="tc-documentnumber"/>
+          </optional>
+        </group>
+      </element>
+    </define>
+    <define name="editorialgroup">
+      <element name="editorialgroup">
+        <ref name="ISOProjectGroup"/>
+      </element>
+    </define>
+  </include>
+  <define name="updates_document_type">
+    <element name="updates-document-type">
+      <ref name="DocumentType"/>
+    </element>
+  </define>
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
+  <define name="horizontal">
+    <element name="horizontal">
+      <data type="boolean"/>
+    </element>
+  </define>
+  <define name="documentnumber">
+    <element name="project-number">
+      <optional>
+        <attribute name="part">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="subpart">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="amendment">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="corrigendum">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="origyr">
+          <ref name="ISO8601Date"/>
+        </attribute>
+      </optional>
+      <text/>
+    </element>
+  </define>
+  <define name="tc-documentnumber">
+    <element name="tc-document-number">
+      <data type="int"/>
+    </element>
+  </define>
+  <define name="subcommittee">
+    <element name="subcommittee">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="workgroup">
+    <element name="workgroup">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
+  <define name="secretariat">
+    <element name="secretariat">
+      <text/>
+    </element>
+  </define>
+  <define name="stagename">
+    <element name="stagename">
+      <optional>
+        <attribute name="abbreviation"/>
+      </optional>
+      <text/>
+    </element>
+  </define>
+</grammar>

data/lib/relaton_cen/biblographic_item.rb

@@ -0,0 +1,12 @@
+module RelatonCen
+  class BibliographicItem < RelatonIsoBib::IsoBibliographicItem
+    #
+    # Fetches CEN flavor schema version.
+    #
+    # @return [String] schema version
+    #
+    def ext_schema
+      @ext_schema ||= schema_versions["relaton-model-cen"]
+    end
+  end
+end

data/lib/relaton_cen/cen_bibliography.rb

@@ -1,12 +1,5 @@
 # frozen_string_literal: true
 
-require "mechanize"
-require "relaton_iso_bib"
-require "relaton_cen/scrapper"
-require "relaton_cen/hit_collection"
-require "relaton_cen/hit"
-require "relaton_cen/xml_parser"
-
 module RelatonCen
   # Class methods for search Cenelec standards.
   class CenBibliography

data/lib/relaton_cen/hash_converter.rb

@@ -0,0 +1,11 @@
+module RelatonCen
+  class HashConverter < RelatonIsoBib::HashConverter
+    class << self
+      # @param item_hash [Hash]
+      # @return [RelatonCen::BibliographicItem]
+      def bib_item(item_hash)
+        BibliographicItem.new(**item_hash)
+      end
+    end
+  end
+end

data/lib/relaton_cen/hit.rb

@@ -6,7 +6,7 @@ module RelatonCen
     attr_writer :fetch
 
     # Parse page.
-    # @return [RelatonBib::BibliographicItem]
+    # @return [IsoRelatonBib::IsoBibliographicItem]
     def fetch
       @fetch ||= Scrapper.parse_page self
     end

data/lib/relaton_cen/hit_collection.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "relaton_cen/hit"
-
 module RelatonCen
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection

data/lib/relaton_cen/processor.rb

@@ -26,13 +26,13 @@ module RelatonCen
     # @param hash [Hash]
     # @return [RelatonBib::BibliographicItem]
     def hash_to_bib(hash)
-      ::RelatonIsoBib::IsoBibliographicItem.from_hash hash
+      ::RelatonCen::BibliographicItem.from_hash hash
     end
 
     # Returns hash of XML grammar
     # @return [String]
     def grammar_hash
-      @grammar_hash ||= ::RelatonIsoBib.grammar_hash
+      @grammar_hash ||= ::RelatonCen.grammar_hash
     end
   end
 end

data/lib/relaton_cen/scrapper.rb

@@ -11,10 +11,10 @@ module RelatonCen
     class << self
       # Parse page.
       # @param hit [RelatonCen::Hit]
-      # @return [RelatonBib::BibliographicItem]
+      # @return [RelatonIsoBib::IsoBibliographicItem]
       def parse_page(hit) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
         doc = hit.hit_collection.agent.get hit.hit[:url]
-        RelatonIsoBib::IsoBibliographicItem.new(
+        BibliographicItem.new(
           fetched: Date.today.to_s,
           type: "standard",
           docid: fetch_docid(hit.hit[:code]),

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.13.0"
+  VERSION = "1.14.1"
 end

data/lib/relaton_cen/xml_parser.rb

@@ -1,5 +1,3 @@
-require "nokogiri"
-
 module RelatonCen
   class XMLParser < RelatonIsoBib::XMLParser
     class << self
@@ -19,10 +17,10 @@ module RelatonCen
       # end
 
       # @param item_hash [Hash]
-      # @return [RelatonBib::BibliographicItem]
-      # def bib_item(item_hash)
-      #   RelatonIsoBib::IsoBibliographicItem.new **item_hash
-      # end
+      # @return [RelatonCen::BibliographicItem]
+      def bib_item(item_hash)
+        BibliographicItem.new(**item_hash)
+      end
     end
   end
 end

data/lib/relaton_cen.rb

@@ -1,7 +1,16 @@
 # frozen_string_literal: true
 
 require "digest/md5"
+require "mechanize"
+require "nokogiri"
 require_relative "relaton_cen/version"
+require "relaton_iso_bib"
+require "relaton_cen/biblographic_item"
+require "relaton_cen/scrapper"
+require "relaton_cen/hit_collection"
+require "relaton_cen/hit"
+require "relaton_cen/xml_parser"
+require "relaton_cen/hash_converter"
 require "relaton_cen/cen_bibliography"
 
 module RelatonCen

data/relaton_cen.gemspec

@@ -8,13 +8,13 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ribose Inc."]
   spec.email         = ["open.source@ribose.com"]
 
-  spec.summary       = "RelatonCen: retrieve Cenelec Standards for "\
+  spec.summary       = "RelatonCen: retrieve Cenelec Standards for " \
                        "bibliographic use using the IsoBibliographicItem model"
-  spec.description   = "RelatonCen: retrieve Cenelec Standards for "\
+  spec.description   = "RelatonCen: retrieve Cenelec Standards for " \
                        "bibliographic use using the IsoBibliographicItem model"
   spec.homepage      = "https://github.com/metanorma/relaton-cen"
   spec.license       = "BSD-2-Clause"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
   # spec.metadata["allowed_push_host"] = "TODO: Set to 'http://mygemserver.com'"
 
@@ -31,18 +31,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "equivalent-xml", "~> 0.6"
-  spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rubocop", "~> 1.17.0"
-  spec.add_development_dependency "rubocop-performance", "~> 1.11.0"
-  spec.add_development_dependency "rubocop-rails", "~> 2.10.0"
-  spec.add_development_dependency "ruby-jing"
-  spec.add_development_dependency "simplecov"
-  spec.add_development_dependency "vcr", "~> 5.0.0"
-  spec.add_development_dependency "webmock"
-
-  spec.add_dependency "mechanize"
-  spec.add_dependency "relaton-iso-bib", "~> 1.13.0"
+  spec.add_dependency "mechanize", "~> 2.8.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.14.0"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html