alexandria-book-collection-manager 0.7.5 → 0.7.6

data/share/alexandria/glade/main_app__builder.glade

@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.0 -->
+<!-- Generated with glade 3.22.2 -->
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkWindow" id="main_app">
     <property name="can_focus">False</property>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox1">
         <property name="visible">True</property>
@@ -135,14 +138,7 @@
                   </object>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
-                  </object>
-                  <packing>
-                    <property name="tab_fill">False</property>
-                  </packing>
+                  <placeholder/>
                 </child>
                 <child>
                   <object class="GtkScrolledWindow" id="scrolledwindow4">
@@ -165,15 +161,7 @@
                   </packing>
                 </child>
                 <child type="tab">
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label" translatable="yes">label</property>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
+                  <placeholder/>
                 </child>
               </object>
               <packing>
@@ -228,8 +216,5 @@
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>

data/share/gnome/help/alexandria/C/smart-libraries.xml

@@ -18,7 +18,7 @@
 
   <para>
     Smart Libraries are listed beneath the actual libraries in the
-    application side pane. They do not actually contain books, but
+    application sidepane. They do not actually contain books, but
     rather a set of rules describing which books you wish to see. The
     books from all libraries which satisfy the set of rules will be
     displayed. You cannot directly add books to a Smart Library.
@@ -58,7 +58,7 @@
     <para>
       An example will illustrate the use of Smart Libraries. Let us
       suppose you have a large collections of books by Terry
-      Practchett and you add the tag <quote>discworld</quote> to all
+      Pratchett and you add the tag <quote>discworld</quote> to all
       the books in the Discworld series. Let us create a Smart Library
       for all his non-Discworld books.
     </para>

data/share/gnome/help/alexandria/C/working-with-libraries.xml

@@ -12,7 +12,7 @@
   <para>Books stored in &app; can be grouped into different collections, called libraries. For instance, you may have
   one library for all your novels, and other for your programming manuals. &app; allows you to create, edit, and move books
   between libraries.</para>
-  <para>Available libraries are listed in the <guilabel>Library pane</guilabel> at the left of the main &app; window. If you cannot see the library pane, open it with <menuchoice><guimenu>View</guimenu><guimenuitem>Side Pane</guimenuitem></menuchoice>. You can close it again with the same menu option, or by clicking the <guibutton>Close</guibutton> icon in the top right of the library pane.</para>
+  <para>Available libraries are listed in the <guilabel>Library pane</guilabel> at the left of the main &app; window. If you cannot see the library pane, open it with <menuchoice><guimenu>View</guimenu><guimenuitem>Sidepane</guimenuitem></menuchoice>. You can close it again with the same menu option, or by clicking the <guibutton>Close</guibutton> icon in the top right of the library pane.</para>
   <figure id="library-pane-fig">
     <title>An &app; list of libraries</title>
     <screenshot>

data/share/gnome/help/alexandria/fr/alexandria.xml

@@ -1240,7 +1240,7 @@ Date : 30 décembre 2005
 		open it with 
 		<menuchoice>
 		<guimenu>View</guimenu>
-		<guimenuitem>Side Pane</guimenuitem>
+		<guimenuitem>Sidepane</guimenuitem>
 		</menuchoice>.
 		You can close it again with the same menu option, or by clicking
 		the <guibutton>Close</guibutton> icon in the top right of the 

data/share/gnome/help/alexandria/ja/smart-libraries.xml

@@ -44,7 +44,7 @@
     
 
     <para>
-高機能ライブラリの例を以下に示します。Terry Practchettという作者の本をたくさん持っていて、
+高機能ライブラリの例を以下に示します。Terry Pratchettという作者の本をたくさん持っていて、
 Discworldシリーズの本に<quote>discworld</quote>というタグをつけてあるとします。
 高機能ライブラリで、彼のDiscworldシリーズでない本を探してライブラリ化します。
     </para>

data/spec/alexandria/book_providers/world_cat_provider_spec.rb

@@ -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 Araviĭ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">Andreĭ 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">Andreĭ 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

@@ -9,157 +9,101 @@ 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
+  describe Alexandria::BookProviders::AmazonProvider do
+    before do
+      skip "Amazon requires an API key. Remove it altogether as a provider?"
+    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 "does not piss off Rich Burridge" do
+      assert_correct_search_result(described_class, "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 "works" do
+      assert_correct_search_result(described_class, "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 "works when searching for title" do
+      assert_correct_search_result(described_class, "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 authors should work" do
+      assert_correct_search_result(described_class, "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)
+    it "amazon keyword should work" do
+      assert_correct_search_result(described_class, "Confederacy Dunces",
+                                   Alexandria::BookProviders::SEARCH_BY_KEYWORD)
+    end
   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
+  describe Alexandria::BookProviders::LOCProvider do
+    it "works for a book with ASCII title" do
+      assert_correct_search_result(described_class, "9780805335583")
+    end
 
-  it "BL should work" do
-    skip "Not working: connect failed"
-    assert_correct_search_result(Alexandria::BookProviders::BLProvider,
-                                 "9781853260803")
+    it "works for a book with a title with non-ASCII letters" do
+      assert_correct_search_result(described_class, "9782070379248")
+    end
   end
 
-  it "SBN should work" do
-    assert_correct_search_result(Alexandria::BookProviders::SBNProvider,
-                                 "9788835926436")
+  describe Alexandria::BookProviders::BLProvider do
+    it "works" do
+      skip "Not working: connect failed"
+      assert_correct_search_result(described_class, "9781853260803")
+    end
   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
+  describe Alexandria::BookProviders::SBNProvider do
+    it "works" do
+      assert_correct_search_result(described_class, "9788835926436")
+    end
   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")
+  describe Alexandria::BookProviders::BarnesAndNobleProvider do
+    it "works" do
+      skip "Barnes and Noble is not operational at the moment"
+      assert_correct_search_result(described_class, "9780961328917") # see #1433
+    end
   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")
+  describe Alexandria::BookProviders::ProxisProvider do
+    it "works" do
+      skip "Needs fixing"
+      assert_correct_search_result(described_class, "9789026965746")
+      assert_correct_search_result(described_class, "9780586071403")
+    end
   end
 
-  it "AdLibris should work" do
-    skip "Needs fixing: site has changed"
-    assert_correct_search_result(Alexandria::BookProviders::AdLibrisProvider,
-                                 "9789100109332")
-  end
+  describe Alexandria::BookProviders::ThaliaProvider do
+    before do
+      skip "Needs fixing"
+    end
 
-  it "Siciliano should work" do
-    skip "Needs fixing: no results found"
-    assert_correct_search_result(Alexandria::BookProviders::SicilianoProvider,
-                                 "9788599170380")
+    it "works" do
+      # german book
+      assert_correct_search_result(described_class, "9783896673305")
+      # international book
+      assert_correct_search_result(described_class, "9780440241904")
+      # movie dvd
+      assert_correct_search_result(described_class, "4010232037824")
+      # music cd
+      assert_correct_search_result(described_class, "0094638203520")
+    end
   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")
+  describe Alexandria::BookProviders::AdLibrisProvider do
+    it "works" do
+      skip "Needs fixing: site has changed"
+      assert_correct_search_result(described_class, "9789100109332")
+    end
   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!"
+  describe Alexandria::BookProviders::SicilianoProvider do
+    it "works" do
+      skip "Needs fixing: no results found"
+      assert_correct_search_result(described_class, "9788599170380")
+    end
   end
 end