relaton-cen 1.16.1 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a64d7b3c77fcd73b38bc5ce62313141e51da3b0f784532b6ff10da1069a7c528
-  data.tar.gz: 6186b2913635bc27fc7cf8ea86961985a809063dc36ca60d75a78976b89949b5
+  metadata.gz: 2536bccf8d4ddbd3215a965683a22eea51e8739ea65a45b3f41a5f46fb63a035
+  data.tar.gz: 148612cdbba0da00f7e81e34c3c79e038cb85cb6249ff9923b0dc7267acb9afb
 SHA512:
-  metadata.gz: ae0b06db552199faef6afda209aa35918b4b486a04e8979c4554527443ac29122e4c6dcb0597e6438898a4dbda24596e7ea436b4810e4becd57eda9415b23e5b
-  data.tar.gz: 7a7644ba895afbfe99c9b5601a1cff601ebd7ee00f5ff842507d3f36f2ecd3ae53ecf054c162ac7d852ad435536997df827040604b15fa5f1f7039bb04b024fb
+  metadata.gz: 9eb0ea3431e54f1b1aade2bb02153c24ac4b2a531cd29e246b7b7cd0caf0af999da18ec56a4ecac1d2a7c125ac8148731d0dc27ec65a58b876f8a719006af9ce
+  data.tar.gz: 56bf1b0df47893249c88a05547fe5c2048112079b32499a5c673979ff05cf2c7a54402cd533d58ad8c986302e26681c4c3f66fd2ea39c097993c977701c58e95

data/README.adoc

@@ -52,18 +52,40 @@ item = hit_collection[0].fetch
 
 === Get a standard by its code
 
+Use `RelatonCen::CenBibliography.get(ref, year, options)` to get a standard by its code.
+
+- `ref` is the standard code, e.g. `CEN ISO/TS 21003-7`
+- `year` is the year of the standard, e.g. `2019` (optional)
+- `options` is a hash of options:
+  - `keep_year` - keep the year in ID if true (optional)
+
 [source,ruby]
 ----
+# With year in reference
+RelatonCen::CenBibliography.get "EN 10160:1999"
+[relaton-cen] (EN 10160:1999) fetching...
+[relaton-cen] (EN 10160:1999) found `EN 10160:1999`
+=> #<RelatonCen::BibliographicItem:0x0000000112d8b900
+...
+
+# With a year as a separate argument
+RelatonCen::CenBibliography.get "EN 10160", "1999"
+
+# To get the most recent version of a standard by its code use reference without year
 > RelatonCen::CenBibliography.get "CEN/CLC Guide 6"
 [relaton-cen] (CEN/CLC Guide 6) fetching...
-[isoics] code   not found in ICS list
-[relaton-cen] (CEN/CLC Guide 6) `found CEN/CLC Guide 6`
-=>
-#<RelatonCen::BibliographicItem:0x000000011371cb90
- @abstract=
-  [#<RelatonBib::FormattedString:0x000000011371c5f0
-    @content=
-     "ISO/IEC Guide 71:2014 provides guidance to standards..."
+[isoics] code   not found in ICS list
+[relaton-cen] (CEN/CLC Guide 6) found `CEN/CLC Guide 6`
+=> #<RelatonCen::BibliographicItem:0x0000000112d81680
+...
+
+# To keep the year in ID use `keep_year` option
+> RelatonCen::CenBibliography.get "CEN/CLC Guide 6", nil, keep_year: true
+[relaton-cen] (CEN/CLC Guide 6) fetching...
+[isoics] code   not found in ICS list
+[relaton-cen] (CEN/CLC Guide 6) found `CEN/CLC Guide 6:2014`
+=> #<RelatonCen::BibliographicItem:0x0000000112d8b400
+...
 ----
 
 === XML serialization

data/lib/relaton_cen/cen_bibliography.rb

@@ -13,11 +13,14 @@ module RelatonCen
         raise RelatonBib::RequestError, e.message
       end
 
+      #
       # @param code [String] the CEN standard Code to look up
       # @param year [String] the year the standard was published (optional)
-      # @param opts [Hash] options; restricted to :all_parts if all-parts
-      #   reference is required
+      # @param opts [Hash] options
+      # @option opts [Boolean] :keep_year don't upate reference
+      #
       # @return [RelatonBib::BibliographicItem, nil]
+      #
       def get(code, year = nil, opts = {})
         code_parts = code_to_parts code
         year ||= code_parts[:year] if code_parts
@@ -64,9 +67,8 @@ module RelatonCen
 
       # @param code [String]
       # @return [RelatonCen::HitCollection]
-      def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
+      def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         parts = code_to_parts code
-        warn "[relaton-cen] (\"#{code}\") fetching..."
         result = search(code)
         result.select do |i|
           pts = code_to_parts i.hit[:code]
@@ -97,12 +99,14 @@ module RelatonCen
         { years: missed_years }
       end
 
-      def bib_get(code, year, _opts)
+      def bib_get(code, year, opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+        ref = year.nil? || code.match?(/:\d{4}/) ? code : "#{code}:#{year}"
+        warn "[relaton-cen] (#{ref}) fetching..."
         result = search_filter(code) || return
         ret = isobib_results_filter(result, year)
         if ret[:ret]
-          bib = year ? ret[:ret] : ret[:ret].to_most_recent_reference
-          warn "[relaton-cen] (#{code}) found `#{bib.docidentifier.first&.id}`"
+          bib = year || opts[:keep_year] ? ret[:ret] : ret[:ret].to_most_recent_reference
+          warn "[relaton-cen] (#{ref}) found `#{bib.docidentifier.first&.id}`"
           bib
         else
           fetch_ref_err(code, year, ret[:years])

data/lib/relaton_cen/scrapper.rb

@@ -41,8 +41,11 @@ module RelatonCen
       # @param doc [Mechanize::Page]
       # @return [Array<RelatonIsobib::Ics>]
       def fetch_ics(doc)
-        doc.xpath("//tr[th[.='ICS']]/td/text()").map do |ics|
-          RelatonIsoBib::Ics.new ics.text.match(/[^\s]+/).to_s
+        doc.xpath("//tr[th[.='ICS']]/td/text()").filter_map do |ics|
+          ics_code = ics.text.match(/[^\s]+/).to_s.gsub("\u00A0", "")
+          next if ics_code.empty?
+
+          RelatonIsoBib::Ics.new ics_code
         end
       end
 

data/lib/relaton_cen/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonCen
-  VERSION = "1.16.1"
+  VERSION = "1.16.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-cen
 version: !ruby/object:Gem::Version
-  version: 1.16.1
+  version: 1.16.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-09-06 00:00:00.000000000 Z
+date: 2023-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize