alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/logging.rb

@@ -18,8 +18,8 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'logger'
-require 'forwardable'
+require "logger"
+require "forwardable"
 
 module Alexandria
   # A Logger subclass which accepts a source for log messages
@@ -82,9 +82,9 @@ module Alexandria
 
     def <<(msg)
       if msg.respond_to? :backtrace
-        msg.backtrace.each { |line|
+        msg.backtrace.each do |line|
           @logger << "  #{line} \n"
-        }
+        end
       else
         @logger << msg + "\n"
       end
@@ -137,7 +137,7 @@ module Alexandria
   def self.create_logger
     logger = Alexandria::Logger.new(STDERR)
 
-    level = ENV['LOGLEVEL'] ? ENV['LOGLEVEL'].intern : nil
+    level = ENV["LOGLEVEL"] ? ENV["LOGLEVEL"].intern : nil
     if [:FATAL, :ERROR, :WARN, :INFO, :DEBUG].include? level
       logger.level = Logger.const_get(level)
     else

data/lib/alexandria/models/book.rb

@@ -24,7 +24,7 @@ module Alexandria
       @isbn = isbn
       @publisher = publisher
       @edition = edition # actually used for binding! (i.e. paperback or hardback)
-      @notes = ''
+      @notes = ""
       @saved_ident = ident
       @publishing_year = publishing_year
       @redd = false

data/lib/alexandria/models/library.rb

@@ -4,12 +4,12 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'yaml'
-require 'fileutils'
-require 'rexml/document'
-require 'tempfile'
-require 'etc'
-require 'alexandria/library_store'
+require "yaml"
+require "fileutils"
+require "rexml/document"
+require "tempfile"
+require "etc"
+require "alexandria/library_store"
 
 module Alexandria
   class Library < Array
@@ -17,12 +17,12 @@ 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
+    DEFAULT_DIR = File.join(ENV["HOME"], ".alexandria")
+    EXT = { book: ".yaml", cover: ".cover" }.freeze
 
     include GetText
     extend GetText
-    bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+    bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a
     include Observable
@@ -36,7 +36,7 @@ module Alexandria
     end
 
     def self.generate_new_name(existing_libraries,
-                               from_base = _('Untitled'))
+                               from_base = _("Untitled"))
       i = 1
       name = nil
       all_libraries = existing_libraries + @@deleted_libraries
@@ -71,11 +71,11 @@ module Alexandria
     def self.extract_numbers(entry)
       return [] if entry.nil? || entry.empty?
 
-      normalized = entry.delete('- ').upcase
-      return [] unless normalized =~ /\A[\dX]*\Z/
+      normalized = entry.delete("- ").upcase
+      return [] unless /\A[\dX]*\Z/.match?(normalized)
 
-      normalized.split('').map do |char|
-        char == 'X' ? 10 : char.to_i
+      normalized.split("").map do |char|
+        char == "X" ? 10 : char.to_i
       end
     end
 
@@ -84,7 +84,7 @@ module Alexandria
         accumulator + numbers[i] * (i + 1)
       end % 11
 
-      sum == 10 ? 'X' : sum
+      sum == 10 ? "X" : sum
     end
 
     def self.valid_isbn?(isbn)
@@ -117,18 +117,18 @@ module Alexandria
     end
 
     AMERICAN_UPC_LOOKUP = {
-      '014794' => '08041', '018926' => '0445', '02778' => '0449',
-      '037145' => '0812', '042799' => '0785',  '043144' => '0688',
-      '044903' => '0312', '045863' => '0517', '046594' => '0064',
-      '047132' => '0152', '051487' => '08167', '051488' => '0140',
-      '060771' => '0002', '065373' => '0373', '070992' => '0523',
-      '070993' => '0446', '070999' => '0345', '071001' => '0380',
-      '071009' => '0440', '071125' => '088677', '071136' => '0451',
-      '071149' => '0451', '071152' => '0515', '071162' => '0451',
-      '071268' => '08217', '071831' => '0425', '071842' => '08439',
-      '072742' => '0441', '076714' => '0671', '076783' => '0553',
-      '076814' => '0449', '078021' => '0872', '079808' => '0394',
-      '090129' => '0679', '099455' => '0061', '099769' => '0451'
+      "014794" => "08041", "018926" => "0445", "02778" => "0449",
+      "037145" => "0812", "042799" => "0785",  "043144" => "0688",
+      "044903" => "0312", "045863" => "0517", "046594" => "0064",
+      "047132" => "0152", "051487" => "08167", "051488" => "0140",
+      "060771" => "0002", "065373" => "0373", "070992" => "0523",
+      "070993" => "0446", "070999" => "0345", "071001" => "0380",
+      "071009" => "0440", "071125" => "088677", "071136" => "0451",
+      "071149" => "0451", "071152" => "0515", "071162" => "0451",
+      "071268" => "08217", "071831" => "0425", "071842" => "08439",
+      "072742" => "0441", "076714" => "0671", "076783" => "0553",
+      "076814" => "0449", "078021" => "0872", "079808" => "0394",
+      "090129" => "0679", "099455" => "0061", "099769" => "0451"
     }.freeze
 
     def self.upc_convert(upc)
@@ -137,15 +137,15 @@ module Alexandria
     end
 
     def self.canonicalise_ean(code)
-      code = code.to_s.delete('- ')
+      code = code.to_s.delete("- ")
       if valid_ean?(code)
         code
       elsif valid_isbn?(code)
-        code = '978' + code[0..8]
+        code = "978" + code[0..8]
         code + String(ean_checksum(extract_numbers(code)))
       elsif valid_upc?(code)
         isbn10 = canonicalise_isbn
-        code = '978' + isbn10[0..8]
+        code = "978" + isbn10[0..8]
         code + String(ean_checksum(extract_numbers(code)))
       end
     end
@@ -185,8 +185,8 @@ module Alexandria
       end
       book.saved_ident = book.ident
 
-      filename = book.saved_ident.to_s + '.yaml'
-      File.open(filename, 'w') { |io| io.puts book.to_yaml }
+      filename = book.saved_ident.to_s + ".yaml"
+      File.open(filename, "w") { |io| io.puts book.to_yaml }
       filename
     end
 
@@ -212,7 +212,7 @@ module Alexandria
 
       temp_book = book.dup
       temp_book.library = nil
-      File.open(yaml(temp_book), 'w') { |io| io.puts temp_book.to_yaml }
+      File.open(yaml(temp_book), "w") { |io| io.puts temp_book.to_yaml }
 
       # Do not notify twice.
       if changed?
@@ -231,7 +231,7 @@ module Alexandria
       Dir.chdir(path) do
         # Fetch the cover picture.
         cover_file = cover(book)
-        File.open(cover_file, 'w') do |io|
+        File.open(cover_file, "w") do |io|
           uri = URI.parse(cover_uri)
           if uri.scheme.nil?
             # Regular filename.
@@ -388,12 +388,12 @@ module Alexandria
     end
 
     def self.jpeg?(file)
-      IO.read(file, 10)[6..9] == 'JFIF'
+      IO.read(file, 10)[6..9] == "JFIF"
     end
 
     def final_cover(book)
       # TODO: what about PNG?
-      book.ident + (Library.jpeg?(cover(book)) ? '.jpg' : '.gif')
+      book.ident + (Library.jpeg?(cover(book)) ? ".jpg" : ".gif")
     end
 
     protected

data/lib/alexandria/net.rb

@@ -24,7 +24,7 @@ module Alexandria
   class WWWAgent
     def initialize
       user_agent = "Ruby #{RUBY_VERSION} #{Alexandria::TITLE}/#{Alexandria::VERSION}"
-      @extra_request_headers = { 'User-Agent' => user_agent }
+      @extra_request_headers = { "User-Agent" => user_agent }
     end
 
     def self.transport
@@ -38,18 +38,18 @@ 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) { |http|
+      res = WWWAgent.transport.start(uri.host, uri.port) do |http|
         http.request(req)
-      }
+      end
       res
     end
 
     def language=(lang)
-      @extra_request_headers['Accept-Language'] = lang.to_s
+      @extra_request_headers["Accept-Language"] = lang.to_s
     end
 
     def user_agent=(agent_string)
-      @extra_request_headers['User-Agent'] = agent_string
+      @extra_request_headers["User-Agent"] = agent_string
     end
   end
 end

data/lib/alexandria/preferences.rb

@@ -4,21 +4,21 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'singleton'
-require 'set'
-require 'alexandria/default_preferences'
+require "singleton"
+require "set"
+require "alexandria/default_preferences"
 
 module Alexandria
   class Preferences
     include Singleton
     include Logging
 
-    APP_DIR = '/apps/alexandria'
-    HTTP_PROXY_DIR = '/system/http_proxy'
-    HTTP_PROXY_MODE = '/system/proxy/mode'
-    URL_HANDLERS_DIR = '/desktop/gnome/url-handlers'
+    APP_DIR = "/apps/alexandria"
+    HTTP_PROXY_DIR = "/system/http_proxy"
+    HTTP_PROXY_MODE = "/system/proxy/mode"
+    URL_HANDLERS_DIR = "/desktop/gnome/url-handlers"
 
-    GCONFTOOL = 'gconftool-2'
+    GCONFTOOL = "gconftool-2"
 
     def initialize
       @alexandria_settings = {}
@@ -46,7 +46,7 @@ module Alexandria
     end
 
     def save!
-      log.debug { 'preferences save!' }
+      log.debug { "preferences save!" }
       @changed_settings.each do |variable_name|
         log.debug { "saving preference #{variable_name} / #{@alexandria_settings[variable_name].class}" }
         generic_save_setting(variable_name, @alexandria_settings[variable_name])
@@ -107,7 +107,7 @@ module Alexandria
     end
 
     def generic_save_setting(variable_name, new_value)
-      var_path = APP_DIR + '/' + variable_name
+      var_path = APP_DIR + "/" + variable_name
       if new_value.is_a?(Array)
         # when setting array, first remove nil elements (fixing #9007)
         new_value.compact!
@@ -136,13 +136,13 @@ module Alexandria
 
     def get_gconf_type(value)
       if value.is_a?(String)
-        'string'
+        "string"
       elsif value.is_a?(Integer)
-        'int'
+        "int"
       elsif value.is_a?(TrueClass) || value.is_a?(FalseClass)
-        'bool'
+        "bool"
       else
-        'string'
+        "string"
       end
     end
 
@@ -150,7 +150,7 @@ module Alexandria
       # NOTE we must check between list and pair...
 
       list_type = get_gconf_type(new_list.first)
-      if list_type == 'int' && new_list.size == 2
+      if list_type == "int" && new_list.size == 2
         # treat this as a pair of int
         a = new_list[0]
         b = new_list[1]
@@ -163,13 +163,13 @@ module Alexandria
     end
 
     def make_list_string(list)
-      list.map! { |x| x.gsub(/\"/, '\\"') } if get_gconf_type(list.first) == 'string'
-      contents = list.join(',')
-      '[' + contents + ']'
+      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/ =~ var_path
+      if /cols_width/.match?(var_path)
         puts new_value
 
         # new_value = {}
@@ -180,12 +180,12 @@ module Alexandria
         new_value.gsub!(/\"/, '\\"')
         value_str = "\"#{new_value}\""
       end
-      puts value_str if /cols_width/ =~ var_path
+      puts value_str if /cols_width/.match?(var_path)
       `gconftool-2 --type #{type} --set #{var_path} #{value_str}`
     end
 
     def exec_gconf_unset(variable_name)
-      `#{GCONFTOOL} --unset #{APP_DIR + '/' + variable_name}`
+      `#{GCONFTOOL} --unset #{APP_DIR + "/" + variable_name}`
     end
 
     ##
@@ -205,14 +205,14 @@ module Alexandria
     def load_http_proxy_settings
       http_proxy_vars = `#{GCONFTOOL} --recursive-list #{HTTP_PROXY_DIR}`
       http_proxy = gconftool_values_to_hash(http_proxy_vars)
-      if http_proxy['use_http_proxy']
+      if http_proxy["use_http_proxy"]
         proxy_mode = `#{GCONFTOOL} --get #{HTTP_PROXY_MODE}`.chomp
-        if proxy_mode == 'manual'
+        if proxy_mode == "manual"
           @use_http_proxy = true
-          @proxy_host = http_proxy['host']
-          @proxy_port = http_proxy['port']
-          @proxy_user = http_proxy['authentication_user']
-          @proxy_password = http_proxy['authentication_n_password']
+          @proxy_host = http_proxy["host"]
+          @proxy_port = http_proxy["port"]
+          @proxy_user = http_proxy["authentication_user"]
+          @proxy_password = http_proxy["authentication_n_password"]
         end
       end
       @http_proxy_loaded = true
@@ -235,17 +235,17 @@ 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
+      if value == "true"        # bool
         true
-      elsif value == 'false'    # bool
+      elsif value == "false"    # bool
         false
-      elsif value =~ /^[0-9]+$/   # int
+      elsif /^[0-9]+$/.match?(value) # int
         value.to_i
       elsif value =~ /^\[(.*)\]$/ # list (assume of type String)
-        Regexp.last_match[1].split(',')
+        Regexp.last_match[1].split(",")
       elsif value =~ /^\((.*)\)$/ # pair (assume of type int)
         begin
-          pair = Regexp.last_match[1].split(',')
+          pair = Regexp.last_match[1].split(",")
           return [discriminate(pair.first), discriminate(pair.last)]
         rescue StandardError
           return [0, 0]

data/lib/alexandria/scanners/{cuecat.rb → cue_cat.rb}

@@ -18,7 +18,7 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'alexandria/scanners'
+require "alexandria/scanners"
 
 module Alexandria
   module Scanners
@@ -26,19 +26,19 @@ module Alexandria
       include Alexandria::Logging
 
       def name
-        'CueCat'
+        "CueCat"
       end
 
       def display_name
-        'CueCat'
+        "CueCat"
       end
 
       # Checks if data looks like cuecat input
       def match?(data)
         data = data.chomp
-        return false if data[-1] != '.'
+        return false if data[-1] != "."
 
-        fields = data.split('.')
+        fields = data.split(".")
         return false if fields.size != 4
         return false if fields[2].size != 4
 
@@ -50,13 +50,13 @@ module Alexandria
       # domain perl implementation.
       def decode(data)
         data = data.chomp
-        fields = data.split('.')
+        fields = data.split(".")
         fields.shift # First part is gibberish
         fields.shift # Second part is cuecat serial number
         type, code = fields.map { |field| decode_field(field) }
 
-        if type == 'IB5'
-          type = 'IBN'
+        if type == "IB5"
+          type = "IBN"
           code = code[0, 13]
         end
 
@@ -64,13 +64,13 @@ module Alexandria
           if Library.valid_upc? code
             isbn13 = Library.canonicalise_ean(code)
             code = isbn13
-            type = 'IBN'
+            type = "IBN"
           end
         rescue StandardError
           log.debug { "Cannot translate UPC (#{type}) code #{code} to ISBN" }
         end
 
-        return code if type == 'IBN'
+        return code if type == "IBN"
 
         raise "Don't know how to handle type #{type} (barcode: #{code})"
       end
@@ -78,7 +78,7 @@ module Alexandria
       private
 
       def decode_field(encoded)
-        seq = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-'
+        seq = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789+-"
 
         chars   = encoded.split(//)
         values  = chars.map { |c| seq.index(c) }
@@ -90,7 +90,7 @@ module Alexandria
       end
 
       def calc(values)
-        result = ''
+        result = ""
         until values.empty?
           num = ((values[0] << 6 | values[1]) << 6 | values[2]) << 6 | values[3]
           result += ((num >> 16) ^ 67).chr
@@ -106,7 +106,7 @@ module Alexandria
         length = array.length % 4
 
         if length.nonzero?
-          raise 'Error parsing CueCat input' if length == 1
+          raise "Error parsing CueCat input" if length == 1
 
           length = 4 - length
           length.times { array.push(0) }