relaton-iso 1.0.4 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50a6b1b3492ba93ad87e502c5b98d71946277db082a6808c509018f0f454c596
-  data.tar.gz: d40c8012e7eb776276cab1bc0ecf9d853651917dfdabfe6a96c761b0abd059ac
+  metadata.gz: 24730f7e5d5dbf0d524cd3c2ff3c0b38484d91c27b61a2b66662fcf56125cd46
+  data.tar.gz: d432201c27f1a6e9ed53765311af71c976b748bc302b30afb8869dea379435b8
 SHA512:
-  metadata.gz: a53a91f835cc53171b34f6a79d2d7a6e6533f1f0181ada1daaaaafda12feb7a505dda718456771e0b24bed8c49b9075b3b91e5dbdb501844603629ce4dff2fa7
-  data.tar.gz: 06dac6e83cde8774fb3862d76fea547965e3a097a781c5c22f29332a0b2946f89dbbc751cde1c0492820e072e96d2913a5e0df097eb339a789c03046c30ef257
+  metadata.gz: bd023540869b80f849eae953fde47d471121ff252d003815b2479b4bdd4e6647a65d1675183f8b29d4c08c5eb8e8dbc43c22961fb27e2abf8c1921a65eba8861
+  data.tar.gz: 2486c06e8dcee6bb301ccdb477f33b82587d68149d81939b75dfcafaa9f9732a184324ad9c6165d8b6ce142a5bad243517936320a0a7c55ec6ccdbc95f539400

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

@@ -36,7 +36,7 @@ module RelatonIso
     }.freeze
 
     PUBLISHERS = {
-      "ISO" => { name: "International Electrotechnical Commission",
+      "IEC" => { name: "International Electrotechnical Commission",
                  url: "www.iec.ch" },
       "ISO" => { name: "International Organization for Standardization",
                  url: "www.iso.org" },
@@ -104,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
@@ -287,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.
@@ -373,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.4"
+  VERSION = "1.3.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.1"
-  spec.add_dependency "relaton-iso-bib", ">= 1.0.1"
+  spec.add_dependency "relaton-iec", "~> 1.3.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.3.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-23 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.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.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.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.3.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: