ruby-fiix-cmms-client 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85d93105c64e8d17809da0de80ba5113b108fa85db720633ab0c47570d463be5
-  data.tar.gz: b93b7c6cd2b7cb56f680d08e270427515afc0e7ac0bb6d31529ddc858693cd7a
+  metadata.gz: 853c18ca53326409075479df9752eb7275b87db31ae147e058d3d5a2cb413c18
+  data.tar.gz: 2a7a76bc625691de142cb31dd32031ad15b8feba1613208e6e17a9808b361fc4
 SHA512:
-  metadata.gz: 34e93a0578c2059165477ac8a61c0e6b7307a6661380d2090f51dc680654b34e372594499a5365dc6a4311f32a2ff84a37138194b31415847ea98afa9edc88ac
-  data.tar.gz: 04f2f8b3a0c94945a229bbac2da2f0bd5f06d5d8d5aad376e810d4d8a3123f0d13af4a1f1b5b7fd7e0d8c8a6c8c9ed0bfb670d4ce7b9c176224cc801c429b93c
+  metadata.gz: 1c21bdbf18edd94292bbaaa4c6f4031047ebc497115a50e7d429e2d8ee7ad8e4799757aef506d7a8d50c1fa483c1ff960884a618e8e027ec6f6e841350d5c15f
+  data.tar.gz: 9daceaebdf2a2681a64b35b9e410280818f587144f0ea2bac4ec893c230800d2f391f44db673c87e7642c8a5b78ead4b65694e91dad85912a69adbcab923631d

data/lib/ruby/fiix/cmms/client/api_client.rb

@@ -30,9 +30,13 @@ module Ruby
 
             validate_credentials!
 
-            @base_url  = Auth.base_url(@subdomain, @api_key, @access_key)
-            @signature = Auth.sign(@api_secret, @base_url)
-            @uri       = URI.parse(@base_url)
+            @base_url    = Auth.base_url(@subdomain, @api_key, @access_key)
+            @signature   = Auth.sign(@api_secret, @base_url)
+            @uri         = URI.parse(@base_url)
+
+            @upload_url  = Auth.upload_url(@subdomain, @api_key, @access_key)
+            @upload_sig  = Auth.sign(@api_secret, @upload_url)
+            @upload_uri  = URI.parse(@upload_url)
           end
 
           OPERATIONS.each do |method_name, request_type|
@@ -44,16 +48,14 @@ module Ruby
             end
           end
 
-          def upload_file(context)
-            normalized = normalize_context(context)
-            file = normalized.delete("file")
-
-            # Build the JSON payload with _maCn and clientVersion, same as regular requests
-            payload = { "_maCn" => "AddRequest" }
-              .merge(DEFAULT_CLIENT_VERSION)
-              .merge(normalized)
+          def upload_file(source_info:, source_id:, file:, field_name: "file_part_1")
+            description = {
+              "sourceInfo" => source_info.to_s,
+              "sourceIdString" => source_id.to_s,
+              "fieldName" => field_name.to_s
+            }
 
-            multipart_request(payload, file)
+            upload_request(descriptions: [description], files: { field_name.to_s => file })
           end
 
           private
@@ -83,13 +85,13 @@ module Ruby
             raise ConnectionError, "Failed to connect to Fiix API: #{e.message}"
           end
 
-          def multipart_request(params, file)
+          def upload_request(descriptions:, files:)
             boundary = "----RubyFiixCmms#{SecureRandom.hex(16)}"
-            body = build_multipart_body(params, file, boundary)
+            body = build_upload_body(descriptions, files, boundary)
 
-            http = build_http
-            req = Net::HTTP::Post.new(@uri.request_uri)
-            req["Authorization"] = @signature
+            http = build_http(@upload_uri)
+            req = Net::HTTP::Post.new(@upload_uri.request_uri)
+            req["Authorization"] = @upload_sig
             req["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
             req.body = body
 
@@ -98,26 +100,25 @@ module Ruby
             raise ConnectionError, "Failed to connect to Fiix API: #{e.message}"
           end
 
-          def build_http
-            http = Net::HTTP.new(@uri.host, @uri.port)
+          def build_http(uri = @uri)
+            http = Net::HTTP.new(uri.host, uri.port)
             http.use_ssl = true
             http
           end
 
-          def build_multipart_body(params, file, boundary)
+          def build_upload_body(descriptions, files, boundary)
             parts = []
 
-            # Send all params as a single JSON field named "data"
             parts << "--#{boundary}\r\n" \
-                     "Content-Disposition: form-data; name=\"data\"\r\n" \
-                     "Content-Type: text/plain;charset=utf-8\r\n\r\n" \
-                     "#{JSON.generate(params)}\r\n"
+                     "Content-Disposition: form-data; name=\"descriptions\"\r\n" \
+                     "Content-Type: application/json\r\n\r\n" \
+                     "#{JSON.generate(descriptions)}\r\n"
 
-            if file
+            files.each do |field_name, file|
               filename = file.respond_to?(:path) ? File.basename(file.path) : "upload"
               file_content = file.respond_to?(:read) ? file.read : file
               parts << "--#{boundary}\r\n" \
-                       "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n" \
+                       "Content-Disposition: form-data; name=\"#{field_name}\"; filename=\"#{filename}\"\r\n" \
                        "Content-Type: application/octet-stream\r\n\r\n" \
                        "#{file_content}\r\n"
             end

data/lib/ruby/fiix/cmms/client/auth.rb

@@ -15,6 +15,12 @@ module Ruby
               "&signatureMethod=HmacSHA256&signatureVersion=1"
           end
 
+          def upload_url(subdomain, api_key, access_key)
+            "https://#{subdomain}.macmms.com/api/upload" \
+              "?action=uploadFile&appKey=#{api_key}&accessKey=#{access_key}" \
+              "&signatureMethod=HmacSHA256&signatureVersion=1"
+          end
+
           def sign(api_secret, url)
             message = url.sub("https://", "")
             OpenSSL::HMAC.hexdigest("SHA256", api_secret, message)

data/lib/ruby/fiix/cmms/client/version.rb

@@ -4,7 +4,7 @@ module Ruby
   module Fiix
     module Cmms
       module Client
-        VERSION = "0.1.1"
+        VERSION = "0.2.0"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-fiix-cmms-client
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Ronald Langeveld