alexandria-book-collection-manager 0.6.9 → 0.7.0

data/lib/alexandria/undo_manager.rb

@@ -34,11 +34,11 @@ module Alexandria
     end
 
     def can_undo?
-      @undo_actions.length > 0
+      !@undo_actions.empty?
     end
 
     def can_redo?
-      @redo_actions.length > 0
+      !@redo_actions.empty?
     end
 
     def undo!

data/lib/alexandria/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014, 2015 Matijs van Zuijlen
+# Copyright (C) 2014-2016 Matijs van Zuijlen
 #
 # This file is part of Alexandria.
 #
@@ -18,7 +18,7 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  VERSION = '0.6.9'
-  DATA_VERSION = '0.6.3'
-  DISPLAY_VERSION = '0.6.9'
+  VERSION = '0.7.0'.freeze
+  DATA_VERSION = '0.6.3'.freeze
+  DISPLAY_VERSION = '0.7.0'.freeze
 end

data/spec/alexandria/book_providers_spec.rb

@@ -26,7 +26,11 @@ describe Alexandria::BookProviders do
   it 'should be less clever'
 
   def assert_correct_search_result(provider, query, search_type = Alexandria::BookProviders::SEARCH_BY_ISBN)
-    results = provider.instance.search(query, search_type)
+    begin
+      results = provider.instance.search(query, search_type)
+    rescue SocketError
+      skip 'Service is offline'
+    end
 
     puts results.inspect if $DEBUG
 
@@ -43,7 +47,7 @@ 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}"
+                                 "Result's isbn #{book.isbn} is not equivalent to the requested isbn #{query} for #{provider}"
 
       if results.length == 2
         cover_url = results.last
@@ -135,9 +139,8 @@ describe Alexandria::BookProviders do
   # providers supposed to be always working
 
   it 'Barnes and Noble should work' do
-    skip 'Needs fixing'
     assert_correct_search_result(Alexandria::BookProviders::BarnesAndNobleProvider,
-                                 '9780961328917')   # see #1433
+                                 '9780961328917') # see #1433
   end
 
   it 'MCU should work' do

data/spec/alexandria/library_spec.rb

@@ -1,7 +1,7 @@
 #-- -*- ruby -*-
 # Copyright (C) 2004-2006 Dafydd Harries
 # Copyright (C) 2007 Cathal Mc Ginley
-# Copyright (C) 2011, 2014, 2015 Matijs van Zuijlen
+# Copyright (C) 2011, 2014-2016 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
@@ -49,11 +49,11 @@ describe Alexandria::Library do
 
   describe '#canonicalise_isbn' do
     it 'returns the correct value for several examples' do
-    expect(Alexandria::Library.canonicalise_isbn('014143984X')).to eq '014143984X'
-    expect(Alexandria::Library.canonicalise_isbn('0-345-43192-8')).to eq '0345431928'
-    expect(Alexandria::Library.canonicalise_isbn('3522105907')).to eq '3522105907'
-    # EAN number
-    expect(Alexandria::Library.canonicalise_isbn('9780345431929')).to eq '0345431928'
+      expect(Alexandria::Library.canonicalise_isbn('014143984X')).to eq '014143984X'
+      expect(Alexandria::Library.canonicalise_isbn('0-345-43192-8')).to eq '0345431928'
+      expect(Alexandria::Library.canonicalise_isbn('3522105907')).to eq '3522105907'
+      # EAN number
+      expect(Alexandria::Library.canonicalise_isbn('9780345431929')).to eq '0345431928'
     end
   end
 
@@ -67,7 +67,7 @@ describe Alexandria::Library do
       first_copy = an_artist_of_the_floating_world
       my_library << first_copy
       my_library.delete(first_copy)
-      expect { my_library.delete(first_copy) }.to raise_error
+      expect { my_library.delete(first_copy) }.to raise_error ArgumentError
     end
 
     it 'allows multiple copies of a book to be added and deleted in turn' do
@@ -85,7 +85,6 @@ describe Alexandria::Library do
       # puts "AAA my_library.size #{my_library.size}"
 
       # puts "second_copy #{second_copy.object_id}"
-      # lambda {  my_library.delete(second_copy) }.should raise_error
       expect { my_library.delete(second_copy) }.not_to raise_error
 
       # puts "BBB my_library.size #{my_library.size}"
@@ -112,11 +111,11 @@ describe Alexandria::Library do
     it "doesn't work quite yet" do
       skip
       # Doesn't work quite yet.
-      on_iterate_cb = proc { }
-      on_error_cb = proc { }
-      library, libraries = __test_fake_import_isbns
-      test_file = "data/isbns.txt"
-      library.import_as_isbn_list("Test Library", test_file, on_iterate_cb, on_error_cb)
+      on_iterate_cb = proc {}
+      on_error_cb = proc {}
+      library, _libraries = __test_fake_import_isbns
+      test_file = 'data/isbns.txt'
+      library.import_as_isbn_list('Test Library', test_file, on_iterate_cb, on_error_cb)
     end
   end
 
@@ -245,9 +244,7 @@ describe Alexandria::Library do
 
     after(:each) do
       FileUtils.rm_rf(TESTDIR)
-      if File.exist? @outfile
-        File.unlink @outfile
-      end
+      File.unlink @outfile if File.exist? @outfile
     end
   end
 end

data/spec/alexandria/scanners/cuecat_spec.rb

@@ -29,8 +29,7 @@ describe Alexandria::Scanners::CueCat do
                  '.C3nZC3nZC3n2ChnWENz7DxnY.',
                  '.C3nZC3nZC3n2ChnWENz7DxnY.cGen',
                  '.C3nZC3nZC3n2ChnWENz7DxnY.cGen.',
-                 '.C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3z0CNj3Dhj1EW'
-                ]
+                 '.C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3z0CNj3Dhj1EW']
     @scans = {
       isbn: '.C3nZC3nZC3n2ChnWENz7DxnY.cGen.ENr7C3z0CNj3Dhj1EW.',
       ib5: '.C3nZC3nZC3n2ChnWENz7DxnY.cGf2.ENr7C3z0DNn0ENnWE3nZDhP6.'

data/spec/alexandria/ui/dialogs_spec.rb

@@ -1,4 +1,5 @@
 # Copyright (C) 2007 Joseph Method
+# Copyright (C) 2015, 2016 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,7 +83,10 @@ describe Alexandria::UI::AlertDialog do
 end
 
 describe Alexandria::UI::AcquireDialog do
-  it 'should work'
+  it 'should work' do
+    parent = Gtk::Window.new :toplevel
+    Alexandria::UI::AcquireDialog.new parent
+  end
 end
 
 describe Alexandria::UI::AboutDialog do

data/spec/alexandria/ui/main_app_spec.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2007 Joseph Method
 # Copyright (C) 2007 Cathal Mc Ginley
-# Copyright (C) 2011, 2014, 2015 Matijs van Zuijlen
+# Copyright (C) 2011, 2014-2016 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
@@ -37,13 +37,13 @@ describe Alexandria::UI::MainApp do
   it 'should be a singleton' do
     expect do
       Alexandria::UI::MainApp.new
-    end.to raise_error
+    end.to raise_error NoMethodError
   end
 
   it 'runs' do
     @main_app = Alexandria::UI::MainApp.instance
 
-    Gtk.timeout_add(100) do
+    GLib::Timeout.add(100) do
       @main_app.main_app.destroy
       Gtk.main_quit
     end

data/{lib/alexandria/utils.rb → spec/alexandria/ui/sound_spec.rb}

@@ -1,4 +1,4 @@
-# Copyright (C) 2005-2006 Laurent Sansonetti
+# Copyright (C) 2016 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
@@ -15,16 +15,11 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require 'glib2'
+require 'spec_helper'
 
-class String
-  # Converts this string into the desired charset.
-  #
-  # Note that this may raise a GLib::ConvertError if the
-  # desired_charset cannot accommodate all the characters present in
-  # the string, e.g. trying to convert Japanese Kanji to ISO-8859-1
-  # will obviously not work.
-  def convert(desired_charset, source_data_charset)
-    GLib.convert(self, desired_charset, source_data_charset)
+describe Alexandria::UI::SoundEffectsPlayer do
+  it 'can be instantiated' do
+    player = described_class.new
+    expect(player).to be_instance_of described_class
   end
 end

data/spec/alexandria/ui/ui_utilities_spec.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007 Joseph Method
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2014-2016 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
@@ -35,8 +35,8 @@ end
 
 # from icons
 
-describe Gdk::Pixbuf do
-  it 'should extend Gdk::PixBuf'
+describe GdkPixbuf::Pixbuf do
+  it 'should extend GdkPixbuf::PixBuf'
 end
 
 describe Alexandria::UI::Icons do

data/spec/spec_helper.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2007 Joseph Method
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2016 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
@@ -36,8 +36,8 @@ def an_artist_of_the_floating_world
                        'Paperback')
 end
 
-Thread.new { Alexandria::UI.start_gnome_program }
 Alexandria::UI::Icons.init
+Alexandria::UI.start_main_app
 
 module Alexandria
   class Library

data/util/rake/fileinstall.rb

@@ -65,9 +65,7 @@ class FileInstallTask < Rake::TaskLib
     @stage_dir = dirname # || @prefix
     @file_groups = []
     @dirs_to_remove_globs = []
-    if block_given?
-      yield self
-    end
+    yield self if block_given?
     make_tasks
   end
 
@@ -85,9 +83,7 @@ class FileInstallTask < Rake::TaskLib
     # INSTALL TASK
 
     description = 'Install package files'
-    if @stage_dir
-      description += ' to staging directory'
-    end
+    description += ' to staging directory' if @stage_dir
     desc description
     task tasknames[:install] do
       @file_groups.each { |g| g.install(@stage_dir) }
@@ -107,19 +103,13 @@ class FileInstallTask < Rake::TaskLib
       @dirs_to_remove_globs.each do |glob|
         regex = glob2regex(glob)
         all_dirs.each do |dir|
-          unless dir =~ /\/$/
-            dir += '/'
-          end
-          if regex =~ dir
-            to_delete << Regexp.last_match[1]
-          end
+          dir += '/' unless dir =~ /\/$/
+          to_delete << Regexp.last_match[1] if regex =~ dir
         end
       end
       to_delete.each do |dirname|
         dir = dirname
-        if @stage_dir
-          dir = File.join(@stage_dir, dirname)
-        end
+        dir = File.join(@stage_dir, dirname) if @stage_dir
         delete_empty(dir)
       end
     end
@@ -150,7 +140,7 @@ class FileInstallTask < Rake::TaskLib
   # Install files the same way as +install+, but setting the mode of
   # the installed file to be executable.
   def install_exe(src_dir, file_glob, dest_dir)
-    @file_groups << FileGroup.new(src_dir, file_glob, dest_dir, 0755)
+    @file_groups << FileGroup.new(src_dir, file_glob, dest_dir, 0o755)
   end
 
   # Install icon files. This method splits up the source file name and
@@ -181,11 +171,11 @@ class FileInstallTask < Rake::TaskLib
   def calculate_ruby_dir
     ruby_prefix = RbConfig::CONFIG['prefix']
 
-    if @install_to_rubylibdir
-      ruby_libdir = RbConfig::CONFIG['rubylibdir']
-    else
-      ruby_libdir = RbConfig::CONFIG['sitelibdir']
-    end
+    ruby_libdir = if @install_to_rubylibdir
+                    RbConfig::CONFIG['rubylibdir']
+                  else
+                    RbConfig::CONFIG['sitelibdir']
+                  end
     if ENV.key?('RUBYLIBDIR')
       ruby_libdir = ENV['RUBYLIBDIR']
     end
@@ -193,7 +183,7 @@ class FileInstallTask < Rake::TaskLib
     @prefix = ENV['PREFIX'] || ruby_prefix
     if @prefix == ruby_prefix
       @rubylib = ruby_libdir
-    elsif ruby_libdir.index(ruby_prefix) == 0
+    elsif ruby_libdir.index(ruby_prefix).zero?
       libpart = ruby_libdir[ruby_prefix.size..-1]
       @rubylib = File.join(@prefix, libpart)
     else
@@ -202,9 +192,7 @@ class FileInstallTask < Rake::TaskLib
   end
 
   def glob2regex(pathglob)
-    if pathglob =~ /\*\*$/
-      pathglob += '/'
-    end
+    pathglob += '/' if pathglob =~ /\*\*$/
     real_parts = pathglob.split('**/')
     real_parts.each do |part|
       part.gsub!('.', '\\.')
@@ -220,23 +208,19 @@ class FileInstallTask < Rake::TaskLib
   def delete_empty(dirs)
     dirs.each do |d|
       p = Pathname.new(d)
-      if p.exist?
-        delete_if_empty(p.realpath)
-      end
+      delete_if_empty(p.realpath) if p.exist?
     end
   end
 
   # Delete the directory at the given Pathname +p+ if all its children
   # can be similarly deleted, and if it is then empty.
   def delete_if_empty(p)
-    unless p.directory?
-      return false
-    end
+    return false unless p.directory?
     p.children.each do |c|
       delete_if_empty(c)
     end
     if p.children.empty?
-      p.delete # TODO optional verbose output here
+      p.delete # TODO: optional verbose output here
       true
     else
       false
@@ -246,7 +230,7 @@ class FileInstallTask < Rake::TaskLib
   class FileGroup
     attr_reader :mode
     attr_accessor :description
-    def initialize(src_dir, file_glob, dest_dir, mode = 0644)
+    def initialize(src_dir, file_glob, dest_dir, mode = 0o644)
       @src_dir = src_dir
       @file_glob = file_glob
       @dest_dir = dest_dir

data/util/rake/gettextgenerate.rb

@@ -32,9 +32,7 @@ class GettextGenerateTask < Rake::TaskLib
   def initialize(projectname)
     @projectname = projectname
     @generated_files = []
-    if block_given?
-      yield self
-    end
+    yield self if block_given?
     make_task
   end
 
@@ -59,7 +57,7 @@ class GettextGenerateTask < Rake::TaskLib
       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 != 0
+      raise "msgfmt failed for #{t.source}" if $CHILD_STATUS.nonzero?
     end
     mo_files.each { |mo| @generated_files << mo }
   end

data/util/rake/omfgenerate.rb

@@ -32,9 +32,7 @@ class OmfGenerateTask < Rake::TaskLib
   def initialize(projectname)
     @projectname = projectname
     @generated_files = []
-    if block_given?
-      yield self
-    end
+    yield self if block_given?
     make_task
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -28,7 +28,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-22 00:00:00.000000000 Z
+date: 2016-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -73,19 +73,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: gtk2
+  name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 3.0.9
+- !ruby/object:Gem::Dependency
+  name: gio2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: gstreamer
   requirement: !ruby/object:Gem::Requirement
@@ -120,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '11.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -231,7 +245,6 @@ files:
 - lib/alexandria/ui/dialogs/smart_library_properties_dialog.rb
 - lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb
 - lib/alexandria/ui/dndable.rb
-- lib/alexandria/ui/gtk_thread_help.rb
 - lib/alexandria/ui/icons.rb
 - lib/alexandria/ui/iconview.rb
 - lib/alexandria/ui/iconview_tooltips.rb
@@ -244,7 +257,6 @@ files:
 - lib/alexandria/ui/sound.rb
 - lib/alexandria/ui/ui_manager.rb
 - lib/alexandria/undo_manager.rb
-- lib/alexandria/utils.rb
 - lib/alexandria/version.rb
 - lib/alexandria/web_themes.rb
 - misc/sounds/README
@@ -411,6 +423,7 @@ files:
 - spec/alexandria/ui/listview_spec.rb
 - spec/alexandria/ui/main_app_spec.rb
 - spec/alexandria/ui/sidepane_spec.rb
+- spec/alexandria/ui/sound_spec.rb
 - spec/alexandria/ui/ui_manager_spec.rb
 - spec/alexandria/ui/ui_utilities_spec.rb
 - spec/alexandria/utilities_spec.rb
@@ -460,9 +473,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: GNOME application for managing collections of books
 test_files: []
-has_rdoc: