alexandria-book-collection-manager 0.7.1 → 0.7.2

data/lib/alexandria/book_providers/renaud.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006-2006 Mathieu Leduc-Hamel
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -25,8 +27,8 @@ module Alexandria
     class RENAUDProvider < GenericProvider
       include GetText
       # GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
-      BASE_URI = 'http://www.renaud-bray.com/'.freeze
-      ACCENTUATED_CHARS = 'áàâäçéèêëíìîïóòôöúùûü'.freeze
+      BASE_URI = 'http://www.renaud-bray.com/'
+      ACCENTUATED_CHARS = 'áàâäçéèêëíìîïóòôöúùûü'
 
       def initialize
         super('RENAUD', 'Renaud-Bray (Canada)')
@@ -34,8 +36,9 @@ module Alexandria
 
       def search(criterion, type)
         criterion = criterion.encode('ISO-8859-1')
-        req = BASE_URI + 'francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_wsc.asp&OnlyAvailable=false&Tri='
-        #        req = BASE_URI + "francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_section_wsc.asp&OnlyAvailable=false&Tri="
+        req = BASE_URI +
+          'francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre' \
+          '&Page=Recherche_wsc.asp&OnlyAvailable=false&Tri='
         req += case type
                when SEARCH_BY_ISBN
                  'ISBN'
@@ -77,19 +80,24 @@ module Alexandria
       end
 
       def url(book)
-        #        "http://www.renaud-bray.com/francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_section_wsc.asp&OnlyAvailable=false&Tri=ISBN&Phrase=" + book.isbn
-        'http://www.renaud-bray.com/francais/menu/gabarit.asp?Rubrique=&Recherche=&Entete=Livre&Page=Recherche_wsc.asp&OnlyAvailable=false&Tri=ISBN&Phrase=' + book.isbn
+        'http://www.renaud-bray.com/francais/menu/gabarit.asp?Rubrique=&Recherche=' \
+          '&Entete=Livre&Page=Recherche_wsc.asp&OnlyAvailable=false&Tri=ISBN&Phrase=' + book.isbn
       end
 
       private
 
+      NO_BOOKS_FOUND_REGEXP =
+        /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/
+      HYPERLINK_SCAN_REGEXP =
+        /"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/
+
       def to_books(data)
         data = CGI.unescapeHTML(data)
         data = data.encode('UTF-8')
-        raise NoResultsError if data =~ /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/
+        raise NoResultsError if data =~ NO_BOOKS_FOUND_REGEXP
 
         titles = []
-        data.scan(/"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/).each { |md|
+        data.scan(HYPERLINK_SCAN_REGEXP).each { |md|
           titles << md[1].strip
         }
         raise if titles.empty?
@@ -120,7 +128,8 @@ module Alexandria
         }
         raise if publishers.empty?
         book_covers = []
-        data.scan(/(\/ImagesEditeurs\/[\d]*\/([\dX]*-f.(jpg|gif))|\/francais\/suggestion\/images\/livre\/livre.gif)/).each { |md|
+        data.scan(/(\/ImagesEditeurs\/[\d]*\/([\dX]*-f.(jpg|gif))
+                    |\/francais\/suggestion\/images\/livre\/livre.gif)/x).each { |md|
           book_covers << BASE_URI + md[0].strip
         }
         raise if book_covers.empty?

data/lib/alexandria/book_providers/siciliano.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004 Laurent Sansonetti
 # Copyright (C) 2007 Laurent Sansonetti and Marco Costantini
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -32,7 +34,7 @@ module Alexandria
     class SicilianoProvider < WebsiteBasedProvider
       include Logging
 
-      SITE = 'http://www.siciliano.com.br'.freeze
+      SITE = 'http://www.siciliano.com.br'
 
       # The string interpolations in this URL are the search term and search
       # type, respectively.
@@ -40,7 +42,7 @@ module Alexandria
         '&FIL_ID=102' \
         '&PALAVRASN1=%s' \
         '&FILTRON1=%s' \
-        '&ESTRUTN1=0301&ORDEMN2=E'.freeze
+        '&ESTRUTN1=0301&ORDEMN2=E'
 
       def initialize
         super('Siciliano', 'Livraria Siciliano (Brasil)')
@@ -69,7 +71,6 @@ module Alexandria
           else
             results.map { |result| get_book_from_search_result(result) }
           end
-
         rescue NoResultsError => err
           if (type == SEARCH_BY_ISBN) && (trying_again == false)
             trying_again = true
@@ -105,7 +106,7 @@ module Alexandria
                                 CGI.escape(search_term)
                               end
 
-        BASE_SEARCH_URL % [search_term_encoded, search_type_code]
+        format(BASE_SEARCH_URL, search_term_encoded, search_type_code)
       end
 
       def parse_search_result_data(html)
@@ -185,9 +186,7 @@ module Alexandria
         publish_year = nil
         edition = details['Edio']
         if edition
-          if edition =~ /([12][0-9]{3})/ # publication date
-            publish_year = Regexp.last_match[1].to_i
-          end
+          publish_year = Regexp.last_match[1].to_i if edition =~ /([12][0-9]{3})/ # publication date
         end
         # cover
         # ImgSrc[1]="/imagem/imagem.dll?pro_id=1386929&PIM_Id=658849";
@@ -204,11 +203,11 @@ module Alexandria
         end
         book = Book.new(title, authors, isbn, publisher, publish_year, binding)
         result = [book, image_urls.first]
-        return result
+        result
       rescue => ex
         trace = ex.backtrace.join("\n> ")
         log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" }
-        return nil
+        nil
       end
 
       def first_non_empty_text_node(elem)

data/lib/alexandria/book_providers/thalia.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2009 Cathal Mc Ginley
 # Copyright (C) 2014 Matijs van Zuijlen
 #
@@ -31,8 +33,8 @@ module Alexandria
     class ThaliaProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.thalia.de'.freeze
-      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s".freeze # type,term
+      SITE = 'http://www.thalia.de'
+      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s" # type,term
 
       def initialize
         super('Thalia', 'Thalia (Germany)')
@@ -71,7 +73,7 @@ module Alexandria
                               else
                                 CGI.escape(search_term)
                               end
-        BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
       end
 
       def parse_search_result_data(html)
@@ -163,9 +165,7 @@ module Alexandria
 
             year = nil
             date = data_from_label(item_details, 'Erschienen:')
-            if date =~ /([\d]{4})/
-              year = Regexp.last_match[1].to_i
-            end
+            year = Regexp.last_match[1].to_i if date =~ /([\d]{4})/
 
             binding = data_from_label(item_details, 'Einband')
 

data/lib/alexandria/book_providers/web.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley

data/lib/alexandria/book_providers/worldcat.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -37,8 +39,8 @@ module Alexandria
     class WorldCatProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.worldcat.org'.freeze
-      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced".freeze # type, term
+      SITE = 'http://www.worldcat.org'
+      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced" # type, term
 
       def initialize
         super('WorldCat', 'WorldCat')
@@ -86,7 +88,7 @@ module Alexandria
                               else
                                 CGI.escape(search_term)
                               end
-        BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+        format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
       end
 
       def get_book_from_search_result(result)
@@ -151,9 +153,7 @@ module Alexandria
               html2 = rslt2.body
 
               book, cover_url = parse_result_data(html2, search_isbn, true)
-              if first_result.nil?
-                first_result = [book, cover_url]
-              end
+              first_result = [book, cover_url] if first_result.nil?
 
               log.debug { "got book #{book}" }
 
@@ -235,7 +235,6 @@ module Alexandria
           image_url = nil # hm, it's on the website, but uses JavaScript...
 
           return [book, image_url]
-
         rescue => ex
           raise ex if ex.instance_of? NoResultsError
           trace = ex.backtrace.join("\n> ")

data/lib/alexandria/book_providers/z3950.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Laurent Sansonetti
 # Copyright (C) 2007 Laurent Sansonetti and Marco Costantini
 # Copyright (C) 2014, 2016 Matijs van Zuijlen
@@ -122,9 +124,7 @@ module Alexandria
           book = nil
           begin
             mappings = Alexandria::PseudoMarcParser::USMARC_MAPPINGS
-            if prefs['hostname'] == 'z3950.bnf.fr'
-              mappings = Alexandria::PseudoMarcParser::BNF_FR_MAPPINGS
-            end
+            mappings = Alexandria::PseudoMarcParser::BNF_FR_MAPPINGS if prefs['hostname'] == 'z3950.bnf.fr'
             # try pseudo-marc parser first (it seems to have more luck)
             book = Alexandria::PseudoMarcParser.marc_text_to_book(marc_txt,
                                                                   mappings)
@@ -219,7 +219,8 @@ module Alexandria
       end
 
       def url(book)
-        'http://catalog.loc.gov/cgi-bin/Pwebrecon.cgi?DB=local&CNT=25+records+per+page&CMD=isbn+' + Library.canonicalise_isbn(book.isbn)
+        'http://catalog.loc.gov/cgi-bin/Pwebrecon.cgi?DB=local&CNT=25+records+per+page&CMD=isbn+' +
+          Library.canonicalise_isbn(book.isbn)
       rescue => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
@@ -231,7 +232,10 @@ module Alexandria
       # http://en.wikipedia.org/wiki/British_Library
       # http://www.bl.uk/catalogues/z3950fullaccess.html
       # http://www.bl.uk/catalogues/z3950copacaccess.html
-      # FIXME: switch from BL to Copac, which incudes the BL itself and many more libraries: http://copac.ac.uk/libraries/
+      #
+      # FIXME: switch from BL to Copac, which incudes the BL itself and many more
+      # libraries: http://copac.ac.uk/libraries/
+      #
       # Details: http://copac.ac.uk/interfaces/z39.50/
       # The SUTRS format used by Copac is different from the one used by BL
       unabstract
@@ -306,7 +310,8 @@ module Alexandria
           }
 
           if title # and !authors.empty?
-            book = Book.new(title, authors, isbn, (publisher || nil), (publish_year || nil), (edition || nil))
+            book = Book.new(title, authors, isbn, (publisher || nil),
+                            (publish_year || nil), (edition || nil))
             results << [book]
           end
         end
@@ -346,8 +351,10 @@ module Alexandria
       end
 
       def url(book)
-        'http://sbnonline.sbn.it/cgi-bin/zgw/BRIEF.pl?displayquery=%253CB%253E%253Cfont%2520color%253D%2523000064%253E' \
-          'Codice%2520ISBN%253C%2FB%253E%253C%2Ffont%253E%2520contiene%2520%2522%2520%253CFONT%2520COLOR%253Dred%253E' +
+        'http://sbnonline.sbn.it/cgi-bin/zgw/BRIEF.pl?displayquery=' \
+          '%253CB%253E%253Cfont%2520color%253D%2523000064%253E' \
+          'Codice%2520ISBN%253C%2FB%253E%253C%2Ffont%253E%2520' \
+          'contiene%2520%2522%2520%253CFONT%2520COLOR%253Dred%253E' +
           canonicalise_isbn_with_dashes(book.isbn) +
           '%253C%2FFONT%253E%2522&session=&zurl=opac&zquery=%281%3D7+4%3D2+2%3D3+5%3D100+6%3D1+3%3D3+%22' +
           canonicalise_isbn_with_dashes(book.isbn) +
@@ -390,8 +397,10 @@ module Alexandria
       #
       # Remarks about SBN
       #
-      # This provider requires that value of conn.count is 0. It's a Yaz option "Number of records to be retrieved".
-      # This provider requires to specify the value of conn.element_set_name = 'F'. It's a Yaz option "Element-Set name of records".
+      # This provider requires that value of conn.count is 0.
+      # It's a Yaz option "Number of records to be retrieved".
+      # This provider requires to specify the value of conn.element_set_name = 'F'.
+      # It's a Yaz option "Element-Set name of records".
       # See http://www.indexdata.dk/yaz/doc/zoom.resultsets.tkl
       #
       # Dashes:

data/lib/alexandria/config.rb

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Alexandria
   module Config
     SHARE_DIR = File.expand_path('../../share', File.dirname(__FILE__))
-    SOUNDS_DIR = "#{SHARE_DIR}/sounds/alexandria".freeze
-    DATA_DIR = "#{SHARE_DIR}/alexandria".freeze
+    SOUNDS_DIR = "#{SHARE_DIR}/sounds/alexandria"
+    DATA_DIR = "#{SHARE_DIR}/alexandria"
     MAIN_DATA_DIR = DATA_DIR
   end
 end

data/lib/alexandria/console.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2008 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or

data/lib/alexandria/execution_queue.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Laurent Sansonetti
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -15,8 +17,6 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'thread'
-
 # Provides a way for two threads to communicate via Proc objects.
 #
 # Thread A can request calls, providing a Proc object and runtime arguments,

data/lib/alexandria/export_library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2014, 2016 Matijs van Zuijlen
@@ -174,9 +176,7 @@ module Alexandria
       FileUtils.mkdir(filename) unless File.exist?(filename)
       Dir.chdir(filename) do
         copy_covers('pixmaps')
-        if theme.has_pixmaps?
-          FileUtils.cp_r(theme.pixmaps_directory, 'pixmaps')
-        end
+        FileUtils.cp_r(theme.pixmaps_directory, 'pixmaps') if theme.has_pixmaps?
         FileUtils.cp(theme.css_file, '.')
         File.open('index.html', 'w') do |io|
           io << to_xhtml(File.basename(theme.css_file))
@@ -238,7 +238,7 @@ module Alexandria
 
     private
 
-    ONIX_DTD_URL = 'http://www.editeur.org/onix/2.1/reference/onix-international.dtd'.freeze
+    ONIX_DTD_URL = 'http://www.editeur.org/onix/2.1/reference/onix-international.dtd'
     def to_onix_document
       doc = REXML::Document.new
       doc << REXML::XMLDecl.new
@@ -249,9 +249,8 @@ module Alexandria
       header.add_element('FromCompany').text = 'Alexandria'
       header.add_element('FromPerson').text = Etc.getlogin
       now = Time.now
-      header.add_element('SentDate').text = '%.4d%.2d%.2d%.2d%.2d' % [
-        now.year, now.month, now.day, now.hour, now.min
-      ]
+      header.add_element('SentDate').text = format('%.4d%.2d%.2d%.2d%.2d',
+                                                   now.year, now.month, now.day, now.hour, now.min)
       header.add_element('MessageNote').text = name
       each_with_index do |book, idx|
         # fields that are missing: edition and rating.
@@ -311,7 +310,9 @@ module Alexandria
       # http://periapsis.org/tellico/doc/hacking.html
       doc = REXML::Document.new
       doc << REXML::XMLDecl.new
-      doc << REXML::DocType.new('tellico', 'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN" "http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
+      doc << REXML::DocType.new('tellico',
+                                'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN"' \
+                                ' "http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
       tellico = doc.add_element('tellico')
       tellico.add_attribute('syntaxVersion', '7')
       tellico.add_namespace('http://periapsis.org/tellico/')
@@ -342,12 +343,8 @@ module Alexandria
         end
         entry.add_element('read').text = book.redd.to_s if book.redd
         entry.add_element('loaned').text = book.loaned.to_s if book.loaned
-        unless book.rating == Book::DEFAULT_RATING
-          entry.add_element('rating').text = book.rating
-        end
-        if book.notes && !book.notes.empty?
-          entry.add_element('comments').text = book.notes
-        end
+        entry.add_element('rating').text = book.rating unless book.rating == Book::DEFAULT_RATING
+        entry.add_element('comments').text = book.notes if book.notes && !book.notes.empty?
         if File.exist?(cover(book))
           entry.add_element('cover').text = final_cover(book)
           image = images.add_element('image')
@@ -451,7 +448,8 @@ EOS
       end
       xhtml << <<EOS
 <p class="copyright">
-  Generated on #{xhtml_escape(Date.today.to_s)} by <a href="#{xhtml_escape(Alexandria::WEBSITE_URL)}">#{xhtml_escape(generator)}</a>.
+  Generated on #{xhtml_escape(Date.today.to_s)}
+  by <a href="#{xhtml_escape(Alexandria::WEBSITE_URL)}">#{xhtml_escape(generator)}</a>.
 </p>
 </body>
 </html>
@@ -485,9 +483,7 @@ EOS
         bibtex << "\",\n"
         bibtex << "title = \"#{latex_escape(book.title)}\",\n"
         bibtex << "publisher = \"#{latex_escape(book.publisher)}\",\n"
-        if book.notes && !book.notes.empty?
-          bibtex << "OPTnote = \"#{latex_escape(book.notes)}\",\n"
-        end
+        bibtex << "OPTnote = \"#{latex_escape(book.notes)}\",\n" if book.notes && !book.notes.empty?
         # year is a required field in bibtex @BOOK
         bibtex << 'year = ' + (book.publishing_year || '"n/a"').to_s + "\n"
         bibtex << "}\n\n"

data/lib/alexandria/import_library.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2010 Cathal Mc Ginley
 # Copyright (C) 2014,2015 Matijs van Zuijlen
@@ -136,9 +138,7 @@ module Alexandria
             end
             book_elements[4] = book_elements[4].to_i unless book_elements[4].nil? # publishing_year
             puts book_elements.inspect
-            cover = if elements['cover']
-                      neaten(elements['cover'].text)
-                    end
+            cover = (neaten(elements['cover'].text) if elements['cover'])
             puts cover
             book = Book.new(*book_elements)
             if elements['rating'] && Book::VALID_RATINGS.member?(elements['rating'].text.to_i)
@@ -146,7 +146,7 @@ module Alexandria
             end
             book.notes = neaten(elements['comments'].text) if elements['comments']
             content << [book, cover]
-            on_iterate_cb.call(n + 1, total) if on_iterate_cb
+            on_iterate_cb&.call(n + 1, total)
           end
 
           library = Library.load(name)
@@ -194,9 +194,7 @@ module Alexandria
                 # available
                 book.authors = dl_book.authors
               end
-              unless book.edition
-                book.edition = dl_book.edition
-              end
+              book.edition = dl_book.edition unless book.edition
               cover = dl_cover
             rescue
               puts "failed to get cover for #{book.title} #{book.isbn}" if $DEBUG
@@ -206,9 +204,7 @@ module Alexandria
 
           books_and_covers << [book, cover]
           import_count += 1
-          if on_iterate_cb
-            on_iterate_cb.call(import_count, max_import)
-          end
+          on_iterate_cb&.call(import_count, max_import)
         end
       rescue CSV::IllegalFormatError
         unless failed_once
@@ -278,9 +274,7 @@ module Alexandria
           #  (on_error_cb and on_error_cb.call(e.message))
         end
 
-        if on_iterate_cb
-          on_iterate_cb.call(current_iteration += 1, max_iterations)
-        end
+        on_iterate_cb&.call(current_iteration += 1, max_iterations)
       end
       puts "Bad Isbn list: #{bad_isbns.inspect}" if bad_isbns
       library = load(name)
@@ -291,9 +285,7 @@ module Alexandria
         puts "Saving #{book.isbn}..." if $DEBUG
         library << book
         library.save(book)
-        if on_iterate_cb
-          on_iterate_cb.call(current_iteration += 1, max_iterations)
-        end
+        on_iterate_cb&.call(current_iteration += 1, max_iterations)
       end
       [library, bad_isbns, failed_lookup_isbns]
     end