alexandria-book-collection-manager 0.7.1 → 0.7.2

data/lib/alexandria/book_providers/amazon_ecs_util.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (c) 2006 Herryanto Siatono, Pluit Solutions
 #
@@ -151,9 +153,7 @@ module Amazon
 
       # Return an array of Amazon::Element item objects.
       def items
-        unless @items
-          @items = (@doc / 'item').map { |item| Element.new(item) }
-        end
+        @items ||= (@doc / 'item').map { |item| Element.new(item) }
         @items
       end
 
@@ -164,25 +164,19 @@ module Amazon
 
       # Return current page no if :item_page option is when initiating the request.
       def item_page
-        unless @item_page
-          @item_page = (@doc / 'itemsearchrequest/itempage').inner_html.to_i
-        end
+        @item_page ||= (@doc / 'itemsearchrequest/itempage').inner_html.to_i
         @item_page
       end
 
       # Return total results.
       def total_results
-        unless @total_results
-          @total_results = (@doc / 'totalresults').inner_html.to_i
-        end
+        @total_results ||= (@doc / 'totalresults').inner_html.to_i
         @total_results
       end
 
       # Return total pages.
       def total_pages
-        unless @total_pages
-          @total_pages = (@doc / 'totalpages').inner_html.to_i
-        end
+        @total_pages ||= (@doc / 'totalpages').inner_html.to_i
         @total_pages
       end
     end
@@ -219,7 +213,9 @@ module Amazon
     end
 
     def self.camelize(s)
-      s.to_s.gsub(/\/(.?)/) { '::' + Regexp.last_match[1].upcase }.gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
+      s.to_s.
+        gsub(/\/(.?)/) { '::' + Regexp.last_match[1].upcase }.
+        gsub(/(^|_)(.)/) { Regexp.last_match[2].upcase }
     end
 
     def self.hmac_sha256(message, key)
@@ -398,7 +394,7 @@ module Amazon
     end
 
     def to_s
-      elem.to_s if elem
+      elem&.to_s
     end
   end
 end

data/lib/alexandria/book_providers/barnes_and_noble.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -35,12 +37,12 @@ module Alexandria
     class BarnesAndNobleProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.barnesandnoble.com'.freeze
+      SITE = 'http://www.barnesandnoble.com'
 
-      BASE_ISBN_SEARCH_URL = 'http://www.barnesandnoble.com/s/%s'.freeze
+      BASE_ISBN_SEARCH_URL = 'http://www.barnesandnoble.com/s/%s'
 
       BASE_SEARCH_URL = 'http://search.barnesandnoble.com/booksearch' \
-        '/results.asp?%s=%s'.freeze # type, term
+        '/results.asp?%s=%s' # type, term
 
       def initialize
         super('BarnesAndNoble', 'BarnesAndNoble')
@@ -49,7 +51,7 @@ module Alexandria
       end
 
       def agent
-        @agent = Alexandria::WWWAgent.new unless @agent
+        @agent ||= Alexandria::WWWAgent.new
         @agent
       end
 
@@ -67,9 +69,7 @@ module Alexandria
         when Net::HTTPSuccess     then response
         when Net::HTTPRedirection then
           redirect = URI.parse response['Location']
-          if redirect.relative?
-            redirect = URI.parse(uri_str) + redirect
-          end
+          redirect = URI.parse(uri_str) + redirect if redirect.relative?
           fetch_redirectly(redirect.to_s, (limit - 1))
         else
           response.error!
@@ -108,7 +108,7 @@ module Alexandria
           BASE_ISBN_SEARCH_URL % Library.canonicalise_ean(search_term) # isbn-13
         else
           search_term_encoded = CGI.escape(search_term)
-          BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+          format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
         end
       end
 
@@ -184,9 +184,7 @@ module Alexandria
 
           book_data[:binding] = ''
           selected_format = (doc / '#availableFormats li.selected a.tabTitle').first
-          if selected_format
-            book_data[:binding] = selected_format.inner_text
-          end
+          book_data[:binding] = selected_format.inner_text if selected_format
 
           book = Book.new(book_data[:title], book_data[:authors],
                           book_data[:isbn], book_data[:publisher],

data/lib/alexandria/book_providers/deastore.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -31,8 +33,8 @@ module Alexandria
     class DeaStoreProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.deastore.com'.freeze
-      BASE_SEARCH_URL = "#{SITE}/search/italian_books/0/%s/%s".freeze # type/term
+      SITE = 'http://www.deastore.com'
+      BASE_SEARCH_URL = "#{SITE}/search/italian_books/0/%s/%s" # type/term
 
       def initialize
         super('DeaStore', 'DeaStore (Italy)')
@@ -98,7 +100,7 @@ module Alexandria
                                 CGI.escape(search_term)
                               end
 
-        uri = BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        uri = format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
         log.debug { uri }
         uri
       end
@@ -153,9 +155,7 @@ module Alexandria
             result[:url] = lookup_url
 
             publishers = (content / 'p.editore')
-            unless publishers.empty?
-              result[:publisher] = normalize(publishers.first.inner_text)
-            end
+            result[:publisher] = normalize(publishers.first.inner_text) unless publishers.empty?
 
             book_search_results << result
           rescue => ex
@@ -176,15 +176,11 @@ module Alexandria
         # cover
         cover_link = nil
         cover_img = data / 'a/img'
-        unless cover_img.empty?
-          cover_link = cover_img.first['src']
-        end
+        cover_link = cover_img.first['src'] unless cover_img.empty?
         # author(s)
         authors = []
         author_span = data % 'span.int_scheda[text()*=Autore]'
-        unless author_span
-          author_span = data % 'span.int_scheda[text()*=cura]' # editor
-        end
+        author_span ||= data % 'span.int_scheda[text()*=cura]'
         if author_span
           author_links = author_span / 'a.info'
           authors = []
@@ -212,9 +208,7 @@ module Alexandria
         date_par = data % 'span.int_scheda[text()*=Data di pubblicazione]/..'
         date_par.inner_text =~ /:[\s]*([12][0-9]{3})[\s]*$/
         publish_year = nil
-        if Regexp.last_match[1]
-          publish_year = Regexp.last_match[1].to_i
-        end
+        publish_year = Regexp.last_match[1].to_i if Regexp.last_match[1]
         isbn_spans = data / 'div.sotto/span.isbn'
         isbns = []
         isbn_spans.each do |span|
@@ -222,9 +216,7 @@ module Alexandria
           isbns << Regexp.last_match[1]
         end
         isbn = nil
-        unless isbns.empty?
-          isbn = Library.canonicalise_isbn(isbns.first)
-        end
+        isbn = Library.canonicalise_isbn(isbns.first) unless isbns.empty?
         # Editore & Imprint : as publisher info above...
         # pages
         # page_par = data % 'span.int_scheda[text()*=Pagine]/..'
@@ -257,11 +249,11 @@ module Alexandria
           log.debug { "Cover Image URL:: #{image_url}" }
         end
         book = Book.new(title, authors, isbn, publisher, publish_year, binding)
-        return [book, image_url]
+        [book, image_url]
       rescue => ex
         trace = ex.backtrace.join("\n> ")
         log.error { "Failed parsing DeaStore product page #{ex.message}\n#{trace}" }
-        return nil
+        nil
       end
 
       def normalize(str)

data/lib/alexandria/book_providers/douban.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -32,8 +34,8 @@ module Alexandria
     class DoubanProvider < GenericProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.douban.com'.freeze
-      BASE_URL = 'http://api.douban.com/book/subjects?q=%s&max-results=5&alt=json'.freeze
+      SITE = 'http://www.douban.com'
+      BASE_URL = 'http://api.douban.com/book/subjects?q=%s&max-results=5&alt=json'
 
       def initialize
         super('Douban', 'Douban (China)')
@@ -85,7 +87,7 @@ module Alexandria
         book_search_results = []
         begin
           # dbresult = JSON.parse(response)
-          dbresult = YAML.load(json2yaml(response))
+          dbresult = YAML.safe_load(json2yaml(response))
           # File.open(",douban.yaml", "wb") {|f| f.write(json2yaml(response)) }
           if dbresult['opensearch:totalResults']['$t'].to_i > 0
             for item in dbresult['entry']
@@ -96,15 +98,9 @@ module Alexandria
               binding = nil
               for av in item['db:attribute']
                 isbn = av['$t'] if av['@name'] == 'isbn13'
-                if av['@name'] == 'publisher'
-                  publisher = av['$t']
-                end
-                if av['@name'] == 'pubdate'
-                  pubdate = av['$t']
-                end
-                if av['@name'] == 'binding'
-                  binding = av['$t']
-                end
+                publisher = av['$t'] if av['@name'] == 'publisher'
+                pubdate = av['$t'] if av['@name'] == 'pubdate'
+                binding = av['$t'] if av['@name'] == 'binding'
               end
               authors = if item['author']
                           item['author'].map { |a| a['name']['$t'] }
@@ -113,9 +109,7 @@ module Alexandria
                         end
               image_url = nil
               for av in item['link']
-                if av['@rel'] == 'image'
-                  image_url = av['@href']
-                end
+                image_url = av['@href'] if av['@rel'] == 'image'
               end
               book = Book.new(name, authors, isbn, publisher, pubdate, binding)
               book_search_results << [book, image_url]

data/lib/alexandria/book_providers/mcu.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004 Javier Fernandez-Sanguino
 # Copyright (C) 2007 Javier Fernandez-Sanguino and Marco Costantini
 # Copyright (C) 2011, 2016 Matijs van Zuijlen
@@ -35,7 +37,7 @@ module Alexandria
       }.freeze
 
       #        BASE_URI = "http://www.mcu.es/cgi-bin/BRSCGI3701?"
-      BASE_URI = 'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?'.freeze
+      BASE_URI = 'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?'
       def initialize
         super('MCU', _('Spanish Culture Ministry'))
         # No preferences
@@ -46,31 +48,36 @@ module Alexandria
         prefs.read
         criterion = criterion.encode('ISO-8859-1') # still needed??
         print "Doing search with MCU #{criterion}, type: #{type}\n" if $DEBUG # for DEBUGing
-        req = BASE_URI + 'CMD=VERLST&BASE=ISBN&DOCS=1-15&CONF=AEISPA.cnf&OPDEF=AND&DOCS=1-1000&SEPARADOR=&'
+        req = BASE_URI +
+          'CMD=VERLST&BASE=ISBN&DOCS=1-15&CONF=AEISPA.cnf&OPDEF=AND&DOCS=1-1000&SEPARADOR=&'
         req += case type
                when SEARCH_BY_ISBN
-                 "WGEN-C=&WISB-C=#{CGI.escape(criterion)}&WAUT-C=&WTIT-C=&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C="
+                 "WGEN-C=&WISB-C=#{CGI.escape(criterion)}&WAUT-C=&WTIT-C="
 
                when SEARCH_BY_TITLE
-                 "WGEN-C=&WISB-C=&WAUT-C=&WTIT-C=#{CGI.escape(criterion)}&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C="
+                 "WGEN-C=&WISB-C=&WAUT-C=&WTIT-C=#{CGI.escape(criterion)}"
 
                when SEARCH_BY_AUTHORS
-                 "WGEN-C=&WISB-C=&WAUT-C=#{CGI.escape(criterion)}&WTIT-C=&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C="
+                 "WGEN-C=&WISB-C=&WAUT-C=#{CGI.escape(criterion)}&WTIT-C="
 
                when SEARCH_BY_KEYWORD
-                 "WGEN-C=#{CGI.escape(criterion)}&WISB-C=&WAUT-C=&WTIT-C=&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C="
+                 "WGEN-C=#{CGI.escape(criterion)}&WISB-C=&WAUT-C=&WTIT-C="
 
                else
                  raise InvalidSearchTypeError
                end
+        req +=
+          '&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=' \
+          '&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C='
         products = {}
         print "Request page is #{req}\n" if $DEBUG # for DEBUGing
         transport.get(URI.parse(req)).each do |line|
           print "Reading line: #{line}" if $DEBUG # for DEBUGing
-          if (line =~ /CMD=VERDOC.*&DOCN=([^&]*)&NDOC=([^&]*)/) && (!products[Regexp.last_match[1]]) && (book = parseBook(Regexp.last_match[1], Regexp.last_match[2]))
-            products[Regexp.last_match[1]] = book
-            puts Regexp.last_match[1] if $DEBUG # for DEBUGing
-          end
+          next unless line =~ /CMD=VERDOC.*&DOCN=([^&]*)&NDOC=([^&]*)/
+          next if products[Regexp.last_match[1]]
+          next unless (book = parseBook(Regexp.last_match[1], Regexp.last_match[2]))
+          products[Regexp.last_match[1]] = book
+          puts Regexp.last_match[1] if $DEBUG # for DEBUGing
         end
 
         raise NoResultsError if products.values.empty?
@@ -79,7 +86,10 @@ module Alexandria
 
       def url(book)
         isbn = Library.canonicalise_isbn(book.isbn)
-        "http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?CMD=VERLST&BASE=ISBN&DOCS=1-15&CONF=AEISPA.cnf&OPDEF=AND&DOCS=1&SEPARADOR=&WGEN-C=&WISB-C=#{isbn}&WAUT-C=&WTIT-C=&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C="
+        'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?CMD=VERLST&BASE=ISBN&DOCS=1-15' \
+          "&CONF=AEISPA.cnf&OPDEF=AND&DOCS=1&SEPARADOR=&WGEN-C=&WISB-C=#{isbn}&WAUT-C=&WTIT-C=" \
+          '&WMAT-C=&WEDI-C=&WFEP-C=&%40T353-GE=&%40T353-LE=&WSER-C=&WLUG-C=' \
+          '&WDIS-C=%28DISPONIBLE+or+AGOTADO%29&WLEN-C=&WCLA-C=&WSOP-C='
       rescue => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
@@ -88,7 +98,9 @@ module Alexandria
       private
 
       def parseBook(docn, ndoc)
-        detailspage = 'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?CMD=VERDOC&CONF=AEISPA.cnf&BASE=ISBN&DOCN=' + docn + '&NDOC=' + ndoc
+        detailspage =
+          'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?' \
+          'CMD=VERDOC&CONF=AEISPA.cnf&BASE=ISBN&DOCN=' + docn + '&NDOC=' + ndoc
         print "Looking at detailspage: #{detailspage}\n" if $DEBUG # for DEBUGing
         product = {}
         product['authors'] = []
@@ -115,7 +127,8 @@ module Alexandria
               print "Authors are #{product['authors']}\n" if $DEBUG # for DEBUGing
               robotstate = 0
             end
-          elsif (robotstate == 2) && line =~ /^(.*)$/ # The title es the next line to title declaration and has not tags on web src code
+          elsif (robotstate == 2) && line =~ /^(.*)$/
+            # The title es the next line to title declaration and has not tags on web src code
             product['name'] = Regexp.last_match[1].strip
             print "Name is #{product['name']}\n" if $DEBUG # for DEBUGing
             robotstate = 0

data/lib/alexandria/book_providers/proxis.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2009 Cathal Mc Ginley
 # Copyright (C) 2014-2016 Matijs van Zuijlen
 #
@@ -34,11 +36,11 @@ module Alexandria
       # it adds most to Alexandria (Amazon already has French and
       # English titles).
 
-      SITE = 'http://www.proxis.nl'.freeze
+      SITE = 'http://www.proxis.nl'
       BASE_SEARCH_URL = "#{SITE}/NLNL/Search/IndexGSA.aspx?search=%s" \
-        '&shop=100001NL&SelRubricLevel1Id=100001NL'.freeze
+        '&shop=100001NL&SelRubricLevel1Id=100001NL'
       ISBN_REDIRECT_BASE_URL = "#{SITE}/NLNL/Search/Index.aspx?search=%s" \
-        '&shop=100001NL&SelRubricLevel1Id=100001NL'.freeze
+        '&shop=100001NL&SelRubricLevel1Id=100001NL'
 
       def initialize
         super('Proxis', 'Proxis (Belgium)')
@@ -76,9 +78,7 @@ module Alexandria
       end
 
       def url(book)
-        if book.isbn.nil? || book.isbn.empty?
-          ISBN_REDIRECT_BASE_URL % Library.canonicalise_ean(book.isbn)
-        end
+        ISBN_REDIRECT_BASE_URL % Library.canonicalise_ean(book.isbn) if book.isbn.nil? || book.isbn.empty?
       end
 
       ## from Palatina
@@ -110,9 +110,7 @@ module Alexandria
           if title_link
             result[:title] = text_of(title_link)
             result[:lookup_url] = title_link['href']
-            unless result[:lookup_url] =~ /^http/
-              result[:lookup_url] = "#{SITE}#{result[:lookup_url]}"
-            end
+            result[:lookup_url] = "#{SITE}#{result[:lookup_url]}" unless result[:lookup_url] =~ /^http/
           end
           book_search_results << result
         end
@@ -136,9 +134,7 @@ module Alexandria
         if (title_header = doc.search('div.detailBlock h3'))
           header_spans = title_header.first.search('span')
           title = text_of(header_spans.first)
-          if title =~ /(.+)-$/
-            title = Regexp.last_match[1].strip
-          end
+          title = Regexp.last_match[1].strip if title =~ /(.+)-$/
           book_data[:title] = title
         end
 
@@ -147,9 +143,7 @@ module Alexandria
         isbns = []
         unless info_headers.empty?
           info_headers.each do |th|
-            if th.inner_text =~ /(ISBN|EAN)/
-              isbns << data_for_header(th)
-            end
+            isbns << data_for_header(th) if th.inner_text =~ /(ISBN|EAN)/
           end
           book_data[:isbn] = Library.canonicalise_ean(isbns.first)
         end

data/lib/alexandria/book_providers/pseudomarc.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2009 Cathal Mc Ginley
 # Copyright (C) 2010 Martin Sucha
 #
@@ -68,16 +70,12 @@ module Alexandria
 
         authors = []
         author_data = details[m[:authors][0]]
-        if author_data
-          author_data.each do |ad|
-            author = ad[m[:authors][1]]
-            if author
-              author = author.strip
-              if author =~ /(.*),$/
-                author = Regexp.last_match[1]
-              end
-              authors << author
-            end
+        author_data&.each do |ad|
+          author = ad[m[:authors][1]]
+          if author
+            author = author.strip
+            author = Regexp.last_match[1] if author =~ /(.*),$/
+            authors << author
           end
         end
 
@@ -85,40 +83,30 @@ module Alexandria
         binding = nil
         isbn_data = details[m[:isbn][0]]
         if isbn_data
-          if isbn_data.first[m[:isbn][1]] =~ /([-0-9xX]+)/
-            isbn = Regexp.last_match[1]
-          end
+          isbn = Regexp.last_match[1] if isbn_data.first[m[:isbn][1]] =~ /([-0-9xX]+)/
         end
 
         binding_data = details[m[:binding][0]]
         if binding_data
-          if binding_data.first[m[:binding][1]] =~ /([a-zA-Z][a-z\s]+[a-z])/
-            binding = Regexp.last_match[1]
-          end
+          binding = Regexp.last_match[1] if binding_data.first[m[:binding][1]] =~ /([a-zA-Z][a-z\s]+[a-z])/
         end
 
         publisher = nil
         publisher_data = details[m[:publisher][0]]
-        if publisher_data
-          publisher = publisher_data.first[m[:publisher][1]]
-        end
+        publisher = publisher_data.first[m[:publisher][1]] if publisher_data
 
         year = nil
         publication_data = details[m[:year][0]]
         if publication_data
           year = publication_data.first[m[:year][1]]
-          if year =~ /(\d+)/
-            year = Regexp.last_match[1].to_i
-          end
+          year = Regexp.last_match[1].to_i if year =~ /(\d+)/
         end
 
         notes = ''
         notes_data = details[m[:notes][0]]
-        if notes_data
-          notes_data.each do |note|
-            txt = note[m[:notes][1]]
-            notes += txt if txt
-          end
+        notes_data&.each do |note|
+          txt = note[m[:notes][1]]
+          notes += txt if txt
         end
 
         if title.nil? && isbn.nil?