braintreehttp 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5acc4be958983186e9a0ec676bb2cd63ef1826
-  data.tar.gz: 1df1e3ea5528c38871d9095a5d950dce2858faa5
+  metadata.gz: 599bde79b1bc33cd0f46c65d37136855ed422343
+  data.tar.gz: 06d2cf5cc5eeda5fad37ba71b07c97f91068331a
 SHA512:
-  metadata.gz: cd69056b00f9453007534051a1c64e54e203f10383e48b6848e3e2c04ce93066e607c76dbe4eca87136e0e7c1c2e0c266b2bebfae094096962b2f14177a41279
-  data.tar.gz: 42179eb6e06bbe238b3f5e4e6022751dc3ef57d06c8254c51d0fa6a73e0dc74096e4e0e54fb2fd9810ed7f334867fc7deddca6068e1e9c804e8a5bcdf28b16c0
+  metadata.gz: 81fe0a125d8b991d02e9f3d77171e4b4c18745df78e3f0a6e6c30d01c8edc873952736a047063d45925af236672f2cdc74f2887e175b98c9ebab5d62a7cf87bd
+  data.tar.gz: 9375dd0800ea34885828d90b3c3987cd8571ff312d28af415be69840671210fcd4edd63a06de5cc9758783472cfca22630b29c47b778a60f1d478b49ed93adec

data/braintreehttp.gemspec

@@ -1,10 +1,12 @@
+require_relative './lib/braintreehttp/version'
+
 $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name = "braintreehttp"
   s.summary = "BraintreeHttp Client Library"
   s.description = "Used for generated API clients"
-  s.version = "0.1.5"
+  s.version = VERSION
   s.license = "MIT"
   s.author = "Braintree"
   s.email = "code@getbraintree.com"

data/lib/braintreehttp/encoder.rb

@@ -1,10 +1,9 @@
 require 'json'
 
 module BraintreeHttp
-
   class Encoder
     def initialize
-      @encoders = [Json.new, Text.new]
+      @encoders = [Json.new, Text.new, Multipart.new]
     end
 
     def serialize_request(req)
@@ -16,7 +15,7 @@ module BraintreeHttp
       enc = _encoder(content_type)
       raise UnsupportedEncodingError.new("Unable to serialize request with Content-Type #{content_type}. Supported encodings are #{supported_encodings}") unless enc
 
-      enc.encode(req.body)
+      enc.encode(req)
     end
 
     def deserialize_response(resp, headers)
@@ -43,9 +42,8 @@ module BraintreeHttp
   end
 
   class Json
-
-    def encode(body)
-      JSON.generate(body)
+    def encode(request)
+      JSON.generate(request.body)
     end
 
     def decode(body)
@@ -58,9 +56,8 @@ module BraintreeHttp
   end
 
   class Text
-
-    def encode(body)
-      body.to_s
+    def encode(request)
+      request.body.to_s
     end
 
     def decode(body)
@@ -71,4 +68,53 @@ module BraintreeHttp
       /^text\/.*/
     end
   end
+
+  class Multipart
+    def encode(request)
+      boundary = DateTime.now.strftime("%Q")
+      request.headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+
+      form_params = []
+      request.body.each do |k, v|
+        if v.is_a? File
+          form_params.push(_add_file_part(k, v))
+        else
+          form_params.push(_add_form_field(k, v))
+        end
+      end
+
+      form_params.collect {|p| "--" + boundary + "#{LINE_FEED}" + p}.join("") + "--" + boundary + "--"
+    end
+
+    def decode(body)
+      raise UnsupportedEncodingError.new("Multipart does not support deserialization")
+    end
+
+    def content_type
+      /^multipart\/.*/
+    end
+
+    def _add_form_field(key, value)
+      return "Content-Disposition: form-data; name=\"#{key}\"#{LINE_FEED}#{LINE_FEED}#{value}#{LINE_FEED}"
+    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}" +
+        "Content-Type: #{mime_type}#{LINE_FEED}#{LINE_FEED}#{file.read}#{LINE_FEED}"
+    end
+
+    def _mime_type_for_file_name(filename)
+      file_extension = File.extname(filename).strip.downcase[1..-1]
+      if file_extension == "jpeg" || file_extension == "jpg"
+        return "image/jpeg"
+      elsif file_extension == "png"
+        return "image/png"
+      elsif file_extension == "pdf"
+        return "application/pdf"
+      else
+        return "application/octet-stream"
+      end
+    end
+  end
 end

data/lib/braintreehttp/http_client.rb

@@ -7,7 +7,7 @@ module BraintreeHttp
   LINE_FEED = "\r\n"
 
   class HttpClient
-    attr_accessor :environment
+    attr_accessor :environment, :encoder
 
     def initialize(environment)
       @environment = environment
@@ -40,65 +40,15 @@ module BraintreeHttp
         request.headers["User-Agent"] = user_agent
       end
 
-      httpRequest = Net::HTTPGenericRequest.new(request.verb, true, true, request.path, request.headers)
+      http_request = Net::HTTPGenericRequest.new(request.verb, true, true, request.path, request.headers)
 
-      content_type = request.headers["Content-Type"]
-      if content_type && content_type.start_with?("multipart/")
-        boundary = DateTime.now.strftime("%Q")
-        httpRequest.set_content_type("multipart/form-data; boundary=#{boundary}")
-
-        form_params = []
-        request.body.each do |k, v|
-          if v.is_a? File
-            form_params.push(_add_file_part(k, v))
-          else
-            form_params.push(_add_form_field(k, v))
-          end
-        end
-
-        httpRequest.body = form_params.collect {|p| "--" + boundary + "#{LINE_FEED}" + p}.join("") + "--" + boundary + "--"
-      elsif has_body(request)
-        if request.body.is_a? String
-          httpRequest.body = request.body
-        else
-          httpRequest.body = serialize_request(request)
-        end
+      if has_body(request)
+        http_request.body = @encoder.serialize_request(request)
       end
 
       uri = URI(@environment.base_url)
       Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') do |http|
-        _parse_response(http.request(httpRequest))
-      end
-    end
-
-    def serialize_request(request)
-      @encoder.serialize_request(request)
-    end
-
-    def deserialize_response(response_body, headers)
-      @encoder.deserialize_response(response_body, headers)
-    end
-
-    def _add_form_field(key, value)
-      return "Content-Disposition: form-data; name=\"#{key}\"#{LINE_FEED}#{LINE_FEED}#{value}#{LINE_FEED}"
-    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}" +
-        "Content-Type: #{mime_type}#{LINE_FEED}#{LINE_FEED}#{file.read}#{LINE_FEED}"
-    end
-
-    def _mime_type_for_file_name(filename)
-      file_extension = File.extname(filename).strip.downcase[1..-1]
-      if file_extension == "jpeg" || file_extension == "jpg"
-        return "image/jpeg"
-      elsif file_extension == "png"
-        return "image/png"
-      elsif file_extension == "pdf"
-        return "application/pdf"
-      else
-        return "application/octet-stream"
+        _parse_response(http.request(http_request))
       end
     end
 
@@ -108,7 +58,7 @@ module BraintreeHttp
       result = response.body
       headers = response.to_hash
       if result && !result.empty?
-        deserialized = deserialize_response(response.body, headers)
+        deserialized = @encoder.deserialize_response(response.body, headers)
         if deserialized.is_a?(String) || deserialized.is_a?(Array)
           result = deserialized
         else

data/lib/braintreehttp/version.rb

@@ -0,0 +1 @@
+VERSION = "0.2.0"

data/spec/braintreehttp/encoder_spec.rb

@@ -36,6 +36,32 @@ describe Encoder do
       expect(Encoder.new.serialize_request(req)).to eq("some text")
     end
 
+    it 'serializes the request when content-type == multipart/form-data' do
+      http_client = HttpClient.new(@environment)
+      file = File.new("README.md", "r")
+      req = OpenStruct.new({
+        :verb => "POST", 
+        :path => "/v1/api", 
+        :headers => {
+          "Content-Type" => "multipart/form-data"
+        },
+        :body => {
+          :key => "value",
+          :another_key => 1013,
+          :readme => file,
+        }
+      })
+
+      serialized = Encoder.new.serialize_request(req)
+
+      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")
+      expect(serialized).to include("Content-Disposition: form-data; name=\"another_key\"")
+      expect(serialized).to include("1013")
+    end
+
     it 'throws when content-type is not application/json' do
       req = OpenStruct.new({
         :headers  => {

data/spec/braintreehttp/http_client_spec.rb

@@ -58,7 +58,13 @@ describe HttpClient do
 
     stub_request(:delete, @environment.base_url + "/path")
 
-    req = OpenStruct.new({:verb => "DELETE", :path => "/path"})
+    req = OpenStruct.new({
+      :verb => "DELETE", 
+      :path => "/path",
+      :headers => {
+        "Content-Type" => "text/plain"
+      }
+    })
 
     req.body = "I want to delete the thing"
 
@@ -157,36 +163,6 @@ describe HttpClient do
     expect(resp.result.key).to eq('value')
   end
 
-  it "allows subclasses to modify response body" do
-    WebMock.enable!
-
-    return_data = {
-      :key => "value"
-    }
-
-    class JSONHttpClient < HttpClient
-      def deserialize_response(body, headers)
-        if headers["content-type"].include? "application/json"
-          return 'something else'
-        end
-
-        body
-      end
-    end
-
-    http_client = JSONHttpClient.new(@environment)
-
-    stub_request(:get, @environment.base_url + "/v1/api")
-      .to_return(body: JSON.generate(return_data), status: 200, headers: {"Content-Type" => "application/json"})
-
-    req = OpenStruct.new({:verb => "GET", :path => "/v1/api"})
-
-    resp = http_client.execute(req)
-
-    expect(resp.status_code).to eq(200)
-    expect(resp.result).to eq('something else')
-  end
-
   it 'handles json array result' do
     WebMock.enable!
 
@@ -204,49 +180,6 @@ describe HttpClient do
     expect(resp.result).to eq(return_data)
   end
 
-  it "encodes multipart/form-data when a file is present without body" do
-    WebMock.enable!
-
-    stub_request(:any, @environment.base_url + "/v1/api")
-
-    http_client = HttpClient.new(@environment)
-    file = File.new("README.md", "r")
-    req = OpenStruct.new({:verb => "POST", :path => "/v1/api", :headers => {"Content-Type" => "multipart/form-data"}})
-    req.body = {:readme => file}
-
-    resp = http_client.execute(req)
-
-    assert_requested(:post, @environment.base_url + "/v1/api") { |requested|
-      requested.body.include? "Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\""
-    }
-  end
-
-  it "encodes multipart/form-data when a file is present with body" do
-    WebMock.enable!
-
-    stub_request(:any, @environment.base_url + "/v1/api")
-
-    http_client = HttpClient.new(@environment)
-    file = File.new("README.md", "r")
-
-    req = OpenStruct.new({:verb => "POST", :path => "/v1/api", :headers => {"Content-Type" => "multipart/form-data"}})
-    req.body = {
-      :key => "value",
-      :another_key => 1013,
-      :readme => file,
-    }
-
-    resp = http_client.execute(req)
-
-    assert_requested(:post, @environment.base_url + "/v1/api") { |requested|
-      requested.body.include? "Content-Disposition: form-data; name=\"readme\"; filename=\"README.md\""
-      requested.body.include? "Content-Disposition: form-data; name=\"key\""
-      requested.body.include? "value"
-      requested.body.include? "Content-Disposition: form-data; name=\"another_key\""
-      requested.body.include? "1013"
-    }
-  end
-
 	it "does not error if no file or body present on a request class" do
 		class Request
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintreehttp
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-30 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies: []
 description: Used for generated API clients
 email: code@getbraintree.com
@@ -22,6 +22,7 @@ files:
 - lib/braintreehttp/environment.rb
 - lib/braintreehttp/errors.rb
 - lib/braintreehttp/http_client.rb
+- lib/braintreehttp/version.rb
 - spec/braintreehttp/encoder_spec.rb
 - spec/braintreehttp/http_client_spec.rb
 - spec/spec_helper.rb
@@ -45,7 +46,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braintreehttp
-rubygems_version: 2.6.12
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: BraintreeHttp Client Library