alexandria-book-collection-manager 0.7.1 → 0.7.6

data/lib/alexandria/book_providers/barnes_and_noble.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # -*- ruby -*-
 #
 # Copyright (C) 2009 Cathal Mc Ginley
@@ -26,35 +28,36 @@
 
 # NOTE: this modified version is based on the Alexandria WorldCat provider.
 
-require 'cgi'
-require 'alexandria/net'
-require 'alexandria/book_providers/web'
+require "cgi"
+require "alexandria/net"
+require "alexandria/book_providers/web"
 
 module Alexandria
   class BookProviders
     class BarnesAndNobleProvider < WebsiteBasedProvider
-      include Alexandria::Logging
+      include Logging
 
-      SITE = 'http://www.barnesandnoble.com'.freeze
+      SITE = "http://www.barnesandnoble.com"
 
-      BASE_ISBN_SEARCH_URL = 'http://www.barnesandnoble.com/s/%s'.freeze
+      BASE_ISBN_SEARCH_URL = "http://www.barnesandnoble.com/s/%s"
 
-      BASE_SEARCH_URL = 'http://search.barnesandnoble.com/booksearch' \
-        '/results.asp?%s=%s'.freeze # type, term
+      BASE_SEARCH_URL = "http://search.barnesandnoble.com/booksearch" \
+        "/results.asp?%s=%s" # type, term
 
       def initialize
-        super('BarnesAndNoble', 'BarnesAndNoble')
+        super("BarnesAndNoble", "BarnesAndNoble")
         @agent = nil
         prefs.read
       end
 
       def agent
-        @agent = Alexandria::WWWAgent.new unless @agent
+        @agent ||= Alexandria::WWWAgent.new
         @agent
       end
 
       def fetch_redirectly(uri_str, limit = 5)
-        raise NoResultsError, 'HTTP redirect too deep' if limit.zero?
+        raise NoResultsError, _("HTTP redirect too deep") if limit.zero?
+
         if limit < 10
           sleep 0.1
           log.debug { "Redirectly :: #{uri_str}" }
@@ -64,12 +67,10 @@ module Alexandria
         response = agent.get(uri_str)
         log.debug { response.inspect }
         case response
-        when Net::HTTPSuccess     then response
-        when Net::HTTPRedirection then
-          redirect = URI.parse response['Location']
-          if redirect.relative?
-            redirect = URI.parse(uri_str) + redirect
-          end
+        when Net::HTTPSuccess then response
+        when Net::HTTPRedirection
+          redirect = URI.parse response["Location"]
+          redirect = URI.parse(uri_str) + redirect if redirect.relative?
           fetch_redirectly(redirect.to_s, (limit - 1))
         else
           response.error!
@@ -78,7 +79,7 @@ module Alexandria
 
       def search(criterion, type)
         req = create_search_uri(type, criterion)
-        puts "Requesting #{req}" if $DEBUG
+        log.debug { "Requesting #{req}" }
         html_data = fetch_redirectly(req)
 
         if type == SEARCH_BY_ISBN
@@ -93,22 +94,22 @@ module Alexandria
 
       def url(book)
         create_search_uri(SEARCH_BY_ISBN, book.isbn)
-      rescue => ex
+      rescue StandardError => ex
         log.warn { "Cannot create url for book #{book}; #{ex.message}" }
         nil
       end
 
       def create_search_uri(search_type, search_term)
         (search_type_code = {
-          SEARCH_BY_AUTHORS => 'ATH',
-          SEARCH_BY_TITLE => 'TTL',
-          SEARCH_BY_KEYWORD => 'WRD' # SEARCH_BY_PUBLISHER => 'PBL' # not implemented
-        }[search_type]) || ''
+          SEARCH_BY_AUTHORS => "ATH",
+          SEARCH_BY_TITLE   => "TTL",
+          SEARCH_BY_KEYWORD => "WRD" # SEARCH_BY_PUBLISHER => 'PBL' # not implemented
+        }[search_type]) || ""
         if search_type == SEARCH_BY_ISBN
           BASE_ISBN_SEARCH_URL % Library.canonicalise_ean(search_term) # isbn-13
         else
           search_term_encoded = CGI.escape(search_term)
-          BASE_SEARCH_URL % [search_type_code, search_term_encoded]
+          format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
         end
       end
 
@@ -127,19 +128,19 @@ module Alexandria
             result = {}
             # img = div % 'div.book-image/a/img'
             # result[:image_url] = img['src'] if img
-            title_header = div % 'h2'
-            title_links = title_header / 'a'
+            title_header = div % "h2"
+            title_links = title_header / "a"
             result[:title] = title_links.first.inner_text
-            result[:url] = title_links.first['href']
+            result[:url] = title_links.first["href"]
 
             book_search_results << result
           end
-        rescue => ex
+        rescue StandardError => ex
           trace = ex.backtrace.join("\n> ")
-          log.warn {
-            'Failed parsing search results for Barnes & Noble ' \
+          log.warn do
+            "Failed parsing search results for Barnes & Noble " \
             "#{ex.message} #{trace}"
-          }
+          end
         end
         book_search_results
       end
@@ -149,8 +150,8 @@ module Alexandria
         begin
           book_data = {}
 
-          dl = (doc / 'dl').first
-          dts = dl.children_of_type('dt')
+          dl = (doc / "dl").first
+          dts = dl.children_of_type("dt")
           dts.each do |dt|
             value = dt.next_sibling.inner_text
             case dt.inner_text
@@ -165,44 +166,44 @@ module Alexandria
             end
           end
 
-          meta = doc / 'meta'
+          meta = doc / "meta"
           meta.each do |it|
             attrs = it.attributes
-            property = attrs['property']
+            property = attrs["property"]
             next unless property
+
             case property
-            when 'og:title'
-              book_data[:title] = attrs['content']
-            when 'og:image'
-              book_data[:image_url] = attrs['content']
+            when "og:title"
+              book_data[:title] = attrs["content"]
+            when "og:image"
+              book_data[:image_url] = attrs["content"]
             end
           end
 
-          author_links = doc / 'span.contributors a'
+          author_links = doc / "span.contributors a"
           authors = author_links.map(&:inner_text)
           book_data[:authors] = authors
 
-          book_data[:binding] = ''
-          selected_format = (doc / '#availableFormats li.selected a.tabTitle').first
-          if selected_format
-            book_data[:binding] = selected_format.inner_text
-          end
+          book_data[:binding] = ""
+          selected_format = (doc / "#availableFormats li.selected a.tabTitle").first
+          book_data[:binding] = selected_format.inner_text if selected_format
 
           book = Book.new(book_data[:title], book_data[:authors],
                           book_data[:isbn], book_data[:publisher],
                           book_data[:publication_year],
                           book_data[:binding])
-          return [book, book_data[:image_url]]
-        rescue => ex
+          [book, book_data[:image_url]]
+        rescue StandardError => ex
           raise ex if ex.instance_of? NoResultsError
+
           trace = ex.backtrace.join("\n> ")
-          log.warn {
-            'Failed parsing search results for BarnesAndNoble ' \
+          log.warn do
+            "Failed parsing search results for BarnesAndNoble " \
             "#{ex.message} #{trace}"
-          }
+          end
           raise NoResultsError
         end
       end
-    end # class BarnesAndNobleProvider
-  end # class BookProviders
-end # module Alexandria
+    end
+  end
+end

data/lib/alexandria/book_providers/douban.rb

@@ -1,42 +1,28 @@
-# -*- ruby -*-
-#
-# Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 2010 Sun Ning
-#
-# 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.
 
 # http://book.douban.com/
 # Douban.com book repository, provides many Chinese books.
 
 # Author: Sun Ning <classicning@gmail.com>, http://sunng.info/
 
-require 'cgi'
-require 'alexandria/net'
-require 'yaml'
+require "cgi"
+require "alexandria/net"
+require "yaml"
 
 module Alexandria
   class BookProviders
     class DoubanProvider < GenericProvider
-      include Alexandria::Logging
+      include Logging
 
-      SITE = 'http://www.douban.com'.freeze
-      BASE_URL = 'http://api.douban.com/book/subjects?q=%s&max-results=5&alt=json'.freeze
+      SITE = "http://www.douban.com"
+      BASE_URL = "http://api.douban.com/book/subjects?q=%s&max-results=5&alt=json"
 
       def initialize
-        super('Douban', 'Douban (China)')
+        super("Douban", "Douban (China)")
         prefs.read
       end
 
@@ -54,9 +40,9 @@ module Alexandria
         raise NoResultsError if results.empty?
 
         if type == SEARCH_BY_ISBN
-          return results.first
+          results.first
         else
-          return results
+          results
         end
       end
 
@@ -72,10 +58,10 @@ module Alexandria
       def json2yaml(json)
         # insert spaces after : and , except within strings
         # i.e. when followed by numeral, quote, { or [
-        yaml = json.gsub(/(\:|\,)([0-9'"{\[])/) do |_match|
+        yaml = json.gsub(/(:|,)([0-9'"{\[])/) do |_match|
           "#{Regexp.last_match[1]} #{Regexp.last_match[2]}"
         end
-        yaml.gsub!(/\\\//, '/') # unescape forward slashes
+        yaml.gsub!(%r{\\/}, "/") # unescape forward slashes
         yaml
       end
 
@@ -85,43 +71,35 @@ module Alexandria
         book_search_results = []
         begin
           # dbresult = JSON.parse(response)
-          dbresult = YAML.load(json2yaml(response))
+          dbresult = YAML.safe_load(json2yaml(response))
           # File.open(",douban.yaml", "wb") {|f| f.write(json2yaml(response)) }
-          if dbresult['opensearch:totalResults']['$t'].to_i > 0
-            for item in dbresult['entry']
-              name = item['title']['$t']
+          if dbresult["opensearch:totalResults"]["$t"].to_i > 0
+            dbresult["entry"].each do |item|
+              name = item["title"]["$t"]
               isbn = nil
               publisher = nil
               pubdate = nil
               binding = nil
-              for av in item['db:attribute']
-                isbn = av['$t'] if av['@name'] == 'isbn13'
-                if av['@name'] == 'publisher'
-                  publisher = av['$t']
-                end
-                if av['@name'] == 'pubdate'
-                  pubdate = av['$t']
-                end
-                if av['@name'] == 'binding'
-                  binding = av['$t']
-                end
+              item["db:attribute"].each do |av|
+                isbn = av["$t"] if av["@name"] == "isbn13"
+                publisher = av["$t"] if av["@name"] == "publisher"
+                pubdate = av["$t"] if av["@name"] == "pubdate"
+                binding = av["$t"] if av["@name"] == "binding"
               end
-              authors = if item['author']
-                          item['author'].map { |a| a['name']['$t'] }
+              authors = if item["author"]
+                          item["author"].map { |a| a["name"]["$t"] }
                         else
                           []
                         end
               image_url = nil
-              for av in item['link']
-                if av['@rel'] == 'image'
-                  image_url = av['@href']
-                end
+              item["link"].each do |av|
+                image_url = av["@href"] if av["@rel"] == "image"
               end
               book = Book.new(name, authors, isbn, publisher, pubdate, binding)
               book_search_results << [book, image_url]
             end
           end
-        rescue => ex
+        rescue StandardError => ex
           log.warn(ex.backtrace.join('\n'))
         end
         book_search_results

data/lib/alexandria/book_providers/proxis.rb

@@ -1,32 +1,20 @@
-# Copyright (C) 2009 Cathal Mc Ginley
-# Copyright (C) 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.
 
 # New Proxis provider, taken from Palatina MetaDataSource and modified
 # for Alexandria. (20 Dec 2009)
 
-require 'cgi'
-require 'alexandria/book_providers/web'
+require "cgi"
+require "alexandria/book_providers/web"
 
 module Alexandria
   class BookProviders
     class ProxisProvider < WebsiteBasedProvider
       # include GetText
-      include Alexandria::Logging
+      include Logging
       # GetText.bindtextdomain(Alexandria::TEXTDOMAIN, :charset => "UTF-8")
 
       # Proxis essentially has three book databases, NL, FR and EN.
@@ -34,14 +22,14 @@ module Alexandria
       # it adds most to Alexandria (Amazon already has French and
       # English titles).
 
-      SITE = 'http://www.proxis.nl'.freeze
+      SITE = "http://www.proxis.nl"
       BASE_SEARCH_URL = "#{SITE}/NLNL/Search/IndexGSA.aspx?search=%s" \
-        '&shop=100001NL&SelRubricLevel1Id=100001NL'.freeze
+        "&shop=100001NL&SelRubricLevel1Id=100001NL"
       ISBN_REDIRECT_BASE_URL = "#{SITE}/NLNL/Search/Index.aspx?search=%s" \
-        '&shop=100001NL&SelRubricLevel1Id=100001NL'.freeze
+        "&shop=100001NL&SelRubricLevel1Id=100001NL"
 
       def initialize
-        super('Proxis', 'Proxis (Belgium)')
+        super("Proxis", "Proxis (Belgium)")
         # prefs.add("lang", _("Language"), "fr",
         #          LANGUAGES.keys)
         prefs.read
@@ -49,11 +37,12 @@ module Alexandria
 
       def search(criterion, type)
         req = create_search_uri(type, criterion)
-        puts req if $DEBUG
+        log.debug { req }
         html_data = transport.get_response(URI.parse(req))
 
         results = parse_search_result_data(html_data.body)
         raise NoResultsError if results.empty?
+
         if type == SEARCH_BY_ISBN
           get_book_from_search_result(results.first)
         else
@@ -85,32 +74,29 @@ module Alexandria
       def text_of(node)
         if node.nil?
           nil
-        else
-          if node.text?
-            node.to_html
-          elsif node.elem?
-            if node.children.nil?
-              nil
-            else
-              node_text = node.children.map { |n| text_of(n) }.join
-              node_text.strip.squeeze(' ')
-            end
+        elsif node.text?
+          node.to_html
+        elsif node.elem?
+          if node.children.nil?
+            nil
+          else
+            node_text = node.children.map { |n| text_of(n) }.join
+            node_text.strip.squeeze(" ")
           end
-          # node.inner_html.strip
         end
       end
 
       def parse_search_result_data(html)
         doc = html_to_doc(html)
         book_search_results = []
-        items = doc.search('table.searchResult tr')
+        items = doc.search("table.searchResult tr")
         items.each do |item|
           result = {}
-          title_link = item % 'h5 a'
+          title_link = item % "h5 a"
           if title_link
             result[:title] = text_of(title_link)
-            result[:lookup_url] = title_link['href']
-            unless result[:lookup_url] =~ /^http/
+            result[:lookup_url] = title_link["href"]
+            unless result[:lookup_url].start_with?("http")
               result[:lookup_url] = "#{SITE}#{result[:lookup_url]}"
             end
           end
@@ -122,9 +108,9 @@ module Alexandria
         book_search_results
       end
 
-      def data_for_header(th)
-        tr = th.parent
-        td = tr.at('td')
+      def data_for_header(header)
+        tr = header.parent
+        td = tr.at("td")
         text_of(td) if td
       end
 
@@ -133,23 +119,19 @@ module Alexandria
         book_data = {}
         book_data[:authors] = []
         # TITLE
-        if (title_header = doc.search('div.detailBlock h3'))
-          header_spans = title_header.first.search('span')
+        if (title_header = doc.search("div.detailBlock h3"))
+          header_spans = title_header.first.search("span")
           title = text_of(header_spans.first)
-          if title =~ /(.+)-$/
-            title = Regexp.last_match[1].strip
-          end
+          title = Regexp.last_match[1].strip if title =~ /(.+)-$/
           book_data[:title] = title
         end
 
-        info_headers = doc.search('table.productInfoTable th')
+        info_headers = doc.search("table.productInfoTable th")
 
         isbns = []
         unless info_headers.empty?
           info_headers.each do |th|
-            if th.inner_text =~ /(ISBN|EAN)/
-              isbns << data_for_header(th)
-            end
+            isbns << data_for_header(th) if /(ISBN|EAN)/.match?(th.inner_text)
           end
           book_data[:isbn] = Library.canonicalise_ean(isbns.first)
         end
@@ -159,15 +141,16 @@ module Alexandria
         unless info_headers.empty?
           info_headers.each do |th|
             header_text = th.inner_text
-            if header_text =~ /Type/
+            case header_text
+            when /Type/
               book_data[:binding] = data_for_header(th)
-            elsif header_text =~ /Verschijningsdatum/
+            when /Verschijningsdatum/
               date = data_for_header(th)
-              date =~ /\/([\d]{4})/
+              date =~ %r{/(\d{4})}
               book_data[:publish_year] = Regexp.last_match[1].to_i
-            elsif header_text =~ /Auteur/
+            when /Auteur/
               book_data[:authors] << data_for_header(th)
-            elsif header_text =~ /Uitgever/
+            when /Uitgever/
               book_data[:publisher] = data_for_header(th)
             end
           end
@@ -175,12 +158,12 @@ module Alexandria
 
         image_url = nil
         if (cover_img = doc.at("img[@id$='imgProduct']"))
-          image_url = if cover_img['src'] =~ /^http/
-                        cover_img['src']
+          image_url = if cover_img["src"].start_with?("http")
+                        cover_img["src"]
                       else
                         "#{SITE}/#{cover_img['src']}" # TODO: use html <base>
                       end
-          image_url = nil if image_url =~ /ProductNoCover/
+          image_url = nil if /ProductNoCover/.match?(image_url)
         end
 
         book = Book.new(book_data[:title], book_data[:authors],