relaton-iso 1.0.3 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b085bd68fb134686bce61bdbb540360ebd52c6f3d7382db66a38b8b05f2e60b8
-  data.tar.gz: 9c4c0858b18d5da5b45ee552b0489f881adcb7c944fc6817d2c6a378d0de371f
+  metadata.gz: 9e3b6cecb41e4d2c51cecad3b906e25fc1202ff2f9d69261d23a199c9084f0d8
+  data.tar.gz: 8a3f4c0a7857ef1c8668b1c1624f22573817b333a6bc674a77d729f2034098d9
 SHA512:
-  metadata.gz: 3c6aac2f294c40fc3d8d946d9462e75e6784f593a9734ce6f8f2378a404fe07acbd4bc148d87db1d7e51fb3b460deb1a944d3894cd97ef1e58a0b6850dde6272
-  data.tar.gz: efdc6acaaaa21d6c1b1354d8c7ff36fc327618edb47f58071e36a277f814f077c414da74c0c7c744bd564f75404fbc65f1d3367342a7cd098f7a5d3e1d4cf4c7
+  metadata.gz: 379e71ee50015f6ee0d012f3f157c1a355d5a69a670f3ed2a6dc7be6dafd86b4376808c8263f15c8deea3c85617ed7368dee72770c5d13e3f6e8948a1bfd9cea
+  data.tar.gz: d66f8ede9750f437adbc36682c4ae591ea800f887c8df54d36ea48f57ee1a09cd98e6e4b1b22dfc8653afdef2a29d7cf678782d41600110fca1e59e5074c77cc

data/.rubocop.yml

@@ -5,6 +5,6 @@
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
 Rails:
-  Enabled: true
+  Enabled: false

data/lib/relaton_iso/iso_bibliography.rb

@@ -38,9 +38,10 @@ module RelatonIso
 
         if year.nil?
           /^(?<code1>[^\s]+(\s\w+)?\s[\d-]+)(:(?<year1>\d{4}))?(?<code2>\s\w+)?/ =~ code
+          /:(?<year2>\d{4})/ =~ corr
           unless code1.nil?
             code = code1 + code2.to_s
-            year = year1
+            year = year2 || year1
           end
         end
         opts[:all_parts] ||= code !~ %r{^[^\s]+\s\d+-\d+} && opts[:all_parts].nil? && code2.nil?
@@ -145,7 +146,7 @@ module RelatonIso
       def isobib_results_filter(result, year, opts)
         missed_years = []
         hits = result.reduce!([]) do |hts, h|
-          if !year || %r{:(?<iyear>\d{4})} =~ h.hit["docRef"] && iyear == year
+          if !year || %r{:(?<iyear>\d{4})(?!.*:\d{4})} =~ h.hit["docRef"] && iyear == year
             hts << h
           else
             missed_years << iyear

data/lib/relaton_iso/scrapper.rb

@@ -33,7 +33,21 @@ module RelatonIso
       "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.
@@ -90,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
@@ -273,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.
@@ -320,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
@@ -364,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.3"
+  VERSION = "1.2.1"
 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.1"
-  spec.add_dependency "relaton-iso-bib", ">= 1.0.1"
+  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.3
+  version: 1.2.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-20 00:00:00.000000000 Z
+date: 2020-08-20 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.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        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.1
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.2.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: