alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/about.rb

@@ -20,64 +20,64 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  TITLE = 'Alexandria'
-  TEXTDOMAIN = 'alexandria'
+  TITLE = "Alexandria"
+  TEXTDOMAIN = "alexandria"
   extend GetText
-  bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
-  DESCRIPTION = _('A program to help you manage your book collection.')
+  bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
+  DESCRIPTION = _("A program to help you manage your book collection.")
   COPYRIGHT = "Copyright (C) 2004-2006 Laurent Sansonetti\n" \
-    'Copyright (C) 2007-2010,2014,2015 Alexandria Contributors'
+    "Copyright (C) 2007-2010,2014,2015 Alexandria Contributors"
   AUTHORS = [
-    'Alexander McCormmach <alexander@tunicate.org>',
-    'Aymeric Nys <aymeric@nnx.com>',
-    'Cathal Mc Ginley <cathal.alexandria@gnostai.org>',
-    'Claudio Belotti <bel8@lilik.it>',
-    'Constantine Evans <cevans@costinet.org>',
-    'Dafydd Harries <daf@muse.19inch.net>',
-    'Javier Fernandez-Sanguino Pena <jfs@debian.org>',
-    'Joseph Method <tristil@gmail.com>',
-    'Kevin Schultz <schultkl@ieee.org>',
-    'Laurent Sansonetti <lrz@gnome.org>',
-    'Marco Costantini <costanti@science.unitn.it>',
-    'Mathieu Leduc-Hamel <arrak@arrak.org>',
-    'Matijs van Zuijlen <matijs@matijs.net>',
-    'Owain Evans <o.evans@gmail.com>',
-    'Pascal Terjan <pterjan@linuxfr.org>',
-    'Rene Samselnig <sandman@sdm-net.org>',
-    'Robby Stephenson <robby@periapsis.org>',
-    'Sun Ning <classicning@gmail.com>',
-    'Takayuki Kusano <AE5T-KSN@asahi-net.or.jp>',
-    'Timothy Malone <timothy.malone@gmail.com>',
-    'Zachary P. Landau <kapheine@hypa.net>'
+    "Alexander McCormmach <alexander@tunicate.org>",
+    "Aymeric Nys <aymeric@nnx.com>",
+    "Cathal Mc Ginley <cathal.alexandria@gnostai.org>",
+    "Claudio Belotti <bel8@lilik.it>",
+    "Constantine Evans <cevans@costinet.org>",
+    "Dafydd Harries <daf@muse.19inch.net>",
+    "Javier Fernandez-Sanguino Pena <jfs@debian.org>",
+    "Joseph Method <tristil@gmail.com>",
+    "Kevin Schultz <schultkl@ieee.org>",
+    "Laurent Sansonetti <lrz@gnome.org>",
+    "Marco Costantini <costanti@science.unitn.it>",
+    "Mathieu Leduc-Hamel <arrak@arrak.org>",
+    "Matijs van Zuijlen <matijs@matijs.net>",
+    "Owain Evans <o.evans@gmail.com>",
+    "Pascal Terjan <pterjan@linuxfr.org>",
+    "Rene Samselnig <sandman@sdm-net.org>",
+    "Robby Stephenson <robby@periapsis.org>",
+    "Sun Ning <classicning@gmail.com>",
+    "Takayuki Kusano <AE5T-KSN@asahi-net.or.jp>",
+    "Timothy Malone <timothy.malone@gmail.com>",
+    "Zachary P. Landau <kapheine@hypa.net>"
   ].freeze
   DOCUMENTERS = [
-    'Cathal Mc Ginley <cathal.alexandria@gnostai.org>',
-    'Liam Davison <registrations@liamjdavison.info>'
+    "Cathal Mc Ginley <cathal.alexandria@gnostai.org>",
+    "Liam Davison <registrations@liamjdavison.info>"
   ].freeze
   TRANSLATORS = [
-    'Adrián Chaves Fernández <adriyetichaves@gmail.com> (gl)',
-    'Cathal Mc Ginley <cathal.alexandria@gnostai.org> (ga)',
-    'CHIKAMA Masaki <masaki.chikama@gmail.com> (ja)',
-    'Dafydd Harries <daf@muse.19inch.net> (cy)',
-    'Damjan Dimitrioski <damjandimitrioski@gmail.com> (mk)',
-    'Giacomo Margarito <giacomomargarito@gmail.com> (it)',
-    'Jack Myrseh <jack@enkom.no> (nb)',
-    'Joachim Breitner <mail@joachim-breitner.de> (de)',
-    'José Ling <jlgdot369@gmail.com> (zh_TW)',
-    'Lennart Karssen <lennart@karssen.org> (nl)',
-    'Lígia Moreira <ligia.moreira@netvisao.pt> (fr, pt, pt_BR)',
-    'Martin Karlsson <martinkarlsson81@hotmail.com> (sv)',
-    'Michael Kotsarinis <mkotsari1@pre.forthnet.gr> (el)',
-    'Miguel Ángel García <magmax@ieee.org> (es)',
-    'Peter Kováč <kovac.peter@fotopriestor.sk> (sk)',
-    'Petr Vanek <vanous@penguin.cz> (cs)',
-    'Piotr Drąg <piotrdrag@gmail.com> (pl)',
-    'Serhij Dubyk <dubyk@library.lviv.ua> (uk)'
+    "Adrián Chaves Fernández <adriyetichaves@gmail.com> (gl)",
+    "Cathal Mc Ginley <cathal.alexandria@gnostai.org> (ga)",
+    "CHIKAMA Masaki <masaki.chikama@gmail.com> (ja)",
+    "Dafydd Harries <daf@muse.19inch.net> (cy)",
+    "Damjan Dimitrioski <damjandimitrioski@gmail.com> (mk)",
+    "Giacomo Margarito <giacomomargarito@gmail.com> (it)",
+    "Jack Myrseh <jack@enkom.no> (nb)",
+    "Joachim Breitner <mail@joachim-breitner.de> (de)",
+    "José Ling <jlgdot369@gmail.com> (zh_TW)",
+    "Lennart Karssen <lennart@karssen.org> (nl)",
+    "Lígia Moreira <ligia.moreira@netvisao.pt> (fr, pt, pt_BR)",
+    "Martin Karlsson <martinkarlsson81@hotmail.com> (sv)",
+    "Michael Kotsarinis <mkotsari1@pre.forthnet.gr> (el)",
+    "Miguel Ángel García <magmax@ieee.org> (es)",
+    "Peter Kováč <kovac.peter@fotopriestor.sk> (sk)",
+    "Petr Vanek <vanous@penguin.cz> (cs)",
+    "Piotr Drąg <piotrdrag@gmail.com> (pl)",
+    "Serhij Dubyk <dubyk@library.lviv.ua> (uk)"
   ].freeze
   ARTISTS = [
-    'Andreas Nilsson <nisses.mail@home.se>',
-    'Stefanie Dijoux <stefanie.dijoux@gmail.com>'
+    "Andreas Nilsson <nisses.mail@home.se>",
+    "Stefanie Dijoux <stefanie.dijoux@gmail.com>"
   ].freeze
-  BUGREPORT_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager/issues'
-  WEBSITE_URL = 'http://www.github.com/mvz/alexandria-book-collection-manager'
+  BUGREPORT_URL = "http://www.github.com/mvz/alexandria-book-collection-manager/issues"
+  WEBSITE_URL = "http://www.github.com/mvz/alexandria-book-collection-manager"
 end

data/lib/alexandria/book_providers.rb

@@ -19,8 +19,8 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'singleton'
-require 'observer'
+require "singleton"
+require "observer"
 
 module Alexandria
   # FIXME: Use delegation instead of inheritance.
@@ -29,7 +29,7 @@ module Alexandria
     include Singleton
     include Observable
     include GetText
-    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     SEARCH_BY_ISBN, SEARCH_BY_TITLE, SEARCH_BY_AUTHORS,
     SEARCH_BY_KEYWORD = (0..3).to_a
@@ -47,9 +47,9 @@ module Alexandria
 
       begin
         factory = instance[factory_n]
-        puts factory.fullname + ' lookup' if $DEBUG
+        puts factory.fullname + " lookup" if $DEBUG
         unless factory.enabled
-          puts factory.fullname + ' disabled!, skipping...' if $DEBUG
+          puts factory.fullname + " disabled!, skipping..." if $DEBUG
           raise ProviderSkippedError
         end
         instance.changed
@@ -64,14 +64,14 @@ module Alexandria
           instance.notify_observers(:not_found, factory.fullname) # new
           raise NoResultsError
         else
-          log.info { 'found at ' + factory.fullname }
+          log.info { "found at " + factory.fullname }
           instance.changed
           instance.notify_observers(:found, factory.fullname) # new
           return results
         end
-      rescue StandardError => boom
-        if boom.is_a? NoResultsError
-          unless boom.instance_of? ProviderSkippedError
+      rescue StandardError => ex
+        if ex.is_a? NoResultsError
+          unless ex.instance_of? ProviderSkippedError
             instance.changed
             instance.notify_observers(:not_found, factory.fullname) # new
             Thread.new { sleep(0.5) }.join
@@ -80,38 +80,38 @@ module Alexandria
           instance.changed
           instance.notify_observers(:error, factory.fullname) # new
           Thread.new { sleep(0.5) }.join # hrmmmm, to make readable...
-          trace = boom.backtrace.join("\n >")
-          log.warn { "Provider #{factory.name} encountered error: #{boom.message} #{trace}" }
+          trace = ex.backtrace.join("\n >")
+          log.warn { "Provider #{factory.name} encountered error: #{ex.message} #{trace}" }
         end
         if last == factory
           log.warn { "Error while searching #{criterion}" }
-          message = case boom
+          message = case ex
                     when Timeout::Error
                       _("Couldn't reach the provider '%s': timeout " \
-                        'expired.') % factory.name
+                        "expired.") % factory.name
 
                     when SocketError
                       format(_("Couldn't reach the provider '%s': socket " \
-                        'error (%s).'), factory.name, boom.message)
+                        "error (%s)."), factory.name, ex.message)
 
                     when NoResultsError
-                      _('No results were found.  Make sure your ' \
-                        'search criterion is spelled correctly, and ' \
-                        'try again.')
+                      _("No results were found.  Make sure your " \
+                        "search criterion is spelled correctly, and " \
+                        "try again.")
 
                     when ProviderSkippedError
-                      _('No results were found.  Make sure your ' \
-                        'search criterion is spelled correctly, and ' \
-                        'try again.')
+                      _("No results were found.  Make sure your " \
+                        "search criterion is spelled correctly, and " \
+                        "try again.")
 
                     when TooManyResultsError
-                      _('Too many results for that search.')
+                      _("Too many results for that search.")
 
                     when InvalidSearchTypeError
-                      _('Invalid search type.')
+                      _("Invalid search type.")
 
                     else
-                      boom.message
+                      ex.message
                     end
           puts "raising empty error #{message}"
           raise SearchEmptyError, message
@@ -152,7 +152,7 @@ module Alexandria
         end
 
         def new_value=(new_value)
-          message = @provider.variable_name(self) + '='
+          message = @provider.variable_name(self) + "="
           Alexandria::Preferences.instance.send(message,
                                                 new_value)
           self.value = new_value
@@ -189,7 +189,7 @@ module Alexandria
         each do |var|
           message = @provider.variable_name(var)
           val = Alexandria::Preferences.instance.send(message)
-          var.value = val unless val.nil? || ((val == '') && var.mandatory?)
+          var.value = val unless val.nil? || ((val == "") && var.mandatory?)
         end
       end
     end
@@ -203,27 +203,27 @@ module Alexandria
         @name = name
         @fullname = (fullname || name)
         @prefs = Preferences.new(self)
-        @prefs.add('enabled', _('Enabled'), true, [true, false])
+        @prefs.add("enabled", _("Enabled"), true, [true, false])
       end
 
       def enabled
-        @prefs['enabled']
+        @prefs["enabled"]
       end
 
       def toggle_enabled
         old_value = enabled
-        @prefs.variable_named('enabled').new_value = !old_value
+        @prefs.variable_named("enabled").new_value = !old_value
       end
 
       def reinitialize(fullname)
-        @name << '_' << fullname.hash.to_s
+        @name << "_" << fullname.hash.to_s
         @fullname = fullname
         prefs = Alexandria::Preferences.instance
         ary = prefs.abstract_providers
         ary ||= []
         ary << @name
         prefs.abstract_providers = ary
-        message = variable_name('name') + '='
+        message = variable_name("name") + "="
         prefs.send(message, @fullname)
       end
 
@@ -241,7 +241,7 @@ module Alexandria
           name = variable_name(variable)
           prefs.remove_preference(name)
         end
-        name = variable_name('name')
+        name = variable_name("name")
         prefs.remove_preference(name)
         prefs.save!
       end
@@ -255,7 +255,7 @@ module Alexandria
             else
               raise
             end
-        @name.downcase + '_' + s
+        @name.downcase + "_" + s
       end
 
       def transport
@@ -289,24 +289,24 @@ module Alexandria
       unabstract
     end
 
-    require 'alexandria/book_providers/douban' # only requires YAML
+    require "alexandria/book_providers/douban" # only requires YAML
 
     # require 'alexandria/book_providers/renaud'
-    log.info { 'Not loading Renaud (provider not functional)' }
+    log.info { "Not loading Renaud (provider not functional)" }
 
     # Amazon AWS (Amazon Associates Web Services) provider, needs hpricot
-    require 'alexandria/book_providers/amazon_aws'
+    require "alexandria/book_providers/amazon_aws"
 
     # Website based providers
-    require 'alexandria/book_providers/adlibris'
-    require 'alexandria/book_providers/barnes_and_noble'
-    require 'alexandria/book_providers/proxis'
-    require 'alexandria/book_providers/siciliano'
-    require 'alexandria/book_providers/thalia'
-    require 'alexandria/book_providers/worldcat'
+    require "alexandria/book_providers/adlibris"
+    require "alexandria/book_providers/barnes_and_noble"
+    require "alexandria/book_providers/proxis"
+    require "alexandria/book_providers/siciliano"
+    require "alexandria/book_providers/thalia"
+    require "alexandria/book_providers/worldcat"
 
     # Z39.50 based providers
-    require 'alexandria/book_providers/z3950'
+    require "alexandria/book_providers/z3950"
 
     attr_reader :abstract_classes
 
@@ -345,11 +345,11 @@ module Alexandria
           md = /^(.+)_/.match(name)
           next unless md
 
-          klass_name = md[1] + 'Provider'
+          klass_name = md[1] + "Provider"
           klass = @abstract_classes.find { |x| x.name.include?(klass_name) }
           next unless klass
 
-          fullname = @prefs.send(name.downcase + '_name')
+          fullname = @prefs.send(name.downcase + "_name")
           next unless fullname
 
           instance = klass.new
@@ -385,17 +385,17 @@ module Alexandria
       unless priority.empty?
         changed = false
 
-        if (ecs_index = priority.index('AmazonECS'))
-          priority[ecs_index] = 'Amazon' # replace legacy "AmazonECS" name
+        if (ecs_index = priority.index("AmazonECS"))
+          priority[ecs_index] = "Amazon" # replace legacy "AmazonECS" name
           priority.uniq! # remove any other "Amazon" from the list
           changed = true
         end
-        if (worldcat_index = priority.index('Worldcat'))
-          priority[worldcat_index] = 'WorldCat'
+        if (worldcat_index = priority.index("Worldcat"))
+          priority[worldcat_index] = "WorldCat"
           changed = true
         end
-        if (adlibris_index = priority.index('Adlibris'))
-          priority[adlibris_index] = 'AdLibris'
+        if (adlibris_index = priority.index("Adlibris"))
+          priority[adlibris_index] = "AdLibris"
           changed = true
         end
         @prefs.providers_priority = priority if changed

data/lib/alexandria/book_providers/adlibris.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.
 
 # AdLibris  Bokhandel AB http://www.adlibris.com/se/
 # Swedish online book store
@@ -27,23 +11,23 @@
 # modified to fit the structure of Alexandria book providers.
 # (26 Feb 2009)
 
-require 'cgi'
-require 'alexandria/book_providers/web'
+require "cgi"
+require "alexandria/book_providers/web"
 
 module Alexandria
   class BookProviders
     class AdLibrisProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.adlibris.com/se/'
+      SITE = "http://www.adlibris.com/se/"
 
       BASE_SEARCH_URL = "#{SITE}searchresult.aspx?search=advanced&%s=%s" \
-        '&fromproduct=False' # type/term
+        "&fromproduct=False" # type/term
 
       PRODUCT_URL = "#{SITE}product.aspx?isbn=%s"
 
       def initialize
-        super('AdLibris', 'AdLibris (Sweden)')
+        super("AdLibris", "AdLibris (Sweden)")
         prefs.read
         # @ent = HTMLEntities.new
       end
@@ -79,10 +63,10 @@ module Alexandria
           PRODUCT_URL % Library.canonicalise_isbn(search_term)
         else
           (search_type_code = {
-            SEARCH_BY_AUTHORS => 'author',
-            SEARCH_BY_TITLE   => 'title',
-            SEARCH_BY_KEYWORD => 'keyword'
-          }[search_type]) || 'keyword'
+            SEARCH_BY_AUTHORS => "author",
+            SEARCH_BY_TITLE   => "title",
+            SEARCH_BY_KEYWORD => "keyword"
+          }[search_type]) || "keyword"
           search_term_encoded = CGI.escape(search_term)
           format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
         end
@@ -106,11 +90,11 @@ module Alexandria
         search_hit = doc.search("div'searchResult")[0]
         return [] unless search_hit
 
-        (search_hit / 'ul.ulSearch table').each do |t|
+        (search_hit / "ul.ulSearch table").each do |t|
           result = {}
-          if (title_data = (t % 'div.divTitle'))
+          if (title_data = (t % "div.divTitle"))
             result[:title] = (title_data % :a).inner_text
-            lookup_url = (title_data % :a)['href']
+            lookup_url = (title_data % :a)["href"]
           end
           result[:lookup_url] = "#{SITE}#{lookup_url}"
 
@@ -145,19 +129,19 @@ module Alexandria
         doc = html_to_doc(html)
         begin
           title = nil
-          if (h1 = doc.at('div.productTitleFormat h1'))
+          if (h1 = doc.at("div.productTitleFormat h1"))
             title = text_of(h1)
           else
-            raise NoResultsError, 'title not found on page'
+            raise NoResultsError, "title not found on page"
           end
 
-          product = doc.at('div.product')
-          ul_info = doc.at('ul.info') # NOTE, two of these
+          product = doc.at("div.product")
+          ul_info = doc.at("ul.info") # NOTE, two of these
 
-          author_cells = ul_info.search('li.liAuthor') # css-like search
+          author_cells = ul_info.search("li.liAuthor") # css-like search
           authors = []
           author_cells.each do |li|
-            author_name = text_of(li.search('h2 > a')[0])
+            author_name = text_of(li.search("h2 > a")[0])
 
             authors << author_name
           end
@@ -168,7 +152,7 @@ module Alexandria
           end
 
           binding = nil
-          if (format = doc.search('div.productTitleFormat span').first)
+          if (format = doc.search("div.productTitleFormat span").first)
             binding = text_of(format)
             binding = Regexp.last_match[1] if binding =~ /\(([^\)]+)\)/
           end
@@ -186,7 +170,7 @@ module Alexandria
             isbn = isbn_td.inner_text
             next unless isbn =~ /[0-9x]{10,13}/i
 
-            isbn.gsub(/(\n|\r)/, ' ')
+            isbn.gsub(/(\n|\r)/, " ")
             isbn = Regexp.last_match[1] if isbn =~ /:[\s]*([0-9x]+)/i
             isbns << isbn
           end
@@ -196,12 +180,12 @@ module Alexandria
           # cover
           image_url = nil
           if (cover_img = doc.search('span.imageWithShadow img[@id$="ProductImageNotLinked"]').first)
-            image_url = if cover_img['src'] =~ /^http\:\/\//
-                          cover_img['src']
+            image_url = if %r{^http\://}.match?(cover_img["src"])
+                          cover_img["src"]
                         else
                           "#{SITE}/#{cover_img['src']}" # HACK: use html base
                         end
-            if image_url =~ /noimage.gif$/
+            if /noimage.gif$/.match?(image_url)
               # no point downloading a "no image" graphic
               # Alexandria has its own generic book icon...
               image_url = nil
@@ -216,10 +200,10 @@ module Alexandria
           raise ex if ex.instance_of? NoResultsError
 
           trace = ex.backtrace.join("\n> ")
-          log.warn {
-            'Failed parsing search results for AdLibris ' \
+          log.warn do
+            "Failed parsing search results for AdLibris " \
             "#{ex.message} #{trace}"
-          }
+          end
           raise NoResultsError
         end
       end