lib/crunchbase/entities/client.rb in crunchbase4-0.1.0 vs lib/crunchbase/entities/client.rb in crunchbase4-0.1.1

@@ -1,50 +1,52 @@
 # frozen_string_literal: true
 
+require_relative '../utilities/request'
+require_relative '../utilities/cb_model'
+
 module Crunchbase
   # Whole entities endpoints
   module Entities
     # Send request for entities endpoints
     class Client
       include ::Crunchbase::Utilities::Request
+      include ::Crunchbase::Utilities::CbModel
 
-      attr_reader :object
-
       ROOT_LIST = 'entities'
 
-      def initialize(entity_id, model_name)
+      def initialize(entity_id, entity_type)
         @entity_id = entity_id
-        @object = model_name.new
+        @entity_type = entity_type
       end
 
       # Will include all attribute from API document
       def fetch
-        object.parse_response(entity(
-                                root_uri,
-                                field_ids: object.field_ids.join(',')
-                              ))
+        cbobject.parse_response(entity(
+                                  root_uri,
+                                  field_ids: cbobject.field_ids.join(',')
+                                ))
       end
 
       # Only include a part basis fields of endpoint
       def fetch_cards(card_names = [])
-        object.parse_cards_response(entity(
-                                      root_uri,
-                                      field_ids: object.basis_fields.join(','),
-                                      cards: (object.full_cards & card_names).join(',')
-                                    ))
+        cbobject.parse_cards_response(entity(
+                                        root_uri,
+                                        field_ids: cbobject.basis_fields.join(','),
+                                        cards: (cbobject.full_cards & card_names).join(',')
+                                      ))
       end
 
       def cards(card_id)
-        object.parse_response(entity(
-                                root_uri(name: __method__, id: card_id)
-                              ))
+        cbobject.parse_response(entity(
+                                  root_uri(name: __method__, id: card_id)
+                                ))
       end
 
       private
 
       def root_uri(args = {})
         [
-          ROOT_LIST, object.class::RESOURCE_LIST,
+          ROOT_LIST, kclass_name::RESOURCE_LIST,
           @entity_id, args[:name], args[:id]
         ].compact.join('/')
       end
     end
   end