rocketchat 0.2.3 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9dd649b2ce883c528aaaa759be25034b0bf112b4c5e21ac3c9202fab78a6baa
-  data.tar.gz: 23e96835f8b14e4601b78bc10506ee222665acc5409b45380572007db067f765
+  metadata.gz: b9f267ba8c635df9da09f97e9da8ba7b4cae0d1ca214aaee49e8ea172abb87af
+  data.tar.gz: f6f3bf71b1dbc67e1218c8767bcc99051979085de1bb1869cb34c50cc622261c
 SHA512:
-  metadata.gz: 9977334377d472e5e51b941f4cf359473b588d2572965bde362d79ffe09e3afc8defdfd47904a32e1e12e47f368917447dc8710227c24d76155d74ea6ee301be
-  data.tar.gz: 82fe7597f43165cedeae9328e2cf8145d9bc5cc0b39f924dfed7580262c1e112a010e5e5711ca74396ee494ffb7855e6aae51adb8c7f6790f7117be54b297569
+  metadata.gz: 9a205e48ec4a51c13a607364850f3febf6be3b2153af570f44b497650e1065740f33fe5a1d044cfb1d2946094aed790c3374947f7bb9bd7ceac6b329efb9c1b6
+  data.tar.gz: f47d747b5bba43b6e10339c63313a64326704f9f2c27b2259ccb308cdc3bea51edb94bdb23a5df7b3a94473050ec57758b6660e01baee04078b7ad5f5a7559ca

data/.github/workflows/test.yml

@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby-version: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1

data/.rubocop.yml

@@ -5,7 +5,7 @@ require:
 
 AllCops:
   NewCops: enable
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
 
 Layout/EmptyLinesAroundAttributeAccessor:
   Enabled: true

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 ## Unreleased
 - None
 
+## [0.2.4](releases/tag/v0.2.4) - 2023-12-22
+### Added
+- [#47] Add content-type and filename params for file upload ([@MrRTI][])
+
 ## [0.2.3](releases/tag/v0.2.3) - 2023-08-22
 ### Added
 - [#46] Add file upload support using rooms.upload endpoint ([@MrRTI][])

data/lib/rocket_chat/gem_version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RocketChat
-  VERSION = '0.2.3'
+  VERSION = '0.2.5'
 end

data/lib/rocket_chat/messages/room.rb

@@ -319,7 +319,7 @@ module RocketChat
         response = session.request_json(
           "#{API_PREFIX}/rooms.upload/#{room_id}",
           method: :post,
-          form_data: file_upload_hash(file: file, **rest_params)
+          form_data: file_upload_array(file: file, **rest_params)
         )
 
         RocketChat::Message.new response['message'] if response['success']
@@ -345,9 +345,17 @@ module RocketChat
           self.class.settable_attributes.include?(attribute)
       end
 
-      def file_upload_hash(**params)
+      def file_upload_array(**params)
         permited_keys_for_file_upload = %i[file msg description tmid]
-        Util.slice_hash(params, *permited_keys_for_file_upload)
+        hash = Util.slice_hash(params, *permited_keys_for_file_upload).compact
+
+        # NOTE: https://docs.ruby-lang.org/en/master/Net/HTTPHeader.html#method-i-set_form
+        file_options = params.slice(:filename, :content_type).compact
+        hash.map do |key, value|
+          next [key.to_s, value, file_options] if key == :file && file_options.keys.any?
+
+          [key.to_s, value]
+        end
       end
     end
   end

data/lib/rocket_chat/request_helper.rb

@@ -110,7 +110,7 @@ module RocketChat
         req = Net::HTTP::Post.new(path, headers)
         add_body(req, body) if body
 
-        form_data = reject_nils(options[:form_data])
+        form_data = options[:form_data]
         add_form_data(req, form_data) if form_data
       else
         uri = path
@@ -131,12 +131,11 @@ module RocketChat
     end
 
     def add_form_data(request, form_data)
-      form_data = form_data.transform_keys(&:to_s) if form_data.is_a? Hash
       request.set_form(form_data, 'multipart/form-data')
     end
 
     def reject_nils(data)
-      data&.reject { |_key, value| value.nil? }
+      data&.compact
     end
   end
 end

data/rocketchat.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Rocket.Chat REST API v1 for Ruby'
   spec.homepage      = 'https://github.com/abrom/rocketchat-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = ['>= 2.5.0', '< 3.3.0']
+  spec.required_ruby_version = ['>= 3.0.0', '< 3.4.0']
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rocketchat
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.5
 platform: ruby
 authors:
 - int512
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-22 00:00:00.000000000 Z
+date: 2024-04-15 00:00:00.000000000 Z
 dependencies: []
 description: Rocket.Chat REST API v1 for Ruby
 email:
@@ -68,10 +68,10 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 3.0.0
   - - "<"
     - !ruby/object:Gem::Version
-      version: 3.3.0
+      version: 3.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="