relaton-iso 1.0.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 726ca28930d18170b319b15d5409f51e7954951c8a527ec22643ebab2e484002
-  data.tar.gz: d063fdc6390a3ace1f03569bb97b85c9e56d7b1ee8d992e809a154ddaa847939
+  metadata.gz: 695d73fc8a0ec542936778c62629e23278859d137bc6ee9b84e6d20336d832da
+  data.tar.gz: 1c529be373cf17e122e7d98cb910e83474916bb9d2b9d38a612c8a5f3d41aeb3
 SHA512:
-  metadata.gz: cf93495c08d8f32b1d08e8c87b6bc8cf7175be8f2ce153862e930e48635f6e238471bd84fda2aa0877351755e973d6bb96e5f01023d23602e6b125fa1dfd333e
-  data.tar.gz: f007ab7035dbaaf3ff603afba1ac944a3b2f22eff1da682078db5f3272248202f4df9668c237e9e2f97b69bd49ee64a281a7a8335cbfe2d1823b5df62ad9c7d4
+  metadata.gz: ecdd90086da2528bf41a05e499da97f10409a69004e7d45786bffcabce715bc5f3261f25a79212b56f9171cbd66ef56a82b382a3c26750f0fed8a2d1142ba922
+  data.tar.gz: d23cdc8f56ec945e945a8b5a5cede2f84e9f68c0419f6e9fc16403988d5f8fd4917656a327ed921f216783829ec2fd91073a2f59adc982cfe249a73f2bc516c2

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]
@@ -80,7 +104,7 @@ module RelatonIso
           d = l[:path] ? get_page(l[:path])[0] : doc
           unless d.at("//h5[@class='help-block'][.='недоступно на русском языке']")
             s << l
-            titles << fetch_title(d, l[:lang])
+            titles += fetch_title(d, l[:lang])
 
             # Fetch abstracts.
             abstract_content = d.css("div[itemprop='description'] p").text
@@ -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]
@@ -256,12 +287,14 @@ module RelatonIso
       # Fetch titles.
       # @param doc [Nokogiri::HTML::Document]
       # @param lang [String]
-      # @return [Hash]
+      # @return [Array<RelatonBib::TypedTitleString>]
       def fetch_title(doc, lang)
         content = doc.at(
-          "//nav[contains(@class,'eading-condensed')]/h2 | //nav[contains(@class,'eading-condensed')]/h3",
-        )&.text
-        RelatonIsoBib::HashConverter.split_title content, lang, script(lang)
+          "//nav[contains(@class,'heading-condensed')]/h2 | //nav[contains(@class,'heading-condensed')]/h3",
+        )&.text&.gsub(/\u2014/, "-")
+        return [] unless content
+
+        RelatonBib::TypedTitleString.from_string content, lang, script(lang)
       end
 
       # Return ISO script code.
@@ -303,17 +336,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 +375,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.2"
+  VERSION = "1.2.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.2.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-14 00:00:00.000000000 Z
+date: 2020-06-26 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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.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.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: