fat_zebra 3.0.7 → 3.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 618e6720f8f02177f35f4b23f6abebe58deed3aa
-  data.tar.gz: 81d4a6d0c8817a79a491a513e76df2ca58a3249c
+  metadata.gz: 1f2329184b0e60cacc02215da4013523ab92bb73
+  data.tar.gz: 9c51d54b355199794f37019cb844bc71bbbfb215
 SHA512:
-  metadata.gz: a3f2c60541dfed2240fabe1e9ad82c8d4dd8bb574541b63f0c282765b575163243351a2ff4d52ae343fcf7c42a749b99dc5b34f3513f386708b67f71c6d80c1a
-  data.tar.gz: a0e013320cb329528bebe850588210de2eada793fe64829a3d8ec7c1012fe76316a78e07f18b324f0bad2044d576742dc92e3d26351e811708c3cbc22e5d351c
+  metadata.gz: 3bae07687f60d964bac95cd305c5f21f3a724f0e310286b8c15007d54c176d88964f3517e8b49dacbd3b55835b4c0248a4896ea1ce8cc3071d5c0d9bb0345fd0
+  data.tar.gz: 58bf0fd4d32eb643acb7b11464a10218afacdc8e52dc1c2d8d62fb565b500ab1975b1710026c3a9dd6e40b5bb58a4268e40022a73b2696f485f2f0c25df6046d

data/lib/fat_zebra/request.rb

@@ -49,7 +49,10 @@ module FatZebra
 
     def initialize(params = {})
       @params = params
-      @http   = Net::HTTP.new(uri.host, uri.port, uri_proxy.host, uri_proxy.port)
+      @http   = Net::HTTP.new(uri.host,
+                              uri.port,
+                              proxy_host,
+                              uri_proxy.port)
 
       setup_ssl if params[:use_ssl]
     end
@@ -163,5 +166,12 @@ module FatZebra
         end
     end
 
+    def proxy_host
+      if !uri_proxy.host.nil?
+        uri_proxy.host
+      else
+        :ENV
+      end
+    end
   end
 end

data/lib/fat_zebra/version.rb

@@ -1,3 +1,3 @@
 module FatZebra
-  VERSION = '3.0.7'.freeze
+  VERSION = '3.0.8'.freeze
 end

data/spec/lib/fat_zebra/request_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe FatZebra::Request do
+  describe '#initalize' do
+    subject do
+      FatZebra::Request
+        .new(params)
+        .http
+    end
+    let(:params) do
+      {
+        url: 'https://cool.dudes/v2/swagtopia.json',
+      }.merge!(proxy_params)
+    end
+    let(:formatted_proxy) { [host, port].join(':') }
+    let(:formatted_host) { URI.parse(host).host }
+    let(:host) { "http://squidward.net" }
+    let(:port) { 6969 }
+
+    context 'with default params' do
+      let(:proxy_params) {{}}
+
+      it 'does not use a proxy configuration' do
+        expect(subject.proxy?).to eq(false)
+      end
+    end
+
+    context 'with env var specifying http proxy' do
+      let(:proxy_params) {{}}
+      before do
+        allow(ENV).to receive(:[]).with("NO_PROXY").and_return(nil)
+        allow(ENV).to receive(:[]).with("no_proxy").and_return(nil)
+        allow(ENV).to receive(:[]).with("http_proxy").and_return(formatted_proxy)
+      end
+
+      it 'draws the proxy configuration from the environment var' do
+        expect(subject.proxy?).to eq(true)
+        expect(subject.proxy_from_env?).to eq(true)
+        expect(subject.proxy_address).to eq(formatted_host)
+        expect(subject.proxy_port).to eq(port)
+      end
+    end
+
+    context 'with custom http_proxy params to the constructor passed via initializer or similar' do
+      let(:proxy_params) do
+        {
+          proxy: formatted_proxy
+        }
+      end
+
+      it 'draws the proxy host and port configuration from the environment var' do
+        expect(subject.proxy?).to eq(true)
+        expect(subject.proxy_from_env?).to eq(false)
+        expect(subject.proxy_address).to eq(formatted_host)
+        expect(subject.proxy_port).to eq(port)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fat_zebra
 version: !ruby/object:Gem::Version
-  version: 3.0.7
+  version: 3.0.8
 platform: ruby
 authors:
 - Matthew Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-22 00:00:00.000000000 Z
+date: 2018-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -376,6 +376,7 @@ files:
 - spec/lib/fat_zebra/payment_plan_spec.rb
 - spec/lib/fat_zebra/purchase_spec.rb
 - spec/lib/fat_zebra/refund_spec.rb
+- spec/lib/fat_zebra/request_spec.rb
 - spec/lib/fat_zebra/util_spec.rb
 - spec/lib/fat_zebra/validation_spec.rb
 - spec/lib/fat_zebra/web_hook_spec.rb
@@ -401,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: fat_zebra
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: Fat Zebra payments gem - integrate your ruby app with Fat Zebra