relaton-iso 1.0.0 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb85071d2ebed9f1e67b59e9a537447760294a8ce80ff22be58d1d7998ab00e
-  data.tar.gz: 35e80272681800ac9e9b74c7ad0cc27591064dc92cbfba32dab152bd7b522176
+  metadata.gz: abf60687d46a08d6b3f1ec1979849f8b13d33d174c7e65c992bf8f81db5a531c
+  data.tar.gz: 22f99b919161f9a36fe5f8292da573b050b0abd80218a4dcc6105d53b71cb46f
 SHA512:
-  metadata.gz: afdf9b868856297b715394060127a9ad5ec690a367e7031364a4cd17c906897a12e99f96d78b2fae16328e955b51ee42e8a7ec449ca341dd7eb3a769b8b4d1cf
-  data.tar.gz: 75890dddb68e7ea33bfcf3bf92589dc61b9c3a8da166079e65bfce7f166c68cc62194e46b5c316ceed4f21f7d477c56eccda8b8d558230af24ed81bb0afc200d
+  metadata.gz: 5f357af63b1d9beeb1848a6f8a4a39d5f1a401a2d7947e59390144c9a9ab0bdc915a4ea342204f355cda395f739e963757d3e5b6e6a083cdb4230173f8b72c22
+  data.tar.gz: 3b7e1cb107ae0b41d50db54c595b88fbb6ddac865893ac2b08a2001fa3494e4ec0cb832352d7a24657b437c3b81985310735dce041434933f29693f2077568ef

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

@@ -12,10 +12,10 @@ module RelatonIso
       # @param text [String]
       # @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
+        HitCollection.new text.gsub(/\u2013/, "-")
+      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
 
@@ -26,15 +26,15 @@ module RelatonIso
       #   return actual reference with year
       # @return [String] Relaton XML serialisation of reference
       def get(ref, year = nil, opts = {})
-        opts[:ref] = ref
+        opts[:ref] = ref.gsub(/\u2013/, "-")
 
         %r{
           ^(?<code1>[^\s]+\s[^/]+) # match code
           /?
           (?<corr>(Amd|DAmd|(CD|WD|AWI|NP)\sAmd|Cor|CD\sCor|FDAmd|PRF\sAmd)\s\d+ # correction name
           :?(\d{4})?(/Cor\s\d+:\d{4})?) # match correction year
-        }x =~ ref
-        code = code1 || ref
+        }x =~ opts[:ref]
+        code = code1 || opts[:ref]
 
         if year.nil?
           /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+)(:(?<year1>\d{4}))?(?<code2>\s\w+)?/ =~ code
@@ -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/scrapper.rb

@@ -25,6 +25,30 @@ module RelatonIso
       "Guide" => "guide",
     }.freeze
 
+    STGABBR = {
+      "00" => "NWIP",
+      "10" => "AWI",
+      "20" => "WD",
+      "30" => "CD",
+      "40" => "DIS",
+      "50" => "FDIS",
+      "60" => { "00" => "PRF", "60" => "FINAL" },
+    }.freeze
+
+    PUBLISHERS = {
+      "IEC" => { name: "International Electrotechnical Commission",
+                 url: "www.iec.ch" },
+      "ISO" => { name: "International Organization for Standardization",
+                 url: "www.iso.org" },
+      "IEEE" => { name: "Institute of Electrical and Electronics Engineers",
+                  url: "www.ieee.org" },
+      "SAE" => { name: "SAE International", url: "www.sae.org" },
+      "CIE" => { name: " International Commission on Illumination",
+                 url: "cie.co.at" },
+      "ASME" => { name: "American Society of Mechanical Engineers",
+                  url: "www.asme.org" },
+    }.freeze
+
     class << self
       # Parse page.
       # @param hit_data [Hash]
@@ -176,10 +200,17 @@ module RelatonIso
       # @param status [String]
       # @return [Hash]
       def fetch_status(doc)
-        stage, substage = doc.css("li.dropdown.active span.stage-code > strong").text.split "."
-        RelatonBib::DocumentStatus.new(stage: stage, substage: substage)
+        stg, substg = doc.css(
+          "li.dropdown.active span.stage-code > strong",
+        ).text.split "."
+        RelatonBib::DocumentStatus.new(stage: stg, substage: substg)
       end
 
+      # def stage(stg, substg)
+      #   abbr = STGABBR[stg].is_a?(Hash) ? STGABBR[stg][substg] : STGABBR[stg]
+      #   RelatonBib::DocumentStatus::Stage.new value: stg, abbreviation: abbr
+      # end
+
       # Fetch workgroup.
       # @param doc [Nokogiri::HTML::Document]
       # @return [Hash]
@@ -303,17 +334,12 @@ module RelatonIso
       end
 
       def fetch_contributors(ref)
-        ref.sub(/\s.*/, "").split("/").map do |abbrev|
-          case abbrev
-          when "IEC"
-            name = "International Electrotechnical Commission"
-            url  = "www.iec.ch"
-          else
-            name = "International Organization for Standardization"
-            url = "www.iso.org"
-          end
-          { entity: { name: name, url: url, abbreviation: abbrev },
-            role: [type: "publisher"] }
+        ref.sub(/\s.*/, "").split("/").reduce([]) do |mem, abbrev|
+          publisher = PUBLISHERS[abbrev]
+          next mem unless publisher
+
+          publisher[:abbreviation] = abbrev
+          mem << { entity: publisher, role: [type: "publisher"] }
         end
       end
       # rubocop:enable Metrics/MethodLength

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -37,6 +37,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"
 
-  spec.add_dependency "relaton-iec", "~> 1.0.0"
-  spec.add_dependency "relaton-iso-bib", "~> 1.0.0"
+  spec.add_dependency "relaton-iec", ">= 1.0.1"
+  spec.add_dependency "relaton-iso-bib", ">= 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.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-25 00:00:00.000000000 Z
+date: 2020-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -154,30 +154,30 @@ dependencies:
   name: relaton-iec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: