relaton-iec 1.6.0 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce61292fadf50fe832b8cd82340ff7978dd88ca647a77dfcb4b1024e663d1920
-  data.tar.gz: 75c21f0d072251b25afa1fb79a5fd9d050f7346b27b1da509c3ef5010e2144a0
+  metadata.gz: 8a149738910c8542c434a360acc80e28b47d0a506610644c46c59ac0b5275bd4
+  data.tar.gz: cef0a735b8ee7049e2f7efe845f60773c9bba620a236422ea52d4dee9b63e83a
 SHA512:
-  metadata.gz: 476865eb91561a56dc9ef96c08aec6f3aafe9cda4f0dc444db0cf433fc36889d9604ca936f6ab66576408a6f0e54d7bf013feb089683d8f903ec508ba003c221
-  data.tar.gz: e852f3cfb7db70dd61bb8729881e7d1d935add63a01f80583e166ae426d26a8765cbc4293e13251110206af10c61a923ef4033d97ffd258a17793acff08fd69d
+  metadata.gz: cf5dced7765bf8060ed5b0b1f73a404f930d2ce3bad4e4b7f500b66c74b24f9d255495e0a049ebd1a3cae99b9c0af4d5f52710f42d5f8eb8e07de2b32a2abf3b
+  data.tar.gz: 7367a1efe7c9ed2e8d976051286c7d2672da7253c0943a00c9e9c100637aff3ece058abb7e69cb8ee74fddb91c908c9df2f1d58741c7a27f1afa513102068c85

data/grammars/isodoc.rng

@@ -24,6 +24,14 @@
     <start>
       <ref name="standard-document"/>
     </start>
+    <define name="doctype">
+      <element name="doctype">
+        <optional>
+          <attribute name="abbreviation"/>
+        </optional>
+        <ref name="DocumentType"/>
+      </element>
+    </define>
     <define name="hyperlink">
       <element name="link">
         <attribute name="target">
@@ -141,6 +149,11 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="key">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>
@@ -1164,49 +1177,7 @@
   </define>
   <define name="annex">
     <element name="annex">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <optional>
-        <attribute name="language"/>
-      </optional>
-      <optional>
-        <attribute name="script"/>
-      </optional>
-      <optional>
-        <attribute name="inline-header">
-          <data type="boolean"/>
-        </attribute>
-      </optional>
-      <attribute name="obligation">
-        <choice>
-          <value>normative</value>
-          <value>informative</value>
-        </choice>
-      </attribute>
-      <optional>
-        <ref name="section-title"/>
-      </optional>
-      <group>
-        <group>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-          <zeroOrMore>
-            <ref name="note"/>
-          </zeroOrMore>
-        </group>
-        <zeroOrMore>
-          <choice>
-            <ref name="annex-subsection"/>
-            <ref name="terms"/>
-            <ref name="definitions"/>
-            <ref name="references"/>
-          </choice>
-        </zeroOrMore>
-      </group>
+      <ref name="Annex-Section"/>
     </element>
   </define>
   <define name="terms">

data/lib/relaton_iec/hit_collection.rb

@@ -9,40 +9,62 @@ module RelatonIec
     DOMAIN = "https://webstore.iec.ch"
 
     # @param ref_nbr [String]
-    # @param year [String]
-    def initialize(ref_nbr, year = nil)
-      super
-      @array = hits ref_nbr, year
+    # @param year [String, nil]
+    # @param part [String, nil]
+    def initialize(ref_nbr, year = nil, part = nil)
+      super ref_nbr, year
+      @array = hits ref_nbr, year, part
     end
 
     private
 
-    def hits(ref, year)
+    # @param ref [String]
+    # @param year [String, nil]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def hits(ref, year, part)
       from, to = nil
       if year
         from = Date.strptime year, "%Y"
         to   = from.next_year.prev_day
       end
-      get_results ref, from, to
+      get_results ref, from, to, part
     end
 
-    def get_results(ref, from,to)
+    # @param ref [String]
+    # @param from [Date, nil]
+    # @param to [Date, nil]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def get_results(ref, from, to, part = nil)
+      code = part ? ref.sub(/(?<=-\d)\d+/, "*") : ref
       [nil, "trf", "wr"].reduce([]) do |m, t|
         url = "#{DOMAIN}/searchkey"
         url += "&type=#{t}" if t
-        url += "&RefNbr=#{ref}&From=#{from}&To=#{to}&start=1"
-        m + results(Addressable::URI.parse(url).normalize)
+        url += "&RefNbr=#{code}&From=#{from}&To=#{to}&start=1"
+        m + results(Addressable::URI.parse(url).normalize, part)
       end
     end
 
-    def results(uri)
-      Nokogiri::HTML(OpenURI.open_uri(uri)).css(
-        "//body/li", "ul.search-results > li", "ul.morethesame > li"
-      ).map { |h| make_hit h }
+    # @param url [String]
+    # @param part [String, nil]
+    # @return [Array<RelatonIec::Hit>]
+    def results(uri, part)
+      contains = "[contains(.,'Part #{part}:')]" if part
+      resp = OpenURI.open_uri(uri, "User-Agent" => "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_6) "\
+        "AppleWebKit/537.36 (KHTML, like Gecko) Chrome/86.0.4240.111 Safari/537.36")
+      doc = Nokogiri::HTML(resp)
+      doc.xpath(
+        "//body/li#{contains}",
+        "//ul[contains(@class,'search-results')]/li#{contains}",
+        "//ul[contains(@class,'morethesame')]/li#{contains}"
+      ).map { |h| make_hit h }.compact
     end
 
     def make_hit(hit)
-      link  = hit.at('a[@href!="#"]')
+      link = hit.at('a[@href!="#"]')
+      return unless link
+
       code  = link.text.tr [194, 160].pack("c*").force_encoding("UTF-8"), ""
       title = hit.xpath("text()").text.gsub(/[\r\n]/, "")
       Hit.new({ code: code, title: title, url: DOMAIN + link[:href] }, self)

data/lib/relaton_iec/iec_bibliography.rb

@@ -9,10 +9,19 @@ module RelatonIec
   # Class methods for search ISO standards.
   class IecBibliography
     class << self
+      ##
+      # Search for standards entries. To seach packaged document it needs to
+      # pass part parametr.
+      #
+      # @example Search for packaged standard
+      #   RelatonIec::IecBibliography.search 'IEC 60050-311', nil, '311'
+      #
       # @param text [String]
+      # @param year [String, nil]
+      # @param part [String, nil] search for packaged stndard if not nil
       # @return [RelatonIec::HitCollection]
-      def search(text, year = nil)
-        HitCollection.new text, year
+      def search(text, year = nil, part = nil)
+        HitCollection.new text, year&.strip, part
       rescue SocketError, OpenURI::HTTPError, OpenSSL::SSL::SSLError
         raise RelatonBib::RequestError, "Could not access http://www.iec.ch"
       end
@@ -76,15 +85,34 @@ module RelatonIec
         workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
-      def isobib_search_filter(code)
-        docidrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+}
-        corrigrx = %r{^(ISO|IEC)[^0-9]*\s[0-9-]+:[0-9]+/}
-        warn "[relaton-iec] (\"#{code}\") fetching..."
-        result = search(code)
+      def isobib_search_filter(reference, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        %r{
+          ^(?<code>(?:ISO|IEC)[^\d]*\s[\d-]+\w?)
+          (:(?<year1>\d{4}))?
+          (?<bundle>\+[^\s\/]+)?
+          (\/(?<corr>AMD\s\d+))?
+        }x =~ reference.upcase
+        year ||= year1
+        corr&.sub! " ", ""
+        warn "[relaton-iec] (\"#{reference}\") fetching..."
+        result = search(code, year)
+        if result.empty? && /(?<=-)(?<part>\d+)/ =~ code
+          # try to search packaged standard
+          result = search code, year, part
+          ref = code.sub /(?<=-\d)\d+/, ""
+        else ref = code
+        end
         result.select do |i|
-          i.hit[:code] &&
-            i.hit[:code].match(docidrx).to_s.include?(code) &&
-            corrigrx !~ i.hit[:code]
+          %r{
+            ^(?<code2>(?:ISO|IEC)[^\d]*\s\d+(-\w+)?)
+            (:(?<year2>\d{4}))?
+            (?<bundle2>\+[^\s\/]+)?
+            (\/(?<corr2>AMD\d+))?
+          }x =~ i.hit[:code]
+          code2.sub! /(?<=-\d)\w*/, "" if part
+          code2.sub! /-\d+\w*/, "" if opts[:all_parts]
+          ref == code2 && (year.nil? || year == year2) && bundle == bundle2 &&
+            corr == corr2
         end
       end
 
@@ -145,10 +173,10 @@ module RelatonIec
         { years: missed_years }
       end
 
-      def iecbib_get1(code, year, _opts)
+      def iecbib_get1(code, year, opts)
         return iev if code.casecmp("IEV").zero?
 
-        result = isobib_search_filter(code) || return
+        result = isobib_search_filter(code, year, opts) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]
           warn "[relaton-iec] (\"#{code}\") found "\

data/lib/relaton_iec/scrapper.rb

@@ -170,8 +170,10 @@ module RelatonIec
       def fetch_status(doc)
         wip = doc.at('//ROW[STATUS[.="PREPARING"]]')
         if wip
-          statuses = YAML.load_file "lib/relaton_iec/statuses.yml"
+          statuses = YAML.load_file File.join __dir__, "statuses.yml"
           s = wip.at("STAGE").text
+          return unless statuses[s]
+
           stage, substage = statuses[s]["stage"].split "."
         else
           stage    = "60"

data/lib/relaton_iec/version.rb

@@ -1,3 +1,3 @@
 module RelatonIec
-  VERSION = "1.6.0".freeze
+  VERSION = "1.7.4".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.6.pre"
+  spec.add_dependency "relaton-iso-bib", "~> 1.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-13 00:00:00.000000000 Z
+date: 2020-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase
@@ -170,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.pre
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.pre
+        version: 1.7.0
 description: 'RelatonIec: retrieve IEC Standards for bibliographic use using the IecBibliographicItem
   model'
 email: