easypost 3.0.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 6168d8faeaf5226b22bed0526e692acb11d0c29d8bcdc42d744c725112854792
-  data.tar.gz: 6fc7826c1e0c958cee412cb9554268c0665ee7a11080ed1309d39f5fbceb9d65
+SHA1:
+  metadata.gz: c78ad14a13a665a9397b5d2ade56cdad38a669f0
+  data.tar.gz: e73234c20adee8cfcbc37f2b93fb1c5aa2a6843d
 SHA512:
-  metadata.gz: 52832eace51fd93e54fdf6117b73beb5facdeb76f6df4a5a50fea512bc4983744cb09ba06e9ed204f91979fee7f902ca9814fbfd9b104075ed99f842bc088d70
-  data.tar.gz: a5f572caca04940e794a8f363c48713159b8a946a82bc76a0465a4408d78ecb5b3419c4e32caa152e0f0e7b7071d67cbbb50dc858fc42dc01e4e0a14c5bf5391
+  metadata.gz: 29e64cace8628e794a110868fbf3395fe560f1334ebe04218ccab054edf84f64631895196a09967ad06021b405162ee660eb29e86992847dfcfd45dc5b7b1549
+  data.tar.gz: f5e58cd6bdbe1cf61b3e272986470eb5beb7c9ba8738a4ebe05b727803c741a518ab5d64876ba2ff8bbb5ae2f331c8f6b977b4f53c1839336ebb72c3ef08337a

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+    - 2.2
+    - 2.3
+    - 2.4
+    - 2.5
+    - 2.6
+    - 2.7
+script: "bundle exec rspec"

data/CHANGELOG

@@ -1,3 +1,21 @@
+=== 3.1.3 2020-06-26
+
+* Fix bug causing Authorization header to be included in User-Agent header. All users must upgrade.
+
+=== 3.1.2 2020-06-24
+
+* Bad gem push. New version required.
+
+=== 3.1.1 2020-06-23
+
+* Fix bug where EasyPost.http_config was invalid when not explicitly initialized.
+
+=== 3.1.0 2020-06-23
+
+* Add Shipment Invoice and Refund Report
+* Remove dependencies on `RestClient` and `MultiJson`
+* Remove some deprecated endpoints
+
 === 3.0.1 2018-05-17
 
 * Enforce TLS certificate validity by default

data/README.md

@@ -1,6 +1,6 @@
 # EasyPost Ruby Client Library
 
-[<img src="https://circleci.com/gh/EasyPost/easypost-ruby.png?circle-token=80adb5236ed1fdce20810b055af79c63c3d5796b">](https://circleci.com/gh/EasyPost/easypost-ruby)
+[![Build Status](https://travis-ci.com/EasyPost/easypost-ruby.svg?branch=master)](https://travis-ci.com/EasyPost/easypost-ruby)
 
 
 EasyPost is a simple shipping API. You can sign up for an account at https://easypost.com

data/VERSION

@@ -1 +1 @@
-3.0.1
+3.1.3

data/easypost.gemspec

@@ -1,27 +1,31 @@
 # coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'easypost/version'
+require "easypost/version"
 
 Gem::Specification.new do |spec|
-  spec.name        = 'easypost'
-  spec.version     = EasyPost::VERSION
-  spec.date        = Time.now.strftime("%Y-%m-%d")
-  spec.summary     = 'EasyPost Ruby Client Library'
-  spec.description = 'Client library for accessing the EasyPost shipping API via Ruby.'
-  spec.authors     = ['Sawyer Bateman']
-  spec.email       = 'contact@easypost.com'
-  spec.homepage    = 'https://www.easypost.com/docs'
+  spec.name = "easypost"
+  spec.version = EasyPost::VERSION
+  spec.licenses = ["MIT"]
+  spec.date = Time.now.strftime("%Y-%m-%d")
+  spec.summary = "EasyPost Ruby Client Library"
+  spec.description = "Client library for accessing the EasyPost shipping API via Ruby."
+  spec.authors = ["Jake Epstein", "Andrew Tribone", "James Brown"]
+  spec.email = "support@easypost.com"
+  spec.homepage = "https://www.easypost.com/docs"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ['lib']
-  spec.required_ruby_version = '~> 2.0'
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = "~> 2.2"
 
-  spec.add_dependency 'rest-client', '>= 1.7'
-  spec.add_dependency 'multi_json', '>= 1.3.0'
-  spec.add_development_dependency 'bundler', '~> 1.7'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 2.13'
+  spec.add_development_dependency "pry", "~> 0.13"
+  spec.add_development_dependency "rake", "~> 13.0"
+  spec.add_development_dependency "rspec", "~> 3.9"
+  spec.add_development_dependency "webmock", "~> 3.8"
+  spec.add_development_dependency "vcr", "~> 5.1"
 end

data/lib/easypost.rb

@@ -1,157 +1,147 @@
-require 'cgi'
-require 'set'
-require 'openssl'
-require 'rest_client'
-require 'multi_json'
+require "base64"
+require "cgi"
+require "net/http"
 
 # Resources
-require 'easypost/version'
-require 'easypost/util'
-require 'easypost/object'
-require 'easypost/resource'
-require 'easypost/address'
-require 'easypost/parcel'
-require 'easypost/customs_item'
-require 'easypost/customs_info'
-require 'easypost/shipment'
-require 'easypost/rate'
-require 'easypost/postage_label'
-require 'easypost/scan_form'
-require 'easypost/refund'
-require 'easypost/insurance'
-require 'easypost/event'
-require 'easypost/batch'
-require 'easypost/tracker'
-require 'easypost/item'
-require 'easypost/order'
-require 'easypost/pickup'
-require 'easypost/pickup_rate'
-require 'easypost/printer'
-require 'easypost/print_job'
-require 'easypost/carrier_account'
-require 'easypost/user'
-require 'easypost/report'
-require 'easypost/webhook'
-
-require 'easypost/error'
+require "easypost/version"
+require "easypost/util"
+require "easypost/object"
+require "easypost/resource"
+require "easypost/address"
+require "easypost/parcel"
+require "easypost/customs_item"
+require "easypost/customs_info"
+require "easypost/shipment"
+require "easypost/rate"
+require "easypost/postage_label"
+require "easypost/scan_form"
+require "easypost/refund"
+require "easypost/insurance"
+require "easypost/event"
+require "easypost/batch"
+require "easypost/tracker"
+require "easypost/item"
+require "easypost/order"
+require "easypost/pickup"
+require "easypost/pickup_rate"
+require "easypost/printer"
+require "easypost/print_job"
+require "easypost/carrier_account"
+require "easypost/user"
+require "easypost/report"
+require "easypost/webhook"
+
+require "easypost/error"
 
 module EasyPost
-  @@api_key = nil
-  @@api_base = 'https://api.easypost.com/v2'
-  @@api_version = nil
-  @@open_timeout = 30
-  @@timeout = 60
-
-  def self.api_url(url='')
-    @@api_base + url
-  end
+  @api_key = nil
+  @api_base = "https://api.easypost.com"
 
   def self.api_key=(api_key)
-    @@api_key = api_key
+    @api_key = api_key
   end
 
   def self.api_key
-    @@api_key
+    @api_key
   end
 
   def self.api_base=(api_base)
-    @@api_base = api_base
+    @api_base = api_base
   end
 
   def self.api_base
-    @@api_base
-  end
-
-  def self.api_version=(version)
-    @@api_version = version
+    @api_base
   end
 
-  def self.api_version
-    @@api_version
-  end
-
-  def self.http_config
-    @@http_config ||= {
+  def self.reset_http_config
+    @http_config = {
       timeout: 60,
       open_timeout: 30,
       verify_ssl: OpenSSL::SSL::VERIFY_PEER,
-      ssl_version: :TLSv1_2,
     }
+
+    ruby_version = Gem::Version.new(RUBY_VERSION)
+    if ruby_version >= Gem::Version.new("2.5.0")
+      @http_config[:min_version] = OpenSSL::SSL::TLS1_2_VERSION
+    else
+      @http_config[:ssl_version] = :TLSv1_2
+    end
+
+    @http_config
+  end
+
+  def self.http_config
+    @http_config ||= reset_http_config
   end
 
   def self.http_config=(http_config_params)
-    self.http_config.merge!(http_config_params)
+    http_config.merge!(http_config_params)
   end
 
-  def self.request(method, url, api_key, params={}, headers={}, api_key_required=true)
-    api_key ||= @@api_key
-    if api_key_required
-      raise Error.new('No API key provided.') unless api_key
-    end
+  def self.make_client(uri)
+    client = if http_config[:proxy]
+               proxy_uri = URI(http_config[:proxy])
+               Net::HTTP.new(
+                 uri.host,
+                 uri.port,
+                 proxy_uri.host,
+                 proxy_uri.port,
+                 proxy_uri.user,
+                 proxy_uri.password
+               )
+             else
+               Net::HTTP.new(uri.host, uri.port)
+             end
+    client.use_ssl = true
+
+    http_config.each do |name, value|
+      # Discrepancies between RestClient and Net::HTTP.
+      if name == :verify_ssl
+        name = :verify_mode
+      elsif name == :timeout
+        name = :read_timeout
+      end
 
-    params = Util.objects_to_ids(params)
-    url = self.api_url(url)
-    case method.to_s.downcase.to_sym
-    when :get, :head, :delete
-      # Make params into GET parameters
-      if params && params.count > 0
-        query_string = Util.flatten_params(params).collect{|key, value| "#{key}=#{Util.url_encode(value)}"}.join('&')
-        url += "#{URI.parse(url).query ? '&' : '?'}#{query_string}"
+      # Handled in the creation of the client.
+      if name == :proxy
+        next
       end
-      payload = nil
-    else
-      payload = Util.flatten_params(params).collect{|(key, value)| "#{key}=#{Util.url_encode(value)}"}.join('&')
+
+      client.send("#{name}=", value)
     end
 
-    headers = {
-      :user_agent => "EasyPost/v2 RubyClient/#{VERSION}",
-      :authorization => "Bearer #{api_key}",
-      :content_type => 'application/x-www-form-urlencoded'
-    }.merge(headers)
-
-    opts = http_config.merge(
-      {
-        :method => method,
-        :url => url,
-        :headers => headers,
-        :payload => payload
-      }
-    )
+    client
+  end
 
-    begin
-      response = execute_request(opts)
-    rescue RestClient::ExceptionWithResponse => e
-      if response_code = e.http_code and response_body = e.http_body
-        begin
-          response_json = MultiJson.load(response_body, :symbolize_keys => true)
-        rescue MultiJson::DecodeError
-          raise Error.new("Invalid response from API, unable to decode.", response_code, response_body)
-        end
-        begin
-          raise NoMethodError if response_json[:error][:message] == nil
-          raise Error.new(response_json[:error][:message], response_code, response_body, response_json)
-        rescue NoMethodError, TypeError
-          raise Error.new(response_json[:error], response_code, response_body, response_json)
-        end
-      else
-        raise Error.new(e.message)
-      end
-    rescue RestClient::Exception, Errno::ECONNREFUSED => e
-      raise Error.new(e.message)
+  def self.make_request(method, path, api_key=nil, body=nil)
+    client = make_client(URI(@api_base))
+
+    request = Net::HTTP.const_get(method.capitalize).new(path)
+    if body
+      request.body = JSON.dump(Util.objects_to_ids(body))
     end
 
-    begin
-      response_json = MultiJson.load(response.body, :symbolize_keys => true)
-    rescue MultiJson::DecodeError
-      raise Error.new("Invalid response object from API, unable to decode.", response.code, response.body)
+    request["Content-Type"] = "application/json"
+    request["User-Agent"] = "EasyPost/v2 RubyClient/#{VERSION} Ruby/#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+    if api_key = api_key || @api_key
+      request["Authorization"] = "Basic #{Base64.strict_encode64("#{api_key}:")}"
     end
 
-    return [response_json, api_key]
-  end
+    response = client.request(request)
 
-  private
+    if (400..599).include? response.code.to_i
+      error = JSON.parse(response.body)["error"]
+      raise Error.new(error["message"], response.code.to_i, error["code"], error["errors"])
+    end
 
-  def self.execute_request(opts)
-    RestClient::Request.execute(opts)
+    if response["Content-Type"].include? "application/json"
+      JSON.parse(response.body)
+    else
+      response.body
+    end
+  rescue JSON::ParserError
+    raise RuntimeError.new(
+      "Invalid response object from API, unable to decode.\n#{response.body}"
+    )
   end
 end

data/lib/easypost/address.rb

@@ -18,7 +18,7 @@ module EasyPost
         end
       end
 
-      response, api_key = EasyPost.request(:post, url, api_key, {address: params})
+      response = EasyPost.make_request(:post, url, api_key, {address: params})
       return Util.convert_to_easypost_object(response, api_key)
     end
 
@@ -26,7 +26,7 @@ module EasyPost
       wrapped_params = {}
       wrapped_params[self.class_name().to_sym] = params
       wrapped_params[:carrier] = carrier
-      response, api_key = EasyPost.request(:post, url + '/create_and_verify', api_key, wrapped_params)
+      response = EasyPost.make_request(:post, url + '/create_and_verify', api_key, wrapped_params)
 
       if response.has_key?(:address)
         if response.has_key?(:message)
@@ -41,13 +41,13 @@ module EasyPost
 
     def verify(params={}, carrier=nil)
       begin
-        response, api_key = EasyPost.request(:get, url + '/verify?carrier=' + String(carrier), @api_key, params)
+        response = EasyPost.make_request(:get, url + '/verify?carrier=' + String(carrier), @api_key, params)
       rescue
         raise Error.new("Unable to verify address.")
       end
 
-      if response.has_key?(:address)
-        return EasyPost::Util::convert_to_easypost_object(response[:address], api_key)
+      if response.has_key?("address")
+        return EasyPost::Util::convert_to_easypost_object(response["address"], api_key)
       else
         raise Error.new("Unable to verify address.")
       end

data/lib/easypost/batch.rb

@@ -4,47 +4,47 @@ module EasyPost
     def self.create_and_buy(params={}, api_key=nil)
       wrapped_params = {}
       wrapped_params[self.class_name().to_sym] = params
-      response, api_key = EasyPost.request(:post, url + '/create_and_buy', api_key, wrapped_params)
+      response = EasyPost.make_request(:post, url + '/create_and_buy', api_key, wrapped_params)
 
       return Util.convert_to_easypost_object(response, api_key)
     end
 
     def buy(params={})
-      response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/buy', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
     def label(params={})
-      response, api_key = EasyPost.request(:post, url + '/label', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/label', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
     def remove_shipments(params={})
-      response, api_key = EasyPost.request(:post, url + '/remove_shipments', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/remove_shipments', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
     def add_shipments(params={})
-      response, api_key = EasyPost.request(:post, url + '/add_shipments', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/add_shipments', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
     def stamp_and_barcode_by_reference(params={})
-      response, api_key = EasyPost.request(:get, url + '/stamp_and_barcode_by_reference', @api_key, params)
+      response = EasyPost.make_request(:get, url + '/stamp_and_barcode_by_reference', @api_key, params)
 
       return response
     end
 
     def create_scan_form(params={})
-      response, api_key = EasyPost.request(:post, url + '/scan_form', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/scan_form', @api_key, params)
 
       return response
     end