relaton-iec 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 157261e9f755e3f373aa9bc025389029f4b069519d7ab4842ea41d3c9a9e19ce
-  data.tar.gz: 89f46eb034143a119e842677074058db9a684eacef09dc4c5b42ec8670f1636f
+  metadata.gz: 3398e512749f7c734e53ea2538e6b39ad87d95c175a35dc339b604e20d674ca4
+  data.tar.gz: 7414e6addf0ffc4cc87ff8c9a1fead896b386399d3c33a87602e8cef376cf6c6
 SHA512:
-  metadata.gz: ecc69a778b11e14465ef0c1827eb038d22fee208f8920772670d95bb48c62d656179871bf47ef6ef4b7a3615ea997349eeee819bd0bd585133c8c3b794afa737
-  data.tar.gz: 74c0e6583725319b9a45429f5cbb9bc7c6434a830268215e243029a3334516854cce54b28229e6797361665bb79da9d42a994bd62cd331710987bb3d46c86244
+  metadata.gz: e60740affa737419167ff5c6fbdaefa4baa53d152a0e92662786bf86ca20fba6dbfeb6c822eaa0f32bd9d24314f80f999e4008ea7117130d6120a7aef05ea2a9
+  data.tar.gz: 4f02935efb8932622d86f70a501a4aeafef0b990362bc0f291e816d29f2c5b6fe9b65198f97378d7906409a34a12853b0b53bda240860228c2251ff1c837ecb8

data/lib/relaton_iec/hit_collection.rb

@@ -51,7 +51,10 @@ module RelatonIec
     # @return [Array<RelatonIec::Hit>]
     def results(uri, part)
       contains = "[contains(.,'Part #{part}:')]" if part
-      Nokogiri::HTML(OpenURI.open_uri(uri)).xpath(
+      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}"

data/lib/relaton_iec/iec_bibliography.rb

@@ -85,10 +85,16 @@ module RelatonIec
         workers.result.sort_by { |a| a[:i] }.map { |x| x[:hit] }
       end
 
-      def isobib_search_filter(code, year) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        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..."
+      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
@@ -97,9 +103,16 @@ module RelatonIec
         else ref = code
         end
         result.select do |i|
-          i.hit[:code] &&
-            i.hit[:code].match(docidrx).to_s.include?(ref) &&
-            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
 
@@ -160,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, year) || 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

@@ -172,6 +172,8 @@ module RelatonIec
         if wip
           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.7.2".freeze
+  VERSION = "1.7.3".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iec
 version: !ruby/object:Gem::Version
-  version: 1.7.2
+  version: 1.7.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-01 00:00:00.000000000 Z
+date: 2020-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: debase