Refactor parameter sorting

lostisland · Jun 30, 2020 · 643b13b · 643b13b
1 parent f613099
commit 643b13b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/lib/faraday/encoders/flat_params_encoder.rb b/lib/faraday/encoders/flat_params_encoder.rb
@@ -33,9 +33,7 @@ def self.encode(params)
           key = key.to_s if key.is_a?(Symbol)
           [key, value]
         end
-        # Useful default for OAuth and caching.
-        # Only to be used for non-Array inputs. Arrays should preserve order.
-        params.sort!
+        sort_params(params)
       end
 
       # The params have form [['key1', 'value1'], ['key2', 'value2']].
@@ -94,5 +92,15 @@ def self.decode(query)
         end
       end
     end
+
+    class << self
+      protected
+
+      def sort_params(params)
+        # Useful default for OAuth and caching.
+        # Only to be used for non-Array inputs. Arrays should preserve order.
+        params.sort!
+      end
+    end
   end
 end
diff --git a/lib/faraday/encoders/nested_params_encoder.rb b/lib/faraday/encoders/nested_params_encoder.rb
@@ -21,9 +21,7 @@ def encode(params)
           key = key.to_s if key.is_a?(Symbol)
           [key, value]
         end
-        # Useful default for OAuth and caching.
-        # Only to be used for non-Array inputs. Arrays should preserve order.
-        params.sort!
+        sort_params(params)
       end
 
       # The params have form [['key1', 'value1'], ['key2', 'value2']].
@@ -69,6 +67,12 @@ def encode_array(parent, value)
       value.each { |val| buffer << "#{encode_pair(new_parent, val)}&" }
       buffer.chop
     end
+
+    def sort_params(params)
+      # Useful default for OAuth and caching.
+      # Only to be used for non-Array inputs. Arrays should preserve order.
+      params.sort!
+    end
   end
 
   # Sub-module for decoding query-string into parameters.