alexandria-book-collection-manager 0.6.9.pre1 → 0.6.9

data/lib/alexandria/ui/dialogs/smart_library_properties_dialog_base.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -61,9 +61,7 @@ module Alexandria
         setup_calendar_widgets
       end
 
-      #########
       protected
-      #########
 
       def smart_library_rules
         fill_smart_library_rules_values
@@ -81,15 +79,15 @@ module Alexandria
       def user_confirms_possible_weirdnesses_before_saving?
         return true unless has_weirdnesses?
         dialog = AlertDialog.new(
-                                 self,
-                                 _('Empty or conflictive condition'),
-                                 Gtk::Stock::DIALOG_QUESTION,
-                                 [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
-                                  [_('_Save However'), Gtk::Dialog::RESPONSE_YES]],
-                                 _('This smart library contains one or more conditions ' \
-                                   'which are empty or conflict with each other. This is ' \
-                                   'likely to result in never matching a book. Are you ' \
-                                   'sure you want to save this library?'))
+          self,
+          _('Empty or conflictive condition'),
+          Gtk::Stock::DIALOG_QUESTION,
+          [[Gtk::Stock::CANCEL, Gtk::Dialog::RESPONSE_CANCEL],
+           [_('_Save However'), Gtk::Dialog::RESPONSE_YES]],
+          _('This smart library contains one or more conditions ' \
+            'which are empty or conflict with each other. This is ' \
+            'likely to result in never matching a book. Are you ' \
+            'sure you want to save this library?'))
         dialog.default_response = Gtk::Dialog::RESPONSE_CANCEL
         dialog.show_all
         confirmed = dialog.run == Gtk::Dialog::RESPONSE_YES
@@ -341,7 +339,6 @@ module Alexandria
             time = Time.gm(year, month, day)
             @calendar_popup_for_entry.text = format_date(time)
           end
-
         end
 
         @calendar.signal_connect('day-selected-double-click') do
@@ -364,7 +361,6 @@ module Alexandria
         self.modal = true
 
         Gtk.timeout_add(150) do
-
           # If we set @popup_displayed=false immediately, then a click
           # event on the primary icon of the Entry simultaneous with
           # the focus-out-event of the Calendar causes the Calendar to

data/lib/alexandria/ui/dndable.rb

@@ -64,7 +64,6 @@ module Alexandria
         end
 
         view.signal_connect('drag-data-get') do |_widget, _drag_context, selection_data, _info, _time|
-
           idents = @parent.selected_books.map(&:ident)
           unless idents.empty?
             selection_data.set(Gdk::Selection::TYPE_STRING,

data/lib/alexandria/ui/gtk_thread_help.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 #--
 # Copyright (C) 2010 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 Matijs van Zuijlen
 #
 # This file is part of Alexandria, a GNOME book collection manager.
 #
@@ -33,6 +33,7 @@
 #   false
 # end
 
+require 'cairo'
 require 'gtk2'
 require 'monitor'
 

data/lib/alexandria/ui/icons.rb

@@ -34,9 +34,9 @@ class Gdk::Pixbuf
 
     # Copies the current pixbuf there (south-west).
     copy_area(0, 0,
-                   width, height,
-                   new_pixbuf,
-                   0, tweak_y)
+              width, height,
+              new_pixbuf,
+              0, tweak_y)
 
     # Copies the tag pixbuf there (north-est).
     tag_pixbuf_x = width - (tweak_x * 2)

data/lib/alexandria/ui/iconview_tooltips.rb

@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2007 kksou
 # Copyright (C) 2008,2009 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011, 2014 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
@@ -40,10 +40,12 @@ class IconViewTooltips
     @tooltip_window.app_paintable = true
 
     @tooltip_window.signal_connect('expose_event') { |window, event|
-      on_expose(window, event) }
+      on_expose(window, event)
+    }
 
     @tooltip_window.signal_connect('leave_notify_event') { |vw, event|
-      on_leave(vw, event) }
+      on_leave(vw, event)
+    }
 
     @label = Gtk::Label.new('')
     @label.wrap = true
@@ -57,9 +59,11 @@ class IconViewTooltips
 
   def set_view(view)
     view.signal_connect('motion_notify_event') { |vw, event|
-      on_motion(vw, event) }
+      on_motion(vw, event)
+    }
     view.signal_connect('leave_notify_event') { |vw, event|
-      on_leave(vw, event) }
+      on_leave(vw, event)
+    }
   end
 
   def on_expose(window, _event)

data/lib/alexandria/ui/init.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -21,11 +21,11 @@ class CellRendererToggle < Gtk::CellRendererToggle
   attr_accessor :text
   type_register
   install_property(GLib::Param::String.new(
-        'text',
-        'text',
-        'Some damn value',
-        '',
-        GLib::Param::READABLE | GLib::Param::WRITABLE))
+    'text',
+    'text',
+    'Some damn value',
+    '',
+    GLib::Param::READABLE | GLib::Param::WRITABLE))
 end
 
 class Gtk::ActionGroup

data/lib/alexandria/ui/listview.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
 # Copyright (C) 2010 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 Matijs van Zuijlen
 #
 # Alexandria is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License aso
@@ -69,7 +69,8 @@ module Alexandria
         column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
           iter = @listview_model.convert_iter_to_child_iter(iter)
           iter = @filtered_model.convert_iter_to_child_iter(iter)
-          cell.text, cell.editable = iter[Columns::TITLE], false # true
+          cell.text = iter[Columns::TITLE]
+          cell.editable = false # true
         end
 
         column.sort_column_id = Columns::TITLE
@@ -222,7 +223,6 @@ module Alexandria
           rescue => e
             log.error { "toggle failed for path #{path} #{e}\n" + e.backtrace.join("\n") }
           end
-
         end
         column = Gtk::TreeViewColumn.new(title, renderer, text: iterid)
         column.widget = Gtk::Label.new(title).show
@@ -294,7 +294,7 @@ module Alexandria
         log.debug { "setup_listview_columns_width #{@prefs.cols_width}" }
         if @prefs.cols_width
           cols_width = YAML.load(@prefs.cols_width)
-          log.debug { "cols_width: #{cols_width.inspect }" }
+          log.debug { "cols_width: #{cols_width.inspect}" }
           @listview.columns.each do |c|
             if cols_width.key?(c.title)
               log.debug { "#{c.title} : #{cols_width[c.title]}" }

data/lib/alexandria/ui/main_app.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2007 Cathal Mc Ginley
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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

data/lib/alexandria/ui/multi_drag_treeview.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -62,17 +62,15 @@ class Gtk::TreeView
 
     @context.button_press_handler =
       signal_connect('button_press_event') do |_widget, event, _data|
-      button_press_event(event)
-    end
+        button_press_event(event)
+      end
   end
 
   def drag_context
     @context.drag_context
   end
 
-  #######
   private
-  #######
 
   def stop_drag_check
     raise if @context.nil?

data/lib/alexandria/ui/sidepane.rb

@@ -1,4 +1,22 @@
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2008 Joseph Method
+# Copyright (C) 2008,2009 Cathal Mc Ginley
+# Copyright (C) 2011,2014,2015 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.
+#
+# 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.
+
 module Alexandria
   module UI
     class SidePaneManager
@@ -99,7 +117,8 @@ module Alexandria
         column.pack_start(renderer, true)
         column.set_cell_data_func(renderer) do |_col, cell, _model, iter|
           # log.debug { "sidepane: editable #{cell}, #{iter} #{iter[1]}: #{iter[2]}" }
-          cell.text, cell.editable = iter[1], iter[2]
+          cell.text = iter[1]
+          cell.editable = iter[2]
           # log.debug { "exit sidepane: editable #{cell}, #{iter}" }
         end
         renderer.signal_connect('edited', &method(:on_edited_library))
@@ -120,11 +139,10 @@ module Alexandria
           BOOKS_TARGET_TABLE,
           Gdk::DragContext::ACTION_MOVE)
 
-        @library_listview.signal_connect('drag-motion') do
-          |_widget, drag_context, x, y, time, _data|
+        @library_listview.signal_connect('drag-motion') do |_widget, drag_context, x, y, time, _data|
           log.debug { 'drag-motion' }
 
-          path, column, _, _ =
+          path, column, =
             @library_listview.get_path_at_pos(x, y)
 
           if path
@@ -153,8 +171,7 @@ module Alexandria
             time)
         end
 
-        @library_listview.signal_connect('drag-drop') do
-          |widget, drag_context, _x, _y, time, _data|
+        @library_listview.signal_connect('drag-drop') do |widget, drag_context, _x, _y, time, _data|
           log.debug { 'drag-drop' }
 
           Gtk::Drag.get_data(widget,
@@ -164,13 +181,12 @@ module Alexandria
           true
         end
 
-        @library_listview.signal_connect('drag-data-received') do
-          |_widget, drag_context, x, y, selection_data, _info, _time|
+        @library_listview.signal_connect('drag-data-received') do |_widget, drag_context, x, y, selection_data, _info, _time|
           log.debug { 'drag-data-received' }
 
           success = false
           if selection_data.type == Gdk::Selection::TYPE_STRING
-            path, _ =
+            path, =
               @library_listview.get_dest_row_at_pos(x, y)
 
             if path

data/lib/alexandria/ui/ui_manager.rb

@@ -1,6 +1,6 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
 # Copyright (C) 2008 Joseph Method
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -22,7 +22,7 @@ module Alexandria
     MAX_RATING_STARS = 5
     class UIManager < BuilderBase
       attr_accessor :main_app, :actiongroup, :appbar, :prefs, :listview, :iconview, :listview_model,
-        :iconview_model, :filtered_model
+                    :iconview_model, :filtered_model
       attr_reader :model
       include Logging
       include GetText
@@ -208,7 +208,6 @@ module Alexandria
         log.debug { 'setup_book_providers' }
         mid = @uimanager.new_merge_id
         BookProviders.each do |provider|
-
           name = provider.action_name
           ['ui/MainMenubar/ViewMenu/OnlineInformation/',
            'ui/BookPopup/OnlineInformation/',
@@ -498,14 +497,14 @@ module Alexandria
           log.debug { "Books are empty: #{books.empty?}" }
           @actiongroup['Properties'].sensitive = \
             @actiongroup['OnlineInformation'].sensitive = \
-            books.length == 1
+              books.length == 1
           @actiongroup['SelectAll'].sensitive = \
             books.length < library.length
 
           @actiongroup['Delete'].sensitive = \
             @actiongroup['DeselectAll'].sensitive = \
-            @actiongroup['Move'].sensitive =
-            @actiongroup['SetRating'].sensitive = !books.empty?
+              @actiongroup['Move'].sensitive =
+                @actiongroup['SetRating'].sensitive = !books.empty?
 
           log.debug { "on_books_selection_changed Delete: #{@actiongroup['Delete'].sensitive?}" }
 
@@ -640,9 +639,7 @@ module Alexandria
         end
       end
 
-      #######
       # private
-      #######
 
       def open_web_browser(url)
         if url.nil?
@@ -926,7 +923,6 @@ module Alexandria
         n = 0
 
         Gtk.idle_add do
-
           block_return = true
           book = library[n]
           if book

data/lib/alexandria/undo_manager.rb

@@ -59,9 +59,7 @@ module Alexandria
       end
     end
 
-    #######
     private
-    #######
 
     def action(array)
       action = array.pop

data/lib/alexandria/version.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2014 Matijs van Zuijlen
+# Copyright (C) 2014, 2015 Matijs van Zuijlen
 #
 # This file is part of Alexandria.
 #
@@ -18,7 +18,7 @@
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
 module Alexandria
-  VERSION = '0.6.9.pre1'
+  VERSION = '0.6.9'
   DATA_VERSION = '0.6.3'
-  DISPLAY_VERSION = '0.6.9.pre1'
+  DISPLAY_VERSION = '0.6.9'
 end

data/lib/alexandria/web_themes.rb

@@ -1,5 +1,5 @@
 # Copyright (C) 2004-2006 Laurent Sansonetti
-# Modifications Copyright (C) 2011 Matijs van Zuijlen
+# Copyright (C) 2011 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
@@ -35,9 +35,7 @@ module Alexandria
       File.exist?(@pixmaps_directory)
     end
 
-    #######
     private
-    #######
 
     def self.load(themes_dir)
       themes = []

data/{test/providers_test.rb → spec/alexandria/book_providers_spec.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2005-2006 Laurent Sansonetti
-# Copyright (C) 2011, 2014 Matijs van Zuijlen
-# Incorporates code Copyright (C) 2007 Joseph Method
+# Copyright (C) 2007 Joseph Method
+# Copyright (C) 2011, 2014, 2015 Matijs van Zuijlen
 #
 # This file is part of Alexandria, a GNOME book collection manager.
 #
@@ -20,7 +20,7 @@
 # write to the Free Software Foundation, Inc., 51 Franklin Street,
 # Fifth Floor, Boston, MA 02110-1301 USA.
 
-require File.expand_path('test_helper.rb', File.dirname(__FILE__))
+require 'spec_helper'
 
 describe Alexandria::BookProviders do
   it 'should be less clever'
@@ -30,27 +30,29 @@ describe Alexandria::BookProviders do
 
     puts results.inspect if $DEBUG
 
-    assert_kind_of(Array, results, "Results are not an array for #{provider}")
-    assert(!results.empty?, "Results are empty for #{provider}")
+    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
-      assert(results.length <= 2, "Results are greater than 2 for #{provider}")
+      expect(results.length).to be <= 2, "Results are greater than 2 for #{provider}"
 
       book = results.first
 
-      assert_kind_of(Alexandria::Book, 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)
-      assert_equal(canonical_query, canonical_result,
-                   "Result's isbn #{book.isbn} is not equivalent to the requested isbn #{query} for #{provider}")
+      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
-        assert(cover_url.nil? || cover_url.is_a?(String), "Unexpected cover_url #{cover_url.inspect} for #{provider}")
+        if cover_url
+          expect(cover_url).to be_instance_of(String), "Unexpected cover_url #{cover_url.inspect} for #{provider}"
+        end
       end
     else
-      assert_kind_of(Alexandria::Book, results.first.first, "Result item is not a Book for #{provider}")
+      expect(results.first.first).to be_instance_of(Alexandria::Book), "Result item is not a Book for #{provider}"
     end
     results
   end
@@ -86,6 +88,7 @@ describe Alexandria::BookProviders do
   end
 
   it 'dea should work' do
+    skip 'DEAStore is not operational at the moment'
     assert_correct_search_result(Alexandria::BookProviders::DeaStoreProvider,
                                  '9788817012980')
     assert_correct_search_result(Alexandria::BookProviders::DeaStoreProvider,
@@ -244,11 +247,10 @@ describe Alexandria::BookProviders do
 
   it 'Worldcat should work with multiple authors' do
     results = assert_correct_search_result(Alexandria::BookProviders::WorldCatProvider,
-                                             '9785941454136')
+                                           '9785941454136')
     this_book = results.first
-    assert_kind_of(Array, this_book.authors, 'Not an array!')
+    expect(this_book.authors).to be_instance_of(Array), 'Not an array!'
     # puts this_book.authors
-    assert(this_book.authors.length == 2, 'Wrong number of authors for this book!')
-
+    expect(this_book.authors.length).to eq(2), 'Wrong number of authors for this book!'
   end
 end