alexandria-book-collection-manager 0.6.9.pre1 → 0.6.9

data/lib/alexandria/book_providers/bol_it.rb

@@ -81,9 +81,7 @@ module Alexandria
         BASE_URI + "/#{LOCALE}/scheda/ea" + Library.canonicalise_ean(book.isbn)[0..-2] + '.html'
       end
 
-      #######
       private
-      #######
 
       def to_book(data)
         raise NoResultsError if /Scheda libro non completa  \(TP null\)/.match(data)

data/lib/alexandria/book_providers/ibs_it.rb

@@ -77,9 +77,7 @@ module Alexandria
         'http://www.internetbookshop.it/ser/serdsp.asp?isbn=' + book.isbn
       end
 
-      #######
       private
-      #######
 
       def to_book(data)
         raise NoResultsError if /<b>Il libro che hai cercato non &egrave; presente nel nostro catalogo<\/b><br>/.match(data)

data/lib/alexandria/book_providers/mcu.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004 Javier Fernandez-Sanguino
 # Copyright (C) 2007 Javier Fernandez-Sanguino and Marco Costantini
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -73,7 +73,7 @@ module Alexandria
         transport.get(URI.parse(req)).each do |line|
           # line = line.convert("ISO-8859-1", "UTF-8")
           print "Reading line: #{line}" if $DEBUG # for DEBUGing
-          if (line =~ /CMD=VERDOC.*&DOCN=([^&]*)&NDOC=([^&]*)/) and (!products[Regexp.last_match[1]]) and (book = parseBook(Regexp.last_match[1], Regexp.last_match[2])) then
+          if (line =~ /CMD=VERDOC.*&DOCN=([^&]*)&NDOC=([^&]*)/) and (!products[Regexp.last_match[1]]) and (book = parseBook(Regexp.last_match[1], Regexp.last_match[2]))
             products[Regexp.last_match[1]] = book
             puts Regexp.last_match[1] if $DEBUG # for DEBUGing
           end
@@ -91,9 +91,7 @@ module Alexandria
         nil
       end
 
-      #######
       private
-      #######
 
       def parseBook(docn, ndoc)
         detailspage = 'http://www.mcu.es/cgi-brs/BasesHTML/isbn/BRSCGI?CMD=VERDOC&CONF=AEISPA.cnf&BASE=ISBN&DOCN=' + docn + '&NDOC=' + ndoc
@@ -117,7 +115,7 @@ module Alexandria
             robotstate = 0
           elsif robotstate == 1 and line =~ /^([^<]+)</
             author = Regexp.last_match[1].gsub('&nbsp;', ' ').sub(/ +$/, '')
-            if author.length > 3 then
+            if author.length > 3
               # Only add authors of appropiate length
               product['authors'] << author
               print "Authors are #{product['authors']}\n" if $DEBUG # for DEBUGing

data/lib/alexandria/book_providers/proxis.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014,2015 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
@@ -82,8 +82,6 @@ module Alexandria
       def url(book)
         if book.isbn.nil? or book.isbn.empty?
           ISBN_REDIRECT_BASE_URL % Library.canonicalise_ean(book.isbn)
-        else
-          nil
         end
       end
 
@@ -133,8 +131,6 @@ module Alexandria
         td = tr.at('td')
         if td
           text_of(td)
-        else
-          nil
         end
       end
 

data/lib/alexandria/book_providers/renaud.rb

@@ -81,9 +81,7 @@ module Alexandria
         '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
-      #######
 
       def to_books(data)
         data = CGI.unescapeHTML(data)

data/lib/alexandria/book_providers/thalia.rb

@@ -80,12 +80,12 @@ module Alexandria
         book_search_results = []
         results_divs = doc / 'div.articlePresentationSearchCH'
         results_divs.each do |div|
-         result = {}
-         title_link = div % 'div.articleText/h2/a'
-         result[:title] = title_link.inner_html
-         result[:lookup_url] = title_link['href']
-         book_search_results << result
-       end
+          result = {}
+          title_link = div % 'div.articleText/h2/a'
+          result[:title] = title_link.inner_html
+          result[:lookup_url] = title_link['href']
+          book_search_results << result
+        end
         book_search_results
       end
 
@@ -187,8 +187,10 @@ module Alexandria
           end
         rescue => ex
           trace = ex.backtrace.join("\n> ")
-          log.warn {'Failed parsing search results for Thalia ' \
-            "#{ex.message} #{trace}" }
+          log.warn {
+            'Failed parsing search results for Thalia ' \
+            "#{ex.message} #{trace}"
+          }
           raise NoResultsError
         end
       end

data/lib/alexandria/book_providers/webster_it.rb

@@ -79,9 +79,7 @@ module Alexandria
         BASE_URI + '/isbn/' + book.isbn
       end
 
-      #######
       private
-      #######
 
       def to_book(data)
         raise NoResultsError if /<font color="\#ffffff"><b>Prodotto non esistente<\/b><\/font>/.match(data)

data/lib/alexandria/book_providers/worldcat.rb

@@ -121,8 +121,10 @@ module Alexandria
           end
         rescue => ex
           trace = ex.backtrace.join("\n> ")
-          log.warn {'Failed parsing search results for WorldCat ' \
-                    "#{ex.message} #{trace}" }
+          log.warn {
+            'Failed parsing search results for WorldCat ' \
+                    "#{ex.message} #{trace}"
+          }
         end
         book_search_results
       end
@@ -241,8 +243,10 @@ module Alexandria
         rescue => ex
           raise ex if ex.instance_of? NoResultsError
           trace = ex.backtrace.join("\n> ")
-          log.warn {'Failed parsing search results for WorldCat ' \
-                    "#{ex.message} #{trace}" }
+          log.warn {
+            'Failed parsing search results for WorldCat ' \
+                    "#{ex.message} #{trace}"
+          }
           raise NoResultsError
         end
       end

data/lib/alexandria/book_providers/z3950.rb

@@ -70,9 +70,7 @@ module Alexandria
         nil
       end
 
-      #######
       private
-      #######
 
       def marc_to_book(marc_txt)
         begin
@@ -157,7 +155,8 @@ module Alexandria
           options['user'] = prefs['username']
           options['password'] = prefs['password']
         end
-        hostname, port = prefs['hostname'], prefs['port'].to_i
+        hostname = prefs['hostname']
+        port = prefs['port'].to_i
         log.debug { "hostname #{hostname} port #{port} options #{options}" }
         conn = ZOOM::Connection.new(options).connect(hostname, port)
         conn.database_name = prefs['database']
@@ -273,9 +272,7 @@ module Alexandria
         nil
       end
 
-      #######
       private
-      #######
 
       def books_from_sutrs(resultset)
         results = []
@@ -316,7 +313,6 @@ module Alexandria
             book = Book.new(title, authors, isbn, (publisher or nil), (publish_year or nil), (edition or nil))
             results << [book]
           end
-
         end
         results
       end
@@ -365,9 +361,7 @@ module Alexandria
         nil
       end
 
-      #######
       private
-      #######
 
       def canonicalise_isbn_with_dashes(isbn)
         # The reference for the position of the dashes is

data/lib/alexandria/execution_queue.rb

@@ -71,9 +71,7 @@ module Alexandria
       @@current_queue = nil
     end
 
-    #######
     private
-    #######
 
     def push(procedure, args, need_retval = false)
       @protect_pending_calls.synchronize do
@@ -81,7 +79,7 @@ module Alexandria
         @pending_calls << [@id, procedure, args, need_retval]
       end
       if need_retval
-        while true
+        loop do
           @protect_pending_retvals.synchronize do
             ary = @pending_retvals.find { |id, _retval| id == @id }
             if ary

data/lib/alexandria/export_library.rb

@@ -128,9 +128,7 @@ module Alexandria
       @needs_preview
     end
 
-    #######
     private
-    #######
 
     def initialize(name, ext, message, needs_preview = false)
       @name = name
@@ -227,7 +225,6 @@ module Alexandria
           # we need to close the files so the iPod can be ejected/unmounted without us closing Alexandria
           io.close
         end
-
       end
       # Again, allow the iPod to unmount
       Dir.chdir(tempdir)
@@ -242,9 +239,7 @@ module Alexandria
       end
     end
 
-    #######
     private
-    #######
 
     ONIX_DTD_URL = 'http://www.editeur.org/onix/2.1/reference/onix-international.dtd'
     def to_onix_document
@@ -291,11 +286,11 @@ module Alexandria
           # front cover image
           elem.add_element('MediaFileTypeCode').text = '04'
           elem.add_element('MediaFileFormatCode').text =
-          (Library.jpeg?(cover(book)) ? '03' : '02')
+            (Library.jpeg?(cover(book)) ? '03' : '02')
           # filename
           elem.add_element('MediaFileLinkTypeCode').text = '06'
           elem.add_element('MediaFileLink').text =
-          File.join('images', final_cover(book))
+            File.join('images', final_cover(book))
         end
         if book.isbn
           BookProviders.each do |provider|

data/lib/alexandria/import_library.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2010 Cathal Mc Ginley
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014,2015 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
@@ -50,9 +50,7 @@ module Alexandria
                    @on_iterate_cb, @on_error_cb)
     end
 
-    #######
     private
-    #######
 
     def initialize(name, patterns, message)
       @name = name
@@ -122,8 +120,6 @@ module Alexandria
             book_elements += keys.map {|key|
               if elements[key]
                 neaten(elements[key].text)
-              else
-                nil
               end
             }
             # isbn
@@ -217,7 +213,6 @@ module Alexandria
           if on_iterate_cb
             on_iterate_cb.call(import_count, max_import)
           end
-
         end
       rescue CSV::IllegalFormatError
         unless failed_once

data/lib/alexandria/logging.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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

data/lib/alexandria/models/book.rb

@@ -18,8 +18,8 @@
 module Alexandria
   class Book
     attr_accessor :title, :authors, :isbn, :publisher, :publishing_year,
-    :edition, :rating, :notes, :loaned, :loaned_since,
-    :loaned_to, :saved_ident, :redd, :redd_when, :own, :want, :tags, :version, :library
+                  :edition, :rating, :notes, :loaned, :loaned_since,
+                  :loaned_to, :saved_ident, :redd, :redd_when, :own, :want, :tags, :version, :library
 
     DEFAULT_RATING = 0
 

data/lib/alexandria/models/library.rb

@@ -59,7 +59,7 @@ module Alexandria
       i = 1
       name = nil
       all_libraries = existing_libraries + @@deleted_libraries
-      while true
+      loop do
         name = i == 1 ? from_base : from_base + " #{i}"
         break unless all_libraries.find { |x| x.name == name }
         i += 1
@@ -77,7 +77,6 @@ module Alexandria
       FileUtils.mkdir_p(library.path) unless File.exist?(library.path)
       Dir.chdir(library.path) do
         Dir['*' + EXT[:book]].each do |filename|
-
           test[1] = filename if test[0] == 0
 
           unless File.size? test[1]
@@ -197,7 +196,10 @@ module Alexandria
         new_yaml.sub!(/^\s*\-+\s*/, '')
         text.sub!(md[0], "loaned_since: #{new_yaml}\n")
       end
+
+      # TODO: Ensure book loading passes through Book#initialize
       book = YAML.load(text)
+
       unless book.isbn.class == String
         # HACK
         md = /isbn: (.+)/.match(text)
@@ -600,7 +602,7 @@ module Alexandria
     end
 
     def n_rated
-      select { |x| !x.rating.nil? and x.rating > 0 }.length
+      count { |x| !x.rating.nil? and x.rating > 0 }
     end
 
     def n_unrated
@@ -630,9 +632,7 @@ module Alexandria
       book.ident + (Library.jpeg?(cover(book)) ? '.jpg' : '.gif')
     end
 
-    #########
     protected
-    #########
 
     def initialize(name)
       @name = name
@@ -697,9 +697,7 @@ module Alexandria
       end
     end
 
-    #######
     private
-    #######
 
     def initialize
       @all_libraries = []

data/lib/alexandria/preferences.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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

data/lib/alexandria/scanners.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2005-2006 Christopher Cyll
+# Copyright (C) 2014, 2015 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
@@ -23,7 +24,7 @@ module Alexandria
   module Scanners
     REGISTRY = []
 
-    def self.register scanner
+    def self.register(scanner)
       REGISTRY.push(scanner)
     end
 
@@ -31,11 +32,11 @@ module Alexandria
       REGISTRY.first
     end
 
-    def self.find_scanner name
+    def self.find_scanner(name)
       REGISTRY.find { |scanner| scanner.name == name }
     end
 
-    def each_scanner
+    def self.each_scanner
       REGISTRY.each { |scanner| yield scanner }
     end
   end

data/lib/alexandria/scanners/cuecat.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2005-2006 Christopher Cyll
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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

data/lib/alexandria/smart_library.rb

@@ -26,7 +26,8 @@ module Alexandria
     extend GetText
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-    ALL_RULES, ANY_RULE = 1, 2
+    ALL_RULES = 1
+    ANY_RULE = 2
     attr_reader :name
     attr_accessor :rules, :predicate_operator_rule, :deleted_books
 
@@ -176,7 +177,7 @@ module Alexandria
         filtered_library.each { |x| @cache[x] = library }
         concat(filtered_library)
       end
-      @n_rated = select { |x| !x.rating.nil? and x.rating > 0 }.length
+      @n_rated = count { |x| !x.rating.nil? and x.rating > 0 }
     end
 
     def cover(book)
@@ -491,7 +492,7 @@ module Alexandria
         when 'Time'
           TIME_OPERATORS.map do |x|
             if x == Operators::IS_IN_LAST or
-              x == Operators::IS_NOT_IN_LAST
+                x == Operators::IS_NOT_IN_LAST
 
               [x, Operands::DAYS]
             else