braintreehttp 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 573b80fe852147baed1c042d799fce690204e54c
-  data.tar.gz: bfe5f2c242d571a4d3b980e06d01187982218bff
+  metadata.gz: deacd36541edfd3d5dc656f1ce53da0b4aaac4ef
+  data.tar.gz: ce4c58630cd4da813c5a2915b241bf55cfcaf5b4
 SHA512:
-  metadata.gz: b9fa99e9a24984d30667ee1e4e7455b119bfdab4a1e2e56b12d3c3e375caf709cdd728f4c8c7c5e554a42313913f2c2a2ef75a7d721cba58d7d4bdfea84a6dc3
-  data.tar.gz: 192deb14605d03670a59f5cf2457fbc4b3b50478061068803f4dfa4bf461893f74ffe3af26bc1a27a3fd0f077a4034b0f80dcb145ff3e8803445cae49f5239a2
+  metadata.gz: 8c76d6da6018a67c292a27afc6d68de3919a7a6c739655da8c2f5c675a6ce6addb8d5c8e2cd130dddb79312b16f92caf60b037d9931e505148b6c802afef184e
+  data.tar.gz: 31dcd34ad1bad733e186d52a637034cc9914833f0a819d8a13b30fb3663fdfe3dfc83e8c645e0a44f360a2c56d021d9211755cbea4e1f82d5a334f9d2036eb57

data/lib/braintreehttp.rb

@@ -3,4 +3,5 @@ module BraintreeHttp
   require_relative "braintreehttp/http_client"
   require_relative "braintreehttp/errors"
   require_relative "braintreehttp/encoder"
+  require_relative "braintreehttp/serializers/form_part"
 end

data/lib/braintreehttp/serializers/form_part.rb

@@ -0,0 +1,14 @@
+module BraintreeHttp
+  class FormPart
+    attr_accessor :value, :headers
+
+    def initialize(value, headers)
+      @value = value
+      @headers = {}
+
+      headers.each do |key, value|
+        @headers[key.to_s.downcase.split('-').map { |word| "#{word[0].upcase}#{word[1..-1]}" }.join("-")] = value
+      end
+    end
+  end
+end

data/lib/braintreehttp/serializers/multipart.rb

@@ -8,14 +8,20 @@ module BraintreeHttp
       request.headers["Content-Type"] = "#{request.headers['Content-Type']}; boundary=#{boundary}"
 
       form_params = []
+      value_params = []
+      file_params = []
+
       request.body.each do |k, v|
         if v.is_a? File
-          form_params.push(_add_file_part(k, v))
+          file_params.push(_add_file_part(k, v))
+        elsif v.is_a? FormPart
+          value_params.push(_add_form_part(k, v))
         else
-          form_params.push(_add_form_field(k, v))
+          value_params.push(_add_form_field(k, v))
         end
       end
 
+      form_params = value_params + file_params
       form_params.collect {|p| "--" + boundary + "#{LINE_FEED}" + p}.join("") + "--" + boundary + "--"
     end
 
@@ -31,6 +37,35 @@ module BraintreeHttp
       return "Content-Disposition: form-data; name=\"#{key}\"#{LINE_FEED}#{LINE_FEED}#{value}#{LINE_FEED}"
     end
 
+    def _add_form_part(key, form_part)
+      retValue = "Content-Disposition: form-data; name=\"#{key}\""
+      if form_part.headers["Content-Type"] == "application/json"
+        retValue += "; filename=\"#{key}.json\""
+      end
+      retValue += "#{LINE_FEED}"
+
+      form_part.headers.each do |key, value|
+        retValue += "#{key}: #{value}#{LINE_FEED}"
+      end
+
+      retValue += "#{LINE_FEED}"
+
+      if form_part.headers["Content-Type"]
+        retValue += Encoder.new().serialize_request(OpenStruct.new({
+          :verb => 'POST',
+          :path => '/',
+          :headers => form_part.headers,
+          :body => form_part.value
+        }))
+      else
+        retValue += form_part.value
+      end
+
+      retValue += "#{LINE_FEED}"
+
+      return retValue
+    end
+
     def _add_file_part(key, file)
       mime_type = _mime_type_for_file_name(file.path)
       return "Content-Disposition: form-data; name=\"#{key}\"; filename=\"#{File.basename(file.path)}\"#{LINE_FEED}" +
@@ -41,6 +76,8 @@ module BraintreeHttp
       file_extension = File.extname(filename).strip.downcase[1..-1]
       if file_extension == "jpeg" || file_extension == "jpg"
         return "image/jpeg"
+      elsif file_extension == "gif"
+        return "image/gif"
       elsif file_extension == "png"
         return "image/png"
       elsif file_extension == "pdf"

data/lib/braintreehttp/version.rb

@@ -1 +1 @@
-VERSION = "0.4.4"
+VERSION = "0.5.0"

data/spec/braintreehttp/encoder_spec.rb

@@ -58,7 +58,6 @@ describe Encoder do
 
       expect(req.headers['Content-Type']).to include('multipart/form-data; charset=utf8; boundary=')
 
-      expect(serialized).to include("Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\"")
       expect(serialized).to include("Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\"")
       expect(serialized).to include("Content-Disposition: form-data; name=\"key\"")
       expect(serialized).to include("value")
@@ -66,6 +65,32 @@ describe Encoder do
       expect(serialized).to include("1013")
     end
 
+    it 'serializes the request when Json is provided inside multipart/form-data' do
+      file = File.new("README.md", "r")
+      req = OpenStruct.new({
+        :verb => "POST",
+        :path => "/v1/api",
+        :headers => {
+          "Content-Type" => "multipart/form-data; charset=utf8"
+        },
+        :body => {
+          :readme => file,
+          :input=> FormPart.new({:key => 'val'}, {'content-type': 'application/json'}),
+        }
+      })
+
+      serialized = Encoder.new.serialize_request(req)
+
+      expect(req.headers['Content-Type']).to include('multipart/form-data; charset=utf8; boundary=')
+
+      expect(serialized).to include("Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\"")
+      expect(serialized).to include("Content-Type: application/octet-stream")
+      expect(serialized).to include("Content-Disposition: form-data; name=\"input\"; filename=\"input.json\"")
+      expect(serialized).to include("Content-Type: application/json")
+      expect(serialized).to include("{\"key\":\"val\"}")
+      expect(serialized).to match(/.*Content-Disposition: form-data; name=\"input\"; filename=\"input.json\".*Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\".*/m)
+    end
+
     it 'serializes the request when content-type == application/x-www-form-urlencoded' do
       req = OpenStruct.new({
         :verb => "POST",

data/spec/braintreehttp/serializers/form_part_spec.rb

@@ -0,0 +1,33 @@
+describe FormPart do
+  describe 'initialize' do
+    it 'Header-Cases lower-case headers' do
+      lowerCaseFormPart = FormPart.new({:key => 'val'}, {'content-type': 'application/json'});
+
+      expect(lowerCaseFormPart.headers.keys).to include('Content-Type')
+      expect(lowerCaseFormPart.headers.keys.length).to eq(1)
+    end
+
+    it 'Header-Cases single char headers' do
+      singleCharFormPart = FormPart.new({:key => 'val'}, {'x': 'application/json'});
+
+      expect(singleCharFormPart.headers.keys).to include('X')
+      expect(singleCharFormPart.headers.keys.length).to eq(1)
+    end
+
+    it 'Header-Cases keeps single header if collision' do
+      multiHeaderFormPart = FormPart.new({:key => 'val'}, {'content-type': 'application/json', 'CONTENT-TYPE': 'application/pdf'});
+
+      expect(multiHeaderFormPart.headers.keys).to include('Content-Type')
+      expect(multiHeaderFormPart.headers.keys.length).to eq(1)
+    end
+
+    it 'Header-Cases multiple headers when supplied' do
+      multiHeaderFormPart = FormPart.new({:key => 'val'}, {'header-one': 'application/json', 'header-Two': 'application/pdf', 'HEADER-THREE': 'img/jpg'});
+
+      expect(multiHeaderFormPart.headers.keys).to include('Header-One')
+      expect(multiHeaderFormPart.headers.keys).to include('Header-Two')
+      expect(multiHeaderFormPart.headers.keys).to include('Header-Three')
+      expect(multiHeaderFormPart.headers.keys.length).to eq(3)
+    end
+  end
+end

data/spec/braintreehttp/serializers/multipart_spec.rb

@@ -0,0 +1,23 @@
+describe Multipart do
+  describe 'mime_type_for_filename' do
+    it 'supports gif' do
+      expect(Multipart.new()._mime_type_for_file_name("test.gif")).to eq('image/gif')
+    end
+
+    it 'supports jpeg' do
+      expect(Multipart.new()._mime_type_for_file_name("test.jpeg")).to eq('image/jpeg')
+    end
+
+    it 'supports jpg' do
+      expect(Multipart.new()._mime_type_for_file_name("test.jpg")).to eq('image/jpeg')
+    end
+
+    it 'supports pdf' do
+      expect(Multipart.new()._mime_type_for_file_name("test.pdf")).to eq('application/pdf')
+    end
+
+    it 'supports appication/octet-stream' do
+      expect(Multipart.new()._mime_type_for_file_name("test.random")).to eq('application/octet-stream')
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintreehttp
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-04-10 00:00:00.000000000 Z
 dependencies: []
 description: Used for generated API clients
 email: code@getbraintree.com
@@ -16,20 +16,23 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- braintreehttp.gemspec
+- lib/braintreehttp.rb
 - lib/braintreehttp/encoder.rb
 - lib/braintreehttp/environment.rb
 - lib/braintreehttp/errors.rb
 - lib/braintreehttp/http_client.rb
 - lib/braintreehttp/serializers/form_encoded.rb
+- lib/braintreehttp/serializers/form_part.rb
 - lib/braintreehttp/serializers/json.rb
 - lib/braintreehttp/serializers/multipart.rb
 - lib/braintreehttp/serializers/text.rb
 - lib/braintreehttp/version.rb
-- lib/braintreehttp.rb
 - spec/braintreehttp/encoder_spec.rb
 - spec/braintreehttp/http_client_spec.rb
+- spec/braintreehttp/serializers/form_part_spec.rb
+- spec/braintreehttp/serializers/multipart_spec.rb
 - spec/spec_helper.rb
-- braintreehttp.gemspec
 homepage: http://www.braintreepayments.com/
 licenses:
 - MIT
@@ -40,17 +43,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: braintreehttp
-rubygems_version: 2.0.14.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: BraintreeHttp Client Library