relaton-iec 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96d2d6999eefa5afb477c3c783a8c8ff9a68b22b69d431973a16417be21e37d9
-  data.tar.gz: 73437e701a2da723a1bc4d36113753dec5a99f9962937a2a7b1d61e50214e337
+  metadata.gz: 3e449c90e5d42349f83529a764d1eb502658dae2dd993e2597f2051c0ac14b9e
+  data.tar.gz: 5cfa9fb5734c5467f22de8bd6629c02d60b7f0f3ac13fb06892530519eaa3af3
 SHA512:
-  metadata.gz: 2682e97e9005ab0e32be5bc672dc1a958501ecc7fc5b23b909a808add96a473a472cdf255b5fb2b5c51664be12c4ce078e318acb44eafb7c6e207b9f31f63190
-  data.tar.gz: 1361dc12bec431a896f5dab4a8d8230e62793da56f387bf8319e42bae35751df25cf79e09655cf111887292885e5105c0887377ebb81301bb33a0eda8dae8629
+  metadata.gz: f4c2d5a7969cd29d8cf4311d636bf5ff8f1567acf5e11d003e2b1bfee8dc35df79a9bcfe5d3a9d738eccfb2b8fbb604c00b408873226c7f21734a3fc1b9dfa5b
+  data.tar.gz: ed09a6035d0f056097f8cf4c0f34f7b0af1d44723e968114f1090652f2aa3ae8aa73ac1f1864f2b45a1ea0ae7696b5082fe18419af286be1a5245c7fcdc82ae9

data/grammars/biblio.rng

@@ -209,9 +209,6 @@
       <zeroOrMore>
         <ref name="contact"/>
       </zeroOrMore>
-      <zeroOrMore>
-        <ref name="uri"/>
-      </zeroOrMore>
     </element>
   </define>
   <define name="fullname">
@@ -828,6 +825,11 @@
       <optional>
         <attribute name="scope"/>
       </optional>
+      <optional>
+        <attribute name="primary">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>

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.10.1".freeze
 end

data/relaton_iec.gemspec

@@ -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.10.1"
 end

metadata

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