alexandrite 0.1.0.pre.alpha → 0.1.2.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daf4377dc5fb6c1b1b122236cdd76e760863a575bd6e1bd177d20d98aab92508
-  data.tar.gz: ce9bfcf98c1142b5e539b52189962779c2286705a9c361ba3da7bfa76b80ac81
+  metadata.gz: 1904340a4469d9f82f1d42d16a58cdd7a63e0a23711ed040d20c63648164d4fc
+  data.tar.gz: a6e306d3416403661661ed1bee823d43bd332f446cb1e1ee61e1529c8f5362aa
 SHA512:
-  metadata.gz: 370748c92b5a9db2b9942fa8b8d779a2324a3a3c95c3114059d708346ff4ef6ee3afa8405a6f5aee58312bfef674e93b14b120d0ed4ef5a6c1cfdbaa4c55bc92
-  data.tar.gz: b04df9e530984ad698e71ea0057a60911480ad5c423d83ecea46413b8eea13af96e7db0fae3cb7d6c96e538b7d50e4457bd63ca04d6176ac5e8282f18f221a31
+  metadata.gz: 40f3d5f4f06ce58a3f99156f4a26e399cb8b3e1c852a34de923947aa1b5cad75f39a2d75cc39ed86fa2a765292318ec890e5acc201fa922d861b91618e4d1d96
+  data.tar.gz: 0fc0a88be83ab17e5753cd389dac7de71ecffaa6915e59d7047a5dd4dc547b84a7fb0a2231be8e22fd911cf162945ad2fa16dafa531af82b0891f6539e22d3eb

data/lib/alexandrite/version.rb

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

data/lib/alexandrite.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'alexandrite_book'
+require_relative 'alexandrite_book_data'
 require_relative 'alexandrite_google'
 require_relative 'alexandrite_oclc'
 require_relative 'error_type/errors'
@@ -8,37 +8,38 @@ require_relative 'error_type/errors'
 # Main gem methods for creating books from ISBN
 module Alexandrite
   include ErrorType
+  include Alexandrite::BookData
 
   # Get and Process data from Google API
   class Google
+    include Alexandrite
     extend Alexandrite::GoogleAPI
 
     attr_reader :result
 
     def initialize(key, query)
-      @result = search_by(key, query)
+      @result = search_with(key, query)
     end
 
-    # @return [Alexandrite::Book]
+    # @return [Alexandrite::BookData]
     def self.create_from_google(key, query)
-      volume_info = get_volume_info(key, query)
-
-      Alexandrite::Book.new(volume_info)
+      Alexandrite::BookData.create_data(get_volume_info(key, query))
     end
   end
 
   # Get and Process data from OCLC API
   class OCLC
+    include Alexandrite
     extend Alexandrite::OCLCAPI
 
     attr_reader :result
 
     # return [Alexandrite::OCLC]
     def initialize(key, query, api: :oclc)
-      @result = search_by(key, query, api: api)
+      @result = search_with(key, query, api: api)
     end
 
-    # @return [Alexandrite::Book]
+    # @return [Alexandrite::BookData]
     def self.create_from_oclc(type, identifier)
       query = Alexandrite::OCLC.new(type, identifier)
       response_code = get_response_code(query.result)
@@ -52,20 +53,20 @@ module Alexandrite
     oclc: Alexandrite::OCLC
   }.freeze
 
-  def search_by(key, query, api: :google)
+  def search_with(key, query, api: :google)
     API[api].search_by(key, query)
   end
 
   def create_book(key, query)
     book = API[:google].create_from_google(key, query)
-    return API[:oclc].create_from_oclc(key, query) if book.error_message
+    return API[:oclc].create_from_oclc(key, query) if book[:error_message]
 
     book
   end
 
   # @param key [String]
   # @param data [Array<String>]
-  # @return [Array<Alexandrite::Books]
+  # @return [Array<Alexandrite::BookData]
   def bulk_create(key, data)
     bookshelf = []
     data.each do |query|
@@ -75,13 +76,4 @@ module Alexandrite
 
     bookshelf
   end
-
-  private
-
-  def get_volume_info(key, query)
-    query = search_by(key, query)
-    return query[:books].first['volumeInfo'] unless query[:error_message]
-
-    query
-  end
 end

data/lib/alexandrite_book_data.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+require_relative 'alexandrite'
+require 'nokogiri'
+
+module Alexandrite
+  # Create a book objects
+  module BookData
+    # @param volume_info [Hash]
+    # @return [Hash]
+    def self.create_data(volume_info)
+      data = add_basic_values(volume_info)
+      data[:data_source] = add_origin(volume_info)
+      data = add_industry_identifiers(volume_info, data)
+      data[:error_message] = volume_info[:error_message]
+
+      data
+    end
+
+    def self.add_basic_values(volume_info)
+      {
+        title: volume_info['title'],
+        authors: volume_info['authors'],
+        published_date: volume_info['publisher'],
+        page_count: volume_info['pageCount'],
+        description: volume_info['description'],
+        categories: volume_info['categories'],
+        language: volume_info['language']
+
+      }
+    end
+
+    # @param [Hash] volume_info
+    # @return [String]
+    def self.add_origin(volume_info) = volume_info['origin'] || 'Google API'
+
+    # @param [Hash] volume_info
+    # @param [Hash] data
+    # @return [NilClass]
+    def self.add_industry_identifiers(volume_info, data)
+      return data unless volume_info[:error_message].nil?
+
+      if data[:data_source] == 'OCLC API'
+        data[:isbn10] = volume_info['ISBN_10']
+        data[:isbn13] = volume_info['ISBN_13']
+        return data
+      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
+      data
+    end
+  end
+end

data/lib/alexandrite_bookshelf.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative 'alexandrite'
-require_relative 'alexandrite_book'
+require_relative 'alexandrite_book_data'
 require_relative 'helpers/file_handler'
 
 # Create, Read, Update and Delete books in a book collection

data/lib/alexandrite_google.rb

@@ -62,6 +62,13 @@ module Alexandrite
 
     private
 
+    def get_volume_info(key, query)
+      query = search_by(key, query)
+      return query[:books].first['volumeInfo'] unless query[:error_message]
+
+      query
+    end
+
     def zero_results?(response_body) = response_body['totalItems'].zero?
 
     def process_response(response)

data/lib/alexandrite_oclc.rb

@@ -17,6 +17,7 @@ module Alexandrite
     include Nokogiri
     include Alexandrite::Helpers::Format
     include Alexandrite::Helpers::Validation
+    include Alexandrite::BookData
 
     BASE_URL = 'http://classify.oclc.org/classify2/Classify?'
 
@@ -30,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 = []
@@ -83,22 +93,13 @@ module Alexandrite
     end
 
     def create_new_book(query)
-      volume_info = get_book_data(query.result)
-
-      Alexandrite::Book.new(volume_info)
-    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::Book.new(volume_info)
+      Alexandrite::BookData.create_data(get_book_data(query.result))
     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::Book.new({ :error_message => e.message, 'origin' => 'OCLC API' })
+      Alexandrite::BookData.create_data({ :error_message => e.message, 'origin' => 'OCLC API' })
     end
 
     # @param [Nokogiri::XML] result
@@ -130,9 +131,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

data/lib/helpers/file_handler.rb

@@ -16,4 +16,4 @@ module Alexandrite
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alexandrite
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre.alpha
+  version: 0.1.2.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-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,7 +156,7 @@ files:
 - data.dump
 - lib/alexandrite.rb
 - lib/alexandrite/version.rb
-- lib/alexandrite_book.rb
+- lib/alexandrite_book_data.rb
 - lib/alexandrite_bookshelf.rb
 - lib/alexandrite_google.rb
 - lib/alexandrite_oclc.rb
@@ -189,7 +189,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: Tools for fetching books data from Google and OCLC

data/lib/alexandrite_book.rb

@@ -1,74 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'alexandrite'
-require 'nokogiri'
-
-module Alexandrite
-  # Create a book objects
-  class Book
-    attr_accessor :title, :authors, :publisher, :published_date, :page_count, :description, :categories, :language,
-                  :country, :isbn10, :isbn13, :error_message, :ddc, :lcc, :suggested_classifications
-
-    # @param volume_info [Hash]
-    # @return [Alexandrite::Books]
-    def initialize(volume_info)
-      add_origin(volume_info)
-      add_basic_values(volume_info)
-      add_industry_identifiers(volume_info, @origin)
-      @error_message = volume_info[:error_message]
-    end
-
-    def self.collection = @@collection
-
-    def self.add_to_collection(book)
-      @@collection.push(book)
-    end
-
-    # @param [String] ddc_code
-    # @return [NilClass]
-    def add_ddc(ddc_code) = @ddc = ddc_code
-
-    # @param [String] lcc_code
-    # @return [NilClass]
-    def add_lcc(lcc_code) = @lcc = lcc_code
-
-    # @param [Array<String>] suggestions
-    # @return [NilClass]
-    def add_classification_suggested(suggestions) = @suggested_classifications = suggestions
-
-    private
-
-    def add_basic_values(volume_info)
-      @title = volume_info['title']
-      @authors = volume_info['authors']
-      @publisher = volume_info['publisher']
-      @published_date = volume_info['publishedDate']
-      @page_count = volume_info['pageCount']
-      @description = volume_info['description']
-      @categories = volume_info['categories']
-      @language = volume_info['language']
-    end
-
-    # @param [Hash] volume_info
-    # @return [String]
-    def add_origin(volume_info) = @origin = volume_info['origin'] || 'Google API'
-
-    # @param [Hash] volume_info
-    # @param [String] origin
-    # @return [NilClass]
-    def add_industry_identifiers(volume_info, origin)
-      return nil unless volume_info[:error_message].nil?
-
-      if origin == 'OCLC API'
-        @isbn10 = volume_info['ISBN_10']
-        @isbn13 = volume_info['ISBN_13']
-        return
-      end
-
-      volume_info['industryIdentifiers'].each do |identifier|
-        @isbn10 = identifier['identifier'] if identifier['type'] == 'ISBN_10'
-        @isbn13 = identifier['identifier'] if identifier['type'] == 'ISBN_13'
-      end
-    end
-  end
-end