credova 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8e49e35b8bb7e538575a92ae35a2e62a24b4812a7fb8d7d6aa42c62d33cffac
-  data.tar.gz: 943709d8daeecf7061cd54b085e8d89b3b2b54387f000bb5ff5f18a81f75c571
+  metadata.gz: 9c7b9f63eb58dc7bf593f4b686a6a7ab01e1e52c025a0bc4267610ab885ed547
+  data.tar.gz: 1ce8e493fd73683012c62401c20aef6ff60642bf8ca8b4dabdf572c4b8d8d8bc
 SHA512:
-  metadata.gz: 1c3f6bc4a6fd36cea80a7a5a9b99b94b9ce0d33aff3f26b74cc4f984972db8b1b7c2aa316953d58257e39b381f5e7a331e736a9490358385c11c711408da4762
-  data.tar.gz: cd87d085afcbe982e49c992cafc9cbf56d417e488c8bb5aa90eaeb45df8c62205de3143d766d0f3706d8f2294f05151ef37abb30cb901b5a3031ef31e56edf2b
+  metadata.gz: 88abc56e0bb002e2e1f9c75a12757b79272a942ce1921c160c281cd27ff117369baf8d60a50a8fc42fea3ba9c5dab6e3231264c73ed90a7d5c01677c23b1ea6a
+  data.tar.gz: a8b281388bc4f7898816f0cc168979434012c52627fa5c489cd2eb6aa324e1e46658dd092b0c3c4aa87700b6358829da812932ff45217b7bb302ff86860fc457

data/lib/credova/api.rb

@@ -9,26 +9,52 @@ module Credova
 
     USER_AGENT = "CredovaRubyGem/#{Credova::VERSION}".freeze
 
+    FILE_UPLOAD_ATTRS = {
+      permitted: %i( file_name file_type file_contents ).freeze,
+      reqired:   %i( file_type file_contents ).freeze,
+    }
+
     def get_request(endpoint, headers = {})
       request = Net::HTTP::Get.new(request_url(endpoint))
 
-      process_request(request, {}, headers)
+      submit_request(request, {}, headers)
     end
 
     def post_request(endpoint, data = {}, headers = {})
       request = Net::HTTP::Post.new(request_url(endpoint))
 
-      process_request(request, data, headers)
+      submit_request(request, data, headers)
+    end
+
+    def post_file_request(endpoint, file_data, headers = {})
+      request = Net::HTTP::Post.new(request_url(endpoint))
+
+      submit_file_request(request, file_data, headers)
     end
 
     private
 
-    def process_request(request, data, headers)
+    def submit_request(request, data, headers)
       set_request_headers(request, headers)
 
-      uri = URI(request.path)
       request.body = data.is_a?(Hash) ? data.to_json : data
 
+      process_request(request)
+    end
+
+    def submit_file_request(request, file_data, headers)
+      boundary = ::SecureRandom.hex(15)
+
+      headers.merge!(content_type_header("multipart/form-data; boundary=#{boundary}"))
+
+      build_multipart_request_body(request, file_data, boundary)
+      set_request_headers(request, headers)
+      process_request(request)
+    end
+
+    def process_request(request)
+      uri = URI(request.path)
+
       response = Net::HTTP.start(uri.host, uri.port, use_ssl: true) do |http|
         http.request(request)
       end
@@ -36,6 +62,23 @@ module Credova
       Credova::Response.new(response)
     end
 
+    def build_multipart_request_body(request, file_data, boundary)
+      file_type     = file_data[:file_type]
+      file_contents = file_data[:file_contents]
+      file_name     = file_data[:file_name] || "ffl-document.#{file_type}"
+      content_type  = "application/#{file_data[:file_type]}"
+
+      body = []
+      body << "--#{boundary}\r\n"
+      body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{file_name}\"\r\n"
+      body << "Content-Type: #{content_type}\r\n"
+      body << "\r\n"
+      body << "#{file_contents}\r\n"
+      body << "--#{boundary}--\r\n"
+
+      request.body = body.join
+    end
+
     def set_request_headers(request, headers)
       request['User-Agent'] = USER_AGENT
 
@@ -58,14 +101,6 @@ module Credova
       ].join('/')
     end
 
-    def extract_file_extension(ffl_document_url)
-      metadata_raw  = Net::HTTP.get(URI.parse("#{ffl_document_url}/metadata"))
-      metadata_json = JSON.parse(metadata_raw)
-      file_name     = metadata_json['filename']
-
-      file_name[(file_name.rindex('.') + 1)..-1]
-    end
-
     def standardize_body_data(submitted_data, permitted_data_attrs)
       _submitted_data = submitted_data.deep_transform_keys(&:to_sym)
       permitted_data = (_submitted_data.select! { |k, v| permitted_data_attrs.include?(k) } || _submitted_data)

data/lib/credova/application.rb

@@ -79,15 +79,12 @@ module Credova
       post_request(endpoint, {}, auth_header(@client.access_token))
     end
 
-    def upload_invoice(public_id, invoice_url)
+    def upload_invoice(public_id, invoice_file_data)
+      requires!(invoice_file_data, *FILE_UPLOAD_ATTRS[:required])
+
       endpoint = ENDPOINTS[:upload_invoice] % public_id
-      data     = { form_data: ['file=@', invoice_url, '; type=application/', extract_file_extension(invoice_url)].join }
-      headers  = [
-        *auth_header(@client.access_token),
-        *content_type_header('multipart/form-data'),
-      ].to_h
 
-      post_request(endpoint, data, headers)
+      post_file_request(endpoint, invoice_file_data, auth_header(@client.access_token))
     end
 
   end

data/lib/credova/ffl.rb

@@ -41,15 +41,12 @@ module Credova
       get_request(endpoint, auth_header(@client.access_token))
     end
 
-    def upload_document(ffl_public_id, ffl_document_url)
+    def upload_document(ffl_public_id, ffl_file_data)
+      requires!(ffl_file_data, *FILE_UPLOAD_ATTRS[:required])
+
       endpoint = ENDPOINTS[:upload_document] % ffl_public_id
-      data     = { form_data: ['file=@', ffl_document_url, '; type=application/', extract_file_extension(ffl_document_url)].join }
-      headers  = [
-        *auth_header(@client.access_token),
-        *content_type_header('multipart/form-data'),
-      ].to_h
 
-      post_request(endpoint, data, headers)
+      post_file_request(endpoint, ffl_file_data, auth_header(@client.access_token))
     end
 
   end

data/lib/credova/version.rb

@@ -1,3 +1,3 @@
 module Credova
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: credova
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jeffrey Dill
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler