relaton-iso 1.10.0 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd281fdcf928bfe44ad8f9b162f09e75a9c25835c93625ed9416ebf60c0a7c8d
-  data.tar.gz: f24e00ea160d81d7c932f77b35639b119955f291ec4c5c0c60de64ab87fcce70
+  metadata.gz: 57aaa988aba37afa1e4cc8eced55b20d46eda761cad5fc8a68ac33c3793afb82
+  data.tar.gz: 0ff660f7a7ffb558659c9d8577f075cfea9e225c2d9a7bf44d209745b0d7fc76
 SHA512:
-  metadata.gz: 5739dbe20f4fe2b841057b720569db621ac96e5aba68f2c1aedd7c3977a3e227c1d424f1c34d513c429b30e9eb0dd18fda807e4833bb0bc04f9d91a172c5ad2f
-  data.tar.gz: 59b4bb9fd476e1f2cf275001f0d799140782e79b539e5f8d4458c5849d36eda7aaac040a366b7803206ecd4c9906c994c1209d8dafce44d64d61cc997a22bd86
+  metadata.gz: 8ef87dc1073df8b8653989494fda55f54cdcd780aaaa9d16e0af6e0ec6778021d73a2e81b23b18b751e95b2c607f6c27a49af50d8df1bbb95c7d9b7df76e3977
+  data.tar.gz: 154c64258dfc69a6ae01822593e0e9759648cc2f773c126f4474cd0aad8483a16e208613ccd582e94f4ea38c4c996cee089c5d5b844782f93ae2ec33be17151c

data/Gemfile

@@ -1,6 +1,3 @@
-Encoding.default_external = Encoding::UTF_8
-Encoding.default_internal = Encoding::UTF_8
-
 source "https://rubygems.org"
 
 git_source(:github) { |repo_name| "https://github.com/#{repo_name}" }

data/lib/relaton_iso/iso_bibliography.rb

@@ -31,8 +31,7 @@ module RelatonIso
       def get(ref, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity,Metrics/AbcSize
         code = ref.gsub(/\u2013/, "-")
         # %r{\s(?<num>\d+)(?:-(?<part>[\d-]+))?(?::(?<year1>\d{4}))?} =~ code
-        _, _part, year1, = ref_components ref
-        year ||= year1
+        year ||= publish_year ref
         code.sub! " (all parts)", ""
         opts[:all_parts] ||= $~ && opts[:all_parts].nil?
         # opts[:keep_year] ||= opts[:keep_year].nil?
@@ -41,7 +40,7 @@ module RelatonIso
         #   return RelatonIec::IecBibliography.get(code, year, opts)
         # end
 
-        ret = isobib_get1(code, year, opts)
+        ret = isobib_get(code, year, opts)
         return nil if ret.nil?
 
         if (year && opts[:keep_year].nil?) || opts[:keep_year] || opts[:all_parts]
@@ -166,7 +165,8 @@ module RelatonIso
       def isobib_results_filter(result, year, opts)
         missed_years = []
         hits = result.reduce!([]) do |hts, h|
-          if !year || (%r{:(?<iyear>\d{4})(?!.*:\d{4})} =~ h.hit[:title] && iyear == year)
+          iyear = publish_year h.hit[:title]
+          if !year || iyear == year
             hts << h
           else
             missed_years << iyear
@@ -183,10 +183,15 @@ module RelatonIso
       end
       # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
 
+      def publish_year(ref)
+        %r{:(?<year>\d{4})(?!.*:\d{4})} =~ ref
+        year
+      end
+
       # @param code [String]
       # @param year [String, NilClass]
       # @param opts [Hash]
-      def isobib_get1(code, year, opts)
+      def isobib_get(code, year, opts)
         # return iev(code) if /^IEC 60050-/.match code
         result = isobib_search_filter(code, opts) || return
         ret = isobib_results_filter(result, year, opts)

data/lib/relaton_iso/scrapper.rb

@@ -176,7 +176,7 @@ module RelatonIso
       def fetch_docid(doc, edition, langs)
         pubid = item_ref doc
         [
-          RelatonBib::DocumentIdentifier.new(id: pubid, type: "ISO"),
+          RelatonBib::DocumentIdentifier.new(id: pubid, type: "ISO", primary: true),
           RelatonBib::DocumentIdentifier.new(
             id: fetch_urn(doc, pubid, edition, langs), type: "URN",
           ),

data/lib/relaton_iso/version.rb

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

data/relaton_iso.gemspec

@@ -42,5 +42,5 @@ Gem::Specification.new do |spec|
 
   # spec.add_dependency "relaton-iec", "~> 1.8.0"
   spec.add_dependency "algolia"
-  spec.add_dependency "relaton-iso-bib", "~> 1.10.0"
+  spec.add_dependency "relaton-iso-bib", "~> 1.11.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-iso
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-30 00:00:00.000000000 Z
+date: 2022-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.11.0
 description: 'RelatonIso: retrieve ISO Standards for bibliographic use using the IsoBibliographicItem
   model'
 email: