alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/book_providers/pseudomarc.rb

@@ -27,7 +27,7 @@ module Alexandria
       year: ['210', 'd'],
       binding: ['225', 'a'],
       notes: ['520', 'a']
-    }
+    }.freeze
 
     USMARC_MAPPINGS = {
       title: ['245', 'a', 'b'],
@@ -37,7 +37,7 @@ module Alexandria
       year: ['260', 'c'],
       binding: ['020', 'a'], # listed with isbn here
       notes: ['520', 'a']
-    }
+    }.freeze
 
     def self.get_fields(data, type, stripping, m = USMARC_MAPPINGS)
       field = ''
@@ -48,15 +48,11 @@ module Alexandria
             part_data = Regexp.last_match[1]
             part_data = part_data.strip
           end
-          if field != ''
-            field += ': '
-          end
+          field += ': ' if field != ''
           field += part_data
         end
       end
-      if field == ''
-        field = nil
-      end
+      field = nil if field == ''
       field
     end
 
@@ -67,9 +63,7 @@ module Alexandria
         title_data = details[m[:title][0]]
         if title_data
           title_data_all = get_fields(title_data, :title, /(.*)[\/:]$/, m)
-          if title_data_all
-            title = title_data_all
-          end
+          title = title_data_all if title_data_all
         end
 
         authors = []
@@ -123,13 +117,11 @@ module Alexandria
         if notes_data
           notes_data.each do |note|
             txt = note[m[:notes][1]]
-            if txt
-              notes += txt
-            end
+            notes += txt if txt
           end
         end
 
-        if title.nil? and isbn.nil?
+        if title.nil? && isbn.nil?
           # probably didn't undertand the MARC dialect
           return nil
         end
@@ -171,9 +163,7 @@ module Alexandria
           end
 
           unless this_line_data.empty?
-            unless details.key?(code)
-              details[code] = []
-            end
+            details[code] = [] unless details.key?(code)
             details[code] << this_line_data
           end
 

data/lib/alexandria/book_providers/renaud.rb

@@ -25,15 +25,15 @@ module Alexandria
     class RENAUDProvider < GenericProvider
       include GetText
       # GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
-      BASE_URI = 'http://www.renaud-bray.com/'
-      ACCENTUATED_CHARS = 'áàâäçéèêëíìîïóòôöúùûü'
+      BASE_URI = 'http://www.renaud-bray.com/'.freeze
+      ACCENTUATED_CHARS = 'áàâäçéèêëíìîïóòôöúùûü'.freeze
 
       def initialize
         super('RENAUD', 'Renaud-Bray (Canada)')
       end
 
       def search(criterion, type)
-        criterion = criterion.convert('ISO-8859-1', 'UTF-8')
+        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 += case type
@@ -58,14 +58,14 @@ module Alexandria
             return to_books(data).pop
           else
             results = []
-            to_books(data).each {|book|
+            to_books(data).each { |book|
               results << book
             }
-            while /Suivant/.match(data)
+            while /Suivant/ =~ data
               md = /Enteterouge\">([\d]*)<\/b>/.match(data)
               num = md[1].to_i + 1
               data = transport.get(URI.parse(req + '&PageActuelle=' + num.to_s))
-              to_books(data).each {|book|
+              to_books(data).each { |book|
                 results << book
               }
             end
@@ -85,16 +85,16 @@ module Alexandria
 
       def to_books(data)
         data = CGI.unescapeHTML(data)
-        data = data.convert('UTF-8', 'ISO-8859-1')
-        raise NoResultsError if /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/.match(data)
+        data = data.encode('UTF-8')
+        raise NoResultsError if data =~ /<strong class="Promotion">Aucun article trouv. selon les crit.res demand.s<\/strong>/
 
         titles = []
-        data.scan(/"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/).each {|md|
+        data.scan(/"(Jeune|Lire)Hyperlien" href.*><strong>([-,'\(\)&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/strong><\/a><br>/).each { |md|
           titles << md[1].strip
         }
         raise if titles.empty?
         authors = []
-        data.scan(/Nom_Auteur.*><i>([,'.&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/i>/).each {|md|
+        data.scan(/Nom_Auteur.*><i>([,'.&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/i>/).each { |md|
           authors2 = []
           for author in md[0].split('  ')
             authors2 << author.strip
@@ -103,30 +103,30 @@ module Alexandria
         }
         raise if authors.empty?
         isbns = []
-        data.scan(/ISBN : ?<\/td><td>(\d+)/).each {|md|
+        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|
+        data.scan(/Parution : <br>(\d{4,}-\d{2,}-\d{2,})/).each { |md|
           editions << md[0].strip
           publish_years << md[0].strip.split(/-/)[0].to_i
         }
-        raise if editions.empty? or publish_years.empty?
+        raise if editions.empty? || publish_years.empty?
         publishers = []
-        data.scan(/diteur : ([,'.&\#;\w\s#{ACCENTUATED_CHARS}]*)<\/span><br>/).each {|md|
+        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)/).each {|md|
+        data.scan(/(\/ImagesEditeurs\/[\d]*\/([\dX]*-f.(jpg|gif))|\/francais\/suggestion\/images\/livre\/livre.gif)/).each { |md|
           book_covers << BASE_URI + md[0].strip
         }
         raise if book_covers.empty?
 
         books = []
-        titles.each_with_index {|title, i|
+        titles.each_with_index { |title, i|
           books << [Book.new(title, authors[i], isbns[i], publishers[i], publish_years[i], editions[i]),
                     book_covers[i]]
           # print books

data/lib/alexandria/book_providers/siciliano.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2004 Laurent Sansonetti
 # Copyright (C) 2007 Laurent Sansonetti and Marco Costantini
 # Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2011, 2014 Matijs van Zuijlen
+# Copyright (C) 2011, 2014, 2016 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
@@ -32,7 +32,7 @@ module Alexandria
     class SicilianoProvider < WebsiteBasedProvider
       include Logging
 
-      SITE = 'http://www.siciliano.com.br'
+      SITE = 'http://www.siciliano.com.br'.freeze
 
       # The string interpolations in this URL are the search term and search
       # type, respectively.
@@ -40,7 +40,7 @@ module Alexandria
         '&FIL_ID=102' \
         '&PALAVRASN1=%s' \
         '&FILTRON1=%s' \
-        '&ESTRUTN1=0301&ORDEMN2=E'
+        '&ESTRUTN1=0301&ORDEMN2=E'.freeze
 
       def initialize
         super('Siciliano', 'Livraria Siciliano (Brasil)')
@@ -55,12 +55,7 @@ module Alexandria
       end
 
       def search(criterion, type)
-        begin
-          criterion = criterion.convert('ISO-8859-1', 'UTF-8') # still needed??
-        rescue GLib::ConvertError
-          log.info { "Cannot search for non-ISO-8859-1 terms at Siciliano : #{criterion}" }
-          raise NoResultsError
-        end
+        criterion = criterion.encode('ISO-8859-1') # still needed??
         trying_again = false
         begin
           req = create_search_uri(type, criterion, trying_again)
@@ -76,7 +71,7 @@ module Alexandria
           end
 
         rescue NoResultsError => err
-          if (type == SEARCH_BY_ISBN) and (trying_again == false)
+          if (type == SEARCH_BY_ISBN) && (trying_again == false)
             trying_again = true
             retry
           else
@@ -94,23 +89,21 @@ 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_BY_AUTHORS => 'B',
-                             SEARCH_BY_KEYWORD => 'X'
-        }[search_type] or 'X'
-        search_term_encoded = search_term
-        if search_type == SEARCH_BY_ISBN
-          if trying_again
-            # on second attempt, try ISBN-10...
-            search_term_encoded = Library.canonicalise_isbn(search_term) # isbn-10
-          else
-            # search by ISBN-13 first
-            search_term_encoded = Library.canonicalise_ean(search_term) # isbn-13
-          end
-        else
-          search_term_encoded = CGI.escape(search_term)
-        end
+        (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
+                                if trying_again
+                                  # on second attempt, try ISBN-10...
+                                  Library.canonicalise_isbn(search_term) # isbn-10
+                                else
+                                  # search by ISBN-13 first
+                                  Library.canonicalise_ean(search_term) # isbn-13
+                                end
+                              else
+                                CGI.escape(search_term)
+                              end
 
         BASE_SEARCH_URL % [search_term_encoded, search_type_code]
       end
@@ -150,10 +143,8 @@ module Alexandria
             result[:title] = link.inner_text.strip
             link_to_description = link['href']
             slash = ''
-            unless link_to_description =~ /^\//
-              slash = '/'
-            end
-            result[:url] =  "#{SITE}#{slash}#{link_to_description}"
+            slash = '/' unless link_to_description =~ /^\//
+            result[:url] = "#{SITE}#{slash}#{link_to_description}"
 
             book_search_results << result
           rescue => ex
@@ -187,9 +178,7 @@ module Alexandria
         isbn =  details['ISBN']
         ## ean = details["CdBarras"]
         translator = details['Tradutor']
-        if translator
-          authors << translator
-        end
+        authors << translator if translator
         binding = details['Acabamento']
         publisher = search_result[:publisher]
         # publish year
@@ -214,7 +203,7 @@ module Alexandria
           end
         end
         book = Book.new(title, authors, isbn, publisher, publish_year, binding)
-        result =  [book, image_urls.first]
+        result = [book, image_urls.first]
         return result
       rescue => ex
         trace = ex.backtrace.join("\n> ")
@@ -255,9 +244,7 @@ module Alexandria
         arr.each do |str|
           key, val = str.split(':')
           # a real hack for not handling encoding properly :^)
-          if val
-            map[key.gsub(/[^a-zA-Z]/, '')] = val.strip
-          end
+          map[key.gsub(/[^a-zA-Z]/, '')] = val.strip if val
         end
         map
       end

data/lib/alexandria/book_providers/thalia.rb

@@ -31,8 +31,8 @@ module Alexandria
     class ThaliaProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.thalia.de'
-      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s" # type,term
+      SITE = 'http://www.thalia.de'.freeze
+      BASE_SEARCH_URL = "#{SITE}/shop/bde_bu_hg_startseite/suche/?%s=%s".freeze # type,term
 
       def initialize
         super('Thalia', 'Thalia (Germany)')
@@ -58,20 +58,19 @@ module Alexandria
       end
 
       def create_search_uri(search_type, search_term)
-        search_type_code = {
+        (search_type_code = {
           SEARCH_BY_ISBN => 'sq',
           SEARCH_BY_AUTHORS => 'sa', # Autor
           SEARCH_BY_TITLE => 'st', # Titel
           SEARCH_BY_KEYWORD => 'ssw' # Schlagwort
-        }[search_type] or ''
+        }[search_type]) || ''
         search_type_code = CGI.escape(search_type_code)
-        search_term_encoded = search_term
-        if search_type == SEARCH_BY_ISBN
-          # search_term_encoded = search_term.as_isbn_13
-          search_term_encoded = Library.canonicalise_isbn(search_term) # check this!
-        else
-          search_term_encoded = CGI.escape(search_term)
-        end
+        search_term_encoded = if search_type == SEARCH_BY_ISBN
+                                # search_term_encoded = search_term.as_isbn_13
+                                Library.canonicalise_isbn(search_term) # check this!
+                              else
+                                CGI.escape(search_term)
+                              end
         BASE_SEARCH_URL % [search_type_code, search_term_encoded]
       end
 
@@ -94,9 +93,7 @@ module Alexandria
         if (item_node = label_node.parent)
           data = ''
           item_node.children.each do |n|
-            if n.text?
-              data += n.to_html
-            end
+            data += n.to_html if n.text?
           end
           data.strip
         else
@@ -106,7 +103,7 @@ module Alexandria
 
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:lookup_url]}" }
-        html_data =  transport.get_response(URI.parse(result[:lookup_url]))
+        html_data = transport.get_response(URI.parse(result[:lookup_url]))
         parse_result_data(html_data.body, 'noisbn', true)
       end
 
@@ -130,7 +127,7 @@ module Alexandria
           chosen = results.first # fallback!
           results.each do |rslt|
             if rslt[:lookup_url] =~ /\/ISBN(\d+[\d-]*)\//
-              if Regexp.last_match[1].gsub('-', '') == isbn10
+              if Regexp.last_match[1].delete('-') == isbn10
                 chosen = rslt
                 break
               end

data/lib/alexandria/book_providers/webster_it.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007 Marco Costantini
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2016 Matijs van Zuijlen
 # based on ibs_it.rb by Claudio Belotti
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -25,10 +25,10 @@ require 'open-uri'
 module Alexandria
   class BookProviders
     class Webster_itProvider < GenericProvider
-      BASE_URI = 'http://www.libreriauniversitaria.it' # also "http://www.webster.it"
+      BASE_URI = 'http://www.libreriauniversitaria.it'.freeze # also "http://www.webster.it"
       CACHE_DIR = File.join(Alexandria::Library::DIR, '.webster_it_cache')
       REFERER = BASE_URI
-      LOCALE = 'BIT' # used only for search by title/author/keyword. possible are: "BIT", "BUS", "BUK", "BDE", "MIT"
+      LOCALE = 'BIT'.freeze # used only for search by title/author/keyword. possible are: "BIT", "BUS", "BUK", "BDE", "MIT"
       def initialize
         super('Webster_it', 'Webster (Italy)')
         FileUtils.mkdir_p(CACHE_DIR) unless File.exist?(CACHE_DIR)
@@ -37,7 +37,7 @@ module Alexandria
       end
 
       def search(criterion, type)
-        criterion = criterion.convert('ISO-8859-15', 'UTF-8')
+        criterion = criterion.encode('ISO-8859-15')
         req = BASE_URI + '/'
         req += case type
                when SEARCH_BY_ISBN
@@ -82,8 +82,8 @@ module Alexandria
       private
 
       def to_book(data)
-        raise NoResultsError if /<font color="\#ffffff"><b>Prodotto non esistente<\/b><\/font>/.match(data)
-        data = data.convert('UTF-8', 'ISO-8859-15')
+        raise NoResultsError if data =~ /<font color="\#ffffff"><b>Prodotto non esistente<\/b><\/font>/
+        data = data.encode('UTF-8')
 
         md = /<li><span class="product_label">Titolo:<\/span><span class="product_text"> ([^<]+)/.match(data)
         raise unless md
@@ -107,26 +107,22 @@ module Alexandria
 
         # raise unless
         md = /<li><span class="product_label">Editore:<\/span> <span class="product_text"><a href="[^>]+>([^<]+)/.match(data)
-        publisher = CGI.unescape(md[1].strip) or md
+        (publisher = CGI.unescape(md[1].strip)) || md
 
-        if (md = /<li><span class="product_label">Pagine:<\/span> <span class="product_text">([^<]+)/.match(data))
-          edition = CGI.unescape(md[1].strip) + ' p.'
-        else
-          edition = nil
-        end
+        edition = if (md = /<li><span class="product_label">Pagine:<\/span> <span class="product_text">([^<]+)/.match(data))
+                    CGI.unescape(md[1].strip) + ' p.'
+                  end
 
         publish_year = nil
         if (md = /<li><span class="product_label">Data di Pubblicazione:<\/span> <span class="product_text">([^<]+)/.match(data))
           publish_year = CGI.unescape(md[1].strip)[-4..-1].to_i
-          publish_year = nil if publish_year == 0
+          publish_year = nil if publish_year.zero?
         end
 
-        if data =~ /javascript:popImage/ and (md = /<img border="0" alt="[^"]+" src="([^"]+)/.match(data))
+        if data =~ /javascript:popImage/ && (md = /<img border="0" alt="[^"]+" src="([^"]+)/.match(data))
           cover_url = BASE_URI + md[1].strip
           # use "p" instead of "g" for smaller image
-          if cover_url[-5] == 103
-            cover_url[-5] = 112
-          end
+          cover_url[-5] = 112 if cover_url[-5] == 103
 
           cover_filename = isbn + '.tmp'
           Dir.chdir(CACHE_DIR) do
@@ -158,7 +154,7 @@ module Alexandria
       end
 
       def clean_cache
-        # FIXME begin ... rescue ... end?
+        # FIXME: begin ... rescue ... end?
         Dir.chdir(CACHE_DIR) do
           Dir.glob('*.tmp') do |file|
             puts 'removing ' + file if $DEBUG

data/lib/alexandria/book_providers/worldcat.rb

@@ -37,8 +37,8 @@ module Alexandria
     class WorldCatProvider < WebsiteBasedProvider
       include Alexandria::Logging
 
-      SITE = 'http://www.worldcat.org'
-      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced" # type, term
+      SITE = 'http://www.worldcat.org'.freeze
+      BASE_SEARCH_URL = "#{SITE}/search?q=%s%s&qt=advanced".freeze # type, term
 
       def initialize
         super('WorldCat', 'WorldCat')
@@ -76,24 +76,22 @@ module Alexandria
       private
 
       def create_search_uri(search_type, search_term)
-        search_type_code = { SEARCH_BY_ISBN => 'isbn:',
-                             SEARCH_BY_AUTHORS => 'au:',
-                             SEARCH_BY_TITLE => 'ti:',
-                             SEARCH_BY_KEYWORD => ''
-        }[search_type] or ''
+        (search_type_code = { SEARCH_BY_ISBN => 'isbn:',
+                              SEARCH_BY_AUTHORS => 'au:',
+                              SEARCH_BY_TITLE => 'ti:',
+                              SEARCH_BY_KEYWORD => '' }[search_type]) || ''
         search_type_code = CGI.escape(search_type_code)
-        search_term_encoded = search_term # TODO, remove attack stuff
-        if search_type == SEARCH_BY_ISBN
-          search_term_encoded = Library.canonicalise_ean(search_term) # isbn-13
-        else
-          search_term_encoded = CGI.escape(search_term)
-        end
+        search_term_encoded = if search_type == SEARCH_BY_ISBN
+                                Library.canonicalise_ean(search_term) # isbn-13
+                              else
+                                CGI.escape(search_term)
+                              end
         BASE_SEARCH_URL % [search_type_code, search_term_encoded]
       end
 
       def get_book_from_search_result(result)
         log.debug { "Fetching book from #{result[:url]}" }
-        html_data =  transport.get_response(URI.parse(result[:url]))
+        html_data = transport.get_response(URI.parse(result[:url]))
         parse_result_data(html_data.body)
       end
 
@@ -105,13 +103,11 @@ module Alexandria
           # puts result_cells.length
           result_cells.each do |td|
             type_icon = (td % 'div.type/img.icn')
-            next unless type_icon and type_icon['src'] =~ /icon-bks/
+            next unless type_icon && type_icon['src'] =~ /icon-bks/
             name_div = td % 'div.name'
             title = name_div.inner_text
             anchor = name_div % :a
-            if anchor
-              url = anchor['href']
-            end
+            url = anchor['href'] if anchor
             lookup_url = "#{SITE}#{url}"
             result = {}
             result[:title] = title
@@ -205,13 +201,13 @@ module Alexandria
           if publisher_row
             publication_info = (publisher_row / 'td').last.inner_text
 
-            if publication_info.index(';')
-              publication_info =~ /;[\s]*([^\d]+)[\s]*[\d]*/
-            elsif publication_info.index(':')
-              publication_info =~ /:[\s]*([^;:,]+)/
-            else
-              publication_info =~ /([^;,]+)/
-            end
+            publication_info =~ if publication_info.index(';')
+                                  /;[\s]*([^\d]+)[\s]*[\d]*/
+                                elsif publication_info.index(':')
+                                  /:[\s]*([^;:,]+)/
+                                else
+                                  /([^;,]+)/
+                                end
 
             publisher = Regexp.last_match[1]
             publication_info =~ /([12][0-9]{3})/