relaton-bsi 1.8.3 → 1.9.2

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
@@ -68,8 +68,6 @@ module RelatonBsi
 
         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