RubyGems - alexandria-book-collection-manager - Versions diffs - 0.7.5 → 0.7.9 - Mend

alexandria-book-collection-manager 0.7.5 → 0.7.9

Files changed (173) hide show

checksums.yaml +4 -4
data/.github/dependabot.yml +9 -0
data/.github/workflows/ruby.yml +72 -0
data/.gitignore +4 -1
data/.rubocop.yml +65 -30
data/.rubocop_todo.yml +49 -165
data/.simplecov +5 -2
data/CHANGELOG.md +64 -0
data/ChangeLog.0 +19 -19
data/INSTALL.md +26 -16
data/README.md +31 -35
data/Rakefile +18 -16
data/alexandria-book-collection-manager.gemspec +35 -29
data/doc/FAQ +2 -2
data/doc/dependency_decisions.yml +22 -3
data/lib/alexandria/about.rb +1 -1
data/lib/alexandria/book_providers/bl_provider.rb +88 -0
data/lib/alexandria/book_providers/douban.rb +2 -2
data/lib/alexandria/book_providers/loc_provider.rb +38 -0
data/lib/alexandria/book_providers/pseudomarc.rb +61 -71
data/lib/alexandria/book_providers/sbn_provider.rb +108 -0
data/lib/alexandria/book_providers/{thalia.rb → thalia_provider.rb} +37 -74
data/lib/alexandria/book_providers/web.rb +2 -2
data/lib/alexandria/book_providers/worldcat.rb +34 -38
data/lib/alexandria/book_providers/z3950_provider.rb +199 -0
data/lib/alexandria/book_providers.rb +48 -65
data/lib/alexandria/default_preferences.rb +2 -1
data/lib/alexandria/execution_queue.rb +13 -12
data/lib/alexandria/export_library.rb +21 -22
data/lib/alexandria/image_fetcher.rb +25 -0
data/lib/alexandria/import_library.rb +46 -70
data/lib/alexandria/import_library_csv.rb +16 -16
data/lib/alexandria/library_sort_order.rb +3 -1
data/lib/alexandria/library_store.rb +19 -20
data/lib/alexandria/logging.rb +5 -9
data/lib/alexandria/models/book.rb +15 -2
data/lib/alexandria/models/library.rb +31 -35
data/lib/alexandria/net.rb +1 -2
data/lib/alexandria/preferences.rb +27 -33
data/lib/alexandria/scanners/cue_cat.rb +6 -6
data/lib/alexandria/scanners/keyboard.rb +1 -1
data/lib/alexandria/scanners.rb +2 -2
data/lib/alexandria/smart_library.rb +22 -26
data/lib/alexandria/ui/about_dialog.rb +1 -1
data/lib/alexandria/ui/acquire_dialog.rb +15 -19
data/lib/alexandria/ui/alert_dialog.rb +36 -19
data/lib/alexandria/ui/bad_isbns_dialog.rb +13 -9
data/lib/alexandria/ui/barcode_animation.rb +6 -6
data/lib/alexandria/ui/book_properties_dialog.rb +2 -3
data/lib/alexandria/ui/book_properties_dialog_base.rb +35 -137
data/lib/alexandria/ui/calendar_popup.rb +58 -0
data/lib/alexandria/ui/callbacks.rb +144 -123
data/lib/alexandria/ui/completion_models.rb +2 -6
data/lib/alexandria/ui/confirm_erase_dialog.rb +1 -1
data/lib/alexandria/ui/conflict_while_copying_dialog.rb +2 -2
data/lib/alexandria/ui/error_dialog.rb +1 -1
data/lib/alexandria/ui/export_dialog.rb +19 -18
data/lib/alexandria/ui/icons.rb +34 -40
data/lib/alexandria/ui/iconview_tooltips.rb +40 -53
data/lib/alexandria/ui/import_dialog.rb +49 -48
data/lib/alexandria/ui/init.rb +14 -12
data/lib/alexandria/ui/keep_bad_isbn_dialog.rb +2 -2
data/lib/alexandria/ui/libraries_combo.rb +10 -9
data/lib/alexandria/ui/listview.rb +6 -7
data/lib/alexandria/ui/main_app.rb +2 -2
data/lib/alexandria/ui/multi_drag_treeview.rb +5 -7
data/lib/alexandria/ui/new_book_dialog.rb +63 -65
data/lib/alexandria/ui/new_book_dialog_manual.rb +1 -1
data/lib/alexandria/ui/new_provider_dialog.rb +12 -11
data/lib/alexandria/ui/new_smart_library_dialog.rb +39 -27
data/lib/alexandria/ui/preferences_dialog.rb +25 -84
data/lib/alexandria/ui/provider_preferences_base_dialog.rb +10 -6
data/lib/alexandria/ui/provider_preferences_dialog.rb +5 -5
data/lib/alexandria/ui/really_delete_dialog.rb +2 -2
data/lib/alexandria/ui/sidepane_manager.rb +38 -38
data/lib/alexandria/ui/skip_entry_dialog.rb +3 -2
data/lib/alexandria/ui/smart_library_properties_dialog.rb +35 -36
data/lib/alexandria/ui/smart_library_properties_dialog_base.rb +61 -244
data/lib/alexandria/ui/smart_library_rule_box.rb +119 -0
data/lib/alexandria/ui/sound.rb +4 -6
data/lib/alexandria/ui/ui_manager.rb +80 -83
data/lib/alexandria/ui.rb +7 -7
data/lib/alexandria/version.rb +2 -2
data/lib/alexandria/web_themes.rb +15 -15
data/lib/alexandria.rb +2 -2
data/po/cs.po +947 -865
data/po/cy.po +913 -864
data/po/de.po +961 -865
data/po/el.po +956 -861
data/po/es.po +952 -857
data/po/fr.po +950 -865
data/po/ga.po +866 -819
data/po/gl.po +946 -861
data/po/it.po +945 -858
data/po/ja.po +921 -836
data/po/mk.po +953 -858
data/po/nb.po +932 -847
data/po/nl.po +955 -849
data/po/pl.po +999 -963
data/po/pt.po +946 -850
data/po/pt_BR.po +944 -859
data/po/ru.po +959 -868
data/po/sk.po +950 -863
data/po/sv.po +944 -859
data/po/uk.po +925 -846
data/po/zh_TW.po +926 -841
data/schemas/alexandria.schemas +1 -1
data/share/alexandria/glade/main_app__builder.glade +6 -21
data/share/gnome/help/alexandria/C/adding-books.xml +3 -4
data/share/gnome/help/alexandria/C/introduction.xml +0 -16
data/share/gnome/help/alexandria/C/searching.xml +1 -4
data/share/gnome/help/alexandria/C/settings.xml +0 -30
data/share/gnome/help/alexandria/C/smart-libraries.xml +2 -2
data/share/gnome/help/alexandria/C/working-with-libraries.xml +1 -1
data/share/gnome/help/alexandria/fr/alexandria.xml +5 -160
data/share/gnome/help/alexandria/ja/adding-books.xml +1 -1
data/share/gnome/help/alexandria/ja/introduction.xml +0 -15
data/share/gnome/help/alexandria/ja/searching.xml +3 -7
data/share/gnome/help/alexandria/ja/settings.xml +0 -27
data/share/gnome/help/alexandria/ja/smart-libraries.xml +1 -1
data/spec/alexandria/book_providers/bl_provider_spec.rb +13 -0
data/spec/alexandria/book_providers/loc_provider_spec.rb +17 -0
data/spec/alexandria/book_providers/sbn_provider_spec.rb +13 -0
data/spec/alexandria/book_providers/thalia_provider_spec.rb +119 -0
data/spec/alexandria/book_providers/world_cat_provider_spec.rb +160 -0
data/spec/alexandria/book_providers_spec.rb +0 -154
data/spec/alexandria/console_spec.rb +0 -5
data/spec/alexandria/export_library_spec.rb +27 -38
data/spec/alexandria/library_spec.rb +76 -46
data/spec/alexandria/preferences_spec.rb +29 -3
data/spec/alexandria/scanners/cue_cat_spec.rb +1 -1
data/spec/alexandria/ui/about_dialog_spec.rb +1 -1
data/spec/alexandria/ui/acquire_dialog_spec.rb +1 -1
data/spec/alexandria/ui/alert_dialog_spec.rb +1 -1
data/spec/alexandria/ui/bad_isbns_dialog_spec.rb +1 -1
data/spec/alexandria/ui/book_properties_dialog_spec.rb +47 -5
data/spec/alexandria/ui/confirm_erase_dialog_spec.rb +1 -1
data/spec/alexandria/ui/conflict_while_copying_dialog_spec.rb +1 -1
data/spec/alexandria/ui/error_dialog_spec.rb +1 -1
data/spec/alexandria/ui/export_dialog_spec.rb +25 -4
data/spec/alexandria/ui/icons_spec.rb +26 -0
data/spec/alexandria/ui/iconview_spec.rb +1 -1
data/spec/alexandria/ui/import_dialog_spec.rb +35 -3
data/spec/alexandria/ui/keep_bad_isbn_dialog_spec.rb +1 -1
data/spec/alexandria/ui/main_app_spec.rb +1 -1
data/spec/alexandria/ui/new_book_dialog_manual_spec.rb +39 -3
data/spec/alexandria/ui/new_provider_dialog_spec.rb +19 -3
data/spec/alexandria/ui/new_smart_library_dialog_spec.rb +28 -3
data/spec/alexandria/ui/preferences_dialog_spec.rb +2 -2
data/spec/alexandria/ui/provider_preferences_dialog_spec.rb +23 -8
data/spec/alexandria/ui/really_delete_dialog_spec.rb +1 -1
data/spec/alexandria/ui/sidepane_manager_spec.rb +2 -2
data/spec/alexandria/ui/skip_entry_dialog_spec.rb +1 -1
data/spec/alexandria/ui/smart_library_properties_dialog_spec.rb +37 -6
data/spec/alexandria/ui/ui_manager_spec.rb +116 -2
data/spec/data/libraries/0.6.2/My Library/9780571147168.yaml +2 -0
data/spec/end_to_end/basic_run_spec.rb +3 -8
data/spec/fixtures/cover.jpg +0 -0
data/spec/spec_helper.rb +47 -3
data/tasks/spec.rake +3 -5
data/util/rake/fileinstall.rb +16 -15
data/util/rake/omfgenerate.rb +1 -1
metadata +141 -52
data/.travis.yml +0 -39
data/lib/alexandria/book_providers/adlibris.rb +0 -196
data/lib/alexandria/book_providers/amazon_aws.rb +0 -252
data/lib/alexandria/book_providers/amazon_ecs_util.rb +0 -388
data/lib/alexandria/book_providers/barnes_and_noble.rb +0 -209
data/lib/alexandria/book_providers/proxis.rb +0 -175
data/lib/alexandria/book_providers/siciliano.rb +0 -257
data/lib/alexandria/book_providers/z3950.rb +0 -415
data/spec/alexandria/ui/ui_utilities_spec.rb +0 -62
data/spec/alexandria/utilities_spec.rb +0 -52

data/spec/alexandria/book_providers/thalia_provider_spec.rb ADDED Viewed

@@ -0,0 +1,119 @@
+# frozen_string_literal: true
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+require "spec_helper"
+RSpec.describe Alexandria::BookProviders::ThaliaProvider do
+  let(:normal_people_main) do
+    +<<~HTML
+      <!DOCTYPE html>
+      <html lang="de" data-environment="prod">
+        <head>
+          <title>Artikel von 0571334652 ansehen | Thalia</title>
+        </head>
+        <body data-mandant="2" data-version="20201112100740_528b0df" data-environment="prod">
+          <main class="suche-grid--main nur-suchergebnis">
+            <section class="suchergebnis">
+              <ul class="suchergebnis-liste no-bullets">
+                <li class="suchergebnis" data-seite="1"
+                                         data-ean="9780571334650"
+                                         data-id="134292338"
+                                         data-preis="9.49"
+                                         data-preis-reduziert="false"
+                                         data-alterpreis="">
+                  <a href="/shop/home/artikeldetails/ID134292338.html" class="layered-link">Normal People von Sally Rooney</a>
+                  <ul class="weitere-formate no-bullets" impression="product-variant">
+                    <li class="format aktiv">
+                      <a href="/shop/home/artikeldetails/ID134292338.html">Buch (Taschenbuch)</a>
+                    </li>
+                    <li class="format">
+                      <a href="/shop/home/artikeldetails/ID95227195.html">Weitere: Buch (Taschenbuch)</a>
+                    </li>
+                  </ul>
+                </li>
+              </ul>
+            </section>
+          </main>
+        </body>
+      </html>
+    HTML
+  end
+  let(:normal_people_details) do
+    +<<~HTML
+      <!DOCTYPE html>
+      <html class="no-js" id="ID-2" lang="de">
+        <head>
+          <title>Normal People von Sally Rooney - Taschenbuch - 978-0-571-33465-0 | Thalia</title>
+        </head>
+        <body>
+          <section class="artikel-medien imagesPreview">
+            <img src="https://assets.thalia.media/img/artikel/ae9934c90f2c7d595146807ea6253c99532043ec-00-00.jpeg" class='largeImg'>
+          </section>
+          <section class="artikel-infos" id="sbe-product-details"
+                                         data-shopid="2"
+                                         data-id="A1051452169"
+                                         data-id-alt="134292338"
+                                         data-titel="Normal People"
+                                         data-verfuegbarkeit="Sofort lieferbar"
+                                         data-preis-netto="9.02"
+                                         data-preis-brutto="9.49"
+                                         data-ean="9780571334650"
+                                         data-reduziert="false"
+                                         data-waehrung="EUR"
+                                         data-preis-liste="9.49"
+                                         data-hersteller="Faber &amp; Faber"
+                                         data-form="Taschenbuch"
+                                         data-verkaufsrang="5"
+                                         data-anzahlbewertungen="19"
+                                         data-durchschnittsbewertung="4.5"
+                                         data-preisbindung="false"
+                                         data-mandant="2"
+                                         data-environment="prod"
+                                         component="artikeldetails-produktdetails">
+            <h1 class="ncTitle">
+              Normal People
+            </h1>
+            <p class="aim-author">
+            <a href="https://www.thalia.de/shop/home/mehr-von-suche/ANY/sp/suche.html?mehrVon=Sally%20Rooney" interaction="autor-klick">Sally Rooney</a>
+            </p>
+          </section>
+          <section class="artikeldetails">
+            <table>
+              <tr> <th> Einband </th> <td> Taschenbuch </td> </tr>
+              <tr> <th> Erscheinungsdatum </th> <td> 02.05.2019 </td> </tr>
+              <tr> <th> ISBN </th> <td> 978-0-571-33465-0 </td> </tr>
+            </table>
+            <table>
+              <tr>
+                <th> Verlag </th>
+                <td>
+                  <a href="https://www.thalia.de/shop/home/mehr-von-suche/ANY/sv/suche.html?mehrVon=Faber%20%26%20Faber" interaction="auswahl">
+                    Faber &amp; Faber
+                  </a>
+                </td>
+              </tr>
+            </table>
+          </section>
+        </body>
+      </html>
+    HTML
+  end
+  it "works when searching by ISBN" do
+    stub_request(:get,
+                 "https://www.thalia.de/shop/bde_bu_hg_startseite/suche/?sq=0571334652")
+      .to_return(status: 200, body: normal_people_main, headers: {})
+    stub_request(:get, "https://www.thalia.de/shop/home/artikeldetails/ID134292338.html")
+      .to_return(status: 200, body: normal_people_details, headers: {})
+    assert_correct_search_result(described_class, "9780571334650")
+  end
+end

data/spec/alexandria/book_providers/world_cat_provider_spec.rb ADDED Viewed

@@ -0,0 +1,160 @@
+# frozen_string_literal: true
+# This file is part of Alexandria.
+#
+# See the file README.md for authorship and licensing information.
+require "spec_helper"
+RSpec.describe Alexandria::BookProviders::WorldCatProvider do
+  let(:sky_catalog_main) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <table class="table-results">
+            <tr class="menuElem">
+              <td class="result details">
+                <div class="name">
+                  <a id="result-1" href="/title/sky-catalogue-20000-ed-by-alan-hirshfeld-and-roger-w-sinnott/oclc/476534140&referer=brief_results"><strong>Sky catalogue 2000.0 ed. by Alan Hirshfeld and Roger W. Sinnott</strong></a>
+                </div>
+                <div class="type">
+                  <img class='icn' src='https://static1.worldcat.org/wcpa/rel20201014/images/icon-bks.gif' alt=' ' height='16' width='16' />&nbsp;<span class='itemType'>Print book</span>
+                </div>
+              </td>
+            </tr>
+            <tr class="menuElem">
+              <td class="result details">
+                <div class="name">
+                  <a id="result-2" href="/title/sky-catalogue-20000/oclc/7978015&referer=brief_results"><strong>Sky catalogue 2000.0</strong></a>
+                </div>
+                <div class="type">
+                  <img class='icn' src='https://static1.worldcat.org/wcpa/rel20201014/images/icon-bks.gif' alt=' ' height='16' width='16' />&nbsp;<span class='itemType'>Print book</span>
+                </div>
+              </td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+  let(:sky_catalog_details) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <div id="bibdata">
+            <h1 class="title">Sky catalogue 2000.0 ed. by Alan Hirshfeld and Roger W. Sinnott</h1>
+            <table border="0" cellspacing="0" cellpadding="0">
+              <tr id="bib-author-row">
+                <th>Author:</th>
+                <td id="bib-author-cell">
+                  <a href='/search?q=au%3AHirshfeld+Alan&amp;qt=hot_author' title='Search for more by this author'>Hirshfeld Alan</a>;
+                  <a href='/search?q=au%3ASinnott+Roger+W.&amp;qt=hot_author' title='Search for more by this author'>Sinnott Roger W.</a>;
+                  <a href='/search?q=au%3ACambridge+Cambridge+University+Press+1982-&amp;qt=hot_author' title='Search for more by this author'>Cambridge Cambridge University Press 1982-</a>
+                </td>
+              </tr>
+              <tr id="bib-publisher-row">
+                <th>Publisher:</th>
+                <td id="bib-publisher-cell">1982</td>
+              </tr>
+            </table>
+          </div>
+          <table border="0" cellspacing="0">
+            <tr id="details-allauthors">
+              <th>All Authors / Contributors:</th>
+              <td>
+                <a href='/search?q=au%3AHirshfeld+Alan&amp;qt=hot_author' title='Search for more by this author'>Hirshfeld Alan</a>;
+                <a href='/search?q=au%3ASinnott+Roger+W.&amp;qt=hot_author' title='Search for more by this author'>Sinnott Roger W.</a>;
+                <a href='/search?q=au%3ACambridge+Cambridge+University+Press+1982-&amp;qt=hot_author' title='Search for more by this author'>Cambridge Cambridge University Press 1982-</a>
+              </td>
+            </tr>
+            <tr id="details-standardno">
+              <th>ISBN:</th>
+              <td>0521247101 9780521247108 0521289130 9780521289139 0521258189 9780521258180</td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+  let(:florence_ru_details) do
+    <<~XHTML
+      <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+      <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
+        <head></head>
+        <body id="worldcat">
+          <div id="bibdata">
+            <h1 class="title">
+              <div class="vernacular" lang="ru">Флоренс Аравийская : роман /</div>
+              Florens Araviĭskai︠a︡ : roman
+            </h1>
+            <table border="0" cellspacing="0" cellpadding="0">
+              <tr id="bib-author-row">
+                <th>Author:</th>
+                <td id="bib-author-cell">
+                  <span class="vernacular" lang="ru">Кристофер Бакли ; перевод с английского Андрея Геласимова.</span>
+                  <span class="vernacular" lang="ru">Геласимов, Андрей.</span> ;
+                  <a href="/search?q=au%3ABuckley%2C+Christopher%2C&amp;qt=hot_author" title="Search for more by this author">Christopher Buckley</a>;
+                  <a href="/search?q=au%3AGelasimov%2C+Andrei%CC%86.&amp;qt=hot_author" title="Search for more by this author">Andreĭ Gelasimov</a>
+                </td>
+              </tr>
+              <tr id="bib-publisher-row">
+                <th>Publisher:</th>
+                <td id="bib-publisher-cell"><span class="vernacular" lang="ru">Иностранка,</span>
+                  Moskva : Inostranka, 2006.
+                </td>
+              </tr>
+            </table>
+          </div>
+          <table border="0" cellspacing="0">
+            <tr id="details-allauthors">
+              <th>All Authors / Contributors:</th>
+              <td>
+                <span class="vernacular" lang="ru">Кристофер Бакли ; перевод с английского Андрея Геласимова.</span>
+                <span class="vernacular" lang="ru">Геласимов, Андрей.</span> ;
+                <a href="/search?q=au%3ABuckley%2C+Christopher%2C&amp;qt=hot_author" title="Search for more by this author">Christopher Buckley</a>;
+                <a href="/search?q=au%3AGelasimov%2C+Andrei%CC%86.&amp;qt=hot_author" title="Search for more by this author">Andreĭ Gelasimov</a>
+              </td>
+            </tr>
+            <tr id="details-standardno">
+              <th>ISBN:</th>
+              <td>5941454139 9785941454136</td>
+            </tr>
+          </table>
+        </body>
+      </html>
+    XHTML
+  end
+  it "works for an isbn with multiple results" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9780521247108&qt=advanced")
+      .to_return(status: 200, body: +sky_catalog_main, headers: {})
+    stub_request(:get,
+                 "https://www.worldcat.org/title/" \
+                 "sky-catalogue-20000-ed-by-alan-hirshfeld-and-roger-w-sinnott" \
+                 "/oclc/476534140&referer=brief_results")
+      .to_return(status: 200, body: +sky_catalog_details, headers: {})
+    assert_correct_search_result(described_class, "9780521247108")
+  end
+  it "works with vernacular" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9785941454136&qt=advanced")
+      .to_return(status: 200, body: +florence_ru_details, headers: {})
+    assert_correct_search_result(described_class, "9785941454136")
+  end
+  it "works with multiple authors" do
+    stub_request(:get, "https://www.worldcat.org/search?q=isbn:9785941454136&qt=advanced")
+      .to_return(status: 200, body: +florence_ru_details, headers: {})
+    results = assert_correct_search_result(described_class,
+                                           "9785941454136")
+    this_book = results.first
+    expect(this_book.authors).to be_instance_of(Array), "Not an array!"
+    expect(this_book.authors.length).to eq(2), "Wrong number of authors for this book!"
+  end
+end

data/spec/alexandria/book_providers_spec.rb CHANGED Viewed

@@ -8,158 +8,4 @@ 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)
-    begin
-      results = provider.instance.search(query, search_type)
-    rescue SocketError
-      skip "Service is offline"
-    end
-    puts results.inspect if $DEBUG
-    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}"
-    if search_type == Alexandria::BookProviders::SEARCH_BY_ISBN
-      expect(results.length).to be <= 2, "Results are greater than 2 for #{provider}"
-      book = results.first
-      expect(book).to be_instance_of(Alexandria::Book),
-                      "Result is not a Book for #{provider}"
-      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}"
-    end
-    results
-  end
-  it "does not piss off Rich Burridge" do
-    skip "Amazon requires an API key. Remove it altogether as a provider?"
-    assert_correct_search_result(Alexandria::BookProviders::AmazonProvider,
-                                 "033025068X")
-  end
-  it "amazon should work" do
-    skip "Amazon requires an API key. Remove it altogether as a provider?"
-    assert_correct_search_result(Alexandria::BookProviders::AmazonProvider,
-                                 "9780385504201")
-  end
-  it "amazon title should work" do
-    skip "Amazon requires an API key. Remove it altogether as a provider?"
-    assert_correct_search_result(Alexandria::BookProviders::AmazonProvider,
-                                 "A Confederacy of Dunces",
-                                 Alexandria::BookProviders::SEARCH_BY_TITLE)
-  end
-  it "amazon authors should work" do
-    skip "Amazon requires an API key. Remove it altogether as a provider?"
-    assert_correct_search_result(Alexandria::BookProviders::AmazonProvider,
-                                 "John Kennedy Toole",
-                                 Alexandria::BookProviders::SEARCH_BY_AUTHORS)
-  end
-  it "amazon keyword should work" do
-    skip "Amazon requires an API key. Remove it altogether as a provider?"
-    assert_correct_search_result(Alexandria::BookProviders::AmazonProvider,
-                                 "Confederacy Dunces",
-                                 Alexandria::BookProviders::SEARCH_BY_KEYWORD)
-  end
-  it "LOC should work" do
-    assert_correct_search_result(Alexandria::BookProviders::LOCProvider,
-                                 "9780805335583")
-    # this book has non-ASCII letters
-    assert_correct_search_result(Alexandria::BookProviders::LOCProvider,
-                                 "9782070379248")
-  end
-  it "BL should work" do
-    skip "Not working: connect failed"
-    assert_correct_search_result(Alexandria::BookProviders::BLProvider,
-                                 "9781853260803")
-  end
-  it "SBN should work" do
-    assert_correct_search_result(Alexandria::BookProviders::SBNProvider,
-                                 "9788835926436")
-  end
-  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
-  it "Proxis should work" do
-    skip "Needs fixing"
-    assert_correct_search_result(Alexandria::BookProviders::ProxisProvider,
-                                 "9789026965746")
-    assert_correct_search_result(Alexandria::BookProviders::ProxisProvider,
-                                 "9780586071403")
-  end
-  it "Thalia should work" do
-    skip "Needs fixing"
-    # german book
-    assert_correct_search_result(Alexandria::BookProviders::ThaliaProvider,
-                                 "9783896673305")
-    # international book
-    assert_correct_search_result(Alexandria::BookProviders::ThaliaProvider,
-                                 "9780440241904")
-    # movie dvd
-    assert_correct_search_result(Alexandria::BookProviders::ThaliaProvider,
-                                 "4010232037824")
-    # music cd
-    assert_correct_search_result(Alexandria::BookProviders::ThaliaProvider,
-                                 "0094638203520")
-  end
-  it "AdLibris should work" do
-    skip "Needs fixing: site has changed"
-    assert_correct_search_result(Alexandria::BookProviders::AdLibrisProvider,
-                                 "9789100109332")
-  end
-  it "Siciliano should work" do
-    skip "Needs fixing: no results found"
-    assert_correct_search_result(Alexandria::BookProviders::SicilianoProvider,
-                                 "9788599170380")
-  end
-  it "Worldcat should work" do
-    assert_correct_search_result(Alexandria::BookProviders::WorldCatProvider,
-                                 "9780521247108")
-    # this one is with <div class=vernacular lang="[^"]+">)
-    assert_correct_search_result(Alexandria::BookProviders::WorldCatProvider,
-                                 "9785941454136")
-  end
-  it "Worldcat should work with multiple authors" do
-    results = assert_correct_search_result(Alexandria::BookProviders::WorldCatProvider,
-                                           "9785941454136")
-    this_book = results.first
-    expect(this_book.authors).to be_instance_of(Array), "Not an array!"
-    # puts this_book.authors
-    expect(this_book.authors.length).to eq(2), "Wrong number of authors for this book!"
-  end
 end

data/spec/alexandria/console_spec.rb CHANGED Viewed

@@ -10,14 +10,9 @@ RSpec.describe Alexandria do
   let(:lib_version) { File.join(LIBDIR, "0.6.2") }
   before do
-    FileUtils.rm_rf(TESTDIR)
     FileUtils.cp_r(lib_version, TESTDIR)
   end
-  after do
-    FileUtils.rm_rf(TESTDIR)
-  end
   describe ".list_books_on_console" do
     it "returns a string containing a list of all books" do
       expect(described_class.list_books_on_console).to eq <<~LIST

data/spec/alexandria/export_library_spec.rb CHANGED Viewed

@@ -7,24 +7,23 @@
 require "spec_helper"
 RSpec.describe Alexandria::ExportLibrary do
-  let(:lib_version) { File.join(LIBDIR, "0.6.2") }
-  let(:loader) { Alexandria::LibraryStore.new(TESTDIR) }
+  let(:my_library) do
+    loader = Alexandria::LibraryStore.new(TESTDIR)
+    loader.load_library("My Library")
+  end
   let(:format) { Alexandria::ExportFormat.all.find { |it| it.message == message } }
-  let(:outfile_base) { format.ext ? "my-library.#{format.ext}" : "my-library" }
-  let(:outfile) { File.join(Dir.tmpdir, outfile_base) }
+  let(:outfile) do
+    outfile_base = format.ext ? "my-library.#{format.ext}" : "my-library"
+    File.join(Dir.tmpdir, outfile_base)
+  end
   let(:unsorted) { Alexandria::LibrarySortOrder::Unsorted.new }
   before do
-    FileUtils.cp_r(lib_version, TESTDIR)
-    @my_library = loader.load_library("My Library")
-    expect(@my_library.size).to eq 5
+    test_library = File.join(LIBDIR, "0.6.2")
+    FileUtils.cp_r(test_library, TESTDIR)
   end
   after do
-    FileUtils.rm_rf(TESTDIR)
     FileUtils.rm_rf(outfile) if File.exist? outfile
   end
@@ -32,44 +31,33 @@ RSpec.describe Alexandria::ExportLibrary do
     let(:message) { :export_as_csv_list }
     def load_rows_from_csv
-      CSV.read(outfile, col_sep: ";")
+      CSV.read(outfile, col_sep: ";", headers: true)
     end
     it "can sort by title" do
       sort_by_title = Alexandria::LibrarySortOrder.new(:title)
-      format.invoke(@my_library, sort_by_title, outfile)
-      expect(File.exist?(outfile)).to be_truthy
+      format.invoke(my_library, sort_by_title, outfile)
       rows = load_rows_from_csv
-      rows.shift
-      expect(rows.size).to eq(@my_library.size)
-      title_index = 0
-      comparisons = rows.size - 1
-      comparisons.times do |index|
-        expect(rows[index][title_index]).to be <= rows[index + 1][title_index]
-      end
+      titles = rows.map { |it| it["Title"] }
+      expect(titles).to eq titles.sort
     end
     it "can sort in descending order" do
       sort_by_date_desc = Alexandria::LibrarySortOrder.new(:publishing_year, false)
-      format.invoke(@my_library, sort_by_date_desc, outfile)
-      expect(File.exist?(outfile)).to be_truthy
+      format.invoke(my_library, sort_by_date_desc, outfile)
       rows = load_rows_from_csv
-      rows.shift
-      expect(rows.size).to eq(@my_library.size)
-      date_index = 5
-      comparisons = rows.size - 1
-      comparisons.times do |index|
-        expect(rows[index][date_index]).to be >= rows[index + 1][date_index]
-      end
+      dates = rows.map { |it| it["Year Published"] }
+      expect(dates).to eq dates.sort.reverse
     end
   end
   describe "#export_as_html" do
     let(:message) { :export_as_html }
-    let(:index) { File.join(outfile, "index.html") }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile, Alexandria::WebTheme.all.first)
+      format.invoke(my_library, unsorted, outfile, Alexandria::WebTheme.all.first)
+      index = File.join(outfile, "index.html")
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.exist?(index)).to be_truthy
@@ -82,7 +70,7 @@ RSpec.describe Alexandria::ExportLibrary do
     let(:message) { :export_as_onix_xml_archive }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile)
+      format.invoke(my_library, unsorted, outfile)
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.size(outfile)).to be_nonzero
@@ -94,7 +82,7 @@ RSpec.describe Alexandria::ExportLibrary do
     let(:message) { :export_as_tellico_xml_archive }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile)
+      format.invoke(my_library, unsorted, outfile)
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.size(outfile)).to be_nonzero
@@ -106,7 +94,7 @@ RSpec.describe Alexandria::ExportLibrary do
     let(:message) { :export_as_bibtex }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile)
+      format.invoke(my_library, unsorted, outfile)
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.size(outfile)).to be_nonzero
@@ -118,7 +106,7 @@ RSpec.describe Alexandria::ExportLibrary do
     let(:message) { :export_as_isbn_list }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile)
+      format.invoke(my_library, unsorted, outfile)
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.size(outfile)).to be_nonzero
@@ -128,10 +116,11 @@ RSpec.describe Alexandria::ExportLibrary do
   describe "#export_as_ipod_notes" do
     let(:message) { :export_as_ipod_notes }
-    let(:index) { File.join(outfile, "index.linx") }
     it "can export unsorted" do
-      format.invoke(@my_library, unsorted, outfile, nil)
+      format.invoke(my_library, unsorted, outfile, nil)
+      index = File.join(outfile, "index.linx")
       aggregate_failures do
         expect(File.exist?(outfile)).to be_truthy
         expect(File.size(index)).to be_nonzero