relaton-iho 1.4.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c2889e6d995ae69c8aaf59df34b2a4c8ca5c7700be4e7f31f5ae27411469afd
-  data.tar.gz: 9c27f57bd7cd0824fcbfbd4acc6cd6921f7c7cf0bd2594a4032406ccd037d406
+  metadata.gz: b5a912d46e4d8722af0143176f796d9ee60169b9e7c02c9e8323cb4b578ea719
+  data.tar.gz: f0868b0fd1b521f2850fd635457bca2270b5c964cea068516e29801bb30ca33f
 SHA512:
-  metadata.gz: b73ac143dab2eff7e69440608d2373b0f62cfe059cebcf0a1fab47a2d395dd8fd6b3fd22ba5f3124293cd14f8d4e7382795e65a0c3135e0ea7fe407636af7503
-  data.tar.gz: e25a2f287db40dfc99a305358134b3dfd87afe2aa3a500c103f2de8f97e6ae4093b8aa3b1843a1cf253c073cb5bc8ca9d6b1f5002b11b711eb313ac15c4b43b4
+  metadata.gz: 85ae6ce05130d766e3674aa146ebf0ac21d46c3f80c53b73b3ebf6dd9b2b7a6da958853bb3ec505e376a91ec2e651f6e9933fc5d974e44e45e4aa6175f715ee4
+  data.tar.gz: 71eda4d452890bcc9168a0f1af9f874f32c1f536fd6cebbb85a1580ae6953de78ff067737964c09c90ff41bcdc544771de4c1e6687912d7be38381bba6e777cd

data/.github/workflows/macos.yml

@@ -26,6 +26,8 @@ jobs:
       - name: Update gems
         run: |
           sudo gem install bundler --force
+          ruby -v | grep 2.5 && bundle config set build.debase --with-cflags="-Wno-error=implicit-function-declaration"
+          ruby -v | grep 2.5 && bundle config set build.ruby-debug-ide --with-cflags="-Wno-error=implicit-function-declaration"
           bundle install --jobs 4 --retry 3
       - name: Run specs
         run: |

data/grammars/iho.rng

@@ -148,6 +148,13 @@
   </define>
   <define name="iho-standard">
     <element name="iho-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -42,7 +50,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -142,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -864,6 +876,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -1158,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_iho/hash_converter.rb

@@ -15,6 +15,12 @@ module RelatonIho
 
       private
 
+      # @param item_hash [Hash]
+      # @return [RelatonBib::BibliographicItem]
+      def bib_item(item_hash)
+        IhoBibliographicItem.new item_hash
+      end
+
       # @param ret [Hash]
       def commentperiod_hash_to_bib(ret)
         ret[:commentperiod] &&= CommentPeriond.new(ret[:commentperiod])

data/lib/relaton_iho/iho_bibliographic_item.rb

@@ -13,11 +13,13 @@ module RelatonIho
       super
     end
 
-    # @param builder [Nokogiri::XML::Builder]
-    # @param bibdata [TrueClasss, FalseClass, NilClass]
-    def to_xml(builer = nil, **opts) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
-      opts[:ext] = !commentperiod.nil?
-      super do |b|
+    # @param opts [Hash]
+    # @option opts [Nokogiri::XML::Builder] :builder XML builder
+    # @option opts [Boolean] :bibdata
+    # @option opts [String] :lang language
+    # @return [String] XML
+    def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      super ext: !commentperiod.nil?, **opts do |b|
         if opts[:bibdata] && (doctype || editorialgroup&.presence? ||
                               ics.any? || commentperiod)
           b.ext do

data/lib/relaton_iho/processor.rb

@@ -35,7 +35,7 @@ module RelatonIho
     # Returns hash of XML grammar
     # @return [String]
     def grammar_hash
-      @grammar_hash ||= ::RelatonIeee.grammar_hash
+      @grammar_hash ||= ::RelatonIho.grammar_hash
     end
   end
 end

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.4.0".freeze
+  VERSION = "1.7.0".freeze
 end

data/relaton_iho.gemspec

@@ -32,5 +32,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "vcr"
   s.add_development_dependency "webmock"
 
-  s.add_dependency "relaton-bib", "~> 1.4.0"
+  s.add_dependency "relaton-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.7.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-18 00:00:00.000000000 Z
+date: 2020-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.7.0
 description: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem
   model'
 email:
@@ -192,7 +192,6 @@ files:
 - lib/relaton_iho/editorial_group.rb
 - lib/relaton_iho/eg.yml
 - lib/relaton_iho/hash_converter.rb
-- lib/relaton_iho/hit_collection.rb
 - lib/relaton_iho/iho_bibliographic_item.rb
 - lib/relaton_iho/iho_bibliography.rb
 - lib/relaton_iho/iho_group.rb

data/lib/relaton_iho/hit_collection.rb

@@ -1,73 +0,0 @@
-require "faraday"
-require "yaml"
-require "fileutils"
-
-module RelatonIho
-  class HitCollection < RelatonBib::HitCollection
-    ENDPOINT = "https://raw.githubusercontent.com/relaton/relaton-data-iho/master/data/".freeze
-
-    # @param ref [Strig]
-    # @param year [String]
-    # @param opts [Hash]
-    def initialize(ref, year = nil)
-      super
-      @array = from_yaml(ref).sort_by do |hit|
-        hit.hit["revdate"] ? Date.parse(hit.hit["revdate"]) : Date.new
-      end.reverse
-    end
-
-    private
-
-    #
-    # Fetch data form yaml
-    #
-    # @param docid [String]
-    def from_yaml(docid, **_opts)
-      data["root"]["items"].select do |doc|
-        doc["docid"] && doc["docid"]["id"].include?(docid)
-      end.map { |h| Hit.new(h, self) }
-    end
-
-    #
-    # Fetches YAML data
-    #
-    # @return [Hash]
-    def data
-      FileUtils.mkdir_p DATADIR
-      ctime = File.ctime DATAFILE if File.exist? DATAFILE
-      fetch_data if !ctime || ctime.to_date < Date.today
-      @data ||= YAML.safe_load File.read(DATAFILE, encoding: "UTF-8")
-    end
-
-    #
-    # fetch data form server and save it to file.
-    #
-    def fetch_data
-      resp = Faraday.new(ENDPOINT, headers: { "If-None-Match" => etag }).get
-      # return if there aren't any changes since last fetching
-      return unless resp.status == 200
-
-      self.etag = resp[:etag]
-      @data = YAML.safe_load resp.body
-      File.write DATAFILE, @data.to_yaml, encoding: "UTF-8"
-    end
-
-    #
-    # Read ETag form file
-    #
-    # @return [String, NilClass]
-    def etag
-      @etag ||= if File.exist? ETAGFILE
-                  File.read ETAGFILE, encoding: "UTF-8"
-                end
-    end
-
-    #
-    # Save ETag to file
-    #
-    # @param tag [String]
-    def etag=(e_tag)
-      File.write ETAGFILE, e_tag, encoding: "UTF-8"
-    end
-  end
-end