relaton-iso 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb85071d2ebed9f1e67b59e9a537447760294a8ce80ff22be58d1d7998ab00e
-  data.tar.gz: 35e80272681800ac9e9b74c7ad0cc27591064dc92cbfba32dab152bd7b522176
+  metadata.gz: 0cbed7056136ece40250512abb969807dbec09fc8ccf7f35c0630cf2bb505930
+  data.tar.gz: f102924d725dbf89310e7b834cff58eea44e4bf394e8e32afa9b896dc6a49f3b
 SHA512:
-  metadata.gz: afdf9b868856297b715394060127a9ad5ec690a367e7031364a4cd17c906897a12e99f96d78b2fae16328e955b51ee42e8a7ec449ca341dd7eb3a769b8b4d1cf
-  data.tar.gz: 75890dddb68e7ea33bfcf3bf92589dc61b9c3a8da166079e65bfce7f166c68cc62194e46b5c316ceed4f21f7d477c56eccda8b8d558230af24ed81bb0afc200d
+  metadata.gz: 52e04fb0cc61407b669e0ad1cdc30220149efe16d72099ac97cca2503847e9d58e18cacd13703142a6bc654ce07c6d953e50640f9018849335b85782b700b840
+  data.tar.gz: f54fc59412c41567637ab92df52dd528fd6c02e7699c5d89a9c385ea37c00e5fc8671581a46579580d467e6206b0f48782113f62a7a2bb163227ac3bc0bf349d

data/lib/relaton_iso/hit.rb

@@ -10,11 +10,12 @@ module RelatonIso
       @fetch ||= Scrapper.parse_page @hit, lang
     end
 
+    # @return [Integer]
     def sort_weight
-      case hit["publicationStatus"]
-      when "Published" then 0
-      when "Under development" then 1
-      when "Withdrawn" then 2
+      case hit["publicationStatus"] && hit["publicationStatus"]["key"]
+      when "ENT_ACTIVE" then 0
+      when "ENT_PROGRESS" then 1
+      when "ENT_INACTIVE" then 2
       else 3
       end
     end

data/lib/relaton_iso/hit_collection.rb

@@ -5,6 +5,8 @@ require "relaton_iso/hit"
 module RelatonIso
   # Page of hit collection.
   class HitCollection < RelatonBib::HitCollection
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+
     # @param text [String] reference to search
     def initialize(text)
       super
@@ -48,9 +50,12 @@ module RelatonIso
       end
       all_parts_item
     end
+    # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
 
     private
 
+    # @param hit [Hash]
+    # @return [Date]
     def parse_date(hit)
       if hit["publicationDate"]
         Date.strptime(hit["publicationDate"], "%Y-%m")

data/lib/relaton_iso/iso_bibliography.rb

@@ -13,9 +13,9 @@ module RelatonIso
       # @return [RelatonIso::HitCollection]
       def search(text)
         HitCollection.new text
-      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError,
-             Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError,
-             OpenSSL::SSL::SSLError, Errno::ETIMEDOUT
+      rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
+             EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
+             Net::ProtocolError, OpenSSL::SSL::SSLError, Errno::ETIMEDOUT
         raise RelatonBib::RequestError, "Could not access http://www.iso.org"
       end
 
@@ -58,6 +58,8 @@ module RelatonIso
 
       private
 
+      # rubocop:disable Metrics/MethodLength
+
       def fetch_ref_err(code, year, missed_years)
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-iso] WARNING: no match found online for #{id}. "\
@@ -75,13 +77,7 @@ module RelatonIso
         nil
       end
 
-      # def fetch_pages(s, n)
-      #   workers = RelatonBib::WorkersPool.new n
-      #   workers.worker { |w| { i: w[:i], hit: w[:hit].fetch } }
-      #   s.each_with_index { |hit, i| workers << { i: i, hit: hit } }
-      #   workers.end
-      #   workers.result.sort { |x, y| x[:i] <=> y[:i] }.map { |x| x[:hit] }
-      # end
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
 
       # Search for hits. If no found then trying missed stages and ISO/IEC.
       #
@@ -114,6 +110,7 @@ module RelatonIso
         end
         res
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       # @param result [RelatonIso::HitCollection]
       # @param corr [String] correction
@@ -137,6 +134,8 @@ module RelatonIso
         end
       end
 
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
       # Sort through the results from RelatonIso, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).
@@ -146,8 +145,6 @@ module RelatonIso
       def isobib_results_filter(result, year, opts)
         missed_years = []
         hits = result.reduce!([]) do |hts, h|
-          # if !year && h.hit["publicationStatus"] == "Withdrawn"
-          #   hts
           if !year || %r{:(?<iyear>\d{4})} =~ h.hit["docRef"] && iyear == year
             hts << h
           else
@@ -161,6 +158,7 @@ module RelatonIso
 
         { ret: hits.to_all_parts(opts[:lang]) }
       end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
       # @param code [String]
       # @param year [String, NilClass]

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug