alexandrite 0.1.2.pre.alpha → 0.1.4.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1904340a4469d9f82f1d42d16a58cdd7a63e0a23711ed040d20c63648164d4fc
-  data.tar.gz: a6e306d3416403661661ed1bee823d43bd332f446cb1e1ee61e1529c8f5362aa
+  metadata.gz: 43a1742c1305de531ba2b4c3b7c68b28763fc0c3193a1e2ab74d47c35a44b260
+  data.tar.gz: 9b3e16191969c872fa000ca8e9fc4c44e9c028b141da68f7d7e54cd911abf2c8
 SHA512:
-  metadata.gz: 40f3d5f4f06ce58a3f99156f4a26e399cb8b3e1c852a34de923947aa1b5cad75f39a2d75cc39ed86fa2a765292318ec890e5acc201fa922d861b91618e4d1d96
-  data.tar.gz: 0fc0a88be83ab17e5753cd389dac7de71ecffaa6915e59d7047a5dd4dc547b84a7fb0a2231be8e22fd911cf162945ad2fa16dafa531af82b0891f6539e22d3eb
+  metadata.gz: d2461c44fc9d3324db7bcf84bc060112094f7a17412b3dcf4c339030b08b1b2c8cd5cee52e70e35aa7cb1339a1c6a8d9300cfe5d36a85f64286acb1cb6943f14
+  data.tar.gz: c2bf54e156474abf8a5424b7e953f8e60e646a2ad56fd4f1e33a42fb69775444df92ab90e81bc3c05b8d486df755f0a02be9467f2a17169847b09c4bd82672d7

data/Gemfile

@@ -7,4 +7,7 @@ gemspec
 
 gem 'faraday'
 gem 'faraday-decode_xml'
+gem 'logger'
+gem 'rbs'
+gem 'bump'
 gem 'rubocop'

data/lib/alexandrite/version.rb

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

data/lib/alexandrite.rb

@@ -21,9 +21,13 @@ module Alexandrite
       @result = search_with(key, query)
     end
 
-    # @return [Alexandrite::BookData]
+    # @param [String] key
+    # @param [String] query
+    # @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,19 +62,27 @@ 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
 
   # @param key [String]
   # @param data [Array<String>]
-  # @return [Array<Alexandrite::BookData]
+  # @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

@@ -40,20 +40,37 @@ module Alexandrite
     def self.add_industry_identifiers(volume_info, data)
       return data unless volume_info[:error_message].nil?
 
-      if data[:data_source] == 'OCLC API'
+      assign_isbn(data, volume_info)
+
+      data
+    end
+
+    private
+
+    def assign_isbn(data, volume_info)
+      case data[:data_source]
+      when 'OCLC API'
         data[:isbn10] = volume_info['ISBN_10']
         data[:isbn13] = volume_info['ISBN_13']
-        return data
+      else
+        select_identifiers(data, volume_info)
       end
-      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
+
+    def select_identifiers(data, volume_info)
+      return data unless volume_info['industryIdentifiers']
+
+      volume_info['industryIdentifiers'].each do |identifier|
+        data[:isbn10] = identifier['identifier'] if isbn10?(identifier)
+        data[:isbn13] = identifier['identifier'] if isbn13?(identifier)
       end
+
       data
     end
+
+    def isbn10?(identifier) = identifier['type'] == 'ISBN_10'
+
+    def isbn13?(identifier) = identifier['type'] == 'ISBN_13'
   end
 end

data/lib/alexandrite_oclc.rb

@@ -94,6 +94,8 @@ 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 handle_error_creating_book

data/sig/alexandrite/alexandrite.rbs

@@ -0,0 +1,10 @@
+module Alexandrite
+  VERSION: String
+  API: {google: singleton(Google), oclc: singleton(OCLC)}
+  include BookData
+  include ErrorType
+
+  def search_with: (String key, String query, ?api: :google | :oclc) -> (Nokogiri::XML::Document | {error_message: String, results_size: Integer, books: untyped})
+  def create_book: (String key, String query) -> {title: String?, authors: String?, published_date: String?, page_count: String?, description: String?, categories: String?, language: String?, data_source: String, isbn10: String?, isbn13: String?, error_message: String?}
+  def bulk_create: (String key, Array[String] data) -> Array[Hash[Symbol,Object]]
+end

data/sig/alexandrite/book_data.rbs

@@ -0,0 +1,16 @@
+module Alexandrite
+  module BookData
+    def self.create_data: (Hash[:books | :error_message | :results_size | String, String?] volume_info) -> {title: String?, authors: String?, published_date: String?, page_count: String?, description: String?, categories: String?, language: String?, data_source: String, isbn10: String?, isbn13: String?, error_message: String?}
+    def self.add_basic_values: (Hash[:books | :error_message | :results_size | String, String?] volume_info) -> {title: String?, authors: String?, published_date: String?, page_count: String?, description: String?, categories: String?, language: String?}
+    def self.add_origin: (Hash[:books | :error_message | :results_size | String, String?] volume_info) -> String
+    def self.add_industry_identifiers: (Hash[:books | :error_message | :results_size | String, String?] volume_info, {title: String?, authors: String?, published_date: String?, page_count: String?, description: String?, categories: String?, language: String?, data_source: String} data) -> {title: String?, authors: String?, published_date: String?, page_count: String?, description: String?, categories: String?, language: String?, data_source: String, isbn10: String?, isbn13: String?}
+
+    private
+
+    def assign_isbn: (Hash[Symbol,Object] data, Hash[Symbol,Object] volume_info) -> Hash[Symbol,Object]
+    def select_identifiers: (Hash[Symbol,Object] data, Hash[Symbol,Object] volume_info) -> Hash[Symbol,Object]
+    def isbn10?: (Hash[String, String] identifier)-> bool
+    def isbn13?: -> (Hash[String, String] identifier)-> bool
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexandrite
 version: !ruby/object:Gem::Version
-  version: 0.1.2.pre.alpha
+  version: 0.1.4.pre.alpha
 platform: ruby
 authors:
 - J. P. Pérez-Tejada
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,6 +164,8 @@ files:
 - lib/helpers/file_handler.rb
 - lib/helpers/format.rb
 - lib/helpers/validation.rb
+- sig/alexandrite/alexandrite.rbs
+- sig/alexandrite/book_data.rbs
 - spec/alexandrite_spec.rb
 - spec/factories/book.rb
 - spec/helpers/format_spec.rb
@@ -189,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.5
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Tools for fetching books data from Google and OCLC