mass-client 1.0.38 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 79a458ee1f713c73e4567171dc2df8fe348612f4acb64b46987d9efbd941ee5c
-  data.tar.gz: 5cdd47bfa69af7dafd52681b64fdd4609d3d3a2c03804dcb20ac7459af2de959
+  metadata.gz: 2f41c23dfa363362e8822c9c590dd0feb49fa8d7a0b46a4404289b3aaf36521d
+  data.tar.gz: d0378de6d177de59b594a0b40ad32a66ffc95ffaff456316843ee7ce7dd6b994
 SHA512:
-  metadata.gz: 40bc64016ace0f97d2a8b6b3b48c85c67cfce7039f6852301be029d2a8a9ba565c6a2520bec6b5b4139a37bcc1c6ba61e24bc0d9444a2e2b36406764e2c11242
-  data.tar.gz: 8d07063dd8c65e0a8a6831b3303ac953ddcb9e70f426259e0edb8f332b47b2e4728d755908a7fd94e241c5021a2c3a056a6745b427944384bb3f26b8fc1f0cde
+  metadata.gz: 40c38809a571acd66f9418892ebe4c4eaca23f01b78beed63faa9e1333b197a2a8e6575c6985f7186868d8d999efb419de5f70066b98fad9f64805dd8914e018
+  data.tar.gz: 78d3f81da07f724a42bbce1d53dfd2329a53a8c0c4874e8d728e7dba7a517087bedd20609a0fe77ac1916acee6ecda0248d0ce9fa7748a5b6100bf016a3d5cb2

data/lib/base-line/profile.rb

@@ -28,25 +28,35 @@ module Mass
 
         # Function to upload a file to Amazon S3 and get its public URL
         def upload_file_to_s3(file_path, s3_key)
-            # Upload the file
-            Mass.s3.put_object(
-                bucket: Mass.s3_bucket, 
-                key: s3_key, 
-                body: File.open(file_path)
-            )
-            # Generate the public URL
-            public_url = "https://#{Mass.s3_bucket}.s3.amazonaws.com/#{s3_key}"
-            # return
-            return public_url
+            if @s3
+                # Upload the file
+                Mass.s3.put_object(
+                    bucket: Mass.s3_bucket, 
+                    key: s3_key, 
+                    body: File.open(file_path)
+                )
+                # Generate the public URL
+                public_url = "https://#{Mass.s3_bucket}.s3.amazonaws.com/#{s3_key}"
+                # return
+                return public_url
+            elsif Mass.my_s3_api_key && Mass.my_s3_url
+                my_s3_upload_file(file_path, s3_key)
+                return my_s3_public_url_for(s3_key)
+            end
         end
   
         # Function to create a folder in S3
         def create_s3_folder(folder_name)
-            Mass.s3.put_object(
-                bucket: Mass.s3_bucket, 
-                key: "#{folder_name}/"
-            )
-            return true
+            if @s3
+                Mass.s3.put_object(
+                    bucket: Mass.s3_bucket, 
+                    key: "#{folder_name}/"
+                )
+                return true
+            elsif Mass.my_s3_api_key && Mass.my_s3_url
+                ensure_my_s3_path_exists(folder_name)
+                return true
+            end 
         end
 
         #
@@ -273,5 +283,125 @@ module Mass
             []
         end # def connectioncheck
 
+        class MyS3Error < StandardError; end
+
+        private
+
+        def ensure_my_s3_path_exists(path)
+            sanitized = path.to_s.strip.gsub(%r{^/+|/+$}, '')
+            return true if sanitized.empty?
+
+            current = ''
+            sanitized.split('/').each do |segment|
+                parent = current
+                begin
+                    my_s3_json_post('/create_folder.json', {
+                        path: parent,
+                        folder_name: segment
+                    })
+                rescue MyS3Error => e
+                    raise unless e.message =~ /folder already exists/i
+                end
+                current = parent.empty? ? segment : [parent, segment].join('/').gsub(%r{/+}, '/').sub(%r{^/+}, '')
+            end
+
+            true
+        end
+
+        def my_s3_upload_file(local_path, remote_path)
+            raise MyS3Error, 'Local file not found' unless File.file?(local_path)
+
+            relative_path = File.dirname(remote_path.to_s)
+            relative_path = '' if relative_path == '.'
+            filename = File.basename(remote_path.to_s).to_s
+            raise MyS3Error, 'Remote filename is required' if filename.strip.empty?
+
+            uri = my_s3_uri_for('/upload.json')
+            boundary = "----MassMyS3#{SecureRandom.hex(12)}"
+            request = Net::HTTP::Post.new(uri)
+            request['X-API-Key'] = my_s3_api_key!
+            request['Content-Type'] = "multipart/form-data; boundary=#{boundary}"
+            request.body = build_my_s3_multipart(boundary, relative_path, filename, local_path)
+
+            response = my_s3_http(uri).request(request)
+            json = parse_my_s3_json(response.body)
+            return json if response.is_a?(Net::HTTPSuccess) && json['success']
+
+            message = json.dig('error', 'message') || response.body
+            raise MyS3Error, message
+        end
+
+        def my_s3_public_url_for(remote_path)
+            dir = File.dirname(remote_path.to_s)
+            dir = '' if dir == '.'
+            filename = File.basename(remote_path.to_s)
+            raise MyS3Error, 'Filename is required for public URL generation' if filename.to_s.strip.empty?
+
+            response = my_s3_json_post('/get_public_url.json', {
+                path: dir,
+                filename: filename
+            })
+
+            response['public_url']
+        end
+
+        def build_my_s3_multipart(boundary, relative_path, filename, local_path)
+            body = []
+            body << "--#{boundary}\r\n"
+            body << "Content-Disposition: form-data; name=\"path\"\r\n\r\n"
+            body << "#{relative_path}\r\n"
+            body << "--#{boundary}\r\n"
+            body << "Content-Disposition: form-data; name=\"file\"; filename=\"#{filename}\"\r\n"
+            body << "Content-Type: application/octet-stream\r\n\r\n"
+            body << File.binread(local_path)
+            body << "\r\n--#{boundary}--\r\n"
+            body.join
+        end
+
+        def my_s3_json_post(endpoint, payload)
+            uri = my_s3_uri_for(endpoint)
+            request = Net::HTTP::Post.new(uri)
+            request['Content-Type'] = 'application/json'
+            request['X-API-Key'] = my_s3_api_key!
+            request.body = JSON.generate(payload)
+
+            response = my_s3_http(uri).request(request)
+            json = parse_my_s3_json(response.body)
+            return json if response.is_a?(Net::HTTPSuccess) && json['success']
+
+            message = json.dig('error', 'message') || response.body
+            raise MyS3Error, message
+        end
+
+        def parse_my_s3_json(body)
+            return {} if body.nil? || body.strip.empty?
+            JSON.parse(body)
+        rescue JSON::ParserError
+            raise MyS3Error, "Invalid JSON response: #{body}"
+        end
+
+        def my_s3_uri_for(endpoint)
+            normalized = my_s3_base_url!
+            URI.join(normalized, endpoint.to_s.sub(%r{^/+}, ''))
+        end
+
+        def my_s3_http(uri)
+            http = Net::HTTP.new(uri.host, uri.port)
+            http.use_ssl = uri.scheme == 'https'
+            http
+        end
+
+        def my_s3_base_url!
+            base = Mass.my_s3_url.to_s.strip
+            raise MyS3Error, 'Mass.my_s3_url is not configured' if base.empty?
+            base.end_with?('/') ? base : "#{base}/"
+        end
+
+        def my_s3_api_key!
+            key = Mass.my_s3_api_key.to_s.strip
+            raise MyS3Error, 'Mass.my_s3_api_key is not configured' if key.empty?
+            key
+        end
+
     end # class Profile
 end # module Mass

data/lib/mass-client.rb

@@ -17,12 +17,17 @@ module Mass
     @@drownload_path
     @@api_client
     
+    # DEPRECATED
     @@s3_bucket
     @@s3_region
     @@s3_access_key_id
     @@s3_secret_access_key
     @@s3
 
+    # https://github.com/MassProspecting/developer-documentation/issues/828
+    @@my_s3_api_key
+    @@my_s3_url
+
     # set the MassProspecting API client
     #
     # Parameters:
@@ -54,10 +59,15 @@ module Mass
         js_path: nil, 
         download_path: [],
 
+        # DEPRECATED
         s3_region: nil,
         s3_access_key_id: nil,
         s3_secret_access_key: nil,
-        s3_bucket: nil
+        s3_bucket: nil,
+
+        # https://github.com/MassProspecting/developer-documentation/issues/828
+        my_s3_api_key: nil,
+        my_s3_url: nil
     )
         # call the master to get the URL and port of the subaccount.
         BlackStack::API.set_client(
@@ -101,6 +111,7 @@ module Mass
         @@js_path = js_path
         @@download_path = download_path
 
+        @@s3 = nil
         @@s3_region = s3_region
         @@s3_access_key_id = s3_access_key_id
         @@s3_secret_access_key = s3_secret_access_key
@@ -119,6 +130,10 @@ module Mass
                 secret_access_key: @@s3_secret_access_key
             )
         end
+
+        # Initialize My.S3 API key
+        @@my_s3_api_key = my_s3_api_key
+        @@my_s3_url = my_s3_url
     end
 
     def self.download_path
@@ -149,6 +164,14 @@ module Mass
         @@s3
     end
 
+    def self.my_s3_api_key
+        @@my_s3_api_key
+    end
+
+    def self.my_s3_url
+        @@my_s3_url
+    end
+
 end # module Mass
 
 # base classes

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mass-client
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.39
 platform: ruby
 authors:
 - Leandro Daniel Sardi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-02 00:00:00.000000000 Z
+date: 2026-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: timeout