alexandria-book-collection-manager 0.7.3 → 0.7.4

data/lib/alexandria/ui/{dialogs/alert_dialog.rb → alert_dialog.rb}

@@ -4,12 +4,11 @@
 #
 # See the file README.md for authorship and licensing information.
 
-# HIG compliant error dialog boxes
 module Alexandria
   module UI
     class AlertDialog < SimpleDelegator
       def initialize(parent, title, stock_icon, buttons, message = nil)
-        dialog = Gtk::Dialog.new(title: '', parent: parent, flags: :destroy_with_parent, buttons: buttons)
+        dialog = Gtk::Dialog.new(title: "", parent: parent, flags: :destroy_with_parent, buttons: buttons)
         super(dialog)
 
         self.border_width = 6
@@ -45,19 +44,5 @@ module Alexandria
         end
       end
     end
-
-    class ErrorDialog < AlertDialog
-      def initialize(parent, title, message = nil)
-        super(parent, title, Gtk::Stock::DIALOG_ERROR,
-              [[Gtk::Stock::OK, :ok]], message)
-        # FIXME: Should accept just :ok
-        self.default_response = Gtk::ResponseType::OK
-      end
-
-      def display
-        show_all && run
-        destroy
-      end
-    end
   end
 end

data/lib/alexandria/ui/{dialogs/barcode_animation.rb → barcode_animation.rb}

@@ -23,7 +23,7 @@
 # Boston, MA 02110-1301 USA.
 #++
 
-require 'gobject-introspection'
+require "gobject-introspection"
 
 module GooCanvas
   class << self
@@ -42,7 +42,7 @@ module GooCanvas
         remove_method(:const_missing)
       end
       loader = GObjectIntrospection::Loader.new(self)
-      loader.load('GooCanvas')
+      loader.load("GooCanvas")
     end
   end
 end
@@ -91,13 +91,13 @@ module Alexandria
       end
 
       def set_active
-        @canvas.set_property(:background_color, 'white')
-        @barcode_bars.each { |rect| rect.set_property(:fill_color, 'white') }
+        @canvas.set_property(:background_color, "white")
+        @barcode_bars.each { |rect| rect.set_property(:fill_color, "white") }
       end
 
       def set_passive
         if @canvas
-          passive_bg = '#F4F4F4'
+          passive_bg = "#F4F4F4"
           @canvas.set_property(:background_color, passive_bg)
           @barcode_bars.each { |rect| rect.set_property(:fill_color, passive_bg) }
         end
@@ -116,7 +116,7 @@ module Alexandria
       private
 
       def create_ean_barcode_data
-        d = '211113123121112331122131113211111123122211132321112311231111'
+        d = "211113123121112331122131113211111123122211132321112311231111"
         # ####911113... but that's too much padding on the left...
         until d.empty?
           space_width = d[0].chr.to_i
@@ -133,7 +133,7 @@ module Alexandria
                                                 x: @bar_left_edge + @scale * @hpos, y: @bar_top,
                                                 width: @scale * bar_width, height: @bar_height,
                                                 line_width: 0,
-                                                fill_color: 'white')
+                                                fill_color: "white")
           @hpos += bar_width
           @barcode_bars << rect_item
         end

data/lib/alexandria/ui/{dialogs/book_properties_dialog.rb → book_properties_dialog.rb}

@@ -1,22 +1,10 @@
 # frozen_string_literal: true
 
-# Copyright (C) 2004-2006 Laurent Sansonetti
-# Copyright (C) 2016 Matijs van Zuijlen
+# This file is part of Alexandria.
 #
-# 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.
+# See the file README.md for authorship and licensing information.
+
+require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
@@ -24,51 +12,51 @@ module Alexandria
       include Logging
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       def initialize(parent, library, book)
         super(parent, library.cover(book))
-        puts 'Initializing Book Properties Dialog...' if $DEBUG
+        puts "Initializing Book Properties Dialog..." if $DEBUG
 
         cancel_button = Gtk::Button.new(stock_id: Gtk::Stock::CANCEL)
-        cancel_button.signal_connect('clicked') { on_cancel }
+        cancel_button.signal_connect("clicked") { on_cancel }
         cancel_button.show
         @button_box << cancel_button
 
         close_button = Gtk::Button.new(stock_id: Gtk::Stock::SAVE)
-        close_button.signal_connect('clicked') { on_close }
+        close_button.signal_connect("clicked") { on_close }
         close_button.show
         @button_box << close_button
 
         help_button = Gtk::Button.new(stock_id: Gtk::Stock::HELP)
-        help_button.signal_connect('clicked') { on_help }
+        help_button.signal_connect("clicked") { on_help }
         help_button.show
         @button_box << help_button
         @button_box.set_child_secondary(help_button, true)
 
         @entry_title.text = @book_properties_dialog.title = book.title
-        @entry_isbn.text = (book.isbn || '')
+        @entry_isbn.text = (book.isbn || "")
         @entry_publisher.text = book.publisher
         @entry_publish_date.text = book.publishing_year.to_s
-        @entry_publish_date.signal_connect('focus-out-event') do
+        @entry_publish_date.signal_connect("focus-out-event") do
           text = @entry_publish_date.text
           if text.empty?
             false
           else
             year = text.to_i
             if year.zero? || year > (Time.now.year + 10) || year < 10
-              @entry_publish_date.text = ''
+              @entry_publish_date.text = ""
               @entry_publish_date.grab_focus
               true
             elsif year < 100
-              @entry_publish_date.text = '19' + year.to_s
+              @entry_publish_date.text = "19" + year.to_s
               false
             end
           end
         end
         @entry_edition.text = book.edition
         if book.tags
-          @entry_tags.text = book.tags.join(',') # tags are comma-separated
+          @entry_tags.text = book.tags.join(",") # tags are comma-separated
         end
 
         book.authors.each do |author|
@@ -78,7 +66,7 @@ module Alexandria
         end
 
         buffer = Gtk::TextBuffer.new
-        buffer.text = (book.notes || '')
+        buffer.text = (book.notes || "")
         @textview_notes.buffer = buffer
 
         @library = library
@@ -87,7 +75,7 @@ module Alexandria
         self.rating = (book.rating || Book::DEFAULT_RATING)
 
         if (@checkbutton_loaned.active = book.loaned?)
-          @entry_loaned_to.text = (book.loaned_to || '')
+          @entry_loaned_to.text = (book.loaned_to || "")
           self.loaned_since = book.loaned_since
           @date_loaned_since.sensitive = true
         else
@@ -98,7 +86,7 @@ module Alexandria
         if (@checkbutton_redd.active = book.redd?)
           @redd_date.sensitive = true
           if book.redd_when.nil?
-            puts 'no redd_when'
+            puts "no redd_when"
           else
             @redd_date.text = format_date(book.redd_when)
           end
@@ -114,17 +102,17 @@ module Alexandria
       private
 
       def on_close
-        if @entry_isbn.text == ''
+        if @entry_isbn.text == ""
           # If set to nil .to_yaml in library.save causes crash
-          @book.isbn = ''
+          @book.isbn = ""
         else
           isbn = Library.canonicalise_ean(@entry_isbn.text)
           unless isbn
             ErrorDialog.new(@book_properties_dialog,
                             _("Couldn't modify the book"),
                             _("Couldn't validate the EAN/ISBN you " \
-                              'provided.  Make sure it is written ' \
-                              'correcty, and try again.')).display
+                              "provided.  Make sure it is written " \
+                              "correcty, and try again.")).display
             return
           end
 
@@ -132,8 +120,8 @@ module Alexandria
           unless ary.empty? || ((ary.length == 1) && (ary.first == @book))
             ErrorDialog.new(@book_properties_dialog,
                             _("Couldn't modify the book"),
-                            _('The EAN/ISBN you provided is already ' \
-                              'used in this library.')).display
+                            _("The EAN/ISBN you provided is already " \
+                              "used in this library.")).display
             return
           end
 
@@ -173,7 +161,7 @@ module Alexandria
         end
         @book.own = @checkbutton_own.active?
         @book.want = @checkbutton_want.active?
-        @book.tags = @entry_tags.text.split(',') # tags are comma separated
+        @book.tags = @entry_tags.text.split(",") # tags are comma separated
 
         FileUtils.rm_f(@cover_file) if @delete_cover_file
 
@@ -191,7 +179,7 @@ module Alexandria
 
       def on_help
         Alexandria::UI.display_help(@preferences_dialog,
-                                    'editing-book-properties')
+                                    "editing-book-properties")
       end
     end
   end

data/lib/alexandria/ui/{dialogs/book_properties_dialog_base.rb → book_properties_dialog_base.rb}

@@ -4,21 +4,22 @@
 #
 # See the file README.md for authorship and licensing information.
 
-require 'alexandria/ui/builder_base'
+require "alexandria/ui/builder_base"
+require "alexandria/ui/error_dialog"
 
 module Alexandria
   module UI
     class BookPropertiesDialogBase < BuilderBase
       include GetText
       extend GetText
-      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: 'UTF-8')
+      GetText.bindtextdomain(Alexandria::TEXTDOMAIN, charset: "UTF-8")
 
       COVER_MAXWIDTH = 140 # pixels
 
       COVER_ABSOLUTE_MAXHEIGHT = 250 # pixels, above this we scale down...
 
       def initialize(parent, cover_file)
-        super('book_properties_dialog__builder.glade', widget_names)
+        super("book_properties_dialog__builder.glade", widget_names)
         @setup_finished = false
         @book_properties_dialog.transient_for = parent
         @parent = parent
@@ -37,15 +38,15 @@ module Alexandria
         @treeview_authors.model = Gtk::ListStore.new(String, TrueClass)
         @treeview_authors.selection.mode = :single
         renderer = Gtk::CellRendererText.new
-        renderer.signal_connect('edited') do |_cell, path_string, new_text|
+        renderer.signal_connect("edited") do |_cell, path_string, new_text|
           path = Gtk::TreePath.new(path_string)
           iter = @treeview_authors.model.get_iter(path)
           iter[0] = new_text
         end
-        renderer.signal_connect('editing_started') do |_cell, entry, _path_string|
+        renderer.signal_connect("editing_started") do |_cell, entry, _path_string|
           entry.complete_authors
         end
-        col = Gtk::TreeViewColumn.new('', renderer,
+        col = Gtk::TreeViewColumn.new("", renderer,
                                       text: 0,
                                       editable: 1)
         @treeview_authors.append_column(col)
@@ -69,12 +70,12 @@ module Alexandria
 
         @calendar_popup.set_transient_for(@book_properties_dialog)
         @calendar_popup.set_type_hint :dialog
-        @calendar_popup.name = 'calendar-popup'
+        @calendar_popup.name = "calendar-popup"
         @calendar_popup.resizable = false
         # @calendar_popup.border_width = 4
         # @calendar_popup.app_paintable = true
 
-        @calendar_popup.signal_connect('focus-out-event') do |_popup, _event|
+        @calendar_popup.signal_connect("focus-out-event") do |_popup, _event|
           hide_calendar_popup
           false
         end
@@ -82,7 +83,7 @@ module Alexandria
         @calendar = Gtk::Calendar.new
         @calendar_popup.add(@calendar)
 
-        @calendar.signal_connect('day-selected') do
+        @calendar.signal_connect("day-selected") do
           date_arr = @calendar.date
           year = date_arr[0]
           month = date_arr[1] # + 1 # gtk : months 0-indexed, Time.gm : 1-index
@@ -93,7 +94,7 @@ module Alexandria
           end
         end
 
-        @calendar.signal_connect('day-selected-double-click') do
+        @calendar.signal_connect("day-selected-double-click") do
           date_arr = @calendar.date
           year = date_arr[0]
           month = date_arr[1] # + 1 # gtk : months 0-indexed, Time.gm : 1-index
@@ -105,26 +106,26 @@ module Alexandria
           hide_calendar_popup
         end
 
-        @redd_date.signal_connect('icon-press') do |entry, primary, _icon|
-          if primary.nick == 'primary'
+        @redd_date.signal_connect("icon-press") do |entry, primary, _icon|
+          if primary.nick == "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == 'secondary'
+          elsif primary.nick == "secondary"
             clear_date_entry(entry)
           end
         end
 
-        @date_loaned_since.signal_connect('icon-press') do |entry, primary, _icon|
-          if primary.nick == 'primary'
+        @date_loaned_since.signal_connect("icon-press") do |entry, primary, _icon|
+          if primary.nick == "primary"
             display_calendar_popup(entry)
-          elsif primary.nick == 'secondary'
+          elsif primary.nick == "secondary"
             clear_date_entry(entry)
-            @label_loaning_duration.label = ''
+            @label_loaning_duration.label = ""
           end
         end
       end
 
       def clear_date_entry(entry)
-        entry.text = ''
+        entry.text = ""
       end
 
       def hide_calendar_popup
@@ -196,7 +197,7 @@ module Alexandria
       def on_title_changed
         title = @entry_title.text.strip
         @book_properties_dialog.title = if title.empty?
-                                          _('Properties')
+                                          _("Properties")
                                         else
                                           _("Properties for '%s'") % title
                                         end
@@ -204,7 +205,7 @@ module Alexandria
 
       def on_add_author
         iter = @treeview_authors.model.append
-        iter[0] = _('Author')
+        iter[0] = _("Author")
         iter[1] = true
         @treeview_authors.set_cursor(iter.path,
                                      @treeview_authors.get_column(0),
@@ -250,14 +251,14 @@ module Alexandria
 
       def want_toggled; end
 
-      @@latest_filechooser_directory = ENV['HOME']
+      @@latest_filechooser_directory = ENV["HOME"]
       def on_change_cover
-        backend = `uname`.chomp == 'FreeBSD' ? 'neant' : 'gnome-vfs'
-        dialog = Gtk::FileChooserDialog.new(_('Select a cover image'),
+        backend = `uname`.chomp == "FreeBSD" ? "neant" : "gnome-vfs"
+        dialog = Gtk::FileChooserDialog.new(_("Select a cover image"),
                                             @book_properties_dialog,
                                             Gtk::FileChooser::ACTION_OPEN,
                                             backend,
-                                            [_('No Cover'), Gtk::ResponseType::REJECT],
+                                            [_("No Cover"), Gtk::ResponseType::REJECT],
                                             [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
                                             [Gtk::Stock::OPEN, Gtk::ResponseType::ACCEPT])
         dialog.current_folder = @@latest_filechooser_directory
@@ -280,15 +281,15 @@ module Alexandria
               new_width = cover.width / (cover.height / COVER_ABSOLUTE_MAXHEIGHT.to_f)
               puts "Scaling large cover image to #{new_width.to_i} x #{COVER_ABSOLUTE_MAXHEIGHT}"
               cover = cover.scale(new_width.to_i, COVER_ABSOLUTE_MAXHEIGHT)
-              cover.save(@cover_file, 'jpeg')
+              cover.save(@cover_file, "jpeg")
             else
               FileUtils.cp(dialog.filename, @cover_file)
             end
 
             self.cover = cover
             @@latest_filechooser_directory = dialog.current_folder
-          rescue RuntimeError => e
-            ErrorDialog.new(@book_properties_dialog, e.message).display
+          rescue RuntimeError => ex
+            ErrorDialog.new(@book_properties_dialog, ex.message).display
           end
         elsif response == Gtk::ResponseType::REJECT
           ## FileUtils.rm_f(@cover_file) # fixing bug #16707
@@ -313,7 +314,7 @@ module Alexandria
       end
 
       def on_loaned_date_changed
-        date_regexes =  [/[0123]?[0-9]\/[0123]?[0-9]\/[0-9]{4}/,
+        date_regexes =  [%r{[0123]?[0-9]/[0123]?[0-9]/[0-9]{4}},
                          /[0-9]{4}-[0123]?[0-9]-[0123]?[0-9]/]
         matches_regex = false
         date_regexes.each do |regex|
@@ -324,19 +325,19 @@ module Alexandria
 
         t = parse_date(@date_loaned_since.text)
         if t.nil?
-          @label_loaning_duration.label = ''
+          @label_loaning_duration.label = ""
           return
         end
         loaned_time = Time.at(t)
         n_days = ((Time.now - loaned_time) / (3600 * 24)).to_i
         if n_days > 365_250 # 1,000 years
-          @label_loaning_duration.label = ''
+          @label_loaning_duration.label = ""
           return
         end
         @label_loaning_duration.label = if n_days > 0
-                                          n_('%d day', '%d days', n_days) % n_days
+                                          n_("%d day", "%d days", n_days) % n_days
                                         else
-                                          ''
+                                          ""
                                         end
       end
 
@@ -359,7 +360,7 @@ module Alexandria
           @image_rating4,
           @image_rating5
         ]
-        raise 'out of range' if rating < 0 || rating > images.length
+        raise "out of range" if rating < 0 || rating > images.length
 
         images[0..rating - 1].each { |x| x.pixbuf = Icons::STAR_SET }
         images[rating..-1].each { |x| x.pixbuf = Icons::STAR_UNSET }
@@ -378,8 +379,8 @@ module Alexandria
 
       def loaned_since=(time)
         if time.nil?
-          @date_loaned_since.text = ''
-          @label_loaning_duration.label = ''
+          @date_loaned_since.text = ""
+          @label_loaning_duration.label = ""
         else
           @date_loaned_since.text = format_date(time)
           on_loaned_date_changed
@@ -392,7 +393,7 @@ 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
+        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
         begin
           d = Date.strptime(datestring, date_format)
@@ -403,7 +404,7 @@ module Alexandria
       end
 
       def format_date(datetime)
-        datetime.strftime('%d/%m/%Y')
+        datetime.strftime("%d/%m/%Y")
       end
     end
   end