refactor and namespace custom metadata

Author: bishosilwal

lib/imagekitio.rb

@@ -11,4 +11,5 @@
 require_relative "./imagekitio/file"
 require_relative "./imagekitio/url"
 require_relative "./imagekitio/utils/calculation"
+require_relative './imagekitio/custom_metadata_field'
 

lib/imagekitio/client.rb

@@ -8,14 +8,15 @@
 require_relative "./utils/calculation"
 require_relative './constant'
 require_relative './configurable'
+require_relative './custom_metadata_field'
 
 module ImageKitIo
   # ImageKitIo class holds each method will be used by user
   class Client
     include Utils::Calculation
     include Constantable
 
-    attr_reader :file
+    attr_reader :file, :custom_metadata_fields
 
     def initialize(private_key, public_key, url_endpoint, transformation_pos = nil, options = nil)
       unless(private_key.is_a?(String) && private_key.to_s.strip.length != 0)
@@ -37,7 +38,7 @@ def initialize(private_key, public_key, url_endpoint, transformation_pos = nil,
       @ik_req = Request.new(private_key, public_key, url_endpoint)
       @file = File.new(@ik_req)
       @url_obj = Url.new(@ik_req)
-
+      @custom_metadata_fields = CustomMetaDataField.new(@ik_req)
     end
 
     def set_ik_request(ik_req)
@@ -148,22 +149,6 @@ def bulk_job_status(job_id)
       @file.job_status(job_id)
     end
 
-    def create_custom_metadata_fields(name, label, schema)
-      @file.create_custom_metadata(name, label, schema)
-    end
-
-    def get_custom_metadata_fields(options = {})
-      @file.get_custom_metadata(options)
-    end
-
-    def update_custom_metadata_fields(id, label: nil, schema: nil)
-      @file.update_custom_metadata(id, label, schema)
-    end
-
-    def delete_custom_metadata_fields(id)
-      @file.delete_custom_metadata(id)
-    end
-
     def phash_distance(first, second)
       # Get hamming distance between two phash(image hash) to check
       # similarity between images

lib/imagekitio/custom_metadata_field.rb

@@ -0,0 +1,49 @@
+require_relative 'utils/formatter'
+
+module ImageKitIo
+  class CustomMetaDataField
+    include Utils::Formatter
+    include Constantable
+
+    def initialize(req_obj)
+      @req_obj = req_obj
+    end
+
+    def create(name, label, schema)
+      if name == '' || name.nil? || label == '' || label.nil? || schema == '' || schema.nil?
+        raise ArgumentError, 'parameters required'
+      end
+      unless schema.is_a?(Hash)
+        raise ArgumentError, 'schema must be hash object'
+      end
+      url = "#{constants.API_BASE_URL}/customMetadataFields"
+      payload = { 'name': name, 'label': label, 'schema': schema }.to_json
+      @req_obj.request('post', url, @req_obj.create_headers, payload)
+    end
+
+    def list(options = {})
+      url = "#{constants.API_BASE_URL}/customMetadataFields"
+      payload = request_formatter(options)
+      @req_obj.request('get', url, @req_obj.create_headers, payload)
+    end
+
+    def update(id, label = nil, schema = nil)
+      if id == '' || id.nil?
+        raise ArgumentError, 'id is required'
+      end
+      url = "#{constants.API_BASE_URL}/customMetadataFields/#{id}"
+      payload = {}
+      payload = payload.merge({ 'label': label }) unless label.nil?
+      payload = payload.merge({ 'schema': label }) unless schema.nil?
+      @req_obj.request('patch', url, @req_obj.create_headers, payload.to_json)
+    end
+
+    def delete(id)
+      if id == '' || id.nil?
+        raise ArgumentError, 'id is required'
+      end
+      url = "#{constants.API_BASE_URL}/customMetadataFields/#{id}"
+      @req_obj.request('delete', url, @req_obj.create_headers)
+    end
+  end
+end

lib/imagekitio/file.rb

@@ -213,43 +213,6 @@ def job_status(id)
       @req_obj.request('get', url, @req_obj.create_headers, payload)
     end
 
-    def create_custom_metadata(name, label, schema)
-      if name == '' || name.nil? || label == '' || label.nil? || schema == '' || schema.nil?
-        raise ArgumentError, 'parameters required'
-      end
-      unless schema.is_a?(Hash)
-        raise ArgumentError, 'schema must be hash object'
-      end
-      url = "#{constants.API_BASE_URL}/customMetadataFields"
-      payload = { 'name': name, 'label': label, 'schema': schema }.to_json
-      @req_obj.request('post', url, @req_obj.create_headers, payload)
-    end
-
-    def get_custom_metadata(options = {})
-      url = "#{constants.API_BASE_URL}/customMetadataFields"
-      payload = request_formatter(options)
-      @req_obj.request('get', url, @req_obj.create_headers, payload)
-    end
-
-    def update_custom_metadata(id, label, schema)
-      if id == '' || id.nil?
-        raise ArgumentError, 'id is required'
-      end
-      url = "#{constants.API_BASE_URL}/customMetadataFields/#{id}"
-      payload = {}
-      payload = payload.merge({ 'label': label }) unless label.nil?
-      payload = payload.merge({ 'schema': label }) unless schema.nil?
-      @req_obj.request('patch', url, @req_obj.create_headers, payload.to_json)
-    end
-
-    def delete_custom_metadata(id)
-      if id == '' || id.nil?
-        raise ArgumentError, 'id is required'
-      end
-      url = "#{constants.API_BASE_URL}/customMetadataFields/#{id}"
-      @req_obj.request('delete', url, @req_obj.create_headers)
-    end
-
     def validate_upload_options(options)
 
       #  Validates upload value, checks if params are valid,

lib/imagekitio/request.rb

@@ -51,7 +51,11 @@ def request(method, url, headers = nil, payload = nil)
         end
 
       rescue RestClient::ExceptionWithResponse => err
-        err.http_code == 404 ? response[:error] = {'message': err.response.to_s} : JSON.parse(err.response)
+        response[:error] = if err.http_code == 404
+                             {'message': err.response.to_s}
+                           else
+                             JSON.parse(err.response)
+                           end
       end
       response
     end