alexandria-book-collection-manager 0.7.1 → 0.7.2

data/lib/alexandria/undo_manager.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 #
 # Alexandria is free software; you can redistribute it and/or

data/lib/alexandria/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2014-2016 Matijs van Zuijlen
 #
 # This file is part of Alexandria.
@@ -18,7 +20,7 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  VERSION = '0.7.1'.freeze
-  DATA_VERSION = '0.6.3'.freeze
-  DISPLAY_VERSION = '0.7.1'.freeze
+  VERSION = '0.7.2'
+  DATA_VERSION = '0.6.3'
+  DISPLAY_VERSION = '0.7.2'
 end

data/lib/alexandria/web_themes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2011 Matijs van Zuijlen
 #

data/spec/alexandria/book_providers_spec.rb

@@ -1,4 +1,5 @@
-#!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # Copyright (C) 2005-2006 Laurent Sansonetti
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2011, 2014, 2015 Matijs van Zuijlen
@@ -25,7 +26,8 @@ require 'spec_helper'
 describe Alexandria::BookProviders do
   it 'should be less clever'
 
-  def assert_correct_search_result(provider, query, search_type = Alexandria::BookProviders::SEARCH_BY_ISBN)
+  def assert_correct_search_result(provider, query,
+                                   search_type = Alexandria::BookProviders::SEARCH_BY_ISBN)
     begin
       results = provider.instance.search(query, search_type)
     rescue SocketError
@@ -46,17 +48,20 @@ describe Alexandria::BookProviders do
 
       canonical_query = Alexandria::Library.canonicalise_ean(query)
       canonical_result = Alexandria::Library.canonicalise_ean(book.isbn)
-      expect(canonical_query).to eq(canonical_result),
-                                 "Result's isbn #{book.isbn} is not equivalent to the requested isbn #{query} for #{provider}"
+      expect(canonical_query).
+        to eq(canonical_result),
+           "Result's isbn #{book.isbn} is not equivalent to the requested isbn #{query} for #{provider}"
 
       if results.length == 2
         cover_url = results.last
         if cover_url
-          expect(cover_url).to be_instance_of(String), "Unexpected cover_url #{cover_url.inspect} for #{provider}"
+          expect(cover_url).
+            to be_instance_of(String), "Unexpected cover_url #{cover_url.inspect} for #{provider}"
         end
       end
     else
-      expect(results.first.first).to be_instance_of(Alexandria::Book), "Result item is not a Book for #{provider}"
+      expect(results.first.first).
+        to be_instance_of(Alexandria::Book), "Result item is not a Book for #{provider}"
     end
     results
   end
@@ -119,9 +124,8 @@ describe Alexandria::BookProviders do
                                  '9788835926436')
   end
 
-  # providers supposed to be always working
-
   it 'Barnes and Noble should work' do
+    skip 'Barnes and Noble is not operational at the moment'
     assert_correct_search_result(Alexandria::BookProviders::BarnesAndNobleProvider,
                                  '9780961328917') # see #1433
   end
@@ -160,16 +164,6 @@ describe Alexandria::BookProviders do
                                  '0094638203520')
   end
 
-  it 'IBS_it should work' do
-    skip 'Marked in code as not working; remove implementation entirely.'
-    # this tests a book without image but with author
-    assert_correct_search_result(Alexandria::BookProviders::IBS_itProvider,
-                                 '9788886973816')
-    # this tests a book with image but without author
-    assert_correct_search_result(Alexandria::BookProviders::IBS_itProvider,
-                                 '9788807710148')
-  end
-
   it 'AdLibris should work' do
     skip 'Needs fixing: site has changed'
     assert_correct_search_result(Alexandria::BookProviders::AdLibrisProvider,
@@ -182,37 +176,6 @@ describe Alexandria::BookProviders do
                                  '9788599170380')
   end
 
-  it 'BOL_it should work' do
-    skip 'Marked in code as not working; remove implementation entirely.'
-    assert_correct_search_result(Alexandria::BookProviders::BOL_itProvider,
-                                 '9788817012980')
-  end
-
-  it 'Webster should work' do
-    skip 'Marked in code as not working; remove implementation entirely.'
-    # BIT
-    assert_correct_search_result(Alexandria::BookProviders::Webster_itProvider,
-                                 '9788817012980')
-    # BUK
-    assert_correct_search_result(Alexandria::BookProviders::Webster_itProvider,
-                                 '9781853260803')
-    # BUS
-    assert_correct_search_result(Alexandria::BookProviders::Webster_itProvider,
-                                 '9780307237699')
-    # BDE
-    assert_correct_search_result(Alexandria::BookProviders::Webster_itProvider,
-                                 '9783442460878')
-  end
-
-  it 'Webster should work with multiple authors' do
-    skip 'Marked in code as not working; remove implementation entirely.'
-    this_book = assert_correct_search_result(Alexandria::BookProviders::Webster_itProvider,
-                                             '9788804559016')
-    assert_kind_of(Array, this_book.authors, 'Not an array!')
-    # puts this_book.authors
-    assert(this_book.authors.length == 3, 'Wrong number of authors for this book!')
-  end
-
   it 'Renaud should work' do
     skip 'Marked in code as not working; remove implementation entirely.'
     # adultes

data/spec/alexandria/book_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2011, 2015 Matijs van Zuijlen
 #
@@ -47,11 +49,11 @@ describe Alexandria::Book do
     end
 
     it 'does not allow higher rating than 5 to be assigned' do
-      expect { book.rating = 6 }.to raise_error
+      expect { book.rating = 6 }.to raise_error ArgumentError
     end
 
     it 'does not allow lower rating than 0 to be assigned' do
-      expect { book.rating = -1 }.to raise_error
+      expect { book.rating = -1 }.to raise_error ArgumentError
     end
   end
 end

data/spec/alexandria/library_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- -*- ruby -*-
 # Copyright (C) 2004-2006 Dafydd Harries
 # Copyright (C) 2007 Cathal Mc Ginley

data/spec/alexandria/preferences_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or

data/spec/alexandria/scanners/cuecat_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #-- -*- ruby -*-
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2014 Matijs van Zuijlen

data/spec/alexandria/smart_library_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or
@@ -24,7 +26,7 @@ describe Alexandria::SmartLibrary do
   end
 
   it 'normalizes the encoding for name' do
-    bad_name = 'Prêts'.force_encoding('ascii')
+    bad_name = (+'Prêts').force_encoding('ascii')
     lib = described_class.new(bad_name, [], :all)
     expect(lib.name.encoding.name).to eq 'UTF-8'
     expect(bad_name.encoding.name).to eq 'US-ASCII'

data/spec/alexandria/ui/dialogs_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2015, 2016 Matijs van Zuijlen
 #

data/spec/alexandria/ui/iconview_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2014 Matijs van Zuijlen
 #

data/spec/alexandria/ui/main_app_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2007 Cathal Mc Ginley
 # Copyright (C) 2011, 2014-2016 Matijs van Zuijlen

data/spec/alexandria/ui/sidepane_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2014 Matijs van Zuijlen
 #

data/spec/alexandria/ui/sound_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2016 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or

data/spec/alexandria/ui/ui_manager_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2014 Matijs van Zuijlen
 #

data/spec/alexandria/ui/ui_utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2011, 2014-2016 Matijs van Zuijlen
 #

data/spec/alexandria/utilities_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 #
 # Alexandria is free software; you can redistribute it and/or

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2014, 2016 Matijs van Zuijlen
 #

data/tasks/dogtail.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 desc 'run dogtail integration tests'
 task :dogtail do
   `RUBYOPT='-rbundler/setup -Ilib' python dogtail/*.py`

data/tasks/setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #--
 # Copyright (C) 2011 Matijs van Zuijlen
 #
@@ -25,6 +27,6 @@
 require 'rake/clean'
 
 # Load the other rake files in the tasks folder
-tasks_dir = File.expand_path(File.dirname(__FILE__))
+tasks_dir = __dir__
 rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
 import(*rakefiles)

data/tasks/spec.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #--
 # Copyright (C) 2011 Matijs van Zuijlen

data/util/rake/fileinstall.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -115,9 +117,7 @@ class FileInstallTask < Rake::TaskLib
     end
 
     uninstall_description = 'Uninstall package files'
-    if @stage_dir
-      uninstall_description += ' from staging directory'
-    end
+    uninstall_description += ' from staging directory' if @stage_dir
     desc uninstall_description
     task tasknames[:uninstall] => [tasknames[:uninstall_files],
                                    tasknames[:uninstall_dirs]]
@@ -176,9 +176,7 @@ class FileInstallTask < Rake::TaskLib
                   else
                     RbConfig::CONFIG['sitelibdir']
                   end
-    if ENV.key?('RUBYLIBDIR')
-      ruby_libdir = ENV['RUBYLIBDIR']
-    end
+    ruby_libdir = ENV['RUBYLIBDIR'] if ENV.key?('RUBYLIBDIR')
 
     @prefix = ENV['PREFIX'] || ruby_prefix
     if @prefix == ruby_prefix
@@ -252,9 +250,7 @@ class FileInstallTask < Rake::TaskLib
       else
         dest_basedir = Pathname.new(@dest_dir)
       end
-      if source_file.file?
-        source_path = source_file.dirname.relative_path_from(source_basedir)
-      end
+      source_path = source_file.dirname.relative_path_from(source_basedir) if source_file.file?
       dest = source_path ? dest_basedir + source_path : dest_basedir
       dest.to_s
     end
@@ -268,9 +264,7 @@ class FileInstallTask < Rake::TaskLib
       files.each do |f|
         dest = dest_dir(f, base_dir)
         FileUtils.mkdir_p(dest) unless test('d', dest)
-        if test('f', f)
-          FileUtils.install(f, dest, mode: mode)
-        end
+        FileUtils.install(f, dest, mode: mode) if test('f', f)
       end
     end
 

data/util/rake/gettextgenerate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -40,9 +42,7 @@ class GettextGenerateTask < Rake::TaskLib
     desc 'Generate gettext localization files'
     task gettext: @generated_files
 
-    if CLOBBER
-      @generated_files.each { |gen| CLOBBER << gen }
-    end
+    @generated_files.each { |gen| CLOBBER << gen } if CLOBBER
   end
 
   def generate_po_files(po_dir, file_glob, dest_dir)
@@ -56,8 +56,8 @@ class GettextGenerateTask < Rake::TaskLib
       dest_dir = File.dirname(t.name)
       FileUtils.makedirs(dest_dir) unless FileTest.exists?(dest_dir)
       puts "Generating #{t.name}"
-      system("msgfmt #{t.source} -o #{t.name}")
-      raise "msgfmt failed for #{t.source}" if $CHILD_STATUS.nonzero?
+      result = system("msgfmt #{t.source} -o #{t.name}")
+      raise "msgfmt failed for #{t.source}" unless result
     end
     mo_files.each { |mo| @generated_files << mo }
   end
@@ -69,8 +69,10 @@ class GettextGenerateTask < Rake::TaskLib
   def generate_desktop(infile, outfile)
     @generated_files << outfile
     file outfile => [infile, *po_files] do |_f|
-      unless `intltool-merge --version`
-        raise Exception, 'Need to install intltool'
+      begin
+        `intltool-merge --version`
+      rescue Errno::ENOENT
+        raise 'Need to install intltool'
       end
       system("intltool-merge -d #{@po_dir} #{infile} #{outfile}")
     end
@@ -97,60 +99,3 @@ class GettextGenerateTask < Rake::TaskLib
     po_file_for(Regexp.last_match[1])
   end
 end
-
-#   class GettextConfig < BuildConfig
-#     attr_accessor :po_dir, :po_files_glob
-#     attr_accessor :mo_dir, :mo_files_regex
-#     def initialize(build)
-#       super(build)
-#       @po_dir = 'po'
-#       @po_files_glob = "#{@po_dir}/*.po"
-#       @mo_dir = 'data/locale'
-#       @mo_files_regex = /.*\/(.+)\/LC_MESSAGES\/.+\.mo/
-#     end
-#     def po_files
-#       FileList[po_files_glob]
-#     end
-#     def po_file_for(locale)
-#       "#{po_dir}/#{locale}.po"
-#     end
-#     def locales
-#       po_files.map { |po| File.basename(po).split('.')[0] }
-#     end
-#     def mo_files
-#       locales.map { |loc| mo_file_for(loc) }
-#     end
-#     def mo_file_for(locale)
-#       "#{mo_dir}/#{locale}/LC_MESSAGES/#{build.name}.mo"
-#     end
-#     def source_file(dest_file)
-#       dest_file =~ mo_files_regex
-#       po_file_for($1)
-#     end
-#   end
-
-#   def define_gettext_tasks
-#     # extract translations from PO files into other files
-#     file files.desktop => ["#{files.desktop}.in",
-#       *@gettext.po_files] do |f|
-#       raise "Need to install intltool" unless system("intltool-merge -d #{@gettext.po_dir} #{f.name}.in #{f.name}")
-#       end
-
-#     # create MO files
-#     rule( /\.mo$/ => [ lambda { |dest| @gettext.source_file(dest) }]) do |t|
-#       dest_dir = File.dirname(t.name)
-#       FileUtils.makedirs(dest_dir) unless FileTest.exists?(dest_dir)
-#       puts "Generating #{t.name}"
-#       system("msgfmt #{t.source} -o #{t.name}")
-#       raise "msgfmt failed for #{t.source}" if $? != 0
-#     end
-
-#     desc "Generate gettext localization files"
-#     task :gettext => [files.desktop, *@gettext.mo_files]
-
-#     task :clobber_gettext do
-#       FileUtils.rm_f(files.desktop)
-#       FileUtils.rm_rf(@gettext.mo_dir)
-#     end
-#     task :clobber => [:clobber_gettext]
-#   end

data/util/rake/omfgenerate.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #--
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -40,9 +42,7 @@ class OmfGenerateTask < Rake::TaskLib
     desc 'Generate Open Metadata Framework files'
     task omf: @generated_files
 
-    if CLOBBER
-      @generated_files.each { |gen| CLOBBER << gen }
-    end
+    @generated_files.each { |gen| CLOBBER << gen } if CLOBBER
   end
 
   def locale_for(omf_file)