relaton-iec 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96438836d8ff6dc43038e974bf3cf1c70107c06e03d7d7878508576907429d51
-  data.tar.gz: bfe78e4af7af37608aa15c21b489411778fd39ba20e743674599a19d2568e5ca
+  metadata.gz: feed37a0cc997a6fbbc8ca4dd6b83dd3cb4496336f65eaeb03f20b12f3ff9f2d
+  data.tar.gz: 7dd0c847253d5e44ad50e36b7352ed905d55c6155cf0bd1621f9b1a46b019160
 SHA512:
-  metadata.gz: 98c11cc1a8e26ce0fa59899b3aaebc236494b05891030e07ea88d16dc44c592050bc07286af2edf64f9691ead7943fdac1571632afbdf86f7282093f24fca666
-  data.tar.gz: a937f3f458bd7a7b7a67eefede14951b6e9672f69a015d2d3ac6796b6e2e94b652fa5c9d5a2ce54bec344a3d0fee8a65c5448db94deb7807e03d0990ccfd99af
+  metadata.gz: d8ded4181c4a2130743bef4664c411b435aa6e9d25b5c580340c6eb644049adc43313089640c4195838ae165a843cfcf869c1076afe92b4f35101c55977f7d22
+  data.tar.gz: 764b7692397d25da284c7ef704ccbc56373d4b743c3c02864e1ede7b530f641ce5a53c3c0486f943a86b52843f7dd30c7ee9f66a0b618647c6bd4f7f1863eedb

data/grammars/biblio.rng

@@ -88,7 +88,7 @@
       <text/>
     </element>
   </define>
-  <define name="LocalizedString">
+  <define name="LocalizedString1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -98,6 +98,16 @@
     </optional>
     <text/>
   </define>
+  <define name="LocalizedString">
+    <choice>
+      <ref name="LocalizedString1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedString1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <!--
     Unlike UML, change type to format: type is overloaded
     Would be need if plain were default value and could omit the attribute
@@ -121,7 +131,7 @@
     </optional>
     <ref name="LocalizedStringOrXsAny"/>
   </define>
-  <define name="LocalizedStringOrXsAny">
+  <define name="LocalizedStringOrXsAny1">
     <optional>
       <!-- multiple languages and scripts possible: comma delimit them if so -->
       <attribute name="language"/>
@@ -136,6 +146,16 @@
       </choice>
     </oneOrMore>
   </define>
+  <define name="LocalizedStringOrXsAny">
+    <choice>
+      <ref name="LocalizedStringOrXsAny1"/>
+      <oneOrMore>
+        <element name="variant">
+          <ref name="LocalizedStringOrXsAny1"/>
+        </element>
+      </oneOrMore>
+    </choice>
+  </define>
   <define name="contributor">
     <element name="contributor">
       <zeroOrMore>
@@ -641,9 +661,9 @@
     <optional>
       <ref name="status"/>
     </optional>
-    <optional>
+    <zeroOrMore>
       <ref name="copyright"/>
-    </optional>
+    </zeroOrMore>
     <zeroOrMore>
       <ref name="docrelation"/>
     </zeroOrMore>
@@ -1001,7 +1021,17 @@
       <optional>
         <ref name="to"/>
       </optional>
-      <ref name="owner"/>
+      <oneOrMore>
+        <ref name="owner"/>
+      </oneOrMore>
+      <optional>
+        <ref name="copyright_scope"/>
+      </optional>
+    </element>
+  </define>
+  <define name="copyright_scope">
+    <element name="scope">
+      <text/>
     </element>
   </define>
   <define name="from">

data/grammars/isodoc.rng

@@ -53,6 +53,14 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="case">
+            <choice>
+              <value>capital</value>
+              <value>lowercase</value>
+            </choice>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -902,7 +910,15 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
-      <ref name="paragraph"/>
+      <oneOrMore>
+        <choice>
+          <ref name="paragraph"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="formula"/>
+        </choice>
+      </oneOrMore>
     </element>
   </define>
   <define name="termexample">

data/grammars/isostandard.rng

@@ -91,6 +91,12 @@
     </define>
     <define name="sections">
       <element name="sections">
+        <zeroOrMore>
+          <choice>
+            <ref name="note"/>
+            <ref name="admonition"/>
+          </choice>
+        </zeroOrMore>
         <ref name="clause"/>
         <optional>
           <choice>
@@ -263,6 +269,8 @@
         <value>publicly-available-specification</value>
         <value>international-workshop-agreement</value>
         <value>guide</value>
+        <value>amendment</value>
+        <value>technical-corrigendum</value>
       </choice>
     </define>
     <define name="structuredidentifier">
@@ -510,7 +518,7 @@
         </attribute>
       </optional>
       <oneOrMore>
-        <ref name="paragraph-with-footnote"/>
+        <ref name="BasicBlock"/>
       </oneOrMore>
     </element>
   </define>

data/lib/relaton_iec/scrapper.rb

@@ -32,27 +32,18 @@ module RelatonIec
     }.freeze
 
     class << self
-      # @param text [String]
-      # @return [Array<Hash>]
-      # def get(text)
-      #   iso_workers = WorkersPool.new 4
-      #   iso_workers.worker { |hit| iso_worker(hit, iso_workers) }
-      #   algolia_workers = start_algolia_search(text, iso_workers)
-      #   iso_docs = iso_workers.result
-      #   algolia_workers.end
-      #   algolia_workers.result
-      #   iso_docs
-      # end
+      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       # Parse page.
       # @param hit [Hash]
       # @return [Hash]
-      # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
       def parse_page(hit_data)
         doc = get_page hit_data[:url]
 
         # Fetch edition.
-        edition = doc.at("//th[contains(., 'Edition')]/following-sibling::td/span").text
+        edition = doc.at(
+          "//th[contains(., 'Edition')]/following-sibling::td/span",
+        ).text
 
         status, relations = fetch_status_relations hit_data[:url]
 
@@ -81,46 +72,6 @@ module RelatonIec
 
       private
 
-      # Start search workers.
-      # @param text[String]
-      # @param iec_workers [Isobib::WorkersPool]
-      # @reaturn [Isobib::WorkersPool]
-      # def start_algolia_search(text, iec_workers)
-      #   index = Algolia::Index.new 'all_en'
-      #   workers = WorkersPool.new
-      #   workers.worker do |page|
-      #     algolia_worker(index, text, page, workers, iec_workers)
-      #   end
-
-      #   # Add first page so search worker will start.
-      #   workers << 0
-      # end
-
-      # Fetch ISO documents.
-      # @param hit [Hash]
-      # @param isiso_workers [Isobib::WorkersPool]
-      # def iso_worker(hit, iso_workers)
-      #   print "Parse #{iso_workers.size} of #{iso_workers.nb_hits}  \r"
-      #   parse_page hit
-      # end
-
-      # Fetch hits from algolia search service.
-      # @param index[Algolia::Index]
-      # @param text [String]
-      # @param page [Integer]
-      # @param algolia_workers [Isobib::WorkersPool]
-      # @param isiso_workers [Isobib::WorkersPool]
-      # def algolia_worker(index, text, page, algolia_workers, iso_workers)
-      #   res = index.search text, facetFilters: ['category:standard'], page: page
-      #   next_page = res['page'] + 1
-      #   algolia_workers << next_page if next_page < res['nbPages']
-      #   res['hits'].each do |hit|
-      #     iso_workers.nb_hits = res['nbHits']
-      #     iso_workers << hit
-      #   end
-      #   iso_workers.end unless next_page < res['nbPages']
-      # end
-
       # Fetch abstracts.
       # @param doc [Nokigiri::HTML::Document]
       # @return [Array<Array>]
@@ -134,19 +85,6 @@ module RelatonIec
         }]
       end
 
-      # Get langs.
-      # @param doc [Nokogiri::HTML::Document]
-      # @return [Array<Hash>]
-      # def langs(doc)
-      #   lgs = [{ lang: 'en' }]
-      #   doc.css('ul#lang-switcher ul li a').each do |lang_link|
-      #     lang_path = lang_link.attr('href')
-      #     lang = lang_path.match(%r{^\/(fr)\/})
-      #     lgs << { lang: lang[1], path: lang_path } if lang
-      #   end
-      #   lgs
-      # end
-
       # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
 
       # Get page.
@@ -154,25 +92,20 @@ module RelatonIec
       # @return [Array<Nokogiri::HTML::Document, String>]
       def get_page(url)
         uri = URI url
-        resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
+        resp = Net::HTTP.get_response(uri)
         case resp.code
         when "301"
           path = resp["location"]
           url = DOMAIN + path
           uri = URI url
-          resp = Net::HTTP.get_response(uri) # .encode("UTF-8")
+          resp = Net::HTTP.get_response(uri)
         when "404"
           raise RelatonBib::RequestError, "Page not found #{url}"
         end
-        # n = 0
-        # while resp.body !~ /<strong/ && n < 10
-        #   resp = Net::HTTP.get_response(uri)#.encode("UTF-8")
-        #   n += 1
-        # end
         Nokogiri::HTML(resp.body)
-      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-             OpenSSL::SSL::SSLError
+      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
+             EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+             Net::ProtocolError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access #{url}"
       end
       # rubocop:enable Metrics/AbcSize
@@ -211,15 +144,12 @@ module RelatonIec
           statuses = YAML.load_file "lib/relaton_iec/statuses.yml"
           s = wip.at("STAGE").text
           stage, substage = statuses[s]["stage"].split "."
-          # status = statuses[s]["status"]
         else
-          # status   = "Published"
           stage    = "60"
           substage = "60"
         end
         RelatonBib::DocumentStatus.new(stage: stage, substage: substage)
       end
-      # rubocop:enable Metrics/MethodLength
 
       # Fetch workgroup.
       # @param doc [Nokogiri::HTML::Document]
@@ -237,13 +167,15 @@ module RelatonIec
           }],
         }
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Fetch relations.
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<Hash>]
       # rubocop:disable Metrics/MethodLength
       def fetch_relations(doc)
-        doc.xpath('//ROW[STATUS[.!="PREPARING"]][STATUS[.!="PUBLISHED"]]').map do |r|
+        doc.xpath('//ROW[STATUS[.!="PREPARING"]][STATUS[.!="PUBLISHED"]]').
+          map do |r|
           r_type = r.at("STATUS").text.downcase
           type = case r_type
                  # when 'published' then 'obsoletes' # Valid
@@ -251,7 +183,6 @@ module RelatonIec
                  when "withdrawn" then "obsoletes"
                  else r_type
                  end
-          # url = DOMAIN + "/publication/" + r.at("PUB_ID").text
           fref = RelatonBib::FormattedRef.new(
             content: r.at("FULL_NAME").text, format: "text/plain",
           )
@@ -270,22 +201,6 @@ module RelatonIec
         status = fetch_status doc
         relations = fetch_relations doc
         [status, relations]
-        # doc.css('ul.steps li').inject([]) do |a, r|
-        #   r_type = r.css('strong').text
-        #   type = case r_type
-        #          when 'Previously', 'Will be replaced by' then 'obsoletes'
-        #          when 'Corrigenda/Amendments', 'Revised by', 'Now confirmed'
-        #            'updates'
-        #          else r_type
-        #          end
-        #   if ['Now', 'Now under review'].include? type
-        #     a
-        #   else
-        #     a + r.css('a').map do |id|
-        #       { type: type, identifier: id.text, url: id['href'] }
-        #     end
-        #   end
-        # end
       end
       # rubocop:enable Metrics/MethodLength
 
@@ -293,23 +208,13 @@ module RelatonIec
       # @param doc [Nokogiri::HTML::Document]
       # @return [String]
       def fetch_type(doc)
-        doc.at('//th[contains(., "Publication type")]/following-sibling::td/span').
-          text.downcase.tr " ", "-"
-        # type_match = title.match(%r{^(ISO|IWA|IEC)(?:(/IEC|/IEEE|/PRF|
-        #   /NP)*\s|/)(TS|TR|PAS|AWI|CD|FDIS|NP|DIS|WD|R|Guide|(?=\d+))}x)
-        # #return "international-standard" if type_match.nil?
-        # if TYPES[type_match[2]]
-        #   TYPES[type_match[2]]
-        # elsif type_match[1]
-        # elsif type_match[1] == 'ISO'
-        #   'international-standard'
-        # elsif type_match[1] == 'IWA'
-        #   'international-workshop-agreement'
-        # end
-        # # rescue => _e
-        # #   puts 'Unknown document type: ' + title
+        doc.at(
+          '//th[contains(., "Publication type")]/following-sibling::td/span',
+        ).text.downcase.tr " ", "-"
       end
 
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
+
       # Fetch titles.
       # @param hit_data [Hash]
       # @return [Array<Hash>]
@@ -337,21 +242,13 @@ module RelatonIec
         end
         [{
           title_intro: intro,
-          title_main:  main,
-          title_part:  part,
-          language:    "en",
-          script:      "Latn"
+          title_main: main,
+          title_part: part,
+          language: "en",
+          script: "Latn",
         }]
       end
-
-      # Return ISO script code.
-      # @param lang [String]
-      # @return [String]
-      # def script(lang)
-      #   case lang
-      #   when 'en', 'fr' then 'Latn'
-      #   end
-      # end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength
 
       # Fetch dates
       # @param doc [Nokogiri::HTML::Document]
@@ -365,6 +262,8 @@ module RelatonIec
         dates
       end
 
+      # rubocop:disable Metrics/MethodLength
+
       def fetch_contributors(code)
         code.sub(/\s.*/, "").split("/").map do |abbrev|
           case abbrev
@@ -379,12 +278,15 @@ module RelatonIec
             role: [type: "publisher"] }
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       # Fetch ICS.
       # @param doc [Nokogiri::HTML::Document]
       # @return [Array<Hash>]
       def fetch_ics(doc)
-        doc.xpath('//th[contains(text(), "ICS")]/following-sibling::td/a').map do |i|
+        doc.xpath(
+          '//th[contains(text(), "ICS")]/following-sibling::td/a',
+        ).map do |i|
           code = i.text.match(/[\d\.]+/).to_s.split "."
           { field: code[0], group: code[1], subgroup: code[2] }
         end
@@ -401,9 +303,11 @@ module RelatonIec
         links
       end
 
+      # rubocop:disable Metrics/MethodLength
+
       # Fetch copyright.
       # @param title [String]
-      # @return [Hash]
+      # @return [Array<Hash>]
       def fetch_copyright(code, doc)
         abbreviation = code.match(/.*?(?=\s)/).to_s
         case abbreviation
@@ -413,11 +317,15 @@ module RelatonIec
         end
         from = code.match(/(?<=:)\d{4}/).to_s
         if from.empty?
-          from = doc.xpath("//span[@itemprop='releaseDate']").text
-            .match(/\d{4}/).to_s
+          from = doc.xpath("//span[@itemprop='releaseDate']").text.
+            match(/\d{4}/).to_s
         end
-        { owner: { name: name, abbreviation: abbreviation, url: url }, from: from }
+        [{
+          owner: [{ name: name, abbreviation: abbreviation, url: url }],
+          from: from,
+        }]
       end
+      # rubocop:enable Metrics/MethodLength
     end
   end
   # rubocop:enable Metrics/ModuleLength

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.0.1".freeze
+  VERSION = "1.1.0".freeze
 end

data/relaton_iec.gemspec

@@ -35,5 +35,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "webmock"
 
   spec.add_dependency "addressable"
-  spec.add_dependency "relaton-iso-bib", ">= 1.0.1"
+  spec.add_dependency "relaton-iso-bib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -168,16 +168,16 @@ dependencies:
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.1.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email: