relaton-iec 1.10.1 → 1.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e449c90e5d42349f83529a764d1eb502658dae2dd993e2597f2051c0ac14b9e
-  data.tar.gz: 5cfa9fb5734c5467f22de8bd6629c02d60b7f0f3ac13fb06892530519eaa3af3
+  metadata.gz: 6ac7a2b47a1a7b746f0a40a5ba93210ef38d6302e155d3b5c52d363e888de9c7
+  data.tar.gz: 18253a34039c3b99ad516f0260f7b34c61df0a4a8dd0ed5a32f5bafabc72b7ad
 SHA512:
-  metadata.gz: f4c2d5a7969cd29d8cf4311d636bf5ff8f1567acf5e11d003e2b1bfee8dc35df79a9bcfe5d3a9d738eccfb2b8fbb604c00b408873226c7f21734a3fc1b9dfa5b
-  data.tar.gz: ed09a6035d0f056097f8cf4c0f34f7b0af1d44723e968114f1090652f2aa3ae8aa73ac1f1864f2b45a1ea0ae7696b5082fe18419af286be1a5245c7fcdc82ae9
+  metadata.gz: d7ade3ceccc427c5901b59fa90674d781430f9562ea4c64b6d575a538a58fb2c930eda46f790c2bbe9439e0e8c0dcfe92122bed97693560674dda66321778c50
+  data.tar.gz: d47eba43051be57244e1985b2311848db19eb5225cdada484b69c4af745eb364e40ab3c0cd745808b9c16378b448049323169844a290fd0710383d7df8bae033

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }

data/grammars/biblio.rng

@@ -677,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -922,9 +925,29 @@
       <text/>
     </element>
   </define>
+  <define name="sizevalue">
+    <element name="value">
+      <attribute name="type"/>
+      <text/>
+    </element>
+  </define>
+  <define name="bibliographic_size">
+    <element name="size">
+      <oneOrMore>
+        <ref name="sizevalue"/>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="extent">
     <element name="extent">
-      <ref name="BibItemLocality"/>
+      <choice>
+        <zeroOrMore>
+          <ref name="locality"/>
+        </zeroOrMore>
+        <zeroOrMore>
+          <ref name="localityStack"/>
+        </zeroOrMore>
+      </choice>
     </element>
   </define>
   <define name="series">

data/grammars/isodoc.rng

@@ -152,9 +152,7 @@
             <data type="boolean"/>
           </attribute>
         </optional>
-        <oneOrMore>
-          <ref name="PureTextElement"/>
-        </oneOrMore>
+        <ref name="XrefBody"/>
       </element>
     </define>
     <define name="erefType">
@@ -188,6 +186,42 @@
         <ref name="PureTextElement"/>
       </oneOrMore>
     </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>
+      </element>
+    </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>
+      </element>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -1098,6 +1132,16 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="image" combine="choice">
+    <element name="svg">
+      <oneOrMore>
+        <choice>
+          <text/>
+          <ref name="AnyElement"/>
+        </choice>
+      </oneOrMore>
+    </element>
+  </define>
   <define name="MultilingualRenderingType">
     <choice>
       <value>common</value>
@@ -2631,4 +2675,30 @@
       </zeroOrMore>
     </element>
   </define>
+  <define name="XrefBody">
+    <zeroOrMore>
+      <ref name="XrefTarget"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="PureTextElement"/>
+    </oneOrMore>
+  </define>
+  <define name="XrefTarget">
+    <element name="location">
+      <attribute name="target">
+        <data type="string">
+          <param name="pattern">\i\c*|\c+#\c+</param>
+        </data>
+      </attribute>
+      <attribute name="connective">
+        <choice>
+          <value>and</value>
+          <value>or</value>
+          <value>from</value>
+          <value>to</value>
+          <value/>
+        </choice>
+      </attribute>
+    </element>
+  </define>
 </grammar>

data/lib/relaton_iec/hit_collection.rb

@@ -31,7 +31,7 @@ module RelatonIec
       all_parts_item = bibitem.to_all_parts
       parts.reject { |h| h.hit[:code] == hit.hit[:code] }.each do |hi|
         isobib = RelatonIec::IecBibliographicItem.new(
-          formattedref: RelatonBib::FormattedRef.new(content: hi.hit[:code])
+          formattedref: RelatonBib::FormattedRef.new(content: hi.hit[:code]),
         )
         all_parts_item.relation << RelatonBib::DocumentRelation.new(type: "partOf", bibitem: isobib)
       end

data/lib/relaton_iec/iec_bibliographic_item.rb

@@ -3,7 +3,7 @@ module RelatonIec
     TYPES = %w[
       international-standard technical-specification technical-report
       publicly-available-specification international-workshop-agreement
-      guide industry-technical-agreement
+      guide industry-technical-agreement system-reference-delivrabble
     ].freeze
 
     FUNCTION = %w[emc safety enviroment quality-assurance].freeze
@@ -25,9 +25,9 @@ module RelatonIec
       if args[:updates_document_type] &&
           !TYPES.include?(args[:updates_document_type])
         warn "[relaton-iec] WARNING: invalid updates_document_type "\
-          "\"#{args[:updates_document_type]}\""
+             "\"#{args[:updates_document_type]}\""
         warn "[relaton-iec] allowed updates_document_type values are: "\
-          "#{TYPES.join(', ')}"
+             "#{TYPES.join(', ')}"
       end
       @function = args.delete :function
       @updates_document_type = args.delete :updates_document_type

data/lib/relaton_iec/iec_bibliography.rb

@@ -21,7 +21,7 @@ module RelatonIec
       # @param part [String, nil] search for packaged stndard if not nil
       # @return [RelatonIec::HitCollection]
       def search(text, year = nil, part = nil)
-        HitCollection.new text.sub(/(^\w+)\//, '\1 '), year&.strip, part
+        HitCollection.new text&.sub(/(^\w+)\//, '\1 '), year&.strip, part
       rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
@@ -32,8 +32,8 @@ module RelatonIec
       #   reference is required
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        opts[:all_parts] ||= code.match? /\s\(all parts\)/
-        ref = code.sub /\s\(all parts\)/, ""
+        opts[:all_parts] ||= code.match?(/\s\(all parts\)/)
+        ref = code.sub(/\s\(all parts\)/, "")
         if year.nil?
           /^(?<code1>[^:]+):(?<year1>[^:]+)/ =~ ref
           unless code1.nil?
@@ -91,10 +91,10 @@ module RelatonIec
       # @return [RelatonIec::HitCollection]
       def search_filter(ref, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         %r{
-          ^(?<code>\S+[^\d]*\s\d+((?:-\w+)+)?)
-          (:(?<year1>\d{4}))?
-          (?<bundle>\+[^\s\/]+)?
-          (\/(?<corr>AMD\s\d+))?
+          ^(?<code>\S+[^\d]*\s\d+(?:-\w+)*)
+          (?::(?<year1>\d{4}))?
+          (?<bundle>\+[^\s/]+)?
+          (?:/(?<corr>AMD\s\d+))?
         }x =~ ref.upcase
         year ||= year1
         corr&.sub! " ", ""
@@ -106,13 +106,12 @@ module RelatonIec
         end
         result = search code if result.empty?
         code = result.text.dup
-        code&.sub! /((?:-\w+)+)/, ""
+        code&.sub!(/((?:-\w+)+)/, "")
         result.select do |i|
           %r{
-            ^(?<code2>\S+[^\d]*\s\d+)((?:-\w+)+)?
-            (:\d{4})?
-            (?<bundle2>\+[^\s\/]+)?
-            (\/(?<corr2>AMD\d+))?
+            ^(?<code2>\S+[^\d]*\s\d+)(?:-\w+)*(?::\d{4})?
+            (?<bundle2>\+[^\s/]+)?
+            (?:/(?<corr2>AMD\d+))?
           }x =~ i.hit[:code]
           code == code2 && bundle == bundle2 && corr == corr2
         end

data/lib/relaton_iec/scrapper.rb

@@ -17,17 +17,18 @@ module RelatonIec
 
     TYPES = {
       "ISO" => "international-standard",
-      "TS" => "technicalSpecification",
-      "TR" => "technicalReport",
-      "PAS" => "publiclyAvailableSpecification",
-      "AWI" => "appruvedWorkItem",
-      "CD" => "committeeDraft",
-      "FDIS" => "finalDraftInternationalStandard",
-      "NP" => "newProposal",
-      "DIS" => "draftInternationalStandard",
-      "WD" => "workingDraft",
+      "TS" => "technical-specification",
+      "TR" => "technical-report",
+      "PAS" => "publicly-available-specification",
+      "AWI" => "appruved-work-item",
+      "CD" => "committee-draft",
+      "FDIS" => "final-draft-international-standard",
+      "NP" => "new-proposal",
+      "DIS" => "draft-international-standard",
+      "WD" => "working-draft",
       "R" => "recommendation",
       "Guide" => "guide",
+      "SRD" => "system-reference-delivrabble",
     }.freeze
 
     class << self
@@ -218,9 +219,10 @@ module RelatonIec
       # @param doc [Nokogiri::HTML::Document]
       # @return [String]
       def fetch_type(doc)
-        doc.at(
+        type = doc.at(
           '//th[contains(., "Publication type")]/following-sibling::td/span',
-        ).text.downcase.tr " ", "-"
+        ).text
+        TYPES[type] || type.downcase.tr(" ", "-")
       end
 
       # Fetch titles.

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.10.1".freeze
+  VERSION = "1.11.2".freeze
 end

data/relaton_iec.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "pry-byebug"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ruby-jing"
   spec.add_development_dependency "simplecov"
@@ -33,5 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", "~> 1.10.1"
+  spec.add_dependency "relaton-iso-bib", "~> 1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.10.1
+  version: 1.11.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-09 00:00:00.000000000 Z
+date: 2022-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml
@@ -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
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.1
+        version: 1.11.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email: