relaton-bsi 1.9.1 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 762ff6b45033ac0a1d992a71e317857a198bebf26078a5018eb7f66932a3b13a
-  data.tar.gz: f57772a8f6a38508d52275df9371f734a62aa6ab2e937f4f1796ee91654a86cc
+  metadata.gz: 9db2a5ff65039b9e7bbda2507f116444d0f0cccc7919da1e3be8d735c94d5324
+  data.tar.gz: 903b68e85f928546ae715b4c0f88cf602e31717d38a39e8f7455df8d4c03ef31
 SHA512:
-  metadata.gz: fcc4a7e94e32c77c4e5ac26811797db97a57616af9c2867a299c1b155a7209c302f24e372e5bae5dee7287e59ac5e5a8bf08ffafd068d2fbc88b74784ac1d14d
-  data.tar.gz: a688c0ef854eaa91003b9728ed46e54498b17a75f877a84418862fa1d960cfec5e501bb56661ea545fcdf6877f465d77c2fccc985ed0968a29cb96a7f0413910
+  metadata.gz: bb7f32531e7aedc5eb0d6499a31cabe1d642809f8b7f324e44bd3ea3af9e751415eb1f06fdb0cf003a3499b543fa202a046e9fce54e16965f39e6ca36c1b4ffd
+  data.tar.gz: d943a7d57ab744e350eb56bd325b7df2e2ea86c513032899b208aa8e9600a0a48c22a76b6cb887885f85edceb545bbe018a855870312e18a15ebd973a03b006a

data/.rubocop.yml

@@ -2,6 +2,8 @@
 # https://github.com/riboseinc/oss-guides
 # All project-specific additions and overrides should be specified in this file.
 
+require: rubocop-rails
+
 inherit_from:
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 AllCops:

data/README.adoc

@@ -124,11 +124,10 @@ item.to_xml bibdata: true
 </bibdata>"
 ----
 
-=== Get code, and year
+=== Get standard by code and year
 [source,ruby]
 ----
-RelatonBsi::BsiBibliographicItem  RelatonBsi::BsiBibliography       
-[7] pry(main)> RelatonBsi::BsiBibliography.get "BS EN ISO 8848:2021"
+RelatonBsi::BsiBibliography.get "BS EN ISO 8848:2021"
 [relaton-bsi] ("BS EN ISO 8848:2021") fetching...
 [relaton-bsi] ("BS EN ISO 8848:2021") found BS EN ISO 8848:2021
 => #<RelatonBsi::BsiBibliographicItem:0x007feb14814ca8

data/lib/relaton_bsi/bsi_bibliography.rb

@@ -24,17 +24,21 @@ module RelatonBsi
         raise RelatonBib::RequestError, e.message
       end
 
+      #
       # @param code [String] the BSI 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] :all_parts if all-parts reference is required
+      # @option opts [Boolean] :no_year if last published document is required
+      #
       # @return [String] Relaton XML serialisation of reference
-      def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        c, y = code.split ':'
-        year ||= y
-        ret = bib_get1(c, year, opts)
+      def get(code, year = nil, opts = {})
+        # y = code.split(":")[1]
+        year ||= code_parts(code)[:year]
+        ret = bib_get1(code, year, opts)
         return nil if ret.nil?
 
-        # ret = ret.to_most_recent_reference unless year || opts[:keep_year]
+        ret = ret.to_most_recent_reference unless year || opts[:keep_year]
         # ret = ret.to_all_parts if opts[:all_parts]
         ret
       end
@@ -44,35 +48,48 @@ module RelatonBsi
       def fetch_ref_err(code, year, missed_years) # rubocop:disable Metrics/MethodLength
         id = year ? "#{code}:#{year}" : code
         warn "[relaton-bsi] WARNING: no match found online for #{id}. "\
-          "The code must be exactly like it is on the standards website."
+             "The code must be exactly like it is on the standards website."
         unless missed_years.empty?
-          warn "[relaton-bsi] (There was no match for #{year}, though there were matches "\
-            "found for #{missed_years.join(', ')}.)"
+          warn "[relaton-bsi] (There was no match for #{year}, though there "\
+               "were matches found for #{missed_years.join(', ')}.)"
         end
         # if /\d-\d/.match? code
-        #   warn "[relaton-bsi] The provided document part may not exist, or the document "\
-        #     "may no longer be published in parts."
+        #   warn "[relaton-bsi] The provided document part may not exist, or "\
+        #     "the document may no longer be published in parts."
         # else
-        #   warn "[relaton-bsi] If you wanted to cite all document parts for the reference, "\
-        #     "use \"#{code} (all parts)\".\nIf the document is not a standard, "\
-        #     "use its document type abbreviation (TS, TR, PAS, Guide)."
+        #   warn "[relaton-bsi] If you wanted to cite all document parts for "\
+        #     "the reference, use \"#{code} (all parts)\".\nIf the document "\
+        #     "is not a standard, use its document type abbreviation (TS, TR, "\
+        #     "PAS, Guide)."
         # end
         nil
       end
 
       def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        # %r{^BSI\s(?<code1>[^:]+)} =~ code
-        code1 = code.sub(/^BSI\s/, "")
+        # %r{^(?:BSI\s)?(?<code1>[^:]+)} =~ code
+        # %r{^(?<code1>[^:]+)} =~ code.sub(/^BSI\s/, "")
+        cp1 = code_parts code
         warn "[relaton-bsi] (\"#{code}\") fetching..."
-        return [] unless code1
+        return [] unless cp1
 
         result = search(code)
         result.select do |i|
-          %r{^(?<code2>[^:]+)} =~ i.hit[:code]
-          code2.include?(code1)
+          # %r{^(?<code2>[^:]+)} =~ i.hit[:code]
+          cp2 = code_parts i.hit[:code]
+          cp2[:code] == cp1[:code] && (!cp1[:a] || cp2[:a] == cp1[:a]) &&
+            (!cp1[:y] || cp2[:y] == cp1[:y])
         end
       end
 
+      def code_parts(code)
+        %r{
+          ^(?:BSI\s)?(?<code>[^:]+)
+          (?::(?<year>\d{4}))?
+          (?:\+(?<a>[^:]+):)?
+          (?::(?<y>\d{4}))?
+        }x.match code
+      end
+
       # Sort through the results from Isobib, fetching them three at a time,
       # and return the first result that matches the code,
       # matches the year (if provided), and which # has a title (amendments do not).

data/lib/relaton_bsi/hit_collection.rb

@@ -8,16 +8,14 @@ module RelatonBsi
   class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://shop.bsigroup.com"
 
-    # @return [Mechanize]
-    # attr_reader :agent
-
     # @param ref [String]
     # @param year [String]
     def initialize(ref, year = nil)
       super ref, year
-      # @agent = Mechanize.new
-      # resp = agent.get "#{DOMAIN}/SearchResults/?q=#{ref}"
-      config = Algolia::Search::Config.new(application_id: "575YE157G9", api_key: "a057b4e74099445df2eddb7940828a10")
+      config = Algolia::Search::Config.new(
+        application_id: "575YE157G9",
+        api_key: "a057b4e74099445df2eddb7940828a10",
+      )
       client = Algolia::Search::Client.new config, logger: ::Logger.new($stderr)
       index = client.init_index "shopify_products"
       resp = index.search text # , facetFilters: "product_type:standard"
@@ -28,11 +26,13 @@ module RelatonBsi
 
     # @param hits [Array<Hash>]
     # @return [Array<RelatonBsi::Hit>]
-    def hits(hits) # rubocop:disable Metrics/MethodLength
+    def hits(hits) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
       hits.map do |h|
+        code = h[:meta][:global][:primaryDesignator]
+          .sub(/\s(?:LOOSELEAF|\(A5 LAMINATED\)|-\sTC$)/, "")
         Hit.new(
           {
-            code: h[:meta][:global][:primaryDesignator],
+            code: code,
             title: h[:title],
             url: h[:handle],
             date: h[:meta][:global][:publishedDate],
@@ -42,7 +42,7 @@ module RelatonBsi
             doctype: h[:product_type],
           }, self
         )
-      end
+      end.sort_by { |h| h.hit[:date] }.reverse
     end
   end
 end

data/lib/relaton_bsi/scrapper.rb

@@ -118,9 +118,9 @@ module RelatonBsi
       # @param docid [String]
       # @param data [Hash]
       # @return [Array<RelatonBib::DocumentIdentifier>]
-      def fetch_docid(docid, data)
+      def fetch_docid(docid, data) # rubocop:disable Metrics/AbcSize
         ids = [{ type: "BSI", id: docid }]
-        if data.any?
+        if data.any? && data["variants"]["edges"][0]["node"]["isbn"]
           isbn = data["variants"]["edges"][0]["node"]["isbn"]["value"]
           ids << { type: "ISBN", id: isbn }
         end

data/lib/relaton_bsi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonBsi
-  VERSION = "1.9.1"
+  VERSION = "1.9.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bsi
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.9.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-11-03 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml