relaton-bsi 1.9.4 → 1.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2749b7966d113cba9dc0cbd432b8f9d072c325397fd41c299425b19446570ea
-  data.tar.gz: 66649bac24670c82a3089b52e0466f149d3b790ba4ec6686bc3b67917f6d329c
+  metadata.gz: 9db2a5ff65039b9e7bbda2507f116444d0f0cccc7919da1e3be8d735c94d5324
+  data.tar.gz: 903b68e85f928546ae715b4c0f88cf602e31717d38a39e8f7455df8d4c03ef31
 SHA512:
-  metadata.gz: 4dcd33e8c4bf049237e3ca184c399c9d3f2f4cfb7ae3c9561ace6eecc03047fadab5268ba34ee382c4572e211740ea2b7b9142d7082148a3276fbc0b8ed9ca63
-  data.tar.gz: 8346013400a2ebe7ed52a1982a792dc0502834dfb3097ecfa9ad9d3dc7f3a5d308cb94a15ebea2cf3988929e09534d2e1ecde846f1e84a46902bc194e96a96a5
+  metadata.gz: bb7f32531e7aedc5eb0d6499a31cabe1d642809f8b7f324e44bd3ea3af9e751415eb1f06fdb0cf003a3499b543fa202a046e9fce54e16965f39e6ca36c1b4ffd
+  data.tar.gz: d943a7d57ab744e350eb56bd325b7df2e2ea86c513032899b208aa8e9600a0a48c22a76b6cb887885f85edceb545bbe018a855870312e18a15ebd973a03b006a

data/lib/relaton_bsi/bsi_bibliography.rb

@@ -33,9 +33,9 @@ module RelatonBsi
       #
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {})
-        c, y = code.split ":"
-        year ||= y
-        ret = bib_get1(c, year, 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]
@@ -66,18 +66,30 @@ module RelatonBsi
       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,14 +8,14 @@ module RelatonBsi
   class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://shop.bsigroup.com"
 
-
     # @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"

data/lib/relaton_bsi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RelatonBsi
-  VERSION = "1.9.4"
+  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.4
+  version: 1.9.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml