alexandria-book-collection-manager 0.7.4 → 0.7.5

data/lib/alexandria/book_providers/adlibris.rb

@@ -103,29 +103,11 @@ module Alexandria
         book_search_results
       end
 
-      # def binding_type(binding) # swedish string
-      #  # hrm, this is a HACK and not currently working
-      #  # perhaps use regexes instead...
-      #  {"inbunden" => :hardback,
-      #    "pocket" => :paperback,
-      #    "storpocket" => :paperback,
-      #    "kartonnage" => :hardback,
-      #    "kassettbok" => :audiobook}[binding.downcase] or :paperback
-      #  # Häftad == Paperback
-      # end
-
       def normalize(text)
-        # unless text.nil?
-        #  text = @ent.decode(text).strip
-        # end
         text
       end
 
       def parse_result_data(html)
-        # adlibris site presents data in ISO-8859-1, so change it to UTF-8
-        # html = Iconv.conv("UTF-8", "ISO-8859-1", html)
-        ## File.open(',log.html', 'wb') {|f| f.write('<?xml encoding="utf-8"?>'); f.write(html) } # DEBUG
-        # doc = Hpricot(html)
         doc = html_to_doc(html)
         begin
           title = nil
@@ -179,7 +161,9 @@ module Alexandria
 
           # cover
           image_url = nil
-          if (cover_img = doc.search('span.imageWithShadow img[@id$="ProductImageNotLinked"]').first)
+          cover_img =
+            doc.search('span.imageWithShadow img[@id$="ProductImageNotLinked"]').first
+          if cover_img
             image_url = if %r{^http\://}.match?(cover_img["src"])
                           cover_img["src"]
                         else
@@ -195,7 +179,7 @@ module Alexandria
 
           book = Book.new(title, authors, isbn, publisher, year, binding)
 
-          return [book, image_url]
+          [book, image_url]
         rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
 

data/lib/alexandria/book_providers/amazon_aws.rb

@@ -50,7 +50,9 @@ module Alexandria
         if token
           token.new_value = token.value.strip if token.value != token.value.strip
         end
-        token.new_value = "" if token && ((token.value.size != 20) || (token.value == "0J356Z09CN88KB743582"))
+        if token && ((token.value.size != 20) || (token.value == "0J356Z09CN88KB743582"))
+          token.new_value = ""
+        end
 
         secret = prefs.variable_named("secret_key")
         if secret
@@ -60,7 +62,9 @@ module Alexandria
         associate = prefs.variable_named("associate_tag")
         if associate
           associate.new_value = "rubyalexa-20" if associate.value.strip.empty?
-          associate.new_value = associate.value.strip if associate.value != associate.value.strip
+          if associate.value != associate.value.strip
+            associate.new_value = associate.value.strip
+          end
         end
       end
 
@@ -99,8 +103,9 @@ module Alexandria
           when SEARCH_BY_ISBN
             criterion = Library.canonicalise_isbn(criterion)
             # This isn't ideal : I'd like to do an ISBN/EAN-specific search
-            res = Amazon::Ecs.item_search(criterion, response_group: "ItemAttributes,Images",
-                                                     country: request_locale)
+            res = Amazon::Ecs.item_search(criterion,
+                                          response_group: "ItemAttributes,Images",
+                                          country: request_locale)
             res.items.each do |item|
               products << item
             end
@@ -194,7 +199,7 @@ module Alexandria
         end
         if type == SEARCH_BY_ISBN
           if results.size == 1
-            return results.first
+            results.first
           else
             log.info { "Found multiple results for lookup: checking each" }
             query_isbn_canon = Library.canonicalise_ean(criterion)
@@ -206,11 +211,13 @@ module Alexandria
               log.debug { "rejected possible result #{book}" }
             end
             # gone through all and no ISBN match, so just return first result
-            log.info { "no more results to check. Returning first result, just an approximation" }
-            return results.first
+            log.info do
+              "no more results to check. Returning first result, just an approximation"
+            end
+            results.first
           end
         else
-          return results
+          results
         end
       end
 

data/lib/alexandria/book_providers/amazon_ecs_util.rb

@@ -16,12 +16,14 @@ module Amazon
   class Ecs
     include Alexandria::Logging
 
-    SERVICE_URLS = { us: "http://webservices.amazon.com/onca/xml?Service=AWSECommerceService",
-                     uk: "http://webservices.amazon.co.uk/onca/xml?Service=AWSECommerceService",
-                     ca: "http://webservices.amazon.ca/onca/xml?Service=AWSECommerceService",
-                     de: "http://webservices.amazon.de/onca/xml?Service=AWSECommerceService",
-                     jp: "http://webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService",
-                     fr: "http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService" }.freeze
+    SERVICE_URLS = {
+      us: "http://webservices.amazon.com/onca/xml?Service=AWSECommerceService",
+      uk: "http://webservices.amazon.co.uk/onca/xml?Service=AWSECommerceService",
+      ca: "http://webservices.amazon.ca/onca/xml?Service=AWSECommerceService",
+      de: "http://webservices.amazon.de/onca/xml?Service=AWSECommerceService",
+      jp: "http://webservices.amazon.co.jp/onca/xml?Service=AWSECommerceService",
+      fr: "http://webservices.amazon.fr/onca/xml?Service=AWSECommerceService"
+    }.freeze
 
     @@options = {}
     @@debug = false
@@ -59,7 +61,8 @@ module Amazon
     end
 
     # Search amazon items with search terms. Default search index option is 'Books'.
-    # For other search type other than keywords, please specify :type => [search type param name].
+    # For other search type other than keywords, please specify
+    # :type => [search type param name].
     def self.item_search(terms, opts = {})
       opts[:operation] = "ItemSearch"
       opts[:search_index] = opts[:search_index] || "Books"
@@ -88,7 +91,8 @@ module Amazon
       config ? Net::HTTP.Proxy(*config) : Net::HTTP
     end
 
-    # Generic send request to ECS REST service. You have to specify the :operation parameter.
+    # Generic send request to ECS REST service. You have to specify the
+    # :operation parameter.
     def self.send_request(opts)
       opts = options.merge(opts) if options
       request_url = prepare_url(opts)
@@ -296,7 +300,8 @@ module Amazon
     end
 
     # Find Hpricot::Elements matching the given path, and convert to Amazon::Element.
-    # Returns an array Amazon::Elements if more than Hpricot::Elements size is greater than 1.
+    # Returns an array Amazon::Elements if more than Hpricot::Elements size is
+    # greater than 1.
     def search_and_convert(path)
       elements = self./(path)
       return unless elements
@@ -322,7 +327,8 @@ module Amazon
       Element.get_array(@element, path)
     end
 
-    # Get the children element text values in hash format with the element names as the hash keys.
+    # Get the children element text values in hash format with the element
+    # names as the hash keys.
     def get_hash(path = "")
       Element.get_hash(@element, path)
     end

data/lib/alexandria/book_providers/barnes_and_noble.rb

@@ -192,7 +192,7 @@ module Alexandria
                           book_data[:isbn], book_data[:publisher],
                           book_data[:publication_year],
                           book_data[:binding])
-          return [book, book_data[:image_url]]
+          [book, book_data[:image_url]]
         rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
 

data/lib/alexandria/book_providers/douban.rb

@@ -40,9 +40,9 @@ module Alexandria
         raise NoResultsError if results.empty?
 
         if type == SEARCH_BY_ISBN
-          return results.first
+          results.first
         else
-          return results
+          results
         end
       end
 

data/lib/alexandria/book_providers/proxis.rb

@@ -65,7 +65,9 @@ module Alexandria
       end
 
       def url(book)
-        ISBN_REDIRECT_BASE_URL % Library.canonicalise_ean(book.isbn) if book.isbn.nil? || book.isbn.empty?
+        if book.isbn.nil? || book.isbn.empty?
+          ISBN_REDIRECT_BASE_URL % Library.canonicalise_ean(book.isbn)
+        end
       end
 
       ## from Palatina
@@ -94,7 +96,9 @@ module Alexandria
           if title_link
             result[:title] = text_of(title_link)
             result[:lookup_url] = title_link["href"]
-            result[:lookup_url] = "#{SITE}#{result[:lookup_url]}" unless /^http/.match?(result[:lookup_url])
+            unless /^http/.match?(result[:lookup_url])
+              result[:lookup_url] = "#{SITE}#{result[:lookup_url]}"
+            end
           end
           book_search_results << result
         end

data/lib/alexandria/book_providers/pseudomarc.rb

@@ -88,7 +88,9 @@ module Alexandria
 
         binding_data = details[m[:binding][0]]
         if binding_data
-          binding = Regexp.last_match[1] if binding_data.first[m[:binding][1]] =~ /([a-zA-Z][a-z\s]+[a-z])/
+          if binding_data.first[m[:binding][1]] =~ /([a-zA-Z][a-z\s]+[a-z])/
+            binding = Regexp.last_match[1]
+          end
         end
 
         publisher = nil

data/lib/alexandria/book_providers/siciliano.rb

@@ -125,33 +125,31 @@ module Alexandria
 
         list_items = doc.search("div.pesquisa-item-lista-conteudo")
         list_items.each do |item|
-          begin
-            result = {}
+          result = {}
 
-            # author & publisher
-            author_publisher = ""
-            item.children.each do |node|
-              author_publisher += node.to_s if node.text?
-              author_publisher.strip!
-              break unless author_publisher.empty?
-            end
-            author, publisher = author_publisher.split("/")
-            result[:author] = author.strip if author
-            result[:publisher] = publisher.strip if publisher
+          # author & publisher
+          author_publisher = ""
+          item.children.each do |node|
+            author_publisher += node.to_s if node.text?
+            author_publisher.strip!
+            break unless author_publisher.empty?
+          end
+          author, publisher = author_publisher.split("/")
+          result[:author] = author.strip if author
+          result[:publisher] = publisher.strip if publisher
 
-            # title & url
-            link = item % "a"
-            result[:title] = link.inner_text.strip
-            link_to_description = link["href"]
-            slash = ""
-            slash = "/" unless %r{^/}.match?(link_to_description)
-            result[:url] = "#{SITE}#{slash}#{link_to_description}"
+          # title & url
+          link = item % "a"
+          result[:title] = link.inner_text.strip
+          link_to_description = link["href"]
+          slash = ""
+          slash = "/" unless %r{^/}.match?(link_to_description)
+          result[:url] = "#{SITE}#{slash}#{link_to_description}"
 
-            book_search_results << result
-          rescue StandardError => ex
-            trace = ex.backtrace.join("\n> ")
-            log.error { "Failed parsing Siciliano search page #{ex.message}\n#{trace}" }
-          end
+          book_search_results << result
+        rescue StandardError => ex
+          trace = ex.backtrace.join("\n> ")
+          log.error { "Failed parsing Siciliano search page #{ex.message}\n#{trace}" }
         end
 
         book_search_results
@@ -186,9 +184,8 @@ module Alexandria
         # publish year
         publish_year = nil
         edition = details["Edio"]
-        if edition
-          publish_year = Regexp.last_match[1].to_i if edition =~ /([12][0-9]{3})/ # publication date
-        end
+        # publication date
+        publish_year = Regexp.last_match[1].to_i if edition && edition =~ /([12][0-9]{3})/
         # cover
         # ImgSrc[1]="/imagem/imagem.dll?pro_id=1386929&PIM_Id=658849";
         image_urls = []

data/lib/alexandria/book_providers/thalia.rb

@@ -181,7 +181,7 @@ module Alexandria
               image_url = image_link["href"]
             end
 
-            return [book, image_url]
+            [book, image_url]
 
           end
         rescue StandardError => ex

data/lib/alexandria/book_providers/worldcat.rb

@@ -148,7 +148,9 @@ module Alexandria
             end
 
             # gone through all and no ISBN match, so just return first result
-            log.info { "no more results to check. Returning first result, just an approximation" }
+            log.info do
+              "no more results to check. Returning first result, just an approximation"
+            end
             return first_result
 
           end
@@ -195,7 +197,7 @@ module Alexandria
 
           isbn = search_isbn
           unless isbn
-            isbn_row = doc % "tr#details-standardno" # #bibdata_table % 'th[text()*=ISBN]/..'
+            isbn_row = doc % "tr#details-standardno"
             if isbn_row
               isbns = (isbn_row / "td").last.inner_text.split
               isbn = Library.canonicalise_isbn(isbns.first)
@@ -210,7 +212,7 @@ module Alexandria
 
           image_url = nil # hm, it's on the website, but uses JavaScript...
 
-          return [book, image_url]
+          [book, image_url]
         rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
 

data/lib/alexandria/book_providers/z3950.rb

@@ -22,7 +22,8 @@ module Alexandria
         prefs.add("hostname", _("Hostname"), "")
         prefs.add("port", _("Port"), 7090)
         prefs.add("database", _("Database"), "")
-        prefs.add("record_syntax", _("Record syntax"), "USMARC", ["USMARC", "UNIMARC", "SUTRS"])
+        prefs.add("record_syntax", _("Record syntax"), "USMARC",
+                  ["USMARC", "UNIMARC", "SUTRS"])
         prefs.add("username", _("Username"), "", nil, false)
         prefs.add("password", _("Password"), "", nil, false)
         prefs.add("charset", _("Charset encoding"), "ISO-8859-1")
@@ -100,7 +101,7 @@ module Alexandria
       def books_from_marc(resultset, _isbn)
         results = []
         resultset[0..9].each do |record|
-          marc_txt = record.render(prefs["charset"], "UTF-8") # (prefs['record_syntax'], 'USMARC')
+          marc_txt = record.render(prefs["charset"], "UTF-8")
           log.debug { marc_txt }
           if $DEBUG
             File.open(",marc.txt", "wb") do |f| # DEBUG
@@ -110,7 +111,9 @@ module Alexandria
           book = nil
           begin
             mappings = Alexandria::PseudoMarcParser::USMARC_MAPPINGS
-            mappings = Alexandria::PseudoMarcParser::BNF_FR_MAPPINGS if prefs["hostname"] == "z3950.bnf.fr"
+            if prefs["hostname"] == "z3950.bnf.fr"
+              mappings = Alexandria::PseudoMarcParser::BNF_FR_MAPPINGS
+            end
             # try pseudo-marc parser first (it seems to have more luck)
             book = Alexandria::PseudoMarcParser.marc_text_to_book(marc_txt,
                                                                   mappings)
@@ -205,8 +208,9 @@ 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)
+        isbn = Library.canonicalise_isbn(book.isbn)
+        "http://catalog.loc.gov/cgi-bin/Pwebrecon.cgi?" \
+          "DB=local&CNT=25+records+per+page&CMD=isbn+#{isbn}"
       rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
@@ -344,7 +348,8 @@ module Alexandria
           "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" +
+          "%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 StandardError => ex
@@ -363,23 +368,23 @@ module Alexandria
         if isbn[0..1] == "88"
           # Italian speaking area
           if isbn > "8895000" && (isbn <= "8899999996")
-            return isbn[0..1] + "-" + isbn[2..6] + "-" + isbn[7..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..6] + "-" + isbn[7..8] + "-" + isbn[9..9]
           elsif isbn > "88900000"
-            return isbn[0..1] + "-" + isbn[2..7] + "-" + isbn[8..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..7] + "-" + isbn[8..8] + "-" + isbn[9..9]
           elsif isbn > "8885000"
-            return isbn[0..1] + "-" + isbn[2..6] + "-" + isbn[7..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..6] + "-" + isbn[7..8] + "-" + isbn[9..9]
           elsif isbn > "886000"
-            return isbn[0..1] + "-" + isbn[2..5] + "-" + isbn[6..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..5] + "-" + isbn[6..8] + "-" + isbn[9..9]
           elsif isbn > "88200"
-            return isbn[0..1] + "-" + isbn[2..4] + "-" + isbn[5..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..4] + "-" + isbn[5..8] + "-" + isbn[9..9]
           elsif isbn > "8800"
-            return isbn[0..1] + "-" + isbn[2..3] + "-" + isbn[4..8] + "-" + isbn[9..9]
+            isbn[0..1] + "-" + isbn[2..3] + "-" + isbn[4..8] + "-" + isbn[9..9]
           else
             raise "Invalid ISBN"
           end
 
         else
-          return isbn
+          isbn
         end
       end
       #
@@ -393,7 +398,8 @@ module Alexandria
       #
       # Dashes:
       # this database requires that Italian books are searched with dashes :(
-      # However, they have also books with dashes in wrong positions, for instance 88-061-4934-2
+      # However, they have also books with dashes in wrong positions, for
+      # instance 88-061-4934-2
       #
       # References:
       # http://opac.internetculturale.it/cgi-bin/main.cgi?type=field

data/lib/alexandria/export_library.rb

@@ -50,13 +50,11 @@ module Alexandria
 
     def export_as_tellico_xml_archive(filename)
       File.open(File.join(Dir.tmpdir, "tellico.xml"), "w") do |io|
-        begin
-          to_tellico_document.write(io, 0)
-        rescue StandardError => ex
-          puts ex.message
-          puts ex.backtrace
-          raise ex
-        end
+        to_tellico_document.write(io, 0)
+      rescue StandardError => ex
+        puts ex.message
+        puts ex.backtrace
+        raise ex
       end
       copy_covers(File.join(Dir.tmpdir, "images"))
       Dir.chdir(Dir.tmpdir) do
@@ -117,7 +115,8 @@ module Alexandria
           io.puts book.authors.join(", ")
           io.puts book.edition
           io.puts((book.isbn || ""))
-          # we need to close the files so the iPod can be ejected/unmounted without us closing Alexandria
+          # we need to close the files so the iPod can be ejected/unmounted
+          # without us closing Alexandria
           io.close
         end
       end
@@ -131,8 +130,8 @@ module Alexandria
                 "Rating(#{Book::DEFAULT_RATING} to #{Book::MAX_RATING_STARS})", "Notes",
                 "Want?", "Read?", "Own?", "Tags"]
         each do |book|
-          csv << [book.title, book.authors.join(", "), book.publisher, book.edition, book.isbn,
-                  book.publishing_year, book.rating, book.notes,
+          csv << [book.title, book.authors.join(", "), book.publisher, book.edition,
+                  book.isbn, book.publishing_year, book.rating, book.notes,
                   (book.want ? "1" : "0"), (book.redd ? "1" : "0"), (book.own ? "1" : "0"),
                   (book.tags ? book.tags.join(", ") : "")]
         end
@@ -245,7 +244,9 @@ 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
-        entry.add_element("rating").text = book.rating unless book.rating == Book::DEFAULT_RATING
+        unless book.rating == Book::DEFAULT_RATING
+          entry.add_element("rating").text = book.rating
+        end
         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)
@@ -381,7 +382,9 @@ module Alexandria
         bibtex << "\",\n"
         bibtex << "title = \"#{latex_escape(book.title)}\",\n"
         bibtex << "publisher = \"#{latex_escape(book.publisher)}\",\n"
-        bibtex << "OPTnote = \"#{latex_escape(book.notes)}\",\n" if book.notes && !book.notes.empty?
+        if book.notes && !book.notes.empty?
+          bibtex << "OPTnote = \"#{latex_escape(book.notes)}\",\n"
+        end
         # year is a required field in bibtex @BOOK
         bibtex << "year = " + (book.publishing_year || '"n/a"').to_s + "\n"
         bibtex << "}\n\n"