alexandria-book-collection-manager 0.7.8 → 0.7.10

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) {}
+    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,13 +10,13 @@ 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
     it "works" do
       ui = described_class.new main_app
-      libraries = ui.instance_variable_get("@libraries")
+      libraries = ui.instance_variable_get(:@libraries)
       libraries_count = libraries.all_libraries.count
       ui.on_new
       expect(libraries.all_libraries.count).to eq libraries_count + 1
@@ -26,7 +26,7 @@ describe Alexandria::UI::UIManager do
   describe "#on_books_selection_changed" do
     let(:lib_version) { File.join(LIBDIR, "0.6.2") }
     let(:ui) { described_class.new main_app }
-    let(:libraries) { ui.instance_variable_get("@libraries") }
+    let(:libraries) { ui.instance_variable_get(:@libraries) }
     let(:regular_library) { libraries.all_regular_libraries.last }
 
     before do
@@ -41,12 +41,90 @@ 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
+
+  describe "#select_a_book" do
+    let(:ui) { described_class.new main_app }
+    let(:libraries) { ui.instance_variable_get(:@libraries) }
+    let(:filter_entry) { ui.instance_variable_get(:@filter_entry) }
+    let(:regular_library) { libraries.all_regular_libraries.last }
+
+    before do
+      lib_version = File.join(LIBDIR, "0.6.2")
+      FileUtils.cp_r(lib_version, TESTDIR)
+
+      ui.select_a_library regular_library
+      # Make books appear in the view
+      regular_library.each { |book| ui.append_book book }
+    end
+
+    context "when selecting in the icon view" do
+      before do
+        # Make view model re-appear
+        ui.iconview.unfreeze
+      end
+
+      it "selects book if it is in view" do
+        ui.select_a_book regular_library.first
+
+        selected = ui.iconview.selected_items
+        expect(selected.count).to eq 1
+      end
+
+      it "selects nothing if book is not in view due to a filter" do
+        filter_entry.text = regular_library.last.title
+        ui.filtered_model.refilter
+
+        ui.select_a_book regular_library.first
+
+        selected = ui.iconview.selected_items
+        expect(selected.count).to eq 0
+      end
+    end
+
+    context "when selecting in the list view" do
+      before do
+        # Make view model re-appear
+        ui.listview.unfreeze
+      end
+
+      it "selects book if it is in view" do
+        ui.select_a_book regular_library.first
+
+        selected, _model = ui.listview.selection.selected_rows
+        expect(selected.count).to eq 1
+      end
+
+      it "selects nothing if book is not in view due to a filter" do
+        filter_entry.text = regular_library.last.title
+        ui.filtered_model.refilter
+
+        ui.select_a_book regular_library.first
+
+        selected = ui.listview.selection.to_a
+        expect(selected).to be_empty
+      end
+
+      it "selects nothing if a new book is not in view due to a filter" do
+        filter_entry.text = regular_library.last.title
+        ui.filtered_model.refilter
+
+        book = an_artist_of_the_floating_world
+        ui.append_book book
+        ui.select_a_book book
+
+        selected = ui.listview.selection.to_a
+        expect(selected).to be_empty
+      end
     end
   end
 end

data/spec/data/libraries/0.6.2/My Library/9780571147168.yaml

@@ -18,3 +18,5 @@ tags: []
 title: An Artist of the Floating World
 version: 0.6.2b1
 want: true
+library: !ruby/array:Alexandria:Library
+  internal: []

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,18 +171,18 @@ 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?
-      libpart = ruby_libdir[ruby_prefix.size..-1]
+      libpart = ruby_libdir[ruby_prefix.size..]
       @rubylib = File.join(@prefix, libpart)
     else
       @rubylib = ruby_libdir
@@ -193,9 +193,9 @@ class FileInstallTask < Rake::TaskLib
     pathglob += "/" if pathglob.end_with?("**")
     real_parts = pathglob.split("**/")
     real_parts.each do |part|
-      part.gsub!(".", '\\.')
-      part.gsub!("*", '[^\\/]*')
-      part.gsub!("?", '[^\\/]')
+      part.gsub!(".", "\\.")
+      part.gsub!("*", "[^\\/]*")
+      part.gsub!("?", "[^\\/]")
     end
     pattern = real_parts.join("([^\/]+\/)*")
     /(#{pattern})/

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

data/util/rake/omfgenerate.rb

@@ -67,7 +67,7 @@ class OmfGenerateTask < Rake::TaskLib
     rule ".omf" => [".omf.in"] do |t|
       path = File.join(@gnome_helpfiles_dir, @projectname,
                        locale_for(t.name), "#{@projectname}.xml")
-      data = IO.read(t.source)
+      data = File.read(t.source)
       data.sub!(/PATH_TO_DOC_FILE/, path)
       puts "Generating #{t.name}..."
       File.open(t.name, "w") { |io| io.puts data }