alexandria-book-collection-manager 0.7.0 → 0.7.1

data/lib/alexandria/ui/main_app.rb

@@ -49,7 +49,6 @@ module Alexandria
     class MainApp
       include Logging
       include GetText
-      MAX_RATING_STARS = 5
       include Singleton
       attr_accessor :main_app, :libraries, :actiongroup, :appbar, :prefs
       attr_accessor :ui_manager

data/lib/alexandria/ui/sidepane.rb

@@ -125,7 +125,7 @@ module Alexandria
         @library_listview.append_column(column)
 
         @library_listview.set_row_separator_func do |model, iter|
-          # log.debug { "library_listview row_separator #{iter}" }
+          # TODO: Replace with iter[3] if possible
           model.get_value(iter, 3)
         end
 

data/lib/alexandria/ui/sound.rb

@@ -36,12 +36,12 @@ module Alexandria
 
       def play(effect)
         file = File.join(@sounds_dir, "#{effect}.ogg")
-        unless @playing
+        if @playing
+          puts "Already playing #{effect}." if $DEBUG
+        else
           puts "Not playing. Starting #{effect}." if $DEBUG
           @filesrc.location = file
           start_playback
-        else
-          puts "Already playing #{effect}." if $DEBUG
         end
       end
 

data/lib/alexandria/ui/ui_manager.rb

@@ -17,9 +17,10 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
+require 'alexandria/ui/columns'
+
 module Alexandria
   module UI
-    MAX_RATING_STARS = 5
     class UIManager < BuilderBase
       attr_accessor :main_app, :actiongroup, :appbar, :prefs, :listview, :iconview, :listview_model,
                     :iconview_model, :filtered_model
@@ -28,15 +29,6 @@ module Alexandria
       include GetText
       GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
 
-      module Columns
-        COVER_LIST, COVER_ICON, TITLE, TITLE_REDUCED, AUTHORS,
-          ISBN, PUBLISHER, PUBLISH_DATE, EDITION, RATING, IDENT,
-          NOTES, REDD, OWN, WANT, TAGS, LOANED_TO = (0..17).to_a # duplicated from listview.rb
-      end
-
-      # The maximum number of rating stars displayed.
-      MAX_RATING_STARS = 5
-
       def initialize(parent)
         super('main_app__builder.glade', widget_names)
         @parent = parent
@@ -153,7 +145,7 @@ module Alexandria
       def setup_toolbar_combobox
         cb = Gtk::ComboBoxText.new
         cb.set_row_separator_func do |model, iter|
-          # log.debug { "row_separator" }
+          # TODO: Replace with iter[0] if possible
           model.get_value(iter, 0) == '-'
         end
         [_('Match everything'),
@@ -761,7 +753,7 @@ module Alexandria
         iter[Columns::NOTES] = (book.notes || '')
         iter[Columns::LOANED_TO] = (book.loaned_to || '')
         rating = (book.rating || Book::DEFAULT_RATING)
-        iter[Columns::RATING] = MAX_RATING_STARS - rating # ascending order is the default
+        iter[Columns::RATING] = Book::MAX_RATING_STARS - rating # ascending order is the default
         iter[Columns::OWN] = book.own?
         iter[Columns::REDD] = book.redd?
         iter[Columns::WANT] = book.want?
@@ -780,7 +772,7 @@ module Alexandria
           new_height = [ICON_HEIGHT, icon.height].min
           icon = cache_scaled_icon(icon, new_width, new_height)
         end
-        if rating == MAX_RATING_STARS
+        if rating == Book::MAX_RATING_STARS
           icon = icon.tag(Icons::FAVORITE_TAG)
         end
         iter[Columns::COVER_ICON] = icon

data/lib/alexandria/version.rb

@@ -18,7 +18,7 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  VERSION = '0.7.0'.freeze
+  VERSION = '0.7.1'.freeze
   DATA_VERSION = '0.6.3'.freeze
-  DISPLAY_VERSION = '0.7.0'.freeze
+  DISPLAY_VERSION = '0.7.1'.freeze
 end

data/spec/alexandria/book_providers_spec.rb

@@ -102,11 +102,6 @@ describe Alexandria::BookProviders do
   # Right? Don't test if dependency isn't present.
 
   it 'LOC should work' do
-    begin
-      require 'zoom'
-    rescue LoadError
-      skip 'This test needs zoom'
-    end
     assert_correct_search_result(Alexandria::BookProviders::LOCProvider,
                                  '9780805335583')
     # this book has non-ASCII letters
@@ -115,23 +110,11 @@ describe Alexandria::BookProviders do
   end
 
   it 'BL should work' do
-    begin
-      require 'zoom'
-    rescue LoadError
-      skip 'This test needs zoom'
-    end
-
     assert_correct_search_result(Alexandria::BookProviders::BLProvider,
                                  '9781853260803')
   end
 
   it 'SBN should work' do
-    begin
-      require 'zoom'
-    rescue LoadError
-      skip 'This test needs zoom'
-    end
-
     assert_correct_search_result(Alexandria::BookProviders::SBNProvider,
                                  '9788835926436')
   end

data/spec/alexandria/book_spec.rb

@@ -31,4 +31,27 @@ describe Alexandria::Book do
     different_book.isbn = '9780571147999'
     expect(different_book).not_to eq book
   end
+
+  describe '#rating' do
+    let(:book) { an_artist_of_the_floating_world }
+    it 'returns 0 by default' do
+      expect(book.rating).to eq 0
+    end
+  end
+
+  describe '#rating=' do
+    let(:book) { an_artist_of_the_floating_world }
+    it 'assigns rating' do
+      book.rating = 5
+      expect(book.rating).to eq 5
+    end
+
+    it 'does not allow higher rating than 5 to be assigned' do
+      expect { book.rating = 6 }.to raise_error
+    end
+
+    it 'does not allow lower rating than 0 to be assigned' do
+      expect { book.rating = -1 }.to raise_error
+    end
+  end
 end

data/spec/alexandria/library_spec.rb

@@ -40,11 +40,37 @@ describe Alexandria::Library do
   describe '#valid_ean?' do
     it 'returns a true value for valid EANs' do
       expect(Alexandria::Library.valid_ean?('9780345431929')).to be_truthy
+      expect(Alexandria::Library.valid_ean?('978034543192912345')).to be_truthy
 
       # Regression test: this EAN has a checksum of 10, which should be
       # treated like a checksum of 0.
       expect(Alexandria::Library.valid_ean?('9784047041790')).to be_truthy
     end
+
+    it 'returns a false value for invalid EANs' do
+      expect(Alexandria::Library.valid_ean?('780345431929')).to be_falsey
+      expect(Alexandria::Library.valid_ean?('97803454319290')).to be_falsey
+      expect(Alexandria::Library.valid_ean?('97803454319291234')).to be_falsey
+      expect(Alexandria::Library.valid_ean?('9780345431929123456')).to be_falsey
+      expect(Alexandria::Library.valid_ean?('9780345431928')).to be_falsey
+      expect(Alexandria::Library.valid_ean?('9780345431929A')).to be_falsey
+
+      expect(Alexandria::Library.valid_ean?('9784047041791')).to be_falsey
+    end
+  end
+
+  describe '#valid_upc?' do
+    it 'returns a true value for valid UPCs' do
+      expect(Alexandria::Library.valid_upc?('97803454319312356')).to be_truthy
+    end
+
+    it 'returns a false value for invalid UPCs' do
+      expect(Alexandria::Library.valid_upc?('978034543193123567')).to be_falsey
+      expect(Alexandria::Library.valid_upc?('9780345431931235')).to be_falsey
+
+      expect(Alexandria::Library.valid_upc?('97803454319412356')).to be_falsey
+      expect(Alexandria::Library.valid_upc?('97803454319212356')).to be_falsey
+    end
   end
 
   describe '#canonicalise_isbn' do

data/spec/alexandria/smart_library_spec.rb

@@ -18,5 +18,15 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Alexandria::SmartLibrary do
-  it 'should be clever'
+  it 'can be instantiated simply' do
+    lib = described_class.new('Hello', [], :all)
+    expect(lib.name).to eq 'Hello'
+  end
+
+  it 'normalizes the encoding for name' do
+    bad_name = 'Prêts'.force_encoding('ascii')
+    lib = described_class.new(bad_name, [], :all)
+    expect(lib.name.encoding.name).to eq 'UTF-8'
+    expect(bad_name.encoding.name).to eq 'US-ASCII'
+  end
 end

data/spec/alexandria/ui/main_app_spec.rb

@@ -39,15 +39,4 @@ describe Alexandria::UI::MainApp do
       Alexandria::UI::MainApp.new
     end.to raise_error NoMethodError
   end
-
-  it 'runs' do
-    @main_app = Alexandria::UI::MainApp.instance
-
-    GLib::Timeout.add(100) do
-      @main_app.main_app.destroy
-      Gtk.main_quit
-    end
-
-    Gtk.main
-  end
 end

data/spec/spec_helper.rb

@@ -37,7 +37,6 @@ def an_artist_of_the_floating_world
 end
 
 Alexandria::UI::Icons.init
-Alexandria::UI.start_main_app
 
 module Alexandria
   class Library

data/tasks/dogtail.rake

@@ -0,0 +1,4 @@
+desc 'run dogtail integration tests'
+task :dogtail do
+  `RUBYOPT='-rbundler/setup -Ilib' python dogtail/*.py`
+end

data/tasks/spec.rake

@@ -26,6 +26,6 @@
 
 require 'rspec/core/rake_task'
 
-RSpec::Core::RakeTask.new(:spec)
-
-task default: :spec
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.ruby_opts = ['-rbundler/setup -rsimplecov -Ilib -w']
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -28,7 +28,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-02 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -78,28 +78,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gio2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.9
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: gstreamer
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: image_size
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.5.0
+- !ruby/object:Gem::Dependency
+  name: marc
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: zoom
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -134,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.1'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +207,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".reek"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
+- ".simplecov"
+- ".yardopts"
 - CHANGELOG.md
 - COPYING
 - ChangeLog.0
@@ -176,7 +221,7 @@ files:
 - README.md
 - RELEASE_CHECKLIST
 - Rakefile
-- TODO
+- TODO.md
 - alexandria-book-collection-manager.gemspec
 - alexandria.desktop.in
 - bin/alexandria
@@ -187,6 +232,7 @@ files:
 - doc/NEWS
 - doc/alexandria.1
 - doc/cuecat_support.rdoc
+- dogtail/basic_run_test.py
 - lib/alexandria.rb
 - lib/alexandria/about.rb
 - lib/alexandria/book_providers.rb
@@ -227,6 +273,7 @@ files:
 - lib/alexandria/ui.rb
 - lib/alexandria/ui/builder_base.rb
 - lib/alexandria/ui/callbacks.rb
+- lib/alexandria/ui/columns.rb
 - lib/alexandria/ui/completion_models.rb
 - lib/alexandria/ui/dialogs/about_dialog.rb
 - lib/alexandria/ui/dialogs/acquire_dialog.rb
@@ -420,7 +467,6 @@ files:
 - spec/alexandria/smart_library_spec.rb
 - spec/alexandria/ui/dialogs_spec.rb
 - spec/alexandria/ui/iconview_spec.rb
-- spec/alexandria/ui/listview_spec.rb
 - spec/alexandria/ui/main_app_spec.rb
 - spec/alexandria/ui/sidepane_spec.rb
 - spec/alexandria/ui/sound_spec.rb
@@ -445,7 +491,7 @@ files:
 - spec/data/libraries/0.6.2/My Library/9780755322800.cover
 - spec/data/libraries/0.6.2/My Library/9780755322800.yaml
 - spec/spec_helper.rb
-- tasks/rdoc.rake
+- tasks/dogtail.rake
 - tasks/setup.rb
 - tasks/spec.rake
 - util/rake/fileinstall.rb
@@ -473,7 +519,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: GNOME application for managing collections of books

data/TODO

@@ -1,24 +0,0 @@
-Alexandria's TODO list
-======================
-
-For the next release:
-
-[X] Drag-and-drop books within libraries
-[X] Infinite Undo/Redo
-[X] Smart libraries
-[X] CueCat userland support
-[ ] Threading of all operations
-
-Future releases:
-
-[ ] Sort providers meaningfully according to the current locale
-[ ] ONIX import 
-[ ] Import/export via GNOME-DB
-[ ] Zoom in the current view, giving more or less details
-[ ] PDA support
-[ ] Win32 MinGW port
-[ ] Show more details about books, like number of pages, price, topic, a 
-    user defined field
-[ ] Printing
-[ ] Editable views; for icons, renaming their title, for list, editing each
-    field