flexirest 1.8.3 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f91ffbe647c15fa55c5d9ec36a5ae23b9008cedda2779d208a4f0214793197c5
-  data.tar.gz: 755abe793f393deb621ad88ada2f8a2758f61e6ca9ea4da34ec8b683b53d7163
+  metadata.gz: ec81f48590a19e143fb865b92c76c4784f1a559380543419d137eb62efc7e1d4
+  data.tar.gz: 7c76f888375d9a989da6b2facdf73176e136cd3b87ae4f54d2b75c182df094c0
 SHA512:
-  metadata.gz: bdc44703759885c555b55ee80aa5bc5ca38cc4fba25cf9b449b4a0e438dd713dc7c716fdae7795bf76754a65c1a07bfc70cf25b9f973f9158a4ada2d6aaa61b2
-  data.tar.gz: adcdc81fc9ad6252d3948a41e8500f802ff48713325ab96c056a106a15a39fc5dd3d2b92159df1f96fed4cafa5d890a340b41d0ab83a5b16524561d5dc676d08
+  metadata.gz: dc6a8378e3486a4f829e4d240395de3312325ba2bac0ab77dd9e730171c208e1109d6106d9109e0aa95586727c0508a22a8d6bbcc5bd8b4ebb5835fea0e80703
+  data.tar.gz: 573e84668b742b1aad8f0678aab3f4cc58e52f2a1b5df5ec2196346df1843e2e3324927d905b3aa7884c9fd9908284785f158a93bedef94e97187cf5a5c1d325

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 1.8.4
+
+Fix:
+
+- Array and Hash parameters should be accepted in `:form_multipart`
+
 ## 1.8.3
 
 Fix:

data/lib/flexirest/multipart.rb

@@ -9,15 +9,10 @@ require 'rubygems'
 require 'mime/types'
 require 'cgi'
 
-
 module Flexirest
   module Multipart
     VERSION = "1.0.0"
 
-    # Formats a given hash as a multipart form post
-    # If a hash value responds to :string or :read messages, then it is
-    # interpreted as a file and processed accordingly; otherwise, it is assumed
-    # to be a string
     class Post
       BOUNDARY = "FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY"
       CONTENT_TYPE = "multipart/form-data; boundary=#{BOUNDARY}"
@@ -27,24 +22,33 @@ module Flexirest
         fp = []
 
         params.stringify_keys.each do |k, v|
-          # Are we trying to make a file parameter?
-          if v.respond_to?(:path) and v.respond_to?(:read) then
-            fp.push(FileParam.new(k, v.path, v.read))
-          # We must be trying to make a regular parameter
-          else
-            fp.push(StringParam.new(k, v))
-          end
+          append_parameter(fp, k, v)
         end
 
-        # Assemble the request body using the special multipart format
         query = fp.collect {|p| "--" + BOUNDARY + "\r\n" + p.to_multipart }.join("") + "--" + BOUNDARY + "--"
         return query, HEADER
       end
+
+      def self.append_parameter(fp, key, value)
+        if value.is_a?(Array)
+          value.each do |i|
+            append_parameter(fp, "#{key}[]", i)
+          end
+        elsif value.is_a?(Hash)
+          value.stringify_keys.each do |k, i|
+            append_parameter(fp, "#{key}[#{k}]", i)
+          end
+        elsif value.respond_to?(:path) and value.respond_to?(:read) then
+          fp.push(FileParam.new(key, value.path, value.read))
+        else
+          fp.push(StringParam.new(key, value))
+        end
+
+      end
     end
 
     private
 
-    # Formats a basic string key/value pair for inclusion with a multipart post
     class StringParam
       attr_accessor :k, :v
 
@@ -58,8 +62,6 @@ module Flexirest
       end
     end
 
-    # Formats the contents of a file or string for inclusion with a multipart
-    # form post
     class FileParam
       attr_accessor :k, :filename, :content
 
@@ -70,8 +72,6 @@ module Flexirest
       end
 
       def to_multipart
-        # If we can tell the possible mime-type from the filename, use the
-        # first in the list; otherwise, use "application/octet-stream"
         mime_type = MIME::Types.type_for(filename)[0] || MIME::Types["application/octet-stream"][0]
         return "Content-Disposition: form-data; name=\"#{CGI::escape(k)}\"; filename=\"#{ filename }\"\r\n" +
                "Content-Type: #{ mime_type.simplified }\r\n\r\n#{ content }\r\n"

data/lib/flexirest/version.rb

@@ -1,3 +1,3 @@
 module Flexirest
-  VERSION = "1.8.3"
+  VERSION = "1.8.4"
 end

data/spec/lib/request_spec.rb

@@ -358,6 +358,18 @@ describe Flexirest::Request do
       "Content-Disposition: form-data; name=\"debug\"\r\n" +
       "\r\n" +
       "true\r\n" +
+      "--FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY\r\n"+
+      "Content-Disposition: form-data; name=\"arrayz%5B%5D\"\r\n"+
+      "\r\n"+
+      "1\r\n"+
+      "--FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY\r\n"+
+      "Content-Disposition: form-data; name=\"arrayz%5B%5D\"\r\n"+
+      "\r\n"+
+      "2\r\n"+
+      "--FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY\r\n"+
+      "Content-Disposition: form-data; name=\"hazh%5Bsomething%5D\"\r\n"+
+      "\r\n"+
+      "bar\r\n"+
       "--FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY\r\n" +
       "Content-Disposition: form-data; name=\"test\"\r\n" +
       "\r\n" +
@@ -372,7 +384,7 @@ describe Flexirest::Request do
       "/put/1234", body, hash_including(headers: hash_including("Content-Type"=>"multipart/form-data; boundary=FLEXIRESTBOUNDARY-20190918-FLEXIRESTBOUNDARY"))
     ).and_return(::FaradayResponseMock.new(OpenStruct.new(body:"{\"result\":true}", response_headers:{})))
     ExampleClient.request_body_type :form_multipart
-    ExampleClient.update id:1234, debug:true, test:'foo', file: File.open("#{File.dirname(__FILE__)}/../../spec/samples/file.txt")
+    ExampleClient.update id:1234, debug:true, arrayz: [1, 2], hazh: {something: "bar"}, test:'foo', file: File.open("#{File.dirname(__FILE__)}/../../spec/samples/file.txt")
   end
 
   it "should encode the body in a JSON format if specified" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: flexirest
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.4
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-18 00:00:00.000000000 Z
+date: 2019-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler