alexandrite 0.1.1.pre.alpha → 0.1.3.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b04594e2817421efbc7843faddd9ea5b6bee3ff093d52c4328d3fa1b76680905
-  data.tar.gz: 6ec96b26a30b7609dcdf2da25ce6ccaf38279d3fb232da07327e6699b39661ff
+  metadata.gz: 35890f7e1386bc1f6d60ac0d68efd032288f1b4c448e5414c4a6bde38469a262
+  data.tar.gz: 5b29ae9057b620bc9649889b86587a77b1ecaf9eee4549d339293657e44ff95c
 SHA512:
-  metadata.gz: b028aba504cc9e5f14deac610c81eb1c18066b90a563f0d9486cd6f06ca4b3a1be803333417fd0c06240be1db021842d334088695d512d06ea873dbd4f126b08
-  data.tar.gz: 66563405941ad6bd600b26466d229eb93929de988848547305322e878d3642df4da7cba555eafa3f22c055ea5c07314a85bc5028c70d352c5479a535324d8e06
+  metadata.gz: 4655704b09257367b07cb36ffaa6ecfc6bd5fd7991f5066791b48a351dfd39f297a517497595122f6312eff2d98c4999593a999a72d96653a6ded608e92fb39f
+  data.tar.gz: 5d12307befe3fee203ed3e0e5c8fe66cb8fa13e10e7b3586023062ad7be124c96f2fd174755181a20ce9290a334efc3720749dcdc1610cd8f9def5608095771b

data/Gemfile

@@ -6,5 +6,6 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'faraday'
+gem 'logger'
 gem 'faraday-decode_xml'
 gem 'rubocop'

data/lib/alexandrite/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Alexandrite
-  VERSION = '0.1.1-alpha'
+  VERSION = '0.1.3-alpha'
 end

data/lib/alexandrite.rb

@@ -21,9 +21,11 @@ module Alexandrite
       @result = search_with(key, query)
     end
 
-    # @return [Alexandrite::BookData]
+    # @return [nil]
     def self.create_from_google(key, query)
       Alexandrite::BookData.create_data(get_volume_info(key, query))
+    rescue StandardError => e
+      Alexandrite::BookData.create_data({ :error_message => e.message, 'origin' => 'Google API' })
     end
   end
 
@@ -58,8 +60,14 @@ module Alexandrite
   end
 
   def create_book(key, query)
+    log = Logger.new(STDOUT)
+    log.info "Fetching book info from Google API. Key: #{key}. Query: #{query}"
     book = API[:google].create_from_google(key, query)
-    return API[:oclc].create_from_oclc(key, query) if book[:error_message]
+    if book[:error_message]
+      log.warn "Failing when fetching book info. Error message: #{book[:error_message]}"
+      log.info "Fetching book info from OCLC API. Key: #{key}. Query: #{query}"
+      return API[:oclc].create_from_oclc(key, query)
+    end
 
     book
   end
@@ -69,8 +77,10 @@ module Alexandrite
   # @return [Array<Alexandrite::BookData]
   def bulk_create(key, data)
     bookshelf = []
+    log = Logger.new(STDOUT)
     data.each do |query|
       book = create_book(key, query)
+      log.info "Book created. Key #{key}. Query: #{query}. Source: #{book[:data_source]}"
       bookshelf << book
     end
 

data/lib/alexandrite_book_data.rb

@@ -45,12 +45,14 @@ module Alexandrite
         data[:isbn13] = volume_info['ISBN_13']
         return data
       end
-
-      volume_info['industryIdentifiers'].each do |identifier|
-        data[:isbn10] = identifier['identifier'] if identifier['type'] == 'ISBN_10'
-        data[:isbn13] = identifier['identifier'] if identifier['type'] == 'ISBN_13'
+      begin
+        volume_info['industryIdentifiers'].each do |identifier|
+          data[:isbn10] = identifier['identifier'] if identifier['type'] == 'ISBN_10'
+          data[:isbn13] = identifier['identifier'] if identifier['type'] == 'ISBN_13'
+        end
+      rescue NoMethodError
+        data
       end
-
       data
     end
   end

data/lib/alexandrite_oclc.rb

@@ -31,28 +31,37 @@ module Alexandrite
       Nokogiri::XML(conn.get(search).body)
     end
 
+    def extract_value(attribute)
+      return nil unless attribute.respond_to?(:value)
+
+      attribute.value
+    end
+
+    def extract_nokogiri_data(document, children, attribute)
+      extract_value(document.css(children).attribute(attribute))
+    end
+
     def get_book_data(result)
       isbn = result.css('input').children.text
       isbn_type = define_isbn_type(isbn)
       {
         'origin' => 'OCLC API',
-        'title' => result.css('work').attribute('title').value,
-        'authors' => result.css('work').attribute('author').value,
-        'ddc' => result.css('mostPopular').attribute('nsfa').value,
+        'title' => extract_nokogiri_data(result, 'work', 'title'),
+        'authors' => extract_nokogiri_data(result, 'work', 'author'),
+        'ddc' => extract_nokogiri_data(result, 'mostPopular', 'nsfa'),
         isbn_type => isbn
       }
     end
 
     def recommend_classification(key, query, length = 5, mode: 'ddc')
       results = search_by(key, query)
-
       response_cases(results, length, mode)
     end
 
     private
 
     # @return [Integer]
-    def get_response_code(result) = result.css('response').attribute('code').value.to_i
+    def get_response_code(result) = extract_nokogiri_data(result, 'response', 'code').to_i
 
     def get_owis(result, length)
       owis = []
@@ -85,17 +94,12 @@ module Alexandrite
 
     def create_new_book(query)
       Alexandrite::BookData.create_data(get_book_data(query.result))
+    rescue StandardError => e
+      Alexandrite::BookData.create_data({ :error_message => e.message, 'origin' => 'OCLC API' })
     end
 
-    def retry_create_new_book(query)
-      owi = get_owis(query.result, 1)[0]
-      new_query = Alexandrite::OCLC.new('owi', owi)
-      volume_info = get_book_data(new_query.result)
-      Alexandrite::BookData.create_data(volume_info)
-    end
-
-    def handle_error_creating_book(query)
-      raise ErrorType::DataNotFound, response_cases(query.result, 0, 'none')
+    def handle_error_creating_book
+      raise ErrorType::DataNotFound, yield
     rescue StandardError => e
       Alexandrite::BookData.create_data({ :error_message => e.message, 'origin' => 'OCLC API' })
     end
@@ -129,9 +133,9 @@ module Alexandrite
       when 0, 2
         create_new_book(query)
       when 4
-        retry_create_new_book(query)
+        handle_error_creating_book { 'Not found exact item. Check coincidences' }
       else
-        handle_error_creating_book(query)
+        handle_error_creating_book { response_cases(query.result, 0, 'none') }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexandrite
 version: !ruby/object:Gem::Version
-  version: 0.1.1.pre.alpha
+  version: 0.1.3.pre.alpha
 platform: ruby
 authors:
 - J. P. Pérez-Tejada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-22 00:00:00.000000000 Z
+date: 2023-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Tools for fetching books data from Google and OCLC