gared 0.0.23 → 0.0.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1e7f535a0650e0251fec57b3572e49dda88b189b96fe1d1b630acc5e147bb4
-  data.tar.gz: b606f6169bdf2cac88f5d29cec6bf4e5464a639bc73b655a24c61aecf7593cd1
+  metadata.gz: 3857f28b69b7cd0d1080208215cbf1bfc57a30a3af5df8162a98aee5b7558939
+  data.tar.gz: a3cf8fbe5018b902db45f6d70c8223f32101c6eb747b070a7f7dc56a8a37c48c
 SHA512:
-  metadata.gz: b5c082ab85a8a7fb4cf5c23af7ebc35584751ebcaf88defc1b4f8c8d808d5cb3ff5d213db4b07687bfae49fda11b12f6963c9c6d2bd2e6b1d2e5edcc487e6e4b
-  data.tar.gz: a4415463242669077a504252094c2e93f63469fe6fcd4faeeee7a5cceb852b5325608dd5255991c79f04d725856ac61296023301c39af0a4f48288dbe1ddad70
+  metadata.gz: 69f3b46c6fa96f5bf2c2f440fbc9bf93bbe57ec8ac61e84a9621289e67b919342558a323a9b14008d58f7472e48651ee43bd584879b011d78741a6212b7e81b1
+  data.tar.gz: f822f3a7f95e6c4ca38f78843a4309b764a624d053234bc880b672ec57cf011b88b3089f5a40836f328a8e1a366cb6660500609449a11eed16d5b0c7a86ac64e

data/lib/gared/googlebooks.rb

@@ -5,9 +5,13 @@ module Gared
     def initialize(api_key, page_size = '40')
       @options = {api_key: api_key, maxResults: page_size}
     end
-
+    def uri_escape(s)
+      p = URI::Parser.new
+      return p.escape(s)
+    end
+  
     def query_publications_by_person(person, ctx = nil)
-      url = "https://www.googleapis.com/books/v1/volumes?q=inauthor:#{URI.escape(person)}&filter=full&key=#{@options[:api_key]}&maxResults=#{@options[:maxResults]}"
+      url = "https://www.googleapis.com/books/v1/volumes?q=inauthor:#{uri_escape(person)}&filter=full&key=#{@options[:api_key]}&maxResults=#{@options[:maxResults]}"
       resp = JSON.parse(RestClient.get(url))
     
       total = resp['totalItems']

data/lib/gared/nli_api.rb

@@ -5,7 +5,11 @@ module Gared
     def initialize(url, api_key)
       @options = {url: url, api_key: api_key}
     end
-
+    def uri_escape(s)
+      p = URI::Parser.new
+      return p.escape(s)
+    end
+  
     def query_persons(q)
     end
 
@@ -36,15 +40,15 @@ module Gared
       ret = []
       begin
         # first run obtain counts for the query
-        escaped_person = URI.escape(person)
-        url = @options[:url]+"?api_key=#{@options[:api_key]}&query=creator,contains,#{escaped_person},AND;language,exact,heb&sort_field=title&material_type=books&count_mode=true"
+        escaped_person = uri_escape(person)
+        url = @options[:url]+"?api_key=#{@options[:api_key]}&query=creator,contains,#{escaped_person},AND;language,exact,heb&sort_field=title&material_type=book&count_mode=true"
         json = JSON.parse(RestClient::Resource.new(url,verify_ssl: OpenSSL::SSL::VERIFY_NONE).get)
         total = json['countInfos']['total']
         # then start loading the results
         result_page = 1
         recs = []
         while recs.length < total
-          url = @options[:url]+"?api_key=#{@options[:api_key]}&query=creator,contains,#{escaped_person},AND;language,exact,heb&sort_field=title&material_type=books&result_page=#{result_page}"
+          url = @options[:url]+"?api_key=#{@options[:api_key]}&query=creator,contains,#{escaped_person},AND;language,exact,heb&sort_field=title&material_type=book&result_page=#{result_page}"
           puts "DBG: retrieving results page #{result_page}"
           json = JSON.parse(RestClient::Resource.new(url,verify_ssl: OpenSSL::SSL::VERIFY_NONE).get)
           recs += json

data/lib/gared/primo.rb

@@ -6,7 +6,11 @@ module Gared
     def initialize(url, institution)
       @options = {url: url, institution: institution}
     end
-
+    def uri_escape(s)
+      p = URI::Parser.new
+      return p.escape(s)
+    end
+  
     def query_persons(q)
     end
 
@@ -23,14 +27,14 @@ module Gared
     def query_publications_by_person(person, ctx = nil)
       ret = []
       begin
-        url = @options[:url]+"?institution=#{@options[:institution]}&query=creator,contains,#{URI.escape(person)}&indx=1&bulkSize=50&query=facet_rtype,exact,books&json=true"
+        url = @options[:url]+"?institution=#{@options[:institution]}&query=creator,contains,#{uri_escape(person)}&indx=1&bulkSize=50&query=facet_rtype,exact,books&json=true"
         json = JSON.parse(RestClient.get(url))
         total = json['SEGMENTS']['JAGROOT']['RESULT']['DOCSET']['@TOTALHITS'].to_i
         start_at = 1
         recs = json['SEGMENTS']['JAGROOT']['RESULT']['DOCSET']['DOC'] # stash the records
         while recs.length < total
           start_at += 50
-          url = @options[:url]+"?institution=#{@options[:institution]}&query=creator,contains,#{URI.escape(person)}&indx=#{start_at}&bulkSize=50&query=facet_rtype,exact,books&json=true"
+          url = @options[:url]+"?institution=#{@options[:institution]}&query=creator,contains,#{uri_escape(person)}&indx=#{start_at}&bulkSize=50&query=facet_rtype,exact,books&json=true"
           json = JSON.parse(RestClient.get(url))
           recs += json['SEGMENTS']['JAGROOT']['RESULT']['DOCSET']['DOC']
           sleep 1 # respect the server and avoid flood-blocking

data/lib/gared.rb

@@ -9,5 +9,4 @@ module Gared
   require 'gared/googlebooks'
   require 'gared/nli_api'
   # ...
-
 end

data/test/test_gared.rb

@@ -12,36 +12,42 @@ class GaredTest < Minitest::Test
     puts "Testing NLI API"
     nli = Gared::Nli_Api.new('https://api.nli.org.il/openlibrary/search', ENV['NLI_API_KEY'])
     refute_nil nli
-    recs = nli.query_publications_by_person('ביאליק')
-    #recs = nli.query_publications_by_person('אילנאה')
+    #recs = nli.query_publications_by_person('ביאליק')
+    recs = nli.query_publications_by_person('אילנאה')
     refute_nil recs
     refute_empty(recs)
     refute_empty(recs[0].title)
   end
 
-  def test_primo_query_publicatios_by_person
-    puts "Testing Primo"
-    primo = Gared::Primo.new('http://primo.nli.org.il/PrimoWebServices/xservice/search/brief', 'NNL')
-    refute_nil primo
-    recs = primo.query_publications_by_person('אילנאה')
-    refute_nil recs
-    refute_empty(recs)
-    refute_empty(recs[0].title)
-  end
+# temporarily disabled until we find another Primo server to test against
+#  def test_primo_query_publicatios_by_person
+#    puts "Testing Primo"
+#    primo = Gared::Primo.new('http://primo.nli.org.il/PrimoWebServices/xservice/search/brief', 'NNL')
+#    refute_nil primo
+#    recs = primo.query_publications_by_person('אילנאה')
+#    refute_nil recs
+#    refute_empty(recs)
+#    refute_empty(recs[0].title)
+#  end
 
-  def test_aleph_query_publicatios_by_person
-    puts "Testing Aleph"
-    aleph = Gared::Aleph.new('aleph.nli.org.il', 9991, 'NNL01')
-    refute_nil aleph
-    recs = aleph.query_publications_by_person('אילנאה')
-    refute_nil recs
-    refute_empty(recs)
-    refute_empty(recs[0].title)
-  end
+# temporarily disabled until we find another Aleph server to test against
+#  def test_aleph_query_publicatios_by_person
+#    puts "Testing Aleph"
+#    aleph = Gared::Aleph.new('aleph.nli.org.il', 9991, 'NNL01')
+#    refute_nil aleph
+#    recs = aleph.query_publications_by_person('אילנאה')
+#    refute_nil recs
+#    refute_empty(recs)
+#    refute_empty(recs[0].title)
+#  end
 
   def test_googlebooks_query_publicatios_by_person
+    if ENV['GOOGLE_API_KEY'].nil?
+      puts "skipping Google Books API test because GOOGLE_API_KEY envvar is not set"
+      return
+    end
     puts "Testing Google Books"
-    gb = Gared::Googlebooks.new('AIzaSyCE2WFqTPdxAz1wv2f33hMfPWIF4tcocgM') # a key I made just for testing this gem. Please do not abuse.
+    gb = Gared::Googlebooks.new(ENV['GOOGLE_API_KEY'])
     refute_nil gb
     recs = gb.query_publications_by_person('מנדלי')
     refute_nil recs
@@ -74,4 +80,4 @@ class GaredTest < Minitest::Test
     assert_empty(recs)
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gared
 version: !ruby/object:Gem::Version
-  version: 0.0.23
+  version: 0.0.26
 platform: ruby
 authors:
 - Asaf Bartov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-13 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zoom