relaton-bsi 1.8.2 → 1.9.1

data/lib/relaton_bsi/bsi_bibliographic_item.rb

@@ -1,24 +1,25 @@
 module RelatonBsi
   class BsiBibliographicItem < RelatonIsoBib::IsoBibliographicItem
     TYPES = %w[
-      specification management-systems-standard code-of-practice guide
-      method-of-test method-of-specifying vocabulary classification
+      british-standard draft-for-development published-document privately-subscribed-standard
+      publicly-available-specification flex-standard international-standard technical-specification
+      technical-report guide international-workshop-agreement industry-technical-agreement
+      standard european-workshop-agreement
     ].freeze
 
-    # @return [String, nil]
-    attr_reader :price_code
-
-    # @return [Boolean, nil]
-    attr_reader :cen_processing
+    SUBDOCTYPES = %w[specification method-of-test method-of-specifying vocabulary code-of-practice].freeze
 
     # @params price_code [String, nil]
     # @param cen_processing [Boolean, nil]
-    def initialize(**args)
+    def initialize(**args) # rubocop:disable Metrics/AbcSize
       # if args[:doctype] && !TYPES.include?(args[:doctype])
       #   warn "[relaton-bsi] WARNING: invalid doctype: #{args[:doctype]}"
+      #   warn "[relaton-bsi] Allowed doctypes are: #{TYPES.join(', ')}"
       # end
-      @price_code = args.delete :price_code
-      @cen_processing = args.delete :cen_processing
+      if args[:subdoctype] && !SUBDOCTYPES.include?(args[:subdoctype])
+        warn "[relaton-bsi] WARNING: invalid subdoctype: #{args[:subdoctype]}"
+        warn "[relaton-bsi] Allowed subdoctypes are: #{SUBDOCTYPES.join(', ')}"
+      end
       super
     end
 
@@ -28,7 +29,7 @@ module RelatonBsi
     # @option opts [String] :lang language
     # @return [String] XML
     def to_xml(**opts) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      super **opts do |b|
+      super(**opts) do |b|
         if opts[:bibdata] && (has_ext_attrs? || price_code ||
           !cen_processing.nil?)
           b.ext do
@@ -38,8 +39,6 @@ module RelatonBsi
             ics.each { |i| i.to_xml b }
             structuredidentifier&.to_xml b
             b.stagename stagename if stagename
-            b.send "price-code", price_code if price_code
-            b.send "cen-processing", cen_processing unless cen_processing.nil?
           end
         end
       end
@@ -49,7 +48,7 @@ module RelatonBsi
     # @return [RelatonBsi::BsiBibliographicItem]
     def self.from_hash(hash)
       item_hash = ::RelatonBsi::HashConverter.hash_to_bib(hash)
-      new **item_hash
+      new(**item_hash)
     end
   end
 end

data/lib/relaton_bsi/bsi_bibliography.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require "mechanize"
+# require "mechanize"
 require "relaton_iso_bib"
 require "relaton_bsi/bsi_bibliographic_item"
 require "relaton_bsi/scrapper"
@@ -20,8 +20,8 @@ module RelatonBsi
         HitCollection.new code, year
       rescue SocketError, Timeout::Error, Errno::EINVAL, Errno::ECONNRESET,
              EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError,
-             Net::ProtocolError
-        raise RelatonBib::RequestError, "Could not access #{HitCollection::DOMAIN}"
+             Net::ProtocolError, Algolia::AlgoliaUnreachableHostError => e
+        raise RelatonBib::RequestError, e.message
       end
 
       # @param code [String] the BSI standard Code to look up
@@ -29,15 +29,9 @@ module RelatonBsi
       # @param opts [Hash] options; restricted to :all_parts if all-parts reference is required
       # @return [String] Relaton XML serialisation of reference
       def get(code, year = nil, opts = {}) # rubocop:disable Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        # if year.nil?
-        #   /^(?<code1>[^\s]+\s[^\s]+)\s\((\d{2}\/)?(?<year1>\d+)\)$/ =~ code
-        #   unless code1.nil?
-        #     code = code1
-        #     year = year1
-        #   end
-        # end
-
-        ret = bib_get1(code, year, 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]
@@ -67,14 +61,13 @@ module RelatonBsi
       end
 
       def search_filter(code) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-        %r{^BSI\s(?<code1>[^:]+)} =~ code
+        # %r{^BSI\s(?<code1>[^:]+)} =~ code
+        code1 = code.sub(/^BSI\s/, "")
         warn "[relaton-bsi] (\"#{code}\") fetching..."
         return [] unless code1
 
         result = search(code)
         result.select do |i|
-          next true unless i.hit[:code]
-
           %r{^(?<code2>[^:]+)} =~ i.hit[:code]
           code2.include?(code1)
         end

data/lib/relaton_bsi/hit_collection.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "algolia"
 require "relaton_bsi/hit"
 
 module RelatonBsi
@@ -8,29 +9,39 @@ module RelatonBsi
     DOMAIN = "https://shop.bsigroup.com"
 
     # @return [Mechanize]
-    attr_reader :agent
+    # 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}"
-      @array = hits resp
+      # @agent = Mechanize.new
+      # resp = agent.get "#{DOMAIN}/SearchResults/?q=#{ref}"
+      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"
+      @array = hits resp[:hits]
     end
 
     private
 
-    # @param resp [Mechanize::Page]
+    # @param hits [Array<Hash>]
     # @return [Array<RelatonBsi::Hit>]
-    def hits(resp)
-      resp.xpath("//div[@class='resultsInd']").map do |h|
-        ref = h.at('div/h2/a')
-        code = ref.text.strip
-        url = ref[:href]
-        d = h.at("//div/strong[.='Published Date:']/following-sibling::strong").text
-        date = Date.parse(d)
-        Hit.new({ code: code, url: url, date: date }, self)
+    def hits(hits) # rubocop:disable Metrics/MethodLength
+      hits.map do |h|
+        Hit.new(
+          {
+            code: h[:meta][:global][:primaryDesignator],
+            title: h[:title],
+            url: h[:handle],
+            date: h[:meta][:global][:publishedDate],
+            publisher: h[:meta][:global][:publisher],
+            status: h[:meta][:global][:status],
+            ics: h[:meta][:global][:icsCodesAlgoliaStringArray],
+            doctype: h[:product_type],
+          }, self
+        )
       end
     end
   end

data/lib/relaton_bsi/processor.rb

@@ -5,7 +5,7 @@ module RelatonBsi
     def initialize
       @short = :relaton_bsi
       @prefix = "BSI"
-      @defaultprefix = %r{^BSI\s}
+      @defaultprefix = %r{^(BSI|BS|PD)\s}
       @idtype = "BSI"
     end