relaton-iec 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d2d6999eefa5afb477c3c783a8c8ff9a68b22b69d431973a16417be21e37d9
-  data.tar.gz: 73437e701a2da723a1bc4d36113753dec5a99f9962937a2a7b1d61e50214e337
+  metadata.gz: 26f4ed095f846982958565c16856f12c681fb06f6b4dcdf6d9d51da5e122fda3
+  data.tar.gz: 9d6d6de7f5ecc68aa0133460e80070e79cf4d58e167ac546dbeb2eb3e18ba537
 SHA512:
-  metadata.gz: 2682e97e9005ab0e32be5bc672dc1a958501ecc7fc5b23b909a808add96a473a472cdf255b5fb2b5c51664be12c4ce078e318acb44eafb7c6e207b9f31f63190
-  data.tar.gz: 1361dc12bec431a896f5dab4a8d8230e62793da56f387bf8319e42bae35751df25cf79e09655cf111887292885e5105c0887377ebb81301bb33a0eda8dae8629
+  metadata.gz: f9110c1ee9b89a7a31048cb3f57814f16ba0835135849db067e6f4970a63f5f9a3af18507d6a5b040fa4e4a239873264b34e85673abb0b034afc45ca78bbe9fe
+  data.tar.gz: c2384461bcfd0715d241e0e5cd91f1631158293a57e488acea984f1fbdb3033997fcface2580d04c07212bd1d6e548edfe332da369b21e41a132673848648d5e

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

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -680,6 +677,9 @@
     <zeroOrMore>
       <ref name="extent"/>
     </zeroOrMore>
+    <optional>
+      <ref name="bibliographic_size"/>
+    </optional>
     <zeroOrMore>
       <ref name="accesslocation"/>
     </zeroOrMore>
@@ -828,6 +828,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
@@ -920,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_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

@@ -9,6 +9,11 @@ module RelatonIec
   # Scrapper.
   module Scrapper
     DOMAIN = "https://webstore.iec.ch"
+    ABBREVS = {
+      "ISO" => ["International Organization for Standardization", "www.iso.org"],
+      "IEC" => ["International Electrotechnical Commission", "www.iec.ch"],
+      "CISPR" => ["International special committee on radio interference", "www.iec.ch"],
+    }.freeze
 
     TYPES = {
       "ISO" => "international-standard",
@@ -36,7 +41,7 @@ module RelatonIec
 
         # Fetch edition.
         edition = doc.at(
-          "//th[contains(., 'Edition')]/following-sibling::td/span"
+          "//th[contains(., 'Edition')]/following-sibling::td/span",
         ).text
 
         status, relations = fetch_status_relations hit_data[:url]
@@ -59,7 +64,7 @@ module RelatonIec
           copyright: fetch_copyright(hit_data[:code], doc),
           link: fetch_link(doc, hit_data[:url]),
           relation: relations,
-          place: ["Geneva"]
+          place: ["Geneva"],
         )
       end
       # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
@@ -71,7 +76,7 @@ module RelatonIec
       def fetch_docid(hit)
         urn = RelatonIec.code_to_urn hit[:code], "en"
         [
-          RelatonBib::DocumentIdentifier.new(id: hit[:code], type: "IEC"),
+          RelatonBib::DocumentIdentifier.new(id: hit[:code], type: "IEC", primary: true),
           RelatonBib::DocumentIdentifier.new(id: urn, type: "URN"),
         ]
       end
@@ -121,12 +126,12 @@ module RelatonIec
         item_ref = doc.at("//span[@itemprop='productID']")
         unless item_ref
           return RelatonIsoBib::StructuredIdentifier.new(
-            project_number: "?", part_number: "", prefix: nil, id: "?"
+            project_number: "?", part_number: "", prefix: nil, id: "?",
           )
         end
 
         m = item_ref.text.match(
-          /(?<=\s)(?<project>\d+)-?(?<part>(?<=-)\d+|)-?(?<subpart>(?<=-)\d+|)/
+          /(?<=\s)(?<project>\d+)-?(?<part>(?<=-)\d+|)-?(?<subpart>(?<=-)\d+|)/,
         )
         RelatonIsoBib::StructuredIdentifier.new(
           project_number: m[:project],
@@ -134,7 +139,7 @@ module RelatonIec
           subpart_number: m[:subpart],
           prefix: nil,
           type: "IEC",
-          id: item_ref.text
+          id: item_ref.text,
         )
       end
 
@@ -190,7 +195,7 @@ module RelatonIec
                  else r_type
                  end
           fref = RelatonBib::FormattedRef.new(
-            content: r.at("FULL_NAME").text, format: "text/plain"
+            content: r.at("FULL_NAME").text, format: "text/plain",
           )
           bibitem = IecBibliographicItem.new(formattedref: fref)
           { type: type, bibitem: bibitem }
@@ -199,8 +204,8 @@ module RelatonIec
 
       def fetch_status_relations(url)
         pubid = url.match(/\d+$/).to_s
-        uri = URI DOMAIN + "/webstore/webstore.nsf/AjaxRequestXML?"\
-        "Openagent&url=" + pubid
+        uri = URI "#{DOMAIN}/webstore/webstore.nsf/AjaxRequestXML?"\
+                  "Openagent&url=#{pubid}"
         resp = Net::HTTP.get_response uri
         doc = Nokogiri::XML resp.body
         status = fetch_status doc
@@ -214,7 +219,7 @@ module RelatonIec
       # @return [String]
       def fetch_type(doc)
         doc.at(
-          '//th[contains(., "Publication type")]/following-sibling::td/span'
+          '//th[contains(., "Publication type")]/following-sibling::td/span',
         ).text.downcase.tr " ", "-"
       end
 
@@ -253,9 +258,9 @@ module RelatonIec
       # @return [Array<Hash>]
       def fetch_ics(doc)
         doc.xpath(
-          '//th[contains(text(), "ICS")]/following-sibling::td/a'
+          '//th[contains(text(), "ICS")]/following-sibling::td/a',
         ).map do |i|
-          code = i.text.match(/[\d\.]+/).to_s.split "."
+          code = i.text.match(/[\d.]+/).to_s.split "."
           { field: code[0], group: code[1], subgroup: code[2] }
         end
       end
@@ -292,11 +297,7 @@ module RelatonIec
       # rubocop:enable Metrics/MethodLength
 
       def name_url(abbrev)
-        case abbrev
-        when "ISO" then ["International Organization for Standardization", "www.iso.org"]
-        when "IEC" then ["International Electrotechnical Commission", "www.iec.ch"]
-        when "CISPR" then ["International special committee on radio interference", "www.iec.ch"]
-        end
+        ABBREVS[abbrev]
       end
     end
   end

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.10.0".freeze
+  VERSION = "1.11.1".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.0"
+  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.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-04-23 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.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email: