alexandria-book-collection-manager 0.7.2 → 0.7.3

data/lib/alexandria/book_providers/renaud.rb

@@ -74,7 +74,7 @@ module Alexandria
             end
             return results
           end
-        rescue
+        rescue StandardError
           raise NoResultsError
         end
       end
@@ -87,9 +87,10 @@ module Alexandria
       private
 
       NO_BOOKS_FOUND_REGEXP =
-        /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/
+        /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/.freeze
       HYPERLINK_SCAN_REGEXP =
-        /"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/
+        /"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/.
+          freeze
 
       def to_books(data)
         data = CGI.unescapeHTML(data)
@@ -101,6 +102,7 @@ module Alexandria
           titles << md[1].strip
         }
         raise if titles.empty?
+
         authors = []
         data.scan(/Nom_Auteur.*><i>([,'.&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/i>/).each { |md|
           authors2 = []
@@ -110,11 +112,13 @@ module Alexandria
           authors << authors2
         }
         raise if authors.empty?
+
         isbns = []
         data.scan(/ISBN : ?<\/td><td>(\d+)/).each { |md|
           isbns << md[0].strip
         }
         raise if isbns.empty?
+
         editions = []
         publish_years = []
         data.scan(/Parution : <br>(\d{4,}-\d{2,}-\d{2,})/).each { |md|
@@ -122,11 +126,13 @@ module Alexandria
           publish_years << md[0].strip.split(/-/)[0].to_i
         }
         raise if editions.empty? || publish_years.empty?
+
         publishers = []
         data.scan(/diteur : ([,'.&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/span><br>/).each { |md|
           publishers << md[0].strip
         }
         raise if publishers.empty?
+
         book_covers = []
         data.scan(/(\/ImagesEditeurs\/[\d]*\/([\dX]*-f.(jpg|gif))
                     |\/francais\/suggestion\/images\/livre\/livre.gif)/x).each { |md|

data/lib/alexandria/book_providers/siciliano.rb

@@ -90,8 +90,8 @@ module Alexandria
       private
 
       def create_search_uri(search_type, search_term, trying_again = false)
-        (search_type_code = { SEARCH_BY_ISBN => 'G',
-                              SEARCH_BY_TITLE => 'A',
+        (search_type_code = { SEARCH_BY_ISBN    => 'G',
+                              SEARCH_BY_TITLE   => 'A',
                               SEARCH_BY_AUTHORS => 'B',
                               SEARCH_BY_KEYWORD => 'X' }[search_type]) || 'X'
         search_term_encoded = if search_type == SEARCH_BY_ISBN
@@ -148,7 +148,7 @@ module Alexandria
             result[:url] = "#{SITE}#{slash}#{link_to_description}"
 
             book_search_results << result
-          rescue => ex
+          rescue StandardError => ex
             trace = ex.backtrace.join("\n> ")
             log.error { "Failed parsing Siciliano search page #{ex.message}\n#{trace}" }
           end
@@ -163,6 +163,7 @@ module Alexandria
         # title
         title_div = doc % 'div#conteudo//div.titulo'
         raise NoResultsError unless title_div
+
         title_h = title_div % 'h2'
         title = title_h.inner_text if title_h
         # title = first_non_empty_text_node(title_div)
@@ -193,6 +194,7 @@ module Alexandria
         image_urls = []
         (doc / 'script').each do |script|
           next if script.children.nil?
+
           script.children.each do |ch|
             ch_text = ch.to_s
             if ch_text =~ /ImgSrc\[[\d]\]="(.+)";/
@@ -204,7 +206,7 @@ module Alexandria
         book = Book.new(title, authors, isbn, publisher, publish_year, binding)
         result = [book, image_urls.first]
         result
-      rescue => ex
+      rescue StandardError => ex
         trace = ex.backtrace.join("\n> ")
         log.error { "Failed parsing Siciliano product page #{ex.message}\n#{trace}" }
         nil
@@ -214,6 +216,7 @@ module Alexandria
         text = ''
         elem.children.each do |node|
           next unless node.text?
+
           text = node.to_s.strip
           break unless text.empty?
         end

data/lib/alexandria/book_providers/thalia.rb

@@ -55,15 +55,16 @@ module Alexandria
         else
           results = parse_search_result_data(html_data.body)
           raise NoResultsError if results.empty?
+
           results.map { |result| get_book_from_search_result(result) }
         end
       end
 
       def create_search_uri(search_type, search_term)
         (search_type_code = {
-          SEARCH_BY_ISBN => 'sq',
+          SEARCH_BY_ISBN    => 'sq',
           SEARCH_BY_AUTHORS => 'sa', # Autor
-          SEARCH_BY_TITLE => 'st', # Titel
+          SEARCH_BY_TITLE   => 'st', # Titel
           SEARCH_BY_KEYWORD => 'ssw' # Schlagwort
         }[search_type]) || ''
         search_type_code = CGI.escape(search_type_code)
@@ -120,6 +121,7 @@ module Alexandria
             # list
             return
           end
+
           # ISBN-lookup results in multiple results (trying to be
           # useful, such as for new editions e.g. 9780974514055
           # "Programming Ruby" )
@@ -182,7 +184,7 @@ module Alexandria
             return [book, image_url]
 
           end
-        rescue => ex
+        rescue StandardError => ex
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for Thalia ' \

data/lib/alexandria/book_providers/web.rb

@@ -1,24 +1,8 @@
 # frozen_string_literal: true
 
-# -*- ruby -*-
+# This file is part of Alexandria.
 #
-# Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2014 Matijs van Zuijlen
-#
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 require 'hpricot'
 require 'htmlentities'
@@ -42,19 +26,17 @@ module Alexandria
       def text_of(node)
         if node.nil?
           nil
-        else
-          if node.text?
-            node.to_html
-          elsif node.elem?
-            if node.children.nil?
-              nil
-            else
-              node_text = node.children.map { |n| text_of(n) }.join
-              node_text.strip.squeeze(' ')
-            end
+        elsif node.text?
+          node.to_html
+        elsif node.elem?
+          if node.children.nil?
+            nil
+          else
+            node_text = node.children.map { |n| text_of(n) }.join
+            node_text.strip.squeeze(' ')
           end
-          # node.inner_html.strip
         end
+        # node.inner_html.strip
       end
     end
   end

data/lib/alexandria/book_providers/worldcat.rb

@@ -70,7 +70,7 @@ module Alexandria
 
       def url(book)
         create_search_uri(SEARCH_BY_ISBN, book.isbn)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
@@ -78,9 +78,9 @@ module Alexandria
       private
 
       def create_search_uri(search_type, search_term)
-        (search_type_code = { SEARCH_BY_ISBN => 'isbn:',
+        (search_type_code = { SEARCH_BY_ISBN    => 'isbn:',
                               SEARCH_BY_AUTHORS => 'au:',
-                              SEARCH_BY_TITLE => 'ti:',
+                              SEARCH_BY_TITLE   => 'ti:',
                               SEARCH_BY_KEYWORD => '' }[search_type]) || ''
         search_type_code = CGI.escape(search_type_code)
         search_term_encoded = if search_type == SEARCH_BY_ISBN
@@ -106,6 +106,7 @@ module Alexandria
           result_cells.each do |td|
             type_icon = (td % 'div.type/img.icn')
             next unless type_icon && type_icon['src'] =~ /icon-bks/
+
             name_div = td % 'div.name'
             title = name_div.inner_text
             anchor = name_div % :a
@@ -117,7 +118,7 @@ module Alexandria
 
             book_search_results << result
           end
-        rescue => ex
+        rescue StandardError => ex
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for WorldCat ' \
@@ -235,8 +236,9 @@ module Alexandria
           image_url = nil # hm, it's on the website, but uses JavaScript...
 
           return [book, image_url]
-        rescue => ex
+        rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
+
           trace = ex.backtrace.join("\n> ")
           log.warn {
             'Failed parsing search results for WorldCat ' \

data/lib/alexandria/book_providers/z3950.rb

@@ -62,6 +62,7 @@ module Alexandria
         resultset = search_records(criterion, type, conn_count)
         log.debug { "total #{resultset.length}" }
         raise NoResultsError if resultset.length == 0
+
         results = books_from_marc(resultset, isbn)
         type == SEARCH_BY_ISBN ? results.first : results
       end
@@ -75,12 +76,12 @@ module Alexandria
       def marc_to_book(marc_txt)
         begin
           marc = MARC::Record.new_from_marc(marc_txt, forgiving: true)
-        rescue => ex
+        rescue StandardError => ex
           log.error { ex.message }
           log.error { ex.backtrace.join("> \n") }
           begin
             marc = MARC::Record.new(marc_txt)
-          rescue => ex2
+          rescue StandardError => ex2
             log.error { ex2.message }
             log.error { ex2.backtrace.join("> \n") }
             raise ex2
@@ -132,7 +133,7 @@ module Alexandria
               # failing that, try the genuine MARC parser
               book = marc_to_book(marc_txt)
             end
-          rescue => ex
+          rescue StandardError => ex
             log.warn { ex }
             log.warn { ex.backtrace }
           end
@@ -183,7 +184,7 @@ module Alexandria
             end
           end
           conn.search(pqf)
-        rescue => ex
+        rescue StandardError => ex
           if /1005/ =~ ex.message
             if prefs.variable_named('piggyback') && prefs['piggyback']
               log.error { "Z39.50 search failed:: #{ex.message}" }
@@ -221,7 +222,7 @@ module Alexandria
       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)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
@@ -262,13 +263,14 @@ module Alexandria
         resultset = search_records(criterion, type, conn_count)
         log.debug { "total #{resultset.length}" }
         raise NoResultsError if resultset.length == 0
+
         results = books_from_sutrs(resultset)
         type == SEARCH_BY_ISBN ? results.first : results
       end
 
       def url(book)
         'http://copac.ac.uk/openurl?isbn=' + Library.canonicalise_isbn(book.isbn)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
@@ -346,6 +348,7 @@ module Alexandria
         resultset = search_records(criterion, type, 0)
         log.debug { "total #{resultset.length}" }
         raise NoResultsError if resultset.length == 0
+
         results = books_from_marc(resultset, isbn)
         type == SEARCH_BY_ISBN ? results.first : results
       end
@@ -359,7 +362,7 @@ module Alexandria
           '%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) +
           '%22%29&language=it&maxentries=10&target=0&position=1'
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end

data/lib/alexandria/console.rb

@@ -1,27 +1,14 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2008 Joseph Method
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 module Alexandria
   def self.list_books_on_console(_title = true, authors = true)
-    libraries_simpleton = Alexandria::Libraries.instance
-    libraries_simpleton.reload
-    libraries = Alexandria::Library.loadall
+    collection = Alexandria::LibraryCollection.instance
+    collection.reload
+    libraries = collection.all_regular_libraries
     output_string = ''
     @books = libraries.flatten
     @books.each do |book|

data/lib/alexandria/execution_queue.rb

@@ -41,7 +41,7 @@ module Alexandria
 
     def self.current
       @@current_queue
-    rescue
+    rescue StandardError
       nil
     end
 
@@ -60,6 +60,7 @@ module Alexandria
         break @pending_calls.pop
       end
       return if ary.nil?
+
       id, procedure, args, need_retval = ary
       retval = procedure.call(*args)
       if need_retval

data/lib/alexandria/export_format.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+
+module Alexandria
+  class ExportFormat
+    attr_reader :name, :ext, :message
+
+    include GetText
+    include Logging
+    extend GetText
+    bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+
+    def self.all
+      [
+        new(_('Archived ONIX XML'), 'onix.tbz2', :export_as_onix_xml_archive),
+        new(_('Archived Tellico XML'), 'tc', :export_as_tellico_xml_archive),
+        new(_('BibTeX'), 'bib', :export_as_bibtex),
+        new(_('CSV list'), 'csv', :export_as_csv_list),
+        new(_('ISBN List'), 'txt', :export_as_isbn_list),
+        new(_('iPod Notes'), nil, :export_as_ipod_notes),
+        new(_('HTML Web Page'), nil, :export_as_html, true)
+      ]
+    end
+
+    def invoke(library, sort_order, filename, *args)
+      sorted = ExportLibrary.new(library, sort_order)
+      log.debug { "Exporting library sorted by #{sort_order}" }
+      sorted.send(@message, filename, *args)
+    end
+
+    def needs_preview?
+      @needs_preview
+    end
+
+    private
+
+    def initialize(name, ext, message, needs_preview = false)
+      @name = name
+      @ext = ext
+      @message = message
+      @needs_preview = needs_preview
+    end
+  end
+end

data/lib/alexandria/export_library.rb

@@ -1,77 +1,18 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2007 Cathal Mc Ginley
-# Copyright (C) 2014, 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# Alexandria is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Export sorting added 23 Oct 2007 by Cathal Mc Ginley
-# Classes LibrarySortOrder and SortedLibrary, and changed ExportFormat#invoke
-# iPod Notes support added 20 January 2008 by Tim Malone
-# require 'cgi'
+# See the file README.md for authorship and licensing information.
 
 require 'csv'
 require 'image_size'
+require 'tmpdir'
 
 module Alexandria
-  class LibrarySortOrder
-    include Logging
-
-    def initialize(book_attribute, ascending = true)
-      @book_attribute = book_attribute
-      @ascending = ascending
-    end
-
-    def sort(library)
-      sorted = library.sort_by do |book|
-        book.send(@book_attribute)
-      end
-      sorted.reverse! unless @ascending
-      sorted
-    rescue => ex
-      log.warn { "Could not sort library by #{@book_attribute.inspect}: #{ex.message}" }
-      library
-    end
-
-    def to_s
-      "#{@book_attribute} #{@ascending ? '(ascending)' : '(descending)'}"
-    end
-
-    class Unsorted < LibrarySortOrder
-      def initialize; end
-
-      def sort(library)
-        library
-      end
-
-      def to_s
-        'default order'
-      end
-    end
-  end
-
-  class SortedLibrary < Library
+  class ExportLibrary
     def initialize(library, sort_order)
-      super(library.name)
       @library = library
-      sorted = sort_order.sort(library)
-      sorted.each do |book|
-        self << book
-      end
+      @sorted = sort_order.sort(library)
     end
 
     def cover(book)
@@ -85,53 +26,15 @@ module Alexandria
     def copy_covers(dest)
       @library.copy_covers(dest)
     end
-  end
-
-  class ExportFormat
-    attr_reader :name, :ext, :message
 
-    include GetText
-    include Logging
-    extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-
-    def self.all
-      [
-        new(_('Archived ONIX XML'), 'onix.tbz2', :export_as_onix_xml_archive),
-        new(_('Archived Tellico XML'), 'tc', :export_as_tellico_xml_archive),
-        new(_('BibTeX'), 'bib', :export_as_bibtex),
-        new(_('CSV list'), 'csv', :export_as_csv_list),
-        new(_('ISBN List'), 'txt', :export_as_isbn_list),
-        new(_('iPod Notes'), nil, :export_as_ipod_notes),
-        new(_('HTML Web Page'), nil, :export_as_html, true)
-      ]
+    def name
+      @library.name
     end
 
-    def invoke(library, sort_order, filename, *args)
-      if sort_order
-        sorted = SortedLibrary.new(library, sort_order)
-        log.debug { "Exporting library sorted by #{sort_order}" }
-        sorted.send(@message, filename, *args)
-      else
-        library.send(@message, filename, *args)
-      end
+    def each(&block)
+      @sorted.each(&block)
     end
 
-    def needs_preview?
-      @needs_preview
-    end
-
-    private
-
-    def initialize(name, ext, message, needs_preview = false)
-      @name = name
-      @ext = ext
-      @message = message
-      @needs_preview = needs_preview
-    end
-  end
-
-  module Exportable
     def export_as_onix_xml_archive(filename)
       File.open(File.join(Dir.tmpdir, 'onix.xml'), 'w') do |io|
         to_onix_document.write(io, 0)
@@ -149,7 +52,7 @@ module Alexandria
       File.open(File.join(Dir.tmpdir, 'tellico.xml'), 'w') do |io|
         begin
           to_tellico_document.write(io, 0)
-        rescue => ex
+        rescue StandardError => ex
           puts ex.message
           puts ex.backtrace
           raise ex
@@ -252,7 +155,7 @@ module Alexandria
       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|
+      @sorted.each_with_index do |book, idx|
         # fields that are missing: edition and rating.
         prod = msg.add_element('Product')
         prod.add_element('RecordReference').text = idx
@@ -325,7 +228,7 @@ module Alexandria
       # collection fields
       field1.add_attribute('name', '_default')
       images = collection.add_element('images')
-      each_with_index do |book, idx|
+      @sorted.each_with_index do |book, idx|
         entry = collection.add_element('entry')
         new_index = (idx + 1).to_s
         entry.add_attribute('id', new_index)
@@ -350,9 +253,9 @@ module Alexandria
           image = images.add_element('image')
           image.add_attribute('id', final_cover(book))
           image_s = ImageSize.new(IO.read(cover(book)))
-          image.add_attribute('height', image_s.get_height.to_s)
-          image.add_attribute('width', image_s.get_width.to_s)
-          image.add_attribute('format', image_s.get_type)
+          image.add_attribute('height', image_s.height.to_s)
+          image.add_attribute('width', image_s.width.to_s)
+          image.add_attribute('format', image_s.format)
         end
       end
       doc
@@ -370,95 +273,91 @@ module Alexandria
 
     def to_xhtml(css)
       generator = 'Alexandria ' + Alexandria::DISPLAY_VERSION
-      xhtml = ''
-      xhtml << <<EOS
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-                      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <meta name="Author" content="#{Etc.getlogin}"/>
-  <meta name="Description" content="List of books"/>
-  <meta name="Keywords" content="books"/>
-  <meta name="Generator" content="#{xhtml_escape(generator)}"/>
-  <title>#{xhtml_escape(name)}</title>
-  <link rel="stylesheet" href="#{xhtml_escape(css)}" type="text/css"/>
-</head>
-<body>
-<h1 class="library_name">#{xhtml_escape(name)}</h1>
-EOS
+      xhtml = +''
+      xhtml << <<~EOS
+        <?xml version="1.0" encoding="UTF-8"?>
+        <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+                              "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+        <html>
+        <head>
+          <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+          <meta name="Author" content="#{Etc.getlogin}"/>
+          <meta name="Description" content="List of books"/>
+          <meta name="Keywords" content="books"/>
+          <meta name="Generator" content="#{xhtml_escape(generator)}"/>
+          <title>#{xhtml_escape(name)}</title>
+          <link rel="stylesheet" href="#{xhtml_escape(css)}" type="text/css"/>
+        </head>
+        <body>
+        <h1 class="library_name">#{xhtml_escape(name)}</h1>
+      EOS
 
       each do |book|
-        xhtml << <<EOS
-<div class="book">
-  <p class="book_isbn">#{book.isbn}</p>
-EOS
+        xhtml << <<~EOS
+          <div class="book">
+            <p class="book_isbn">#{book.isbn}</p>
+        EOS
 
         if File.exist?(cover(book))
-          xhtml << <<EOS
-  <img class="book_cover"
-       src="#{File.join('pixmaps', final_cover(book))}"
-       alt="Cover file for '#{xhtml_escape(book.title)}'"
-EOS
           image_s = ImageSize.new(IO.read(cover(book)))
-          xhtml << <<EOS
-       height="#{image_s.get_height}" width="#{image_s.get_width}"
-EOS
-          xhtml << <<EOS
-  />
-EOS
+          xhtml << <<~EOS
+            <img class="book_cover"
+                 src="#{File.join('pixmaps', final_cover(book))}"
+                 alt="Cover file for '#{xhtml_escape(book.title)}'"
+                 height="#{image_s.height}" width="#{image_s.width}"
+            />
+          EOS
         else
-          xhtml << <<EOS
-<div class="no_book_cover"></div>
-EOS
+          xhtml << <<~EOS
+            <div class="no_book_cover"></div>
+          EOS
         end
 
         unless book.title.nil?
-          xhtml << <<EOS
-<p class="book_title">#{xhtml_escape(book.title)}</p>
-EOS
+          xhtml << <<~EOS
+            <p class="book_title">#{xhtml_escape(book.title)}</p>
+          EOS
         end
 
         unless book.authors.empty?
           xhtml << '<ul class="book_authors">'
           book.authors.each do |author|
-            xhtml << <<EOS
-<li class="book_author">#{xhtml_escape(author)}</li>
-EOS
+            xhtml << <<~EOS
+              <li class="book_author">#{xhtml_escape(author)}</li>
+            EOS
           end
           xhtml << '</ul>'
         end
 
         unless book.edition.nil?
-          xhtml << <<EOS
-<p class="book_binding">#{xhtml_escape(book.edition)}</p>
-EOS
+          xhtml << <<~EOS
+            <p class="book_binding">#{xhtml_escape(book.edition)}</p>
+          EOS
         end
 
         unless book.publisher.nil?
-          xhtml << <<EOS
-<p class="book_publisher">#{xhtml_escape(book.publisher)}</p>
-EOS
+          xhtml << <<~EOS
+            <p class="book_publisher">#{xhtml_escape(book.publisher)}</p>
+          EOS
         end
 
-        xhtml << <<EOS
-</div>
-EOS
+        xhtml << <<~EOS
+          </div>
+        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>.
-</p>
-</body>
-</html>
-EOS
+      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>.
+        </p>
+        </body>
+        </html>
+      EOS
     end
 
     def to_bibtex
       generator = 'Alexandria ' + Alexandria::DISPLAY_VERSION
-      bibtex = ''
+      bibtex = +''
       bibtex << "\%Generated on #{Date.today} by: #{generator}\n"
       bibtex << "\%\n"
       bibtex << "\n"
@@ -493,6 +392,7 @@ EOS
 
     def latex_escape(str)
       return '' if str.nil?
+
       my_str = str.dup
       my_str.gsub!(/%/, '\\%')
       my_str.gsub!(/~/, '\\textasciitilde')
@@ -506,12 +406,4 @@ EOS
       my_str
     end
   end
-
-  class Library
-    include Exportable
-  end
-
-  class SmartLibrary
-    include Exportable
-  end
 end