relaton-iso 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cbed7056136ece40250512abb969807dbec09fc8ccf7f35c0630cf2bb505930
-  data.tar.gz: f102924d725dbf89310e7b834cff58eea44e4bf394e8e32afa9b896dc6a49f3b
+  metadata.gz: 23dbce13e2b3ded9fbcca9cc7c9193fdf8bdec270fdf52b416652f334f8af593
+  data.tar.gz: bb3482b113d31b79c7050f0d2206cb3df3588f8ef1cc45e72721c9c2dfd50201
 SHA512:
-  metadata.gz: 52e04fb0cc61407b669e0ad1cdc30220149efe16d72099ac97cca2503847e9d58e18cacd13703142a6bc654ce07c6d953e50640f9018849335b85782b700b840
-  data.tar.gz: f54fc59412c41567637ab92df52dd528fd6c02e7699c5d89a9c385ea37c00e5fc8671581a46579580d467e6206b0f48782113f62a7a2bb163227ac3bc0bf349d
+  metadata.gz: a9bfbe60c42fb0ee0aee1e67c4b125715d3cad5ec9b52dfa87b1efb2484260ba768da03aabddc4794d28c2d18a840dc9f982eb28b1e41399f3166052806294d8
+  data.tar.gz: dd40529ac753e12996e0fc57abcf8b1bfa161059f726688ab0895f921cc8d65d3b6f224eb39a51081137b2338e0e891cc042d6cd470e2aa38195e53970bf6d63

data/lib/relaton_iso/iso_bibliography.rb

@@ -12,7 +12,7 @@ module RelatonIso
       # @param text [String]
       # @return [RelatonIso::HitCollection]
       def search(text)
-        HitCollection.new text
+        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
@@ -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

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
@@ -347,14 +373,14 @@ module RelatonIso
       # Fetch copyright.
       # @param ref [String]
       # @param doc [Nokogiri::HTML::Document]
-      # @return [Hash]
+      # @return [Array<Hash>]
       def fetch_copyright(ref, doc)
         owner_name = ref.match(/.*?(?=\s)/).to_s
         from = ref.match(/(?<=:)\d{4}/).to_s
         if from.empty?
           from = doc.xpath("//span[@itemprop='releaseDate']").text.match(/\d{4}/).to_s
         end
-        { owner: { name: owner_name }, from: from }
+        [{ owner: [{ name: owner_name }], from: from }]
       end
     end
   end

data/lib/relaton_iso/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonIso
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 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.1.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 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-04-28 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -156,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: relaton-iso-bib
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: