alexandria-book-collection-manager 0.7.4 → 0.7.5

data/lib/alexandria/ui/smart_library_properties_dialog_base.rb

@@ -111,7 +111,8 @@ module Alexandria
           cb = Gtk::ComboBoxText.new
           [_("all"), _("any")].each { |x| cb.append_text(x) }
           cb.signal_connect("changed") do
-            @predicate_operator_rule = cb.active.zero? ? SmartLibrary::ALL_RULES : SmartLibrary::ANY_RULE
+            @predicate_operator_rule =
+              cb.active.zero? ? SmartLibrary::ALL_RULES : SmartLibrary::ANY_RULE
           end
           cb.active =
             predicate_operator_rule == SmartLibrary::ALL_RULES ? 0 : 1
@@ -405,8 +406,9 @@ module Alexandria
       end
 
       def parse_date(datestring)
-        date_format = "%d/%m/%Y" # or '%m/%d/%Y' for USA and Canada ; or '%Y-%m-%d' for most of Asia
-        ## http://en.wikipedia.org/wiki/Calendar_date#Middle_endian_forms.2C_starting_with_the_month
+        # '%m/%d/%Y' for USA and Canada ; or '%Y-%m-%d' for most of Asia
+        # http://en.wikipedia.org/wiki/Calendar_date#Middle_endian_forms.2C_starting_with_the_month
+        date_format = "%d/%m/%Y"
         begin
           d = Date.strptime(datestring, date_format)
           Time.gm(d.year, d.month, d.day)

data/lib/alexandria/ui/ui_manager.rb

@@ -12,8 +12,8 @@ require "alexandria/library_sort_order"
 module Alexandria
   module UI
     class UIManager < BuilderBase
-      attr_accessor :main_app, :actiongroup, :appbar, :prefs, :listview, :iconview, :listview_model,
-                    :iconview_model, :filtered_model
+      attr_accessor :main_app, :actiongroup, :appbar, :prefs, :listview, :iconview,
+                    :listview_model, :iconview_model, :filtered_model
       attr_reader :model
       include Logging
       include GetText
@@ -296,7 +296,8 @@ module Alexandria
           library_already_selected = true
           if (path = widget.get_path_at_pos(event.x, event.y))
             @clicking_on_sidepane = true
-            obj, path = widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+            obj, path =
+              widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
             widget.has_focus = true
 
             unless obj.path_is_selected?(path)
@@ -347,7 +348,8 @@ module Alexandria
           # not a right click
         elsif (path = widget.get_path_at_pos(event.x, event.y))
           @clicking_on_sidepane = true
-          obj, path = widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+          obj, path =
+            widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
           obj.select_path(path)
           sensitize_library selected_library
         end
@@ -373,7 +375,8 @@ module Alexandria
           widget.grab_focus
 
           if (path = widget.get_path_at_pos(event.x.to_i, event.y.to_i))
-            obj, path = widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
+            obj, path =
+              widget.is_a?(Gtk::TreeView) ? [widget.selection, path.first] : [widget, path]
 
             unless obj.path_is_selected?(path)
               log.debug { "Select #{path}" }
@@ -458,7 +461,9 @@ module Alexandria
               @actiongroup["Move"].sensitive =
                 @actiongroup["SetRating"].sensitive = !books.empty?
 
-          log.debug { "on_books_selection_changed Delete: #{@actiongroup['Delete'].sensitive?}" }
+          log.debug do
+            "on_books_selection_changed Delete: #{@actiongroup['Delete'].sensitive?}"
+          end
 
           if library.is_a?(SmartLibrary)
             @actiongroup["Delete"].sensitive =
@@ -509,8 +514,7 @@ module Alexandria
       end
 
       def determine_delete_option
-        sensitive = (@libraries.all_regular_libraries.length > 1 || selected_library.is_a?(SmartLibrary))
-        sensitive
+        @libraries.all_regular_libraries.length > 1 || selected_library.is_a?(SmartLibrary)
       end
 
       def on_close_sidepane
@@ -663,11 +667,15 @@ module Alexandria
                     end
                   end
 
-                  log.debug { "Trying to add #{book.title}, #{cover_uri} in library ''#{library.name}'" }
+                  log.debug do
+                    "Trying to add #{book.title}, #{cover_uri}" \
+                    " in library ''#{library.name}'"
+                  end
                   library.save_cover(book, cover_uri) unless cover_uri.nil?
                   library << book
                   library.save(book)
-                  set_status_label(format(_("Added '%s' to library '%s'"), book.title, library.name))
+                  set_status_label(format(_("Added '%s' to library '%s'"),
+                                          book.title, library.name))
                 rescue StandardError => ex
                   log.error { "Couldn't add book #{isbn}: #{ex}" }
                   log.error { ex.backtrace.join("\n") }
@@ -722,7 +730,8 @@ module Alexandria
         iter[Columns::NOTES] = (book.notes || "")
         iter[Columns::LOANED_TO] = (book.loaned_to || "")
         rating = (book.rating || Book::DEFAULT_RATING)
-        iter[Columns::RATING] = Book::MAX_RATING_STARS - rating # ascending order is the default
+        # ascending order is the default
+        iter[Columns::RATING] = Book::MAX_RATING_STARS - rating
         iter[Columns::OWN] = book.own?
         iter[Columns::REDD] = book.redd?
         iter[Columns::WANT] = book.want?
@@ -1168,7 +1177,8 @@ module Alexandria
 
       ICONS_SORTS = [
         Columns::TITLE, Columns::AUTHORS, Columns::ISBN,
-        Columns::PUBLISHER, Columns::EDITION, Columns::RATING, Columns::REDD, Columns::OWN, Columns::WANT
+        Columns::PUBLISHER, Columns::EDITION, Columns::RATING,
+        Columns::REDD, Columns::OWN, Columns::WANT
       ].freeze
 
       def setup_books_iconview_sorting

data/lib/alexandria/version.rb

@@ -5,7 +5,7 @@
 # See the file README.md for authorship and licensing information.
 
 module Alexandria
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
   DATA_VERSION = "0.6.3"
-  DISPLAY_VERSION = "0.7.4"
+  DISPLAY_VERSION = "0.7.5"
 end

data/po/Makefile

@@ -3,7 +3,7 @@ POT=./alexandria.pot
 
 RUBY=../bin/alexandria $(shell find ../lib -name '*.rb' -and -not -path '*macui*')
 
-GLADE=$(shell find ../data -name '*.glade')
+GLADE=$(shell find ../share/alexandria/glade -name '*.glade')
 
 HEADERS=$(shell find .. -name '*.h')
 
@@ -12,7 +12,7 @@ PO=$(wildcard *.po)
 $(POT): $(RUBY) $(GLADE) ../alexandria.desktop.in.h $(HEADERS)
 	rm -f $(POT)
 	@echo Updating PO template from Ruby files
-	@rgettext --output=$(POT) $(RUBY)
+	@rxgettext --output=$(POT) $(RUBY)
 	@echo Updating PO template from Glade files
 	@xgettext --output=$(POT) --join-existing $(GLADE)
 	@echo Updating PO template from header files

data/share/alexandria/glade/acquire_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="acquire_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes">Acquire from Scanner</property>

data/share/alexandria/glade/book_properties_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="book_properties_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="modal">True</property>
     <property name="type_hint">dialog</property>

data/share/alexandria/glade/new_book_dialog__builder.glade

@@ -26,7 +26,7 @@
     </data>
   </object>
   <object class="GtkDialog" id="new_book_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="border_width">8</property>
     <property name="title" translatable="yes">Adding a Book</property>

data/share/alexandria/glade/preferences_dialog__builder.glade

@@ -3,7 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.0"/>
   <object class="GtkDialog" id="preferences_dialog">
-    <property name="visible">True</property>
+    <property name="visible">False</property>
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">Preferences</property>
     <property name="type_hint">dialog</property>

data/share/gnome/help/alexandria/C/introduction.xml

@@ -52,10 +52,6 @@
 	      <para><ulink url="http://www.internetbookshop.it">Internet Bookshop Italia</ulink></para>
 	    </listitem>
 
-	    <listitem>
-	      <para><ulink url="http://www.renaud-bray.com/">Renaud-Bray</ulink></para>
-	    </listitem>
-
 	    <listitem>
 	      <para><ulink url="http://www.loc.gov">US Library of Congress</ulink></para>
 	    </listitem>

data/share/gnome/help/alexandria/C/searching.xml

@@ -79,7 +79,7 @@
   <!-- ========= Finding out more online =========== -->
   <section id="searching-more-online">
     <title>Finding out more information about your books online</title>
-    <para>If you want to find out more information about your book, you can use &app; to open the web page of Amazon, Barnes and Noble, or one of the other online information providers and be taken directly to the relevant book. Simply select the book you wish to know more about, right-click on it, and from the menu <guimenuitem>Display Online Information</guimenuitem>, choose from either Amazon, Barnes and Nobel, Proxis, Spanish Culture Ministry, Amadeus Buch, Renaud-Bray or Internet Bookshop Italia.</para>
+    <para>If you want to find out more information about your book, you can use &app; to open the web page of Amazon, Barnes and Noble, or one of the other online information providers and be taken directly to the relevant book. Simply select the book you wish to know more about, right-click on it, and from the menu <guimenuitem>Display Online Information</guimenuitem>, choose from either Amazon, Barnes and Nobel, Proxis, Spanish Culture Ministry, Amadeus Buch or Internet Bookshop Italia.</para>
     <tip>
       <para>The <menuchoice><guimenu>Display Online Information</guimenu><guimenuitem>At Amazon</guimenuitem></menuchoice> choice will take you to the Amazon .com, .co.uk, .de, or jp site, as set up in the <xref linkend="alexandria-amazon-prefs"/>.</para>
     </tip>

data/share/gnome/help/alexandria/ja/introduction.xml

@@ -44,10 +44,6 @@
 	      <para><ulink url="http://www.internetbookshop.it">Internet Bookshop Italia</ulink></para>
 	    </listitem>
 
-	    <listitem>
-	      <para><ulink url="http://www.renaud-bray.com/">Renaud-Bray</ulink></para>
-	    </listitem>
-
 	    <listitem>
 	      <para><ulink url="http://www.loc.gov">米国国会図書館</ulink></para>
 	    </listitem>

data/spec/alexandria/book_providers_spec.rb

@@ -27,19 +27,22 @@ describe Alexandria::BookProviders do
 
       book = results.first
 
-      expect(book).to be_instance_of(Alexandria::Book), "Result is not a Book for #{provider}"
+      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}"
+            "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}"
+            .to be_instance_of(String),
+                "Unexpected cover_url #{cover_url.inspect} for #{provider}"
         end
       end
     else
@@ -64,19 +67,22 @@ describe Alexandria::BookProviders do
   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)
+                                 "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)
+                                 "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)
+                                 "Confederacy Dunces",
+                                 Alexandria::BookProviders::SEARCH_BY_KEYWORD)
   end
 
   it "LOC should work" do
@@ -140,16 +146,6 @@ describe Alexandria::BookProviders do
                                  "9788599170380")
   end
 
-  it "Renaud should work" do
-    skip "Marked in code as not working; remove implementation entirely."
-    # adultes
-    assert_correct_search_result(Alexandria::BookProviders::RENAUDProvider,
-                                 "9782894723388")
-    # jeunesse
-    assert_correct_search_result(Alexandria::BookProviders::RENAUDProvider,
-                                 "9782764605059")
-  end
-
   it "Worldcat should work" do
     assert_correct_search_result(Alexandria::BookProviders::WorldCatProvider,
                                  "9780521247108")

data/spec/alexandria/console_spec.rb

@@ -21,10 +21,10 @@ RSpec.describe Alexandria do
   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
-        The Dispossessed, Ursula Le Guin
         Pattern Recognition, William Gibson
         Bonjour Tristesse, Francoise Sagan & Irene Ash
         An Artist of the Floating World, Kazuo Ishiguro
+        The Dispossessed, Ursula Le Guin
         Neverwhere, Neil Gaiman
       LIST
     end

data/spec/alexandria/ui/main_app_spec.rb

@@ -1,40 +1,13 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2007 Joseph Method
-# Copyright (C) 2007 Cathal Mc Ginley
-# 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
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# Alexandria is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
+# frozen_string_literal: true
+
+# This file is part of Alexandria.
 #
-# You should have received a copy of the GNU General Public
-# License along with Alexandria; see the file COPYING.  If not,
-# write to the Free Software Foundation, Inc., 51 Franklin Street,
-# Fifth Floor, Boston, MA 02110-1301 USA.
+# See the file README.md for authorship and licensing information.
 
 require File.dirname(__FILE__) + "/../../spec_helper"
 
-# break this up!
-
-describe CellRendererToggle do
-  it "should work"
-end
-
-describe Gtk::ActionGroup do
-  it "should work"
-end
-
-describe Gtk::IconView do
-  it "should work"
-end
-
 describe Alexandria::UI::MainApp do
   it "is a singleton" do
     expect do

data/spec/alexandria/ui/really_delete_dialog_spec.rb

@@ -8,7 +8,8 @@ require File.dirname(__FILE__) + "/../../spec_helper"
 
 describe Alexandria::UI::ReallyDeleteDialog do
   it "works" do
-    library = instance_double(Alexandria::Library, name: "Bar Library", empty?: false, size: 12)
+    library = instance_double(Alexandria::Library,
+                              name: "Bar Library", empty?: false, size: 12)
     parent = Gtk::Window.new :toplevel
     described_class.new parent, library
   end

data/tasks/spec.rake

@@ -2,7 +2,7 @@
 
 # -*- ruby -*-
 #--
-# Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011-2019 Matijs van Zuijlen
 #
 # This file is part of the Alexandria build system.
 #
@@ -39,8 +39,10 @@ namespace "spec" do
     t.ruby_opts = ["-rbundler/setup -rsimplecov -Ilib -w"]
   end
 
-  desc "Runs all unit and end-to-end specs"
-  task "all" => ["spec:unit", "spec:end_to_end"]
+  RSpec::Core::RakeTask.new("all") do |t|
+    t.pattern = "spec/**/*_spec.rb"
+    t.ruby_opts = ["-rbundler/setup -rsimplecov -Ilib -w"]
+  end
 end
 
-task default: "spec:all"
+task spec: "spec:all"

data/util/rake/fileinstall.rb

@@ -251,7 +251,9 @@ class FileInstallTask < Rake::TaskLib
       else
         dest_basedir = Pathname.new(@dest_dir)
       end
-      source_path = source_file.dirname.relative_path_from(source_basedir) if source_file.file?
+      if source_file.file?
+        source_path = source_file.dirname.relative_path_from(source_basedir)
+      end
       dest = source_path ? dest_basedir + source_path : dest_basedir
       dest.to_s
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -28,7 +28,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-24 00:00:00.000000000 Z
+date: 2020-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -128,6 +128,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: zoom
   requirement: !ruby/object:Gem::Requirement
@@ -212,6 +226,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".simplecov"
+- ".travis.yml"
 - ".yardopts"
 - CHANGELOG.md
 - COPYING
@@ -234,7 +249,6 @@ files:
 - doc/alexandria.1
 - doc/cuecat_support.rdoc
 - doc/dependency_decisions.yml
-- dogtail/basic_run_test.py
 - lib/alexandria.rb
 - lib/alexandria/about.rb
 - lib/alexandria/book_providers.rb
@@ -245,7 +259,6 @@ files:
 - lib/alexandria/book_providers/douban.rb
 - lib/alexandria/book_providers/proxis.rb
 - lib/alexandria/book_providers/pseudomarc.rb
-- lib/alexandria/book_providers/renaud.rb
 - lib/alexandria/book_providers/siciliano.rb
 - lib/alexandria/book_providers/thalia.rb
 - lib/alexandria/book_providers/web.rb
@@ -524,7 +537,6 @@ files:
 - spec/data/libraries/0.6.2/My Library/9780755322800.yaml
 - spec/end_to_end/basic_run_spec.rb
 - spec/spec_helper.rb
-- tasks/dogtail.rake
 - tasks/setup.rb
 - tasks/spec.rake
 - util/rake/fileinstall.rb
@@ -544,14 +556,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: GNOME application for managing collections of books