alexandria-book-collection-manager 0.7.9 → 0.7.10

data/spec/alexandria/ui/keep_bad_isbn_dialog_spec.rb

@@ -12,6 +12,6 @@ describe Alexandria::UI::KeepBadISBNDialog do
     book = instance_double(Alexandria::Book,
                            title: "Foo Book",
                            isbn: "98765432")
-    described_class.new parent, book
+    expect { described_class.new parent, book }.not_to raise_error
   end
 end

data/spec/alexandria/ui/new_book_dialog_manual_spec.rb

@@ -14,7 +14,7 @@ describe Alexandria::UI::NewBookDialogManual do
   end
 
   it "works" do
-    described_class.new parent, library
+    expect { described_class.new parent, library }.not_to raise_error
   end
 
   describe "#on_change_cover" do
@@ -31,21 +31,21 @@ describe Alexandria::UI::NewBookDialogManual do
       allow(filechooser)
         .to receive(:run).and_return(Gtk::ResponseType::ACCEPT)
 
-      dialog.on_change_cover
+      expect { dialog.on_change_cover }.not_to raise_error
     end
 
     it "works when response is reject" do
       allow(filechooser)
         .to receive(:run).and_return(Gtk::ResponseType::REJECT)
 
-      dialog.on_change_cover
+      expect { dialog.on_change_cover }.not_to raise_error
     end
 
     it "works when response is cancel" do
       allow(filechooser)
         .to receive(:run).and_return(Gtk::ResponseType::CANCEL)
 
-      dialog.on_change_cover
+      expect { dialog.on_change_cover }.not_to raise_error
     end
   end
 end

data/spec/alexandria/ui/new_book_dialog_spec.rb

@@ -11,12 +11,12 @@ describe Alexandria::UI::NewBookDialog do
   let(:model) { Gtk::ListStore.new(String, String, GdkPixbuf::Pixbuf) }
 
   it "works" do
-    described_class.new parent
+    expect { described_class.new parent }.not_to raise_error
   end
 
   it "can copy search results into result treeview" do
     results = [[an_artist_of_the_floating_world, "cover-url"]]
     dialog = described_class.new parent
-    dialog.copy_results_to_treeview_model results, model
+    expect { dialog.copy_results_to_treeview_model results, model }.not_to raise_error
   end
 end

data/spec/alexandria/ui/new_provider_dialog_spec.rb

@@ -10,7 +10,7 @@ describe Alexandria::UI::NewProviderDialog do
   let(:parent) { Gtk::Window.new :toplevel }
 
   it "can be instantiated" do
-    described_class.new parent
+    expect { described_class.new parent }.not_to raise_error
   end
 
   describe "#acquire" do
@@ -19,12 +19,12 @@ describe Alexandria::UI::NewProviderDialog do
 
     it "works when response is cancel" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::CANCEL)
-      provider_dialog.acquire
+      expect { provider_dialog.acquire }.not_to raise_error
     end
 
     it "works when response is accept" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::ACCEPT)
-      provider_dialog.acquire
+      expect { provider_dialog.acquire }.not_to raise_error
     end
   end
 end

data/spec/alexandria/ui/new_smart_library_dialog_spec.rb

@@ -10,30 +10,32 @@ describe Alexandria::UI::NewSmartLibraryDialog do
   let(:parent) { Gtk::Window.new :toplevel }
 
   it "can be instantiated" do
-    described_class.new parent
+    expect { described_class.new parent }.not_to raise_error
   end
 
   describe "#acquire" do
     let(:properties_dialog) { described_class.new parent }
     let(:gtk_dialog) { properties_dialog.dialog }
+    let(:rules_box) { properties_dialog.instance_variable_get(:@rules_box) }
+    let(:rule_entry) { rules_box.children.first.children[2] }
 
     it "works when response is cancel" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::CANCEL)
-      properties_dialog.acquire
+      expect { properties_dialog.acquire }.not_to raise_error
     end
 
     it "returns a smart library that can be saved when response is ok" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::OK)
 
       # Make sure entered rule is valid
-      rules_box = properties_dialog.instance_variable_get(:@rules_box)
-      entry = rules_box.children.first.children[2]
-      entry.text = "foo"
+      rule_entry.text = "foo"
 
       result = properties_dialog.acquire
 
-      expect(result).to be_a Alexandria::SmartLibrary
-      expect { result.save }.not_to raise_error
+      aggregate_failures do
+        expect(result).to be_a Alexandria::SmartLibrary
+        expect { result.save }.not_to raise_error
+      end
     end
   end
 end

data/spec/alexandria/ui/preferences_dialog_spec.rb

@@ -9,6 +9,6 @@ require_relative "../../spec_helper"
 describe Alexandria::UI::PreferencesDialog do
   it "works" do
     parent = Gtk::Window.new :toplevel
-    described_class.new(parent) { nil }
+    expect { described_class.new(parent) { nil } }.not_to raise_error
   end
 end

data/spec/alexandria/ui/provider_preferences_dialog_spec.rb

@@ -19,7 +19,7 @@ describe Alexandria::UI::ProviderPreferencesDialog do
   end
 
   it "can be instantiated" do
-    described_class.new parent, provider
+    expect { described_class.new parent, provider }.not_to raise_error
   end
 
   describe "#acquire" do
@@ -28,7 +28,7 @@ describe Alexandria::UI::ProviderPreferencesDialog do
       gtk_dialog = preferences_dialog.dialog
       allow(gtk_dialog).to receive(:run)
 
-      preferences_dialog.acquire
+      expect { preferences_dialog.acquire }.not_to raise_error
     end
   end
 end

data/spec/alexandria/ui/really_delete_dialog_spec.rb

@@ -11,6 +11,6 @@ describe Alexandria::UI::ReallyDeleteDialog do
     library = instance_double(Alexandria::Library,
                               name: "Bar Library", empty?: false, size: 12)
     parent = Gtk::Window.new :toplevel
-    described_class.new parent, library
+    expect { described_class.new parent, library }.not_to raise_error
   end
 end

data/spec/alexandria/ui/sidepane_manager_spec.rb

@@ -10,6 +10,6 @@ describe Alexandria::UI::SidepaneManager do
   it "works" do
     library_listview = instance_double(Gtk::TreeView).as_null_object
     parent = instance_double(Alexandria::UI::UIManager, main_app: nil, append_library: nil)
-    described_class.new library_listview, parent
+    expect { described_class.new library_listview, parent }.not_to raise_error
   end
 end

data/spec/alexandria/ui/skip_entry_dialog_spec.rb

@@ -7,8 +7,24 @@
 require_relative "../../spec_helper"
 
 describe Alexandria::UI::SkipEntryDialog do
+  let(:parent) { Gtk::Window.new :toplevel }
+
   it "works" do
-    parent = Gtk::Window.new :toplevel
-    described_class.new parent, "Foo"
+    expect { described_class.new parent, "Foo" }.not_to raise_error
+  end
+
+  describe "continue?" do
+    let(:instance) { described_class.new parent, "Foo" }
+    let(:dialog) { instance.dialog }
+
+    it "returns false when response is cancel" do
+      allow(dialog).to receive(:run).and_return(Gtk::ResponseType::CANCEL)
+      expect(instance.continue?).to be false
+    end
+
+    it "returns true when response is OK" do
+      allow(dialog).to receive(:run).and_return(Gtk::ResponseType::OK)
+      expect(instance.continue?).to be true
+    end
   end
 end

data/spec/alexandria/ui/smart_library_properties_dialog_spec.rb

@@ -18,12 +18,12 @@ describe Alexandria::UI::SmartLibraryPropertiesDialog do
   describe "#acquire" do
     it "works when response is cancel" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::CANCEL)
-      properties_dialog.acquire
+      expect { properties_dialog.acquire }.not_to raise_error
     end
 
     it "works when response is ok" do
       allow(gtk_dialog).to receive(:run).and_return(Gtk::ResponseType::OK)
-      properties_dialog.acquire
+      expect { properties_dialog.acquire }.not_to raise_error
     end
   end
 

data/spec/alexandria/ui/ui_manager_spec.rb

@@ -10,7 +10,7 @@ describe Alexandria::UI::UIManager do
   let(:main_app) { instance_double(Alexandria::UI::MainApp) }
 
   it "works" do
-    described_class.new main_app
+    expect { described_class.new main_app }.not_to raise_error
   end
 
   describe "#on_new" do
@@ -41,12 +41,14 @@ describe Alexandria::UI::UIManager do
       regular_library.each { |book| ui.append_book book }
       # This makes the iconview model re-appear
       ui.iconview.unfreeze
-      expect(ui.model.iter_n_children).to eq regular_library.count
 
       # This triggers the #on_books_selection_changed callback
       ui.select_a_book regular_library.first
 
-      expect(ui.iconview.selected_items).not_to be_empty
+      aggregate_failures do
+        expect(ui.model.iter_n_children).to eq regular_library.count
+        expect(ui.iconview.selected_items).not_to be_empty
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -20,45 +20,36 @@ def an_artist_of_the_floating_world
                        "Paperback")
 end
 
-def assert_correct_search_result(provider, query,
-                                 search_type = Alexandria::BookProviders::SEARCH_BY_ISBN)
-  begin
-    results = provider.instance.search(query, search_type)
-  rescue SocketError
-    skip "Service is offline"
-  end
-
-  expect(results).to be_instance_of(Array), "Results are not an array for #{provider}"
-  expect(results).not_to be_empty, "Results are empty for #{provider}"
+RSpec::Matchers.define :have_correct_search_result_for do |query|
+  match(notify_expectation_failures: true) do |provider|
+    begin
+      results = provider.instance.search(query, Alexandria::BookProviders::SEARCH_BY_ISBN)
+    rescue SocketError
+      skip "Service is offline"
+    end
 
-  if search_type == Alexandria::BookProviders::SEARCH_BY_ISBN
-    expect(results.length).to be <= 2, "Results are greater than 2 for #{provider}"
+    expect(results).to be_instance_of(Array)
+    expect(results).not_to be_empty
+    expect(results.length).to be <= 2
 
-    book = results.first
+    book, cover_url = *results
 
-    expect(book).to be_instance_of(Alexandria::Book),
-                    "Result is not a Book for #{provider}"
+    expect(book).to be_instance_of(Alexandria::Book)
 
     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}"
-
-    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}"
-      end
-    end
-  else
-    expect(results.first.first)
-      .to be_instance_of(Alexandria::Book), "Result item is not a Book for #{provider}"
+    expect(canonical_query).to eq(canonical_result)
+
+    expect(cover_url).to be_instance_of(String) if cover_url
+
+    true
+  end
+end
+
+RSpec::Matchers.define :be_an_existing_file do
+  match do |filename|
+    File.exist? filename
   end
-  results
 end
 
 Alexandria::UI::Icons.init

data/util/rake/fileinstall.rb

@@ -171,14 +171,14 @@ class FileInstallTask < Rake::TaskLib
   def calculate_ruby_dir
     ruby_prefix = RbConfig::CONFIG["prefix"]
 
-    ruby_libdir = if @install_to_rubylibdir
-                    RbConfig::CONFIG["rubylibdir"]
-                  else
-                    RbConfig::CONFIG["sitelibdir"]
-                  end
-    ruby_libdir = ENV["RUBYLIBDIR"] if ENV.key?("RUBYLIBDIR")
-
-    @prefix = ENV["PREFIX"] || ruby_prefix
+    ruby_libdir = ENV.fetch("RUBYLIBDIR", nil)
+    ruby_libdir ||= if @install_to_rubylibdir
+                      RbConfig::CONFIG["rubylibdir"]
+                    else
+                      RbConfig::CONFIG["sitelibdir"]
+                    end
+
+    @prefix = ENV.fetch("PREFIX", ruby_prefix)
     if @prefix == ruby_prefix
       @rubylib = ruby_libdir
     elsif ruby_libdir.index(ruby_prefix).zero?

data/util/rake/gettextgenerate.rb

@@ -54,7 +54,7 @@ class GettextGenerateTask < Rake::TaskLib
     # create MO files
     rule(/\.mo$/ => [->(dest) { source_file(dest) }]) do |t|
       dest_dir = File.dirname(t.name)
-      FileUtils.makedirs(dest_dir) unless FileTest.exists?(dest_dir)
+      FileUtils.makedirs(dest_dir)
       puts "Generating #{t.name}"
       result = system("msgfmt #{t.source} -o #{t.name}")
       raise "msgfmt failed for #{t.source}" unless result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.7.10
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -28,7 +28,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-04 00:00:00.000000000 Z
+date: 2022-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -50,28 +50,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -119,7 +119,7 @@ dependencies:
         version: '1.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -174,14 +174,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -216,14 +216,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.32'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '1.32'
 - !ruby/object:Gem::Dependency
   name: rubocop-i18n
   requirement: !ruby/object:Gem::Requirement
@@ -338,7 +338,6 @@ files:
 - lib/alexandria/book_providers/bl_provider.rb
 - lib/alexandria/book_providers/douban.rb
 - lib/alexandria/book_providers/loc_provider.rb
-- lib/alexandria/book_providers/pseudomarc.rb
 - lib/alexandria/book_providers/sbn_provider.rb
 - lib/alexandria/book_providers/thalia_provider.rb
 - lib/alexandria/book_providers/web.rb
@@ -361,6 +360,7 @@ files:
 - lib/alexandria/models/library.rb
 - lib/alexandria/net.rb
 - lib/alexandria/preferences.rb
+- lib/alexandria/pseudo_marc_parser.rb
 - lib/alexandria/scanners.rb
 - lib/alexandria/scanners/cue_cat.rb
 - lib/alexandria/scanners/keyboard.rb
@@ -577,6 +577,7 @@ files:
 - spec/alexandria/library_spec.rb
 - spec/alexandria/library_store_spec.rb
 - spec/alexandria/preferences_spec.rb
+- spec/alexandria/pseudo_marc_parser_spec.rb
 - spec/alexandria/scanners/cue_cat_spec.rb
 - spec/alexandria/smart_library_spec.rb
 - spec/alexandria/ui/about_dialog_spec.rb
@@ -652,7 +653,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: GNOME application for managing collections of books