relaton-iho 1.7.1 → 1.10.0

data/grammars/reqt.rng

@@ -30,9 +30,22 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="number"/>
+    </optional>
     <optional>
       <attribute name="subsequence"/>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <attribute name="id">
       <data type="ID"/>
     </attribute>
@@ -40,17 +53,23 @@
       <attribute name="filename"/>
     </optional>
     <optional>
-      <ref name="reqtitle"/>
+      <attribute name="model"/>
     </optional>
     <optional>
-      <ref name="label"/>
+      <attribute name="type"/>
     </optional>
     <optional>
-      <ref name="subject"/>
+      <ref name="reqtitle"/>
     </optional>
     <optional>
-      <ref name="reqinherit"/>
+      <ref name="label"/>
     </optional>
+    <zeroOrMore>
+      <ref name="subject"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="reqinherit"/>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="classification"/>
     </zeroOrMore>
@@ -61,6 +80,7 @@
         <ref name="verification"/>
         <ref name="import"/>
         <ref name="description"/>
+        <ref name="component"/>
       </choice>
     </zeroOrMore>
     <optional>
@@ -86,12 +106,16 @@
   </define>
   <define name="subject">
     <element name="subject">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="reqinherit">
     <element name="inherit">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="measurementtarget">
@@ -119,6 +143,12 @@
       <ref name="RequirementSubpart"/>
     </element>
   </define>
+  <define name="component">
+    <element name="component">
+      <attribute name="class"/>
+      <ref name="RequirementSubpart"/>
+    </element>
+  </define>
   <define name="reqt_references">
     <element name="references">
       <oneOrMore>
@@ -135,6 +165,16 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="keep-with-next">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
+    <optional>
+      <attribute name="keep-lines-together">
+        <data type="boolean"/>
+      </attribute>
+    </optional>
     <oneOrMore>
       <ref name="BasicBlock"/>
     </oneOrMore>

data/lib/relaton_iho/iho_bibliographic_item.rb

@@ -13,6 +13,13 @@ module RelatonIho
       super
     end
 
+    # @param hash [Hash]
+    # @return [RelatonIho::IhoBibliographicItem]
+    def self.from_hash(hash)
+      item_hash = ::RelatonIho::HashConverter.hash_to_bib(hash)
+      new **item_hash
+    end
+
     # @param opts [Hash]
     # @option opts [Nokogiri::XML::Builder] :builder XML builder
     # @option opts [Boolean] :bibdata

data/lib/relaton_iho/iho_bibliography.rb

@@ -10,18 +10,23 @@ module RelatonIho
       # @return [RelatonIho::IhoBibliographicItem]
       def search(text, _year = nil, _opts = {}) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         warn "[relaton-iho] (\"#{text}\") fetching..."
-        ref = text.sub(/^IHO\s/, "").downcase.sub /^([[:alpha:]]+)(\d+)/, '\1-\2'
+        ref = text.sub(/^IHO\s/, "").downcase.sub(/^([[:alpha:]]+)(\d+)/, '\1-\2')
         uri = URI("#{ENDPOINT}#{ref}.yaml")
         resp = Net::HTTP.get_response uri
         return unless resp.code == "200"
 
-        hash = HashConverter.hash_to_bib YAML.safe_load(resp.body, [Date])
-        item = IhoBibliographicItem.new **hash
+        yaml = if RUBY_VERSION.match?(/^2\.5/)
+                 YAML.safe_load(resp.body, [Date])
+               else
+                 YAML.safe_load(resp.body, permitted_classes: [Date])
+               end
+        hash = HashConverter.hash_to_bib yaml
+        item = IhoBibliographicItem.new(**hash)
         warn "[relaton-iho] (\"#{text}\") found #{item.docidentifier.first.id}"
         item
       rescue SocketError, Errno::EINVAL, Errno::ECONNRESET, EOFError,
              Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError, Net::ReadTimeout, # OpenSSL::SSL::SSLError,
+             Net::ProtocolError, Net::ReadTimeout, OpenSSL::SSL::SSLError,
              Errno::ETIMEDOUT => e
         raise RelatonBib::RequestError, "Could not access #{uri}: #{e.message}"
       end

data/lib/relaton_iho/processor.rb

@@ -28,8 +28,7 @@ module RelatonIho
     # @param hash [Hash]
     # @return [RelatonIho::IhoBibliographicItem]
     def hash_to_bib(hash)
-      item_hash = ::RelatonIho::HashConverter.hash_to_bib(hash)
-      ::RelatonIho::IhoBibliographicItem.new item_hash
+      ::RelatonIho::IhoBibliographicItem.new hash
     end
 
     # Returns hash of XML grammar

data/lib/relaton_iho/version.rb

@@ -1,3 +1,3 @@
 module RelatonIho
-  VERSION = "1.7.1".freeze
+  VERSION = "1.10.0".freeze
 end

data/lib/relaton_iho/xml_parser.rb

@@ -18,7 +18,7 @@ module RelatonIho
       # @param item_hash [Hash]
       # @return [RelatonIho::IhoBibliographicItem]
       def bib_item(item_hash)
-        IhoBibliographicItem.new **item_hash
+        IhoBibliographicItem.new(**item_hash)
       end
 
       # @param ext [Nokogiri::XML::Element, nil]

data/lib/relaton_iho.rb

@@ -1,4 +1,5 @@
 require "digest/md5"
+require "yaml"
 require "relaton_bib"
 require "relaton_iho/version"
 require "relaton_iho/iho_bibliography"

data/relaton_iho.gemspec

@@ -19,18 +19,16 @@ Gem::Specification.new do |s|
   end
   s.platform      = Gem::Platform::RUBY
   s.require_paths = ["lib"]
-  s.required_ruby_version = Gem::Requirement.new(">= 2.4.0")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.5.0")
 
   s.add_development_dependency "byebug"
-  # s.add_development_dependency "debase"
   s.add_development_dependency "equivalent-xml", "~> 0.6"
-  s.add_development_dependency "rake", "~> 10.0"
+  s.add_development_dependency "rake", "~> 13.0"
   s.add_development_dependency "rspec", "~> 3.0"
-  # s.add_development_dependency "ruby-debug-ide"
   s.add_development_dependency "ruby-jing"
   s.add_development_dependency "simplecov"
   s.add_development_dependency "vcr"
   s.add_development_dependency "webmock"
 
-  s.add_dependency "relaton-bib", "~> 1.7.0"
+  s.add_dependency "relaton-bib", "~> 1.10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iho
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-18 00:00:00.000000000 Z
+date: 2022-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.0
+        version: 1.10.0
 description: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem
   model'
 email:
@@ -181,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: 'RelatonIho: retrieve IHO Standards for bibliographic using the BibliographicItem