mass-client 1.0.39 → 1.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f41c23dfa363362e8822c9c590dd0feb49fa8d7a0b46a4404289b3aaf36521d
-  data.tar.gz: d0378de6d177de59b594a0b40ad32a66ffc95ffaff456316843ee7ce7dd6b994
+  metadata.gz: 7ec4e04320c9b045e3fd167a0992413724da792d58809ee888ec044e8c2f4cf5
+  data.tar.gz: 2b8a3d0ddadc3b85b19947a813ff460d88a6001a6e5cdbd7c6c441659787bc57
 SHA512:
-  metadata.gz: 40c38809a571acd66f9418892ebe4c4eaca23f01b78beed63faa9e1333b197a2a8e6575c6985f7186868d8d999efb419de5f70066b98fad9f64805dd8914e018
-  data.tar.gz: 78d3f81da07f724a42bbce1d53dfd2329a53a8c0c4874e8d728e7dba7a517087bedd20609a0fe77ac1916acee6ecda0248d0ce9fa7748a5b6100bf016a3d5cb2
+  metadata.gz: ed1b3b52dd330363eeac43528265042f89890f210fb214cf387ce742f355317564ad41e096929bd0d3cc02bf901499293100a3b6cbae4818ff84a04258e2903b
+  data.tar.gz: c88c3f653e7e9db68e81a1a9f3a7a3e71b6086b23e6088d1e6e87a468922f4b5afb43a420937d15456acc7160e6835235d1a3e24afc5fdbfb79d485ba25fbb0f

data/lib/base-line/profile.rb

@@ -40,8 +40,24 @@ module Mass
                 # 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)
+                relative_path = File.dirname(s3_key.to_s)
+                relative_path = '' if relative_path == '.'
+                filename = File.basename(s3_key.to_s)
+                raise MyS3Error, 'Remote filename is required' if filename.to_s.strip.empty?
+
+                begin
+                    client = my_s3_client
+                    client.upload_file(
+                        file_path: file_path,
+                        path: relative_path,
+                        filename: filename,
+                        ensure_path: true
+                    )
+                    response = client.get_public_url(path: relative_path, filename: filename)
+                    return response['public_url']
+                rescue MyS3::Client::Error => e
+                    raise MyS3Error, e.message
+                end
             end
         end
   
@@ -54,7 +70,11 @@ module Mass
                 )
                 return true
             elsif Mass.my_s3_api_key && Mass.my_s3_url
-                ensure_my_s3_path_exists(folder_name)
+                begin
+                    my_s3_client.ensure_folder_chain(folder_name)
+                rescue MyS3::Client::Error => e
+                    raise MyS3Error, e.message
+                end
                 return true
             end 
         end
@@ -151,7 +171,7 @@ module Mass
             # Proceed with Dropbox operations
             year = Time.now.year.to_s.rjust(4, '0')
             month = Time.now.month.to_s.rjust(2, '0')
-            folder = dropbox_folder #"/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
+            folder = "#{dropbox_folder}/leads" #"/massprospecting.rpa/#{dropbox_folder}.#{year}.#{month}"
             path = "#{folder}/#{filename}"
             create_s3_folder(folder)
 
@@ -287,120 +307,18 @@ module Mass
 
         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
-            })
+        def my_s3_client
+            require 'my_s3/client'
 
-            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
+            base_url = Mass.my_s3_url.to_s.strip
+            api_key = Mass.my_s3_api_key.to_s.strip
+            raise MyS3Error, 'Mass.my_s3_url is not configured' if base_url.empty?
+            raise MyS3Error, 'Mass.my_s3_api_key is not configured' if api_key.empty?
 
-        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
+            @my_s3_client ||= MyS3::Client.new(
+                base_url: base_url,
+                api_key: api_key
+            )
         end
 
     end # class Profile

data/lib/first-line/profile_rpa.rb

@@ -244,7 +244,11 @@ module Mass
         # return the URL of the file
         def snapshot(dropbox_folder=nil)
             raise "Either dropbox_folder parameter or self.desc['id_account'] are required." if dropbox_folder.nil? && self.desc['id_account'].nil?
-            dropbox_folder = self.desc['id_account'] if dropbox_folder.nil?
+            if dropbox_folder.nil?
+                dropbox_folder = self.desc['id_account'] 
+            else
+                dropbox_folder = "#{self.desc['id_account']}/#{dropbox_folder}"
+            end
             # parameters
             id = SecureRandom.uuid
             filename = "#{id}.html"

metadata

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