alexandria-book-collection-manager 0.7.9 → 0.7.11

data/lib/alexandria/export_library.rb

@@ -31,8 +31,8 @@ module Alexandria
       @library.name
     end
 
-    def each(&block)
-      @sorted.each(&block)
+    def each(&)
+      @sorted.each(&)
     end
 
     def export_as_onix_xml_archive(filename)
@@ -52,28 +52,30 @@ module Alexandria
     end
 
     def export_as_tellico_xml_archive(filename)
-      File.open(File.join(Dir.tmpdir, "tellico.xml"), "w") do |io|
+      tmpdir = Dir.mktmpdir "tellico_export"
+
+      File.open(File.join(tmpdir, "tellico.xml"), "w") do |io|
         to_tellico_document.write(io, 0)
       end
-      copy_covers(File.join(Dir.tmpdir, "images"))
-      Dir.chdir(Dir.tmpdir) do
+      copy_covers(File.join(tmpdir, "images"))
+      Dir.chdir(tmpdir) do
         output = `zip -q -r \"#{filename}\" tellico.xml images 2>&1`
         raise output unless $CHILD_STATUS.success?
       end
-      FileUtils.rm_rf(File.join(Dir.tmpdir, "images"))
-      FileUtils.rm(File.join(Dir.tmpdir, "tellico.xml"))
+      FileUtils.rm_rf(File.join(tmpdir, "images"))
+      FileUtils.rm(File.join(tmpdir, "tellico.xml"))
     end
 
     def export_as_isbn_list(filename)
       File.open(filename, "w") do |io|
         each do |book|
-          io.puts((book.isbn || ""))
+          io.puts(book.isbn || "")
         end
       end
     end
 
     def export_as_html(filename, theme)
-      FileUtils.mkdir(filename) unless File.exist?(filename)
+      FileUtils.mkdir_p(filename)
       Dir.chdir(filename) do
         copy_covers("pixmaps")
         FileUtils.cp_r(theme.pixmaps_directory, "pixmaps") if theme.has_pixmaps?
@@ -91,7 +93,7 @@ module Alexandria
     end
 
     def export_as_ipod_notes(filename, _theme)
-      FileUtils.mkdir(filename) unless File.exist?(filename)
+      FileUtils.mkdir_p(filename)
       tempdir = Dir.getwd
       Dir.chdir(filename)
       copy_covers("pixmaps")
@@ -113,7 +115,7 @@ module Alexandria
           end
           io.puts book.authors.join(", ")
           io.puts book.edition
-          io.puts((book.isbn || ""))
+          io.puts(book.isbn || "")
           # we need to close the files so the iPod can be ejected/unmounted
           # without us closing Alexandria
           io.close
@@ -140,6 +142,8 @@ module Alexandria
     private
 
     ONIX_DTD_URL = "http://www.editeur.org/onix/2.1/reference/onix-international.dtd"
+    private_constant :ONIX_DTD_URL
+
     def to_onix_document
       doc = REXML::Document.new
       doc << REXML::XMLDecl.new
@@ -211,8 +215,8 @@ module Alexandria
       doc = REXML::Document.new
       doc << REXML::XMLDecl.new
       doc << REXML::DocType.new("tellico",
-                                'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN"' \
-                                ' "http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
+                                'PUBLIC "-//Robby Stephenson/DTD Tellico V7.0//EN" ' \
+                                '"http://periapsis.org/tellico/dtd/v7/tellico.dtd"')
       tellico = doc.add_element("tellico")
       tellico.add_attribute("syntaxVersion", "7")
       tellico.add_namespace("http://periapsis.org/tellico/")
@@ -263,10 +267,10 @@ module Alexandria
     def xhtml_escape(str)
       escaped = str.dup
       # used to occasionally use CGI.escapeHTML
-      escaped.gsub!(/&/, "&amp;")
-      escaped.gsub!(/</, "&lt;")
-      escaped.gsub!(/>/, "&gt;")
-      escaped.gsub!(/"/, "&quot;")
+      escaped.gsub!("&", "&amp;")
+      escaped.gsub!("<", "&lt;")
+      escaped.gsub!(">", "&gt;")
+      escaped.gsub!('"', "&quot;")
       escaped
     end
 
@@ -357,27 +361,18 @@ module Alexandria
     def to_bibtex
       generator = "Alexandria " + Alexandria::DISPLAY_VERSION
       bibtex = +""
-      bibtex << "\%Generated on #{Date.today} by: #{generator}\n"
-      bibtex << "\%\n"
+      bibtex << "%Generated on #{Date.today} by: #{generator}\n"
+      bibtex << "%\n"
       bibtex << "\n"
 
       auths = Hash.new(0)
       each do |book|
-        k = (book.authors[0] || "Anonymous").split[0]
-        if auths.key?(k)
-          auths[k] += 1
-        else
-          auths[k] = 1
-        end
-        cite_key = k + auths[k].to_s
+        auth_key = (book.authors[0] || "Anonymous").split[0]
+        auths[auth_key] += 1
+        cite_key = "#{auth_key}#{auths[auth_key]}"
         bibtex << "@BOOK{#{cite_key},\n"
         bibtex << 'author = "'
-        if book.authors != []
-          bibtex << book.authors[0]
-          book.authors[1..].each do |author|
-            bibtex << " and #{latex_escape(author)}"
-          end
-        end
+        bibtex << book.authors.map { latex_escape(_1) }.join(" and ")
         bibtex << "\",\n"
         bibtex << "title = \"#{latex_escape(book.title)}\",\n"
         bibtex << "publisher = \"#{latex_escape(book.publisher)}\",\n"
@@ -395,14 +390,14 @@ module Alexandria
       return "" if str.nil?
 
       my_str = str.dup
-      my_str.gsub!(/%/, "\\%")
-      my_str.gsub!(/~/, "\\textasciitilde")
-      my_str.gsub!(/&/, "\\\\&")
-      my_str.gsub!(/\#/, "\\\\#")
-      my_str.gsub!(/\{/, "\\{")
-      my_str.gsub!(/\}/, "\\}")
-      my_str.gsub!(/_/, "\\_")
-      my_str.gsub!(/\$/, "\\\$")
+      my_str.gsub!("%", "\\%")
+      my_str.gsub!("~", "\\textasciitilde")
+      my_str.gsub!("&", "\\\\&")
+      my_str.gsub!("#", "\\\\#")
+      my_str.gsub!("{", "\\{")
+      my_str.gsub!("}", "\\}")
+      my_str.gsub!("_", "\\_")
+      my_str.gsub!("$", "\\$")
       my_str.gsub!(/"(.+)"/, "``\1''")
       my_str
     end

data/lib/alexandria/import_library.rb

@@ -14,6 +14,7 @@ module Alexandria
     include Logging
     include GetText
     extend GetText
+
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def self.all
@@ -71,9 +72,7 @@ module Alexandria
       log.debug { "Starting import_as_tellico_xml_archive... " }
       return nil unless system("unzip -qqt \"#{filename}\"")
 
-      tmpdir = File.join(Dir.tmpdir, "tellico_export")
-      FileUtils.rm_rf(tmpdir) if File.exist?(tmpdir)
-      Dir.mkdir(tmpdir)
+      tmpdir = Dir.mktmpdir "tellico_import"
       Dir.chdir(tmpdir) do
         system("unzip -qq \"#{filename}\"")
         file = File.exist?("bookcase.xml") ? "bookcase.xml" : "tellico.xml"
@@ -181,7 +180,7 @@ module Alexandria
           # probably Goodreads' wonky ISBN fields ,,="043432432X",
           # this is a hack to fix up such files
           data = File.read(filename)
-          data.gsub!(/,="/, ',"')
+          data.gsub!(',="', ',"')
           csv_fixed = Tempfile.new("alexandria_import_csv_fixed_")
           csv_fixed.write(data)
           csv_fixed.close

data/lib/alexandria/import_library_csv.rb

@@ -46,7 +46,7 @@ module Alexandria
 
   class GoodreadsCSVImport < CSVImport
     def initialize(header)
-      super(header)
+      super
       @title = index_of("Title")
       @author = index_of("Author")
       @additional_authors = index_of("Additional Authors")
@@ -119,7 +119,7 @@ module Alexandria
 
   class LibraryThingCSVImport < CSVImport
     def initialize(header)
-      super(header)
+      super
       @title = index_of("'TITLE'")
       @author = index_of("'AUTHOR (first, last)'")
       @isbn = index_of("'ISBN'")

data/lib/alexandria/library_collection.rb

@@ -23,7 +23,7 @@ module Alexandria
       ruined = []
       deleted = []
       all_regular_libraries.each do |library|
-        ruined += library.ruined_books
+        library.ruined_books.each { |isbn| ruined << [nil, isbn, library] }
         # make deleted books from each library accessible so we don't crash on
         # smart libraries
         deleted += library.deleted_books

data/lib/alexandria/library_store.rb

@@ -9,9 +9,10 @@ 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}
 
     include GetText
+
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     def initialize(dir)
@@ -32,8 +33,8 @@ module Alexandria
       rescue Errno::ENOENT
         FileUtils.mkdir_p(library_dir)
       end
-      # Create the default library if there is no library yet.
 
+      # Create the default library if there is no library yet.
       a << load_library(_("My Library")) if a.empty?
 
       a
@@ -43,21 +44,13 @@ module Alexandria
       test = [0, nil]
       ruined_books = []
       library = Library.new(name, self)
-      FileUtils.mkdir_p(library.path) unless File.exist?(library.path)
+      FileUtils.mkdir_p(library.path)
       Dir.chdir(library.path) do
-        Dir["*" + Library::EXT[:book]].sort.each do |filename|
-          test[1] = filename if (test[0]).zero?
+        Dir["*" + Library::EXT[:book]].each do |filename|
+          test[1] = filename if test[0].zero?
 
           unless File.size? test[1]
-            log.warn { "Book file #{test[1]} was empty" }
-            md = /([\dxX]{10,13})#{Library::EXT[:book]}/.match(filename)
-            if md
-              file_isbn = md[1]
-              ruined_books << [nil, file_isbn, library]
-            else
-              log.warn { "Filename #{filename} does not contain an ISBN" }
-              # TODO: delete this file...
-            end
+            handle_empty_book_file(test[1], ruined_books)
             next
           end
           book = regularize_book_from_yaml(test[1])
@@ -180,6 +173,18 @@ module Alexandria
 
     private
 
+    def handle_empty_book_file(filename, ruined_books)
+      log.warn { "Book file #{filename} was empty" }
+      md = /([\dxX]{10,13})#{Library::EXT[:book]}/.match(filename)
+      if md
+        file_isbn = md[1]
+        ruined_books << file_isbn
+      else
+        log.warn { "Filename #{filename} does not contain an ISBN" }
+        # TODO: delete this file...
+      end
+    end
+
     def regularize_book_from_yaml(name)
       text = File.read(name)
 
@@ -188,7 +193,7 @@ module Alexandria
 
       # The string is removed on load, but can't make it stick, maybe has to do with cache
 
-      if /!str:Amazon::Search::Response/.match?(text)
+      if text.include?("!str:Amazon::Search::Response")
         log.debug { "Removing Ruby/Amazon strings from #{name}" }
         text.gsub!("!str:Amazon::Search::Response", "")
       end

data/lib/alexandria/logging.rb

@@ -37,24 +37,24 @@ module Alexandria
       super(severity, message, category, &block)
     end
 
-    def debug(source = nil, progname = nil, &block)
-      add(DEBUG, nil, source, progname, &block)
+    def debug(source = nil, progname = nil, &)
+      add(DEBUG, nil, source, progname, &)
     end
 
-    def info(source = nil, progname = nil, &block)
-      add(INFO, nil, source, progname, &block)
+    def info(source = nil, progname = nil, &)
+      add(INFO, nil, source, progname, &)
     end
 
-    def warn(source = nil, progname = nil, &block)
-      add(WARN, nil, source, progname, &block)
+    def warn(source = nil, progname = nil, &)
+      add(WARN, nil, source, progname, &)
     end
 
-    def error(source = nil, progname = nil, &block)
-      add(ERROR, nil, source, progname, &block)
+    def error(source = nil, progname = nil, &)
+      add(ERROR, nil, source, progname, &)
     end
 
-    def fatal(source = nil, progname = nil, &block)
-      add(FATAL, nil, source, progname, &block)
+    def fatal(source = nil, progname = nil, &)
+      add(FATAL, nil, source, progname, &)
     end
 
     def self.category(source)
@@ -73,6 +73,7 @@ module Alexandria
   # whithout needing to specify the source each time.
   class LogWrapper
     extend Forwardable
+
     def initialize(logger, source)
       @logger = logger
       @source = source
@@ -90,24 +91,24 @@ module Alexandria
       end
     end
 
-    def debug(progname = nil, &block)
-      @logger.debug(@source, progname, &block)
+    def debug(progname = nil, &)
+      @logger.debug(@source, progname, &)
     end
 
-    def info(progname = nil, &block)
-      @logger.info(@source, progname, &block)
+    def info(progname = nil, &)
+      @logger.info(@source, progname, &)
     end
 
-    def warn(progname = nil, &block)
-      @logger.warn(@source, progname, &block)
+    def warn(progname = nil, &)
+      @logger.warn(@source, progname, &)
     end
 
-    def error(progname = nil, &block)
-      @logger.error(@source, progname, &block)
+    def error(progname = nil, &)
+      @logger.error(@source, progname, &)
     end
 
-    def fatal(progname = nil, &block)
-      @logger.fatal(@source, progname, &block)
+    def fatal(progname = nil, &)
+      @logger.fatal(@source, progname, &)
     end
   end
 
@@ -135,7 +136,7 @@ module Alexandria
   def self.create_logger
     logger = Alexandria::Logger.new($stderr)
 
-    level = ENV["LOGLEVEL"] ? ENV["LOGLEVEL"].intern : nil
+    level = ENV["LOGLEVEL"]&.intern
     if [:FATAL, :ERROR, :WARN, :INFO, :DEBUG].include? level
       logger.level = Logger.const_get(level)
     else

data/lib/alexandria/models/book.rb

@@ -15,11 +15,10 @@ module Alexandria
 
     DEFAULT_RATING = 0
     MAX_RATING_STARS = 5
-    VALID_RATINGS = (DEFAULT_RATING..MAX_RATING_STARS).freeze
+    VALID_RATINGS = (DEFAULT_RATING..MAX_RATING_STARS)
 
     def initialize(title, authors, isbn, publisher, publishing_year,
                    edition)
-
       @title = title
       @authors = authors
       @isbn = isbn

data/lib/alexandria/models/library.rb

@@ -20,11 +20,12 @@ module Alexandria
     attr_reader :name
     attr_accessor :ruined_books, :updating, :deleted_books
 
-    DEFAULT_DIR = File.join(ENV["HOME"], ".alexandria")
+    DEFAULT_DIR = File.join(Dir.home, ".alexandria")
     EXT = { book: ".yaml", cover: ".cover" }.freeze
 
     include GetText
     extend GetText
+
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     BOOK_ADDED, BOOK_UPDATED, BOOK_REMOVED = (0..3).to_a
@@ -117,8 +118,7 @@ module Alexandria
 
     def self.valid_upc?(upc)
       numbers = extract_numbers(upc)
-      ((numbers.length == 17) &&
-       (upc_checksum(numbers[0..10]) == numbers[11]))
+      numbers.length == 17 && upc_checksum(numbers[0..10]) == numbers[11]
     end
 
     AMERICAN_UPC_LOOKUP = {
@@ -167,7 +167,7 @@ module Alexandria
                   elsif valid_upc?(isbn)
                     # Seems to be a valid UPC number.
                     prefix = upc_convert(numbers[0..5])
-                    isbn_sans_chcksm = prefix + numbers[(8 + prefix.length)..17]
+                    isbn_sans_chcksm = prefix + numbers[(prefix.length + 8)..17]
                     isbn_sans_chcksm + [isbn_checksum(isbn_sans_chcksm)]
                   elsif valid_isbn?(isbn)
                     # Seems to be a valid ISBN number.
@@ -216,8 +216,7 @@ module Alexandria
         book.saved_ident = book.ident
       end
       # #was File.exist? but that returns true for empty files... CathalMagus
-      already_there = (File.size?(yaml(book)) &&
-                       !@deleted_books.include?(book))
+      already_there = File.size?(yaml(book)) && !@deleted_books.include?(book)
 
       temp_book = book.dup
       temp_book.library = nil
@@ -379,7 +378,7 @@ module Alexandria
     end
 
     def copy_covers(somewhere)
-      FileUtils.rm_rf(somewhere) if File.exist?(somewhere)
+      FileUtils.rm_rf(somewhere)
       FileUtils.mkdir(somewhere)
       each do |book|
         next unless File.exist?(cover(book))
@@ -398,7 +397,7 @@ module Alexandria
       book.ident + (Library.jpeg?(cover(book)) ? ".jpg" : ".gif")
     end
 
-    protected
+    private
 
     def initialize(name, store = nil)
       @name = name

data/lib/alexandria/preferences.rb

@@ -5,7 +5,6 @@
 # See the file README.md for authorship and licensing information.
 
 require "singleton"
-require "set"
 require "alexandria/default_preferences"
 
 module Alexandria
@@ -64,7 +63,7 @@ module Alexandria
 
     DEFAULT_VALUES.each_key do |var|
       define_method(var) { generic_getter var }
-      define_method("#{var}=") { |val| generic_setter var, val }
+      define_method(:"#{var}=") { |val| generic_setter var, val }
     end
 
     def get_variable(variable_name)
@@ -120,13 +119,6 @@ module Alexandria
         # set non-list value
         exec_gconf_set(var_path, new_value)
       end
-    rescue StandardError => ex
-      log.debug { new_value.inspect }
-      log.error do
-        "Could not set GConf setting #{variable_name} to value: #{new_value.inspect}"
-      end
-      log << ex.message
-      log << ex
     end
 
     ##
@@ -161,13 +153,13 @@ 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)
+      if var_path.include?("cols_width")
         log.debug { new_value }
 
         # new_value = {}
@@ -175,10 +167,10 @@ module Alexandria
       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
-      log.debug { value_str } if /cols_width/.match?(var_path)
+      log.debug { value_str } if var_path.include?("cols_width")
       `gconftool-2 --type #{type} --set #{var_path} #{value_str}`
     end
 
@@ -245,12 +237,8 @@ module Alexandria
       when /^\[(.*)\]$/ # list (assume of type String)
         Regexp.last_match[1].split(",")
       when /^\((.*)\)$/ # pair (assume of type int)
-        begin
-          pair = Regexp.last_match[1].split(",")
-          [discriminate(pair.first), discriminate(pair.last)]
-        rescue StandardError
-          [0, 0]
-        end
+        pair = Regexp.last_match[1].split(",")
+        [discriminate(pair.first), discriminate(pair.last)]
       else
         value # string
       end

data/lib/alexandria/{book_providers/pseudomarc.rb → pseudo_marc_parser.rb}

@@ -43,7 +43,7 @@ module Alexandria
 
     def self.get_fields(data, type, stripping, mappings = USMARC_MAPPINGS)
       field = ""
-      mappings[type][1..mappings[type].length - 1].each do |part|
+      mappings[type][1..(mappings[type].length - 1)].each do |part|
         if data.first[part]
           part_data = data.first[part].strip
           if part_data =~ stripping
@@ -124,7 +124,7 @@ module Alexandria
 
     def self.marc_text_to_details(marc)
       details = {}
-      marc.each_line do |line|
+      marc&.each_line do |line|
         if line =~ /(\d+)\s*(.+)/
           code = Regexp.last_match[1]
           data = Regexp.last_match[2]

data/lib/alexandria/scanners/cue_cat.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Copyright (C) 2005-2006 Christopher Cyll
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2014-2022 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
@@ -60,14 +60,10 @@ module Alexandria
           code = code[0, 13]
         end
 
-        begin
-          if Library.valid_upc? code
-            isbn13 = Library.canonicalise_ean(code)
-            code = isbn13
-            type = "IBN"
-          end
-        rescue StandardError
-          log.debug { "Cannot translate UPC (#{type}) code #{code} to ISBN" }
+        if Library.valid_upc? code
+          isbn13 = Library.canonicalise_ean(code)
+          code = isbn13
+          type = "IBN"
         end
 
         return code if type == "IBN"

data/lib/alexandria/scanners/{keyboard.rb → keyboard_wedge.rb}

@@ -36,13 +36,13 @@ module Alexandria
 
       # Checks if data looks like a completed scan
       def match?(data)
-        data.gsub!(/\s/, "")
-        (data =~ /[0-9]{12,18}/) || (data =~ /[0-9]{9}[0-9Xx]/)
+        data = data.gsub(/\s/, "")
+        data.match?(/^[0-9]{13,18}$/) || data.match?(/^[0-9]{9}[0-9Xx]$/)
       end
 
       # Gets the essential 13-digits from an ISBN barcode (EAN-13)
       def decode(data)
-        data.gsub!(/\s/, "")
+        data = data.gsub(/\s/, "")
         if data.length == 10
           data
         elsif data.length >= 13

data/lib/alexandria/scanners.rb

@@ -40,8 +40,8 @@ module Alexandria
       registry.find { |scanner| scanner.name == name }
     end
 
-    def self.each_scanner(&block)
-      registry.each(&block)
+    def self.each_scanner(&)
+      registry.each(&)
     end
 
     private_class_method :registry

data/lib/alexandria/smart_library.rb

@@ -12,6 +12,7 @@ module Alexandria
     include Logging
     include GetText
     extend GetText
+
     bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
     ALL_RULES = 1
@@ -148,7 +149,7 @@ module Alexandria
       if book
         @cache[book].save(book)
       else
-        FileUtils.mkdir_p(base_dir) unless File.exist? base_dir
+        FileUtils.mkdir_p(base_dir)
         File.open(yaml, "w") { |io| io.puts to_hash.to_yaml }
       end
     end
@@ -162,7 +163,7 @@ module Alexandria
     end
 
     def copy_covers(somewhere)
-      FileUtils.rm_rf(somewhere) if File.exist?(somewhere)
+      FileUtils.rm_rf(somewhere)
       FileUtils.mkdir(somewhere)
       each do |book|
         library = @cache[book]
@@ -233,6 +234,7 @@ module Alexandria
     class Rule
       include GetText
       extend GetText
+
       bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       attr_accessor :operand, :operation, :value
@@ -273,8 +275,8 @@ module Alexandria
       class LeftOperand < Operand
         attr_accessor :book_selector
 
-        def initialize(book_selector, *args)
-          super(*args)
+        def initialize(book_selector, *)
+          super(*)
           @book_selector = book_selector
         end
       end
@@ -289,6 +291,7 @@ module Alexandria
       module Operands
         include GetText
         extend GetText
+
         bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
         LEFT = [
@@ -321,6 +324,7 @@ module Alexandria
         include Logging
         include GetText
         extend GetText
+
         bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
         IS_TRUE = Operator.new(:is_true,
@@ -328,7 +332,7 @@ module Alexandria
                                proc { |x| x })
         IS_NOT_TRUE = Operator.new(:is_not_true,
                                    _("is not set"),
-                                   proc { |x| !x })
+                                   proc(&:!))
         IS = Operator.new(:is,
                           _("is"),
                           proc { |x, y| x == y })