relaton-bsi 1.9.0 → 1.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7956b847d798601ca7e8d1f0d08ad59ff0904f9b8319bfff428a3365f686af67
-  data.tar.gz: 4b33279c2c90e6be9cf718fd4770de6ca067d7a890b018b61350f0a3f644b92e
+  metadata.gz: e2749b7966d113cba9dc0cbd432b8f9d072c325397fd41c299425b19446570ea
+  data.tar.gz: 66649bac24670c82a3089b52e0466f149d3b790ba4ec6686bc3b67917f6d329c
 SHA512:
-  metadata.gz: f93174899ac9ad8ae5462c127dfee8213703a1721d660875e4d3e548134b3001dbc7756f607f2923d2583979a1a8c416c90d741903be125ac36e3a20ca197918
-  data.tar.gz: 285774c1eee290f9fb18af06b9f256bd80357c8ceef98189eb9c5fc022850809bc87e6efdb60ecd46ad083703b5850f8de7aa35184c0c4645beca31ac8b44090
+  metadata.gz: 4dcd33e8c4bf049237e3ca184c399c9d3f2f4cfb7ae3c9561ace6eecc03047fadab5268ba34ee382c4572e211740ea2b7b9142d7082148a3276fbc0b8ed9ca63
+  data.tar.gz: 8346013400a2ebe7ed52a1982a792dc0502834dfb3097ecfa9ad9d3dc7f3a5d308cb94a15ebea2cf3988929e09534d2e1ecde846f1e84a46902bc194e96a96a5

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

@@ -94,6 +94,16 @@ item.to_xml
 </bibitem>"
 ----
 
+=== Typed links
+
+Each BSI document has `src` type link.
+
+[source,ruby]
+----
+item.link
+=> [#<RelatonBib::TypedUri:0x00007fc02a152768 @content=#<Addressable::URI:0x576c URI:https://shop.bsigroup.com/products/small-craft-remote-mechanical-steering-systems>, @type="src">]
+----
+
 With `bibdata: true` option XML output wrapped with `bibdata` element and `ext` element added.
 [source,ruby]
 ----
@@ -114,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 ':'
+      def get(code, year = nil, opts = {})
+        c, y = code.split ":"
         year ||= y
         ret = bib_get1(c, 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,18 +48,19 @@ 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

data/lib/relaton_bsi/hit_collection.rb

@@ -8,8 +8,6 @@ module RelatonBsi
   class HitCollection < RelatonBib::HitCollection
     DOMAIN = "https://shop.bsigroup.com"
 
-    # @return [Mechanize]
-    # attr_reader :agent
 
     # @param ref [String]
     # @param year [String]
@@ -20,7 +18,7 @@ module RelatonBsi
       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"
+      resp = index.search text # , facetFilters: "product_type:standard"
       @array = hits resp[:hits]
     end
 
@@ -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.0"
+  VERSION = "1.9.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: relaton-bsi
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: equivalent-xml