easypost 2.7.2 → 3.1.4

data/lib/easypost/carrier_account.rb

@@ -1,7 +1,7 @@
 module EasyPost
   class CarrierAccount < Resource
     def self.types
-      response, api_key = EasyPost.request(:get, "/carrier_types", @api_key)
+      response = EasyPost.make_request(:get, "/carrier_types", @api_key)
       return Util.convert_to_easypost_object(response, api_key)
     end
   end

data/lib/easypost/customs_info.rb

@@ -1,4 +1,9 @@
 module EasyPost
   class CustomsInfo < Resource
+
+    def self.all(filters={}, api_key=nil)
+      raise NotImplementedError.new('CustomsInfo.all not implemented.')
+    end
+
   end
 end

data/lib/easypost/customs_item.rb

@@ -1,4 +1,9 @@
 module EasyPost
   class CustomsItem < Resource
+
+    def self.all(filters={}, api_key=nil)
+      raise NotImplementedError.new('CustomsItem.all not implemented.')
+    end
+
   end
 end

data/lib/easypost/error.rb

@@ -1,39 +1,33 @@
 module EasyPost
   class Error < StandardError
     attr_reader :message
-    attr_reader :http_status
+    attr_reader :status
+    attr_reader :http_status # deprecated
     attr_reader :http_body
-    attr_reader :json_body
-    attr_reader :param
     attr_reader :code
     attr_reader :errors
 
-    def initialize(message=nil, http_status=nil, http_body=nil, json_body={})
+    def initialize(message = nil, status = nil, code = nil, errors = nil, http_body = nil)
       @message = message
-      @http_status = http_status
+      @status = status
+      @http_status = status # deprecated
+      @code = code
+      @errors = errors
       @http_body = http_body
-      @json_body = json_body
-
-      @param = @json_body.fetch(:error, {}).fetch(:param, nil)
-      @code = @json_body.fetch(:error, {}).fetch(:code, nil)
-      @errors = @json_body.fetch(:error, {}).fetch(:errors, nil)
 
       super(message)
     end
 
     def to_s
-      s = "#{@code} (#{@http_status}): #{@message}";
-      if @errors
-          s += "\nField errors:\n"
-          @errors.each do |field_error|
-            field_error.each do |k, v|
-              s += "  #{k}: #{v}\n"
-            end
-            s += "\n"
-          end
-      end
-      s
+      "#{code} (#{status}): #{message} #{errors}".strip
+    end
+
+    def ==(other)
+      other.is_a?(Error) &&
+        message == other.message &&
+        status == other.status &&
+        code == other.code &&
+        errors == other.errors
     end
   end
 end
-

data/lib/easypost/item.rb

@@ -2,7 +2,7 @@ module EasyPost
   class Item < Resource
 
     def self.retrieve_reference(params={}, api_key=nil)
-      response, api_key = EasyPost.request(:get, url + '/retrieve_reference', api_key, params)
+      response = EasyPost.make_request(:get, url + '/retrieve_reference', api_key, params)
       return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
     end
 

data/lib/easypost/object.rb

@@ -1,3 +1,5 @@
+require "set"
+
 module EasyPost
   class EasyPostObject
     include Enumerable
@@ -22,12 +24,12 @@ module EasyPost
     end
 
     def to_s(*args)
-      MultiJson.dump(@values, :pretty => true)
+      JSON.dump(@values)
     end
 
-    def inspect()
+    def inspect
       id_string = (self.respond_to?(:id) && !self.id.nil?) ? " id=#{self.id}" : ""
-      "#<#{self.class}:#{id_string}> JSON: " + MultiJson.dump(@values, :pretty => true)
+      "#<#{self.class}:#{id_string}> JSON: " + to_json
     end
 
     def refresh_from(values, api_key, partial=false)
@@ -40,15 +42,14 @@ module EasyPost
       end
 
       values.each do |k, v|
-        @values[k] = Util.convert_to_easypost_object(v, api_key, self, k)
+        @values[k.to_s] = Util.convert_to_easypost_object(v, api_key, self, k)
         @transient_values.delete(k)
         @unsaved_values.delete(k)
       end
     end
 
     def [](k)
-      k = k.to_sym if k.is_a?(String)
-      @values[k]
+      @values[k.to_s]
     end
 
     def []=(k, v)
@@ -64,7 +65,7 @@ module EasyPost
     end
 
     def to_json(options = {})
-      MultiJson.dump(@values)
+      JSON.dump(@values)
     end
 
     def as_json(options = {})
@@ -144,6 +145,5 @@ module EasyPost
         end
       end
     end
-
   end
 end

data/lib/easypost/order.rb

@@ -2,7 +2,7 @@ module EasyPost
   class Order < Resource
 
     def get_rates(params={})
-      response, api_key = EasyPost.request(:get, url + '/rates', @api_key, params)
+      response = EasyPost.make_request(:get, url + '/rates', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
@@ -16,11 +16,15 @@ module EasyPost
         params[:service] = temp.service
       end
 
-      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 self.all(filters={}, api_key=nil)
+      raise NotImplementedError.new('Order.all not implemented.')
+    end
+
   end
 end

data/lib/easypost/pickup.rb

@@ -9,17 +9,22 @@ module EasyPost
         params[:service] = temp.service
       end
 
-      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 cancel(params={})
-      response, api_key = EasyPost.request(:post, url + '/cancel', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/cancel', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
+
+    def self.all(filters={}, api_key=nil)
+      raise NotImplementedError.new('Pickup.all not implemented.')
+    end
+
   end
 end

data/lib/easypost/printer.rb

@@ -2,7 +2,7 @@ module EasyPost
   class Printer < Resource
 
     def job
-      response, api_key = EasyPost.request(
+      response = EasyPost.make_request(
         :get, url + '/jobs', @api_key
       )
       return EasyPost::Util::convert_to_easypost_object(response, api_key)
@@ -15,7 +15,7 @@ module EasyPost
         params[:postage_label] = temp
       end
 
-      response, api_key = EasyPost.request(
+      response = EasyPost.make_request(
         :post, url + '/print_postage_label', @api_key, params
       )
       return true

data/lib/easypost/report.rb

@@ -5,7 +5,7 @@ module EasyPost
       wrapped_params = {}
       wrapped_params[class_name.to_sym] = params
 
-      response, api_key = EasyPost.request(:post, url, api_key, params)
+      response = EasyPost.make_request(:post, url, api_key, params)
       return Util.convert_to_easypost_object(response, api_key)
     end
 
@@ -24,7 +24,7 @@ module EasyPost
     def self.all(filters={}, api_key=nil)
       url = "#{self.url}/#{filters[:type]}"
 
-      response, api_key = EasyPost.request(:get, url, api_key, filters)
+      response = EasyPost.make_request(:get, url, api_key, filters)
       return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
     end
   end

data/lib/easypost/resource.rb

@@ -11,9 +11,9 @@ module EasyPost
         raise NotImplementedError.new('Resource is an abstract class.  You should perform actions on its subclasses (Address, Shipment, etc.)')
       end
       if(self.class_name[-1..-1] == 's' || self.class_name[-1..-1] == 'h')
-        return "/#{CGI.escape(self.class_name.downcase)}es"
+        return "/v2/#{CGI.escape(self.class_name.downcase)}es"
       else
-        return "/#{CGI.escape(class_name.downcase)}s"
+        return "/v2/#{CGI.escape(class_name.downcase)}s"
       end
     end
 
@@ -25,13 +25,13 @@ module EasyPost
     end
 
     def refresh
-      response, api_key = EasyPost.request(:get, url, @api_key, @retrieve_options)
+      response = EasyPost.make_request(:get, url, @api_key, @retrieve_options)
       refresh_from(response, api_key)
       return self
     end
 
     def self.all(filters={}, api_key=nil)
-      response, api_key = EasyPost.request(:get, url, api_key, filters)
+      response = EasyPost.make_request(:get, url, api_key, filters)
       return Util.convert_to_easypost_object(response, api_key)
     end
 
@@ -44,12 +44,12 @@ module EasyPost
     def self.create(params={}, api_key=nil)
       wrapped_params = {}
       wrapped_params[self.class_name().to_sym] = params
-      response, api_key = EasyPost.request(:post, self.url, api_key, wrapped_params)
+      response = EasyPost.make_request(:post, self.url, api_key, wrapped_params)
       return Util.convert_to_easypost_object(response, api_key)
     end
 
     def delete
-      response, api_key = EasyPost.request(:delete, url, @api_key)
+      response = EasyPost.make_request(:delete, url, @api_key)
       refresh_from(response, api_key)
       return self
     end
@@ -68,7 +68,7 @@ module EasyPost
 
         wrapped_params = {self.class.class_name => values}
 
-        response, api_key = EasyPost.request(:put, url, @api_key, wrapped_params)
+        response = EasyPost.make_request(:put, url, @api_key, wrapped_params)
         refresh_from(response, api_key)
       end
       return self

data/lib/easypost/scan_form.rb

@@ -1,7 +1,7 @@
 module EasyPost
   class ScanForm < Resource
     def self.create(params={}, api_key=nil)
-      response, api_key = EasyPost.request(:post, self.url, api_key, params)
+      response = EasyPost.make_request(:post, self.url, api_key, params)
       return Util.convert_to_easypost_object(response, api_key)
     end
   end

data/lib/easypost/shipment.rb

@@ -2,7 +2,7 @@ module EasyPost
   class Shipment < Resource
 
     def get_rates(params={})
-      response, api_key = EasyPost.request(:get, url + '/rates', @api_key, params)
+      response = EasyPost.make_request(:get, url + '/rates', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
@@ -15,7 +15,7 @@ module EasyPost
         params[:rate] = temp
       end
 
-      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
@@ -28,14 +28,14 @@ module EasyPost
         params[:amount] = temp
       end
 
-      response, api_key = EasyPost.request(:post, url + '/insure', @api_key, params)
+      response = EasyPost.make_request(:post, url + '/insure', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
     def refund(params={})
-      response, api_key = EasyPost.request(:get, url + '/refund', @api_key, params)
+      response = EasyPost.make_request(:get, url + '/refund', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
@@ -55,7 +55,7 @@ module EasyPost
         params[:file_format] = temp
       end
 
-      response, api_key = EasyPost.request(:get, url + '/label', @api_key, params)
+      response = EasyPost.make_request(:get, url + '/label', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
@@ -66,9 +66,7 @@ module EasyPost
 
       self.get_rates unless self.rates
 
-      carriers = carriers.is_a?(String) ? carriers.split(',') : Array(carriers)
-      carriers.map!(&:downcase)
-      carriers.map!(&:strip)
+      carriers = EasyPost::Util.normalize_string_list(carriers)
 
       negative_carriers = []
       carriers_copy = carriers.clone
@@ -79,9 +77,7 @@ module EasyPost
         end
       end
 
-      services = services.is_a?(String) ? services.split(',') : Array(services)
-      services.map!(&:downcase)
-      services.map!(&:strip)
+      services = EasyPost::Util.normalize_string_list(services)
 
       negative_services = []
       services_copy = services.clone

data/lib/easypost/tracker.rb

@@ -2,13 +2,13 @@ module EasyPost
   class Tracker < Resource
     def self.create_list(params={}, api_key=nil)
       url = self.url + '/create_list'
-      response, api_key = EasyPost.request(:post, url, api_key, params)
+      response = EasyPost.make_request(:post, url, api_key, params)
       return true
     end
 
     def self.all_updated(params={}, api_key=nil)
       url = self.url + '/all_updated'
-      response, api_key = EasyPost.request(:get, url, api_key, params)
+      response = EasyPost.make_request(:get, url, api_key, params)
       return Util.convert_to_easypost_object(response, api_key)
     end
   end

data/lib/easypost/user.rb

@@ -1,9 +1,7 @@
 module EasyPost
   class User < Resource
     def self.create(params={}, api_key=nil)
-      wrapped_params = {}
-      wrapped_params[self.class_name().to_sym] = params
-      response, api_key = EasyPost.request(:post, self.url, api_key, wrapped_params, {}, false)
+      response = EasyPost.make_request(:post, self.url, api_key, {self.class_name.to_sym => params})
       return Util.convert_to_easypost_object(response, api_key)
     end
 
@@ -14,7 +12,7 @@ module EasyPost
 
         wrapped_params = {user: values}
 
-        response, api_key = EasyPost.request(:put, url, @api_key, wrapped_params)
+        response = EasyPost.make_request(:put, url, @api_key, wrapped_params)
         refresh_from(response, api_key)
       end
       return self
@@ -25,7 +23,7 @@ module EasyPost
     end
 
     def self.all_api_keys
-      response, api_key = EasyPost.request(:get, "/api_keys", @api_key)
+      response = EasyPost.make_request(:get, "/api_keys", @api_key)
       return Util.convert_to_easypost_object(response, api_key)
     end
 

data/lib/easypost/util.rb

@@ -15,6 +15,11 @@ module EasyPost
       end
     end
 
+    def self.normalize_string_list(lst)
+      lst = lst.is_a?(String) ? lst.split(',') : Array(lst)
+      lst.map(&:to_s).map(&:downcase).map(&:strip)
+    end
+
     def self.convert_to_easypost_object(response, api_key, parent=nil, name=nil)
       types = {
         'Address' => Address,
@@ -42,6 +47,8 @@ module EasyPost
         'ShipmentReport' => Report,
         'PaymentLogReport' => Report,
         'TrackerReport' => Report,
+        'RefundReport' => Report,
+        'ShipmentInvoiceReport' => Report,
         'Webhook' => Webhook
       }
 
@@ -70,6 +77,8 @@ module EasyPost
         'shprep' => Report,
         'plrep' => Report,
         'trkrep' => Report,
+        'refrep' => Report,
+        'shpinvrep' => Report,
         'hook' => Webhook
       }
 
@@ -86,7 +95,7 @@ module EasyPost
             cls = prefixes[cls_prefix[0..-2]]
           end
         elsif response['id']
-          if response[:id].index('_').nil?
+          if response['id'].index('_').nil?
             cls = EasyPostObject
           elsif cls_prefix = response['id'][0..response['id'].index('_')]
             cls = prefixes[cls_prefix[0..-2]]
@@ -99,49 +108,5 @@ module EasyPost
         return response
       end
     end
-
-    def self.symbolize_names(obj)
-      case obj
-      when Hash
-        result = {}
-        obj.each do |k, v|
-          k = (k.to_sym rescue k) || k
-          obj[k] = symbolize_names(v)
-        end
-        return result
-      when Array
-        return obj.map { |v| symbolize_names(v) }
-      else
-        return obj
-      end
-    end
-
-    def self.url_encode(key)
-      URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-    end
-
-    def self.flatten_params(params, parent_key=nil)
-      result = []
-      if params.is_a?(Hash)
-        params.each do |k, v|
-          calculated_key = parent_key ? "#{parent_key}[#{url_encode(k)}]" : url_encode(k)
-          if v.is_a?(Hash) or v.is_a?(Array)
-            result += flatten_params(v, calculated_key)
-          else
-            result << [calculated_key, v]
-          end
-        end
-      elsif params.is_a?(Array)
-        params.each_with_index do |v, i|
-          calculated_key = parent_key ? "#{parent_key}[#{i}]" : i
-          if v.is_a?(Hash) or v.is_a?(Array)
-            result += flatten_params(v, calculated_key)
-          else
-            result << [calculated_key, v]
-          end
-        end
-      end
-      return result
-    end
   end
 end