alexandria-book-collection-manager 0.7.8 → 0.7.9

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alexandria-book-collection-manager
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.7.9
 platform: ruby
 authors:
 - Alexander McCormmach
@@ -28,7 +28,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-29 00:00:00.000000000 Z
+date: 2022-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gettext
@@ -50,98 +50,110 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: gtk3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.3
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: hpricot
+  name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.5
+        version: '4.3'
 - !ruby/object:Gem::Dependency
-  name: htmlentities
+  name: image_size
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: image_size
+  name: marc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: marc
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: zoom
   requirement: !ruby/object:Gem::Requirement
@@ -171,103 +183,103 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.3.0
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.25'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '1.25'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: rubocop-i18n
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.93.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.93.1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rubocop-i18n
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: '1.13'
 - !ruby/object:Gem::Dependency
-  name: rubocop-performance
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.44.1
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -323,24 +335,22 @@ files:
 - lib/alexandria.rb
 - lib/alexandria/about.rb
 - lib/alexandria/book_providers.rb
-- lib/alexandria/book_providers/adlibris.rb
-- lib/alexandria/book_providers/amazon_aws.rb
-- lib/alexandria/book_providers/amazon_ecs_util.rb
-- lib/alexandria/book_providers/barnes_and_noble.rb
+- lib/alexandria/book_providers/bl_provider.rb
 - lib/alexandria/book_providers/douban.rb
-- lib/alexandria/book_providers/proxis.rb
+- lib/alexandria/book_providers/loc_provider.rb
 - lib/alexandria/book_providers/pseudomarc.rb
-- lib/alexandria/book_providers/siciliano.rb
+- lib/alexandria/book_providers/sbn_provider.rb
 - lib/alexandria/book_providers/thalia_provider.rb
 - lib/alexandria/book_providers/web.rb
 - lib/alexandria/book_providers/worldcat.rb
-- lib/alexandria/book_providers/z3950.rb
+- lib/alexandria/book_providers/z3950_provider.rb
 - lib/alexandria/config.rb
 - lib/alexandria/console.rb
 - lib/alexandria/default_preferences.rb
 - lib/alexandria/execution_queue.rb
 - lib/alexandria/export_format.rb
 - lib/alexandria/export_library.rb
+- lib/alexandria/image_fetcher.rb
 - lib/alexandria/import_library.rb
 - lib/alexandria/import_library_csv.rb
 - lib/alexandria/library_collection.rb
@@ -555,6 +565,9 @@ files:
 - share/sounds/alexandria/good_scan.wav
 - share/sounds/alexandria/scanning.ogg
 - share/sounds/alexandria/scanning.wav
+- spec/alexandria/book_providers/bl_provider_spec.rb
+- spec/alexandria/book_providers/loc_provider_spec.rb
+- spec/alexandria/book_providers/sbn_provider_spec.rb
 - spec/alexandria/book_providers/thalia_provider_spec.rb
 - spec/alexandria/book_providers/world_cat_provider_spec.rb
 - spec/alexandria/book_providers_spec.rb
@@ -619,8 +632,9 @@ files:
 - util/rake/omfgenerate.rb
 homepage: http://www.github.com/mvz/alexandria-book-collection-manager
 licenses:
-- GPL-2
-metadata: {}
+- GPL-2.0+
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options:
 - "--main"
@@ -631,14 +645,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: GNOME application for managing collections of books

data/lib/alexandria/book_providers/adlibris.rb

@@ -1,191 +0,0 @@
-# frozen_string_literal: true
-
-# This file is part of Alexandria.
-#
-# See the file README.md for authorship and licensing information.
-
-# AdLibris  Bokhandel AB http://www.adlibris.com/se/
-# Swedish online book store
-
-# New AdLibris provider, taken from the Palatina MetaDataSource and
-# modified to fit the structure of Alexandria book providers.
-# (26 Feb 2009)
-
-require "cgi"
-require "alexandria/book_providers/web"
-
-module Alexandria
-  class BookProviders
-    class AdLibrisProvider < WebsiteBasedProvider
-      include Logging
-
-      SITE = "http://www.adlibris.com/se/"
-
-      BASE_SEARCH_URL = "#{SITE}searchresult.aspx?search=advanced&%s=%s" \
-        "&fromproduct=False" # type/term
-
-      PRODUCT_URL = "#{SITE}product.aspx?isbn=%s"
-
-      def initialize
-        super("AdLibris", "AdLibris (Sweden)")
-        prefs.read
-        # @ent = HTMLEntities.new
-      end
-
-      ## search (copied from new WorldCat search)
-      def search(criterion, type)
-        req = create_search_uri(type, criterion)
-        log.info { "Fetching #{req} " }
-        html_data = transport.get_response(URI.parse(req))
-
-        if type == SEARCH_BY_ISBN
-          parse_result_data(html_data.body)
-        else
-          results = parse_search_result_data(html_data.body)
-          raise NoResultsError if results.empty?
-
-          results.map { |result| get_book_from_search_result(result) }
-        end
-      end
-
-      ## url
-      def url(book)
-        create_search_uri(SEARCH_BY_ISBN, book.isbn)
-      rescue StandardError => ex
-        log.warn { "Cannot create url for book #{book}; #{ex.message}" }
-        nil
-      end
-
-      private
-
-      def create_search_uri(search_type, search_term)
-        if search_type == SEARCH_BY_ISBN
-          PRODUCT_URL % Library.canonicalise_isbn(search_term)
-        else
-          (search_type_code = {
-            SEARCH_BY_AUTHORS => "author",
-            SEARCH_BY_TITLE   => "title",
-            SEARCH_BY_KEYWORD => "keyword"
-          }[search_type]) || "keyword"
-          search_term_encoded = CGI.escape(search_term)
-          format(BASE_SEARCH_URL, search_type_code, search_term_encoded)
-        end
-      end
-
-      # TODO: use Iconv to pre-convert the html.body to UTF-8 everywhere
-      # before sending it to the parser methods
-
-      def get_book_from_search_result(rslt)
-        html_data = transport.get_response(URI.parse(rslt[:lookup_url]))
-        parse_result_data(html_data.body)
-      end
-
-      def parse_search_result_data(html)
-        doc = html_to_doc(html)
-        book_search_results = []
-
-        search_hit = doc.search("div'searchResult")[0]
-        return [] unless search_hit
-
-        (search_hit / "ul.ulSearch table").each do |t|
-          result = {}
-          if (title_data = (t % "div.divTitle"))
-            result[:title] = (title_data % :a).inner_text
-            lookup_url = (title_data % :a)["href"]
-          end
-          result[:lookup_url] = "#{SITE}#{lookup_url}"
-
-          book_search_results << result
-        end
-        book_search_results
-      end
-
-      def normalize(text)
-        text
-      end
-
-      def parse_result_data(html)
-        doc = html_to_doc(html)
-        begin
-          h1 = doc.at("div.productTitleFormat h1")
-          raise NoResultsError, _("title not found on page") unless h1
-
-          title = text_of(h1)
-
-          product = doc.at("div.product")
-          ul_info = doc.at("ul.info") # NOTE, two of these
-
-          author_cells = ul_info.search("li.liAuthor") # css-like search
-          authors = []
-          author_cells.each do |li|
-            author_name = text_of(li.search("h2 > a")[0])
-
-            authors << author_name
-          end
-
-          publisher = nil
-          if (publisher_elem = product.search('li[@id$="liPublisher"] a').first)
-            publisher = text_of(publisher_elem)
-          end
-
-          binding = nil
-          if (format = doc.search("div.productTitleFormat span").first)
-            binding = text_of(format)
-            binding = Regexp.last_match[1] if binding =~ /\(([^)]+)\)/
-          end
-
-          year = nil
-          if (published = product.search('span[@id$="Published"]').first)
-            publication = published.inner_text
-            year = Regexp.last_match[1].to_i if publication =~ /([12][0-9]{3})/
-          end
-
-          isbns = []
-          isbn_tds = doc.search("li[@id *= 'liISBN'] td[text()]")
-
-          isbn_tds.each do |isbn_td|
-            isbn = isbn_td.inner_text
-            next unless isbn =~ /[0-9x]{10,13}/i
-
-            isbn.gsub(/(\n|\r)/, " ")
-            isbn = Regexp.last_match[1] if isbn =~ /:\s*([0-9x]+)/i
-            isbns << isbn
-          end
-          isbn = isbns.first
-          isbn = Library.canonicalise_isbn(isbn) if isbn
-
-          # cover
-          image_url = nil
-          cover_img =
-            doc.search('span.imageWithShadow img[@id$="ProductImageNotLinked"]').first
-          if cover_img
-            image_url = if cover_img["src"].start_with?("http://")
-                          cover_img["src"]
-                        else
-                          "#{SITE}/#{cover_img['src']}" # HACK: use html base
-                        end
-            if /noimage.gif$/.match?(image_url)
-              # no point downloading a "no image" graphic
-              # Alexandria has its own generic book icon...
-              image_url = nil
-            end
-
-          end
-
-          book = Book.new(title, authors, isbn, publisher, year, binding)
-
-          [book, image_url]
-        rescue StandardError => ex
-          raise ex if ex.instance_of? NoResultsError
-
-          trace = ex.backtrace.join("\n> ")
-          log.warn do
-            "Failed parsing search results for AdLibris " \
-            "#{ex.message} #{trace}"
-          end
-          raise NoResultsError
-        end
-      end
-    end
-  end
-end