alexandria-book-collection-manager 0.7.5 → 0.7.6

data/lib/alexandria/import_library_csv.rb

@@ -72,8 +72,7 @@ module Alexandria
       additional.split(",").each do |add|
         authors << normalize(add)
       end
-      isbn = row[@isbn] # TODO: canonicalize_ean...
-      isbn = Library.canonicalise_ean(isbn) if isbn
+      isbn = Library.canonicalise_ean(row[@isbn])
       publisher = normalize(row[@publisher])
       year = row[@publishing_year].to_i
       edition = normalize(row[@edition])
@@ -95,12 +94,13 @@ module Alexandria
         book.redd = true
       end
       if row[@mainshelf]
-        if row[@mainshelf] == "read"
+        case row[@mainshelf]
+        when "read"
           book.redd = true
-        elsif row[@mainshelf] == "to-read"
+        when "to-read"
           book.redd = false
           book.tags = ["to read"]
-        elsif row[@mainshelf] == "currently-reading"
+        when "currently-reading"
           book.redd = false
           book.tags = ["currently reading"]
         end
@@ -112,7 +112,7 @@ module Alexandria
           book.tags << tag unless book.tags.include? tag
         end
       end
-      puts "Goodreads loading #{book.title}" if $DEBUG
+      log.debug { "Goodreads loading #{book.title}" }
       book
     end
   end
@@ -146,7 +146,7 @@ module Alexandria
       # sometimes "Publisher (YEAR), Edition: NUM, Binding, NUM pages"
       publisher_info = normalize(row[@publisher_info])
       publisher = publisher_info
-      publisher = Regexp.last_match[1] if publisher_info =~ /([^\(]+)\(/
+      publisher = Regexp.last_match[1] if publisher_info =~ /([^(]+)\(/
       edition = publisher_info # binding
       edition_info = publisher_info.split(",")
       edition = publisher_info.split(",")[-2] if edition_info.size >= 3
@@ -169,7 +169,7 @@ module Alexandria
         end
       end
 
-      puts "LibraryThing loading #{book.title}" if $DEBUG
+      log.debug { "LibraryThing loading #{book.title}" }
       book
     end
   end
@@ -183,20 +183,20 @@ module Alexandria
       is_librarything = false
       is_goodreads = false
       header.each do |head|
-        if head == "'PUBLICATION INFO'"
+        case head
+        when "'PUBLICATION INFO'"
           is_librarything = true
           break
-        elsif head == "Year Published"
+        when "Year Published"
           is_goodreads = true
           break
         end
       end
-      if is_librarything
-        return LibraryThingCSVImport.new(header)
-      elsif is_goodreads
-        return GoodreadsCSVImport.new(header)
-      end
-      raise "Not Recognized" unless is_librarything || is_goodreads
+
+      return LibraryThingCSVImport.new(header) if is_librarything
+      return GoodreadsCSVImport.new(header) if is_goodreads
+
+      raise _("Not Recognized") unless is_librarything || is_goodreads
     end
   end
 end

data/lib/alexandria/library_sort_order.rb

@@ -29,7 +29,9 @@ module Alexandria
     end
 
     class Unsorted < LibrarySortOrder
-      def initialize; end
+      def initialize
+        super(nil, nil)
+      end
 
       def sort(library)
         library

data/lib/alexandria/library_store.rb

@@ -9,7 +9,7 @@ module Alexandria
     include Logging
 
     FIX_BIGNUM_REGEX =
-      %r{loaned_since:\s*(\!ruby/object\:Bignum\s*)?(\d+)\n}.freeze
+      %r{loaned_since:\s*(!ruby/object:Bignum\s*)?(\d+)\n}.freeze
 
     include GetText
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
@@ -23,7 +23,7 @@ module Alexandria
       begin
         Dir.entries(library_dir).each do |file|
           # Skip hidden files.
-          next if /^\./.match?(file)
+          next if file.start_with?(".")
           # Skip non-directory files.
           next unless File.stat(File.join(library_dir, file)).directory?
 
@@ -64,7 +64,7 @@ module Alexandria
           old_isbn = book.isbn
           old_pub_year = book.publishing_year
           begin
-            raise "Not a book: #{book.inspect}" unless book.is_a?(Book)
+            raise format(_("Not a book: %<book>s"), book.inspect) unless book.is_a?(Book)
 
             ean = Library.canonicalise_ean(book.isbn)
             book.isbn = ean if ean
@@ -74,16 +74,18 @@ module Alexandria
             end
 
             # Or if isbn has changed
-            raise "#{test[1]} isbn is not okay" unless book.isbn == old_isbn
+            unless book.isbn == old_isbn
+              raise format(_("%<file>s isbn is not okay"), file: test[1])
+            end
 
             # Re-save book if Alexandria::DATA_VERSION changes
             unless book.version == Alexandria::DATA_VERSION
-              raise "#{test[1]} version is not okay"
+              raise format(_("%<file>s version is not okay"), file: test[1])
             end
 
             # Or if publishing year has changed
             unless book.publishing_year == old_pub_year
-              raise "#{test[1]} pub year is not okay"
+              raise format(_("%<file>s pub year is not okay"), file: test[1])
             end
 
             # ruined_books << [book, book.isbn, library]
@@ -92,13 +94,11 @@ module Alexandria
             ## TODO copy cover image file, if necessary
             # due to #26909 cover files for books without ISBN are re-saved as
             # "g#{ident}.cover"
-            if book.isbn.nil? || book.isbn.empty?
-              if File.exist? library.old_cover(book)
-                log.debug do
-                  "#{library.name}; book #{book.title} has no ISBN, fixing cover image"
-                end
-                FileUtils::Verbose.mv(library.old_cover(book), library.cover(book))
+            if (book.isbn.nil? || book.isbn.empty?) && File.exist?(library.old_cover(book))
+              log.debug do
+                "#{library.name}; book #{book.title} has no ISBN, fixing cover image"
               end
+              FileUtils::Verbose.mv(library.old_cover(book), library.cover(book))
             end
 
             library << book
@@ -198,14 +198,14 @@ module Alexandria
       if (md = FIX_BIGNUM_REGEX.match(text))
         new_yaml = Time.at(md[2].to_i).to_yaml
         # Remove the "---" prefix.
-        new_yaml.sub!(/^\s*\-+\s*/, "")
+        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.safe_load(text, permitted_classes: [Book, Time])
 
-      unless book.isbn.class == String
+      unless book.isbn.instance_of? String
         # HACK
         md = /isbn: (.+)/.match(text)
         if md
@@ -215,7 +215,7 @@ module Alexandria
       end
 
       # another HACK of the same type as above
-      unless book.saved_ident.class == String
+      unless book.saved_ident.instance_of? String
 
         md2 = /saved_ident: (.+)/.match(text)
         if md2
@@ -224,7 +224,7 @@ module Alexandria
           book.saved_ident = string_saved_ident
         end
       end
-      if (book.isbn.class == String) && book.isbn.empty?
+      if (book.isbn.instance_of? String) && book.isbn.empty?
         book.isbn = nil # save trouble later
       end
       book

data/lib/alexandria/logging.rb

@@ -25,7 +25,7 @@ module Alexandria
   # A Logger subclass which accepts a source for log messages
   # in order to improve legibility of the logs.
   # The source should usually be +self+, whether that be a Class, Module
-  # or Object. A LoggerWrapper can be used to simplify this procedure.
+  # or Object. A LogWrapper can be used to simplify this procedure.
   class Logger < ::Logger
     def add(severity, message = nil, source = nil, progname = nil, &block)
       return super(severity, message, progname, &block) if source.nil?
@@ -118,7 +118,7 @@ module Alexandria
   module Logging
     module ClassMethods
       def log
-        @log_wrapper ||= LogWrapper.new(Alexandria.log, self)
+        @log ||= LogWrapper.new(Alexandria.log, self)
       end
     end
 
@@ -127,15 +127,13 @@ module Alexandria
     end
 
     def log
-      @log_wrapper ||= LogWrapper.new(Alexandria.log, self)
+      @log ||= LogWrapper.new(Alexandria.log, self)
     end
   end
 
-  private
-
   # Creates the Logger for Alexandria
   def self.create_logger
-    logger = Alexandria::Logger.new(STDERR)
+    logger = Alexandria::Logger.new($stderr)
 
     level = ENV["LOGLEVEL"] ? ENV["LOGLEVEL"].intern : nil
     if [:FATAL, :ERROR, :WARN, :INFO, :DEBUG].include? level
@@ -150,8 +148,6 @@ module Alexandria
 
   @@logger = create_logger
 
-  public
-
   # Returns the Logger for Alexandria
   def self.log
     @@logger

data/lib/alexandria/models/book.rb

@@ -64,8 +64,8 @@ module Alexandria
       own || false
     end
 
-    def ==(obj)
-      obj.is_a?(self.class) && (ident == obj.ident)
+    def ==(other)
+      other.is_a?(self.class) && (ident == other.ident)
     end
 
     def inspect

data/lib/alexandria/models/library.rb

@@ -17,6 +17,7 @@ module Alexandria
 
     attr_reader :name
     attr_accessor :ruined_books, :updating, :deleted_books
+
     DEFAULT_DIR = File.join(ENV["HOME"], ".alexandria")
     EXT = { book: ".yaml", cover: ".cover" }.freeze
 
@@ -95,8 +96,8 @@ module Alexandria
     end
 
     def self.ean_checksum(numbers)
-      -(numbers.values_at(1, 3, 5, 7, 9, 11).reduce(:+) * 3 +
-        numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+)) % 10
+      -(numbers.values_at(1, 3, 5, 7, 9, 11).sum * 3 +
+        numbers.values_at(0, 2, 4, 6, 8, 10).sum) % 10
     end
 
     def self.valid_ean?(ean)
@@ -108,8 +109,8 @@ module Alexandria
     end
 
     def self.upc_checksum(numbers)
-      -(numbers.values_at(0, 2, 4, 6, 8, 10).reduce(:+) * 3 +
-        numbers.values_at(1, 3, 5, 7, 9).reduce(:+)) % 10
+      -(numbers.values_at(0, 2, 4, 6, 8, 10).sum * 3 +
+        numbers.values_at(1, 3, 5, 7, 9).sum) % 10
     end
 
     def self.valid_upc?(upc)
@@ -221,11 +222,11 @@ module Alexandria
       File.open(yaml(temp_book), "w") { |io| io.puts temp_book.to_yaml }
 
       # Do not notify twice.
-      if changed?
-        notify_observers(self,
-                         already_there ? BOOK_UPDATED : BOOK_ADDED,
-                         book)
-      end
+      return unless changed?
+
+      notify_observers(self,
+                       already_there ? BOOK_UPDATED : BOOK_ADDED,
+                       book)
     end
 
     def transport
@@ -283,7 +284,10 @@ module Alexandria
       else
         if @deleted_books.include?(book)
           doubles = @deleted_books.select { |b| b.equal?(book) }
-          raise ArgumentError, "Book #{book.isbn} was already deleted" unless doubles.empty?
+          unless doubles.empty?
+            raise ArgumentError, format(_("Book %<isbn>s was already deleted"),
+                                        isbn: book.isbn)
+          end
         end
         @deleted_books << book
         i = index(book)
@@ -346,7 +350,7 @@ module Alexandria
               when Integer
                 something
               else
-                raise "#{something} is a #{something.class}"
+                raise NotImplementedError
               end
       File.join(path, ident.to_s + EXT[:cover])
     end
@@ -360,7 +364,7 @@ module Alexandria
               when Integer
                 something
               else
-                raise "#{something} is #{something.class}"
+                raise NotImplementedError
               end
       File.join(basedir, ident.to_s + EXT[:book])
     end
@@ -378,8 +382,8 @@ module Alexandria
       length - n_rated
     end
 
-    def ==(object)
-      object.is_a?(self.class) && object.name == name
+    def ==(other)
+      other.is_a?(self.class) && other.name == name
     end
 
     def copy_covers(somewhere)

data/lib/alexandria/net.rb

@@ -38,10 +38,9 @@ module Alexandria
       @extra_request_headers.each_pair do |header_name, value|
         req.add_field(header_name, value)
       end
-      res = WWWAgent.transport.start(uri.host, uri.port) do |http|
+      WWWAgent.transport.start(uri.host, uri.port) do |http|
         http.request(req)
       end
-      res
     end
 
     def language=(lang)

data/lib/alexandria/preferences.rb

@@ -57,30 +57,24 @@ module Alexandria
       @changed_settings.clear
     end
 
-    def method_missing(id, *args)
-      method = id.id2name
-      if (match = /(.*)=$/.match(method))
-        if args.length != 1
-          raise "Set method #{method} should be called with " \
-            "only one argument (was called with #{args.length})"
-        end
-        variable_name = match[1]
-        new_value = args.first
-        generic_setter(variable_name, new_value)
-      else
-        unless args.empty?
-          raise "Get method #{method} should be called " \
-            "without argument (was called with #{args.length})"
-        end
-        generic_getter(method)
-      end
-    end
-
     def remove_preference(variable_name)
       @alexandria_settings.delete(variable_name)
       @changed_settings << variable_name
     end
 
+    DEFAULT_VALUES.each_key do |var|
+      define_method(var) { generic_getter var }
+      define_method("#{var}=") { |val| generic_setter var, val }
+    end
+
+    def get_variable(variable_name)
+      generic_getter(variable_name.to_s)
+    end
+
+    def set_variable(variable_name, value)
+      generic_setter(variable_name.to_s, value)
+    end
+
     private
 
     ##
@@ -140,11 +134,12 @@ module Alexandria
     ##
 
     def get_gconf_type(value)
-      if value.is_a?(String)
+      case value
+      when String
         "string"
-      elsif value.is_a?(Integer)
+      when Integer
         "int"
-      elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
+      when TrueClass, FalseClass
         "bool"
       else
         "string"
@@ -168,24 +163,24 @@ module Alexandria
     end
 
     def make_list_string(list)
-      list.map! { |x| x.gsub(/\"/, '\\"') } if get_gconf_type(list.first) == "string"
+      list.map! { |x| x.gsub(/"/, '\\"') } if get_gconf_type(list.first) == "string"
       contents = list.join(",")
       "[" + contents + "]"
     end
 
     def exec_gconf_set(var_path, new_value)
       if /cols_width/.match?(var_path)
-        puts new_value
+        log.debug { new_value }
 
         # new_value = {}
       end
       type = get_gconf_type(new_value)
       value_str = new_value
       if new_value.is_a? String
-        new_value = new_value.gsub(/\"/, '\\"')
+        new_value = new_value.gsub(/"/, '\\"')
         value_str = "\"#{new_value}\""
       end
-      puts value_str if /cols_width/.match?(var_path)
+      log.debug { value_str } if /cols_width/.match?(var_path)
       `gconftool-2 --type #{type} --set #{var_path} #{value_str}`
     end
 
@@ -242,15 +237,16 @@ module Alexandria
     # gconftool. This is not fool-proof, but it *does* work for the
     # range of values used by Alexandria.
     def discriminate(value)
-      if value == "true"        # bool
+      case value
+      when "true" # bool
         true
-      elsif value == "false"    # bool
+      when "false"    # bool
         false
-      elsif /^[0-9]+$/.match?(value) # int
+      when /^[0-9]+$/ # int
         value.to_i
-      elsif value =~ /^\[(.*)\]$/ # list (assume of type String)
+      when /^\[(.*)\]$/ # list (assume of type String)
         Regexp.last_match[1].split(",")
-      elsif value =~ /^\((.*)\)$/ # pair (assume of type int)
+      when /^\((.*)\)$/ # pair (assume of type int)
         begin
           pair = Regexp.last_match[1].split(",")
           [discriminate(pair.first), discriminate(pair.last)]