Refactor

murugaperumal-ramasamy · Feb 4, 2023 · 3b468dc · 3b468dc
1 parent ee620fb
commit 3b468dc
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/twitter/rest/form_encoder.rb b/lib/twitter/rest/form_encoder.rb
@@ -4,11 +4,11 @@ class FormEncoder
       UNESCAPED_CHARS = /[^a-z0-9\-\.\_\~]/i
 
       def self.encode(data)
-        data.map do |k, v|
+        data.collect do |k, v|
           if v.nil?
             ::URI::DEFAULT_PARSER.escape(k.to_s, UNESCAPED_CHARS)
           elsif v.respond_to?(:to_ary)
-            v.to_ary.map do |w|
+            v.to_ary.collect do |w|
               str = ::URI::DEFAULT_PARSER.escape(k.to_s, UNESCAPED_CHARS)
               unless w.nil?
                 str << '='

diff --git a/lib/twitter/rest/request.rb b/lib/twitter/rest/request.rb
@@ -45,11 +45,11 @@ def perform
     private
 
       def request_options
-        if @options_key == :form
-          options = {form: HTTP::FormData.create(@options, encoder: Twitter::REST::FormEncoder.method(:encode))}
-        else
-          options = {@options_key => @options}
-        end
+        options = if @options_key == :form
+                    {form: HTTP::FormData.create(@options, encoder: Twitter::REST::FormEncoder.method(:encode))}
+                  else
+                    {@options_key => @options}
+                  end
 
         if @params
           if options[:params]

diff --git a/spec/twitter/rest/request_spec.rb b/spec/twitter/rest/request_spec.rb
@@ -20,6 +20,7 @@
       expect(a_request(:post, 'https://upload.twitter.com/1.1/media/upload.json')).to have_been_made
       expect(a_post('/1.1/statuses/update.json').with(body: {status: 'Update', media_ids: '470030289822314497'})).to have_been_made
     end
+
     it 'uses custom HTTP::FormData::Urlencoded instance for form requests' do
       stub_post('/1.1/statuses/update.json').with(body: {status: 'Update'}).to_return(body: fixture('status.json'), headers: {content_type: 'application/json; charset=utf-8'})
       expect_any_instance_of(HTTP::Client).to receive(:post).with('https://api.twitter.com/1.1/statuses/update.json', form: instance_of(HTTP::FormData::Urlencoded)).and_call_original