easypost 3.0.1 → 3.3.0

data/lib/easypost/tracker.rb

@@ -1,15 +1,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)
-      return true
-    end
+class EasyPost::Tracker < EasyPost::Resource
+  def self.create_list(params={}, api_key=nil)
+    url = self.url + '/create_list'
+    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)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
+  def self.all_updated(params={}, api_key=nil)
+    url = self.url + '/all_updated'
+    response = EasyPost.make_request(:get, url, api_key, params)
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
   end
 end

data/lib/easypost/user.rb

@@ -1,49 +1,45 @@
-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)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
+class EasyPost::User < EasyPost::Resource
+  def self.create(params={}, api_key=nil)
+    response = EasyPost.make_request(:post, self.url, api_key, {self.class_name.to_sym => params})
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
 
-    def save
-      if @unsaved_values.length > 0
-        values = {}
-        @unsaved_values.each { |k| values[k] = @values[k] }
+  def save
+    if @unsaved_values.length > 0
+      values = {}
+      @unsaved_values.each { |k| values[k] = @values[k] }
 
-        wrapped_params = {user: values}
+      wrapped_params = {user: values}
 
-        response, api_key = EasyPost.request(:put, url, @api_key, wrapped_params)
-        refresh_from(response, api_key)
-      end
-      return self
+      response = EasyPost.make_request(:put, url, @api_key, wrapped_params)
+      refresh_from(response, api_key)
     end
+    return self
+  end
 
-    def self.retrieve_me
-      self.all
-    end
+  def self.retrieve_me
+    self.all
+  end
 
-    def self.all_api_keys
-      response, api_key = EasyPost.request(:get, "/api_keys", @api_key)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
+  def self.all_api_keys
+    response = EasyPost.make_request(:get, "/api_keys", @api_key)
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
+
+  def api_keys
+    api_keys = EasyPost::User.all_api_keys
 
-    def api_keys
-      api_keys = EasyPost::User.all_api_keys
-
-      if api_keys.id == self.id
-        my_api_keys = api_keys.keys
-      else
-        for child in api_keys.children
-          if child.id == self.id
-            my_api_keys = child.keys
-            break
-          end
+    if api_keys.id == self.id
+      my_api_keys = api_keys.keys
+    else
+      for child in api_keys.children
+        if child.id == self.id
+          my_api_keys = child.keys
+          break
         end
       end
-
-      my_api_keys
     end
+
+    my_api_keys
   end
 end

data/lib/easypost/util.rb

@@ -1,147 +1,110 @@
-module EasyPost
-  module Util
-    def self.objects_to_ids(obj)
-      case obj
-      when Resource
-        return {:id => obj.id}
-      when Hash
-        result = {}
-        obj.each { |k, v| result[k] = objects_to_ids(v) unless v.nil? }
-        return result
-      when Array
-        return obj.map { |v| objects_to_ids(v) }
-      else
-        return obj
-      end
+module EasyPost::Util
+  def self.objects_to_ids(obj)
+    case obj
+    when EasyPost::Resource
+      return {:id => obj.id}
+    when Hash
+      result = {}
+      obj.each { |k, v| result[k] = objects_to_ids(v) unless v.nil? }
+      return result
+    when Array
+      return obj.map { |v| objects_to_ids(v) }
+    else
+      return obj
     end
+  end
 
-    def self.convert_to_easypost_object(response, api_key, parent=nil, name=nil)
-      types = {
-        'Address' => Address,
-        'ScanForm' => ScanForm,
-        'CustomsItem' => CustomsItem,
-        'CustomsInfo' => CustomsInfo,
-        'Parcel' => Parcel,
-        'Shipment' => Shipment,
-        'Rate' => Rate,
-        'Refund' => Refund,
-        'Event' => Event,
-        'Batch' => Batch,
-        'Tracker' => Tracker,
-        'Item' => Item,
-        'Insurance' => Insurance,
-        'Order' => Order,
-        'Pickup' => Pickup,
-        'PickupRate' => PickupRate,
-        'PostageLabel' => PostageLabel,
-        'Printer' => Printer,
-        'PrintJob' => PrintJob,
-        'CarrierAccount' => CarrierAccount,
-        'User' => User,
-        'Report' => Report,
-        'ShipmentReport' => Report,
-        'PaymentLogReport' => Report,
-        'TrackerReport' => Report,
-        'Webhook' => Webhook
-      }
-
-      prefixes = {
-        'adr' => Address,
-        'sf' => ScanForm,
-        'cstitem' => CustomsItem,
-        'cstinfo' => CustomsInfo,
-        'prcl' => Parcel,
-        'shp' => Shipment,
-        'rate' => Rate,
-        'rfnd' => Refund,
-        'evt' => Event,
-        'batch' => Batch,
-        'trk' => Tracker,
-        'item' => Item,
-        'ins' => Insurance,
-        'order' => Order,
-        'pickup' => Pickup,
-        'pickuprate' => PickupRate,
-        'pl' => PostageLabel,
-        'printer' => Printer,
-        'printjob' => PrintJob,
-        'ca' => CarrierAccount,
-        'user' => User,
-        'shprep' => Report,
-        'plrep' => Report,
-        'trkrep' => Report,
-        'hook' => Webhook
-      }
-
-      case response
-      when Array
-        return response.map { |i| convert_to_easypost_object(i, api_key, parent) }
-      when Hash
-        if cls_name = response[:object]
-          cls = types[cls_name]
-        elsif response[:id]
-          if response[:id].index('_').nil?
-            cls = EasyPostObject
-          elsif cls_prefix = response[:id][0..response[:id].index('_')]
-            cls = prefixes[cls_prefix[0..-2]]
-          end
-        elsif response['id']
-          if response['id'].index('_').nil?
-            cls = EasyPostObject
-          elsif cls_prefix = response['id'][0..response['id'].index('_')]
-            cls = prefixes[cls_prefix[0..-2]]
-          end
-        end
-
-        cls ||= EasyPostObject
-        return cls.construct_from(response, api_key, parent, name)
-      else
-        return response
-      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.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.convert_to_easypost_object(response, api_key, parent=nil, name=nil)
+    types = {
+      'Address' => EasyPost::Address,
+      'ScanForm' => EasyPost::ScanForm,
+      'CustomsItem' => EasyPost::CustomsItem,
+      'CustomsInfo' => EasyPost::CustomsInfo,
+      'Parcel' => EasyPost::Parcel,
+      'Shipment' => EasyPost::Shipment,
+      'Rate' => EasyPost::Rate,
+      'Refund' => EasyPost::Refund,
+      'Event' => EasyPost::Event,
+      'Batch' => EasyPost::Batch,
+      'Tracker' => EasyPost::Tracker,
+      'Item' => EasyPost::Item,
+      'Insurance' => EasyPost::Insurance,
+      'Order' => EasyPost::Order,
+      'Pickup' => EasyPost::Pickup,
+      'PickupRate' => EasyPost::PickupRate,
+      'PostageLabel' => EasyPost::PostageLabel,
+      'Printer' => EasyPost::Printer,
+      'PrintJob' => EasyPost::PrintJob,
+      'CarrierAccount' => EasyPost::CarrierAccount,
+      'User' => EasyPost::User,
+      'Report' => EasyPost::Report,
+      'ShipmentReport' => EasyPost::Report,
+      'PaymentLogReport' => EasyPost::Report,
+      'TrackerReport' => EasyPost::Report,
+      'RefundReport' => EasyPost::Report,
+      'ShipmentInvoiceReport' => EasyPost::Report,
+      'Webhook' => EasyPost::Webhook
+    }
 
-    def self.url_encode(key)
-      URI.escape(key.to_s, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]"))
-    end
+    prefixes = {
+      'adr' => EasyPost::Address,
+      'sf' => EasyPost::ScanForm,
+      'cstitem' => EasyPost::CustomsItem,
+      'cstinfo' => EasyPost::CustomsInfo,
+      'prcl' => EasyPost::Parcel,
+      'shp' => EasyPost::Shipment,
+      'rate' => EasyPost::Rate,
+      'rfnd' => EasyPost::Refund,
+      'evt' => EasyPost::Event,
+      'batch' => EasyPost::Batch,
+      'trk' => EasyPost::Tracker,
+      'item' => EasyPost::Item,
+      'ins' => EasyPost::Insurance,
+      'order' => EasyPost::Order,
+      'pickup' => EasyPost::Pickup,
+      'pickuprate' => EasyPost::PickupRate,
+      'pl' => EasyPost::PostageLabel,
+      'printer' => EasyPost::Printer,
+      'printjob' => EasyPost::PrintJob,
+      'ca' => EasyPost::CarrierAccount,
+      'user' => EasyPost::User,
+      'shprep' => EasyPost::Report,
+      'plrep' => EasyPost::Report,
+      'trkrep' => EasyPost::Report,
+      'refrep' => EasyPost::Report,
+      'shpinvrep' => EasyPost::Report,
+      'hook' => EasyPost::Webhook
+    }
 
-    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
+    case response
+    when Array
+      return response.map { |i| convert_to_easypost_object(i, api_key, parent) }
+    when Hash
+      if cls_name = response[:object]
+        cls = types[cls_name]
+      elsif response[:id]
+        if response[:id].index('_').nil?
+          cls = EasyPost::EasyPostObject
+        elsif cls_prefix = response[:id][0..response[:id].index('_')]
+          cls = prefixes[cls_prefix[0..-2]]
         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
+      elsif response['id']
+        if response['id'].index('_').nil?
+          cls = EasyPost::EasyPostObject
+        elsif cls_prefix = response['id'][0..response['id'].index('_')]
+          cls = prefixes[cls_prefix[0..-2]]
         end
       end
-      return result
+
+      cls ||= EasyPost::EasyPostObject
+      return cls.construct_from(response, api_key, parent, name)
+    else
+      return response
     end
   end
 end

data/lib/easypost/webhook.rb

@@ -1,28 +1,29 @@
-module EasyPost
-  class Webhook < Resource
-    def update(params={})
-      unless self.id
-        raise Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
-      end
-      instance_url = "#{self.class.url}/#{CGI.escape(id)}"
-
-      response, api_key = EasyPost.request(:put, instance_url, @api_key, params)
-      self.refresh_from(response, api_key, true)
-
-      return self
+class EasyPost::Webhook < EasyPost::Resource
+  def update(params={})
+    # NOTE: This method is redefined here since the "url" method conflicts
+    # with the objects field
+    unless self.id
+      raise EasyPost::Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
     end
+    instance_url = "#{self.class.url}/#{CGI.escape(id)}"
 
-    def delete
-      # Note: This method is redefined here since the "url" method conflicts with the objects field
-      unless self.id
-        raise Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
-      end
-      instance_url = "#{self.class.url}/#{CGI.escape(id)}"
+    response = EasyPost.make_request(:put, instance_url, @api_key, params)
+    self.refresh_from(response, api_key, true)
 
-      response, api_key = EasyPost.request(:delete, instance_url, @api_key)
-      refresh_from(response, api_key)
+    return self
+  end
 
-      return self
+  def delete
+    # NOTE: This method is redefined here since the "url" method conflicts
+    # with the objects field
+    unless self.id
+      raise EasyPost::Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
     end
+    instance_url = "#{self.class.url}/#{CGI.escape(id)}"
+
+    response = EasyPost.make_request(:delete, instance_url, @api_key)
+    refresh_from(response, api_key)
+
+    return self
   end
 end

metadata

@@ -1,92 +1,95 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.3.0
 platform: ruby
 authors:
-- Sawyer Bateman
+- Jake Epstein
+- Andrew Tribone
+- James Brown
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-17 00:00:00.000000000 Z
+date: 2021-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :runtime
+        version: '0.13'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
-  type: :runtime
+        version: '13.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '5.1'
 description: Client library for accessing the EasyPost shipping API via Ruby.
-email: contact@easypost.com
+email: support@easypost.com
 executables:
 - easypost-irb
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - CHANGELOG
 - Gemfile
@@ -95,12 +98,12 @@ files:
 - Rakefile
 - VERSION
 - bin/easypost-irb
-- circle.yml
 - easypost.gemspec
 - lib/easypost.rb
 - lib/easypost/address.rb
 - lib/easypost/batch.rb
 - lib/easypost/carrier_account.rb
+- lib/easypost/carrier_type.rb
 - lib/easypost/customs_info.rb
 - lib/easypost/customs_item.rb
 - lib/easypost/error.rb
@@ -126,23 +129,9 @@ files:
 - lib/easypost/util.rb
 - lib/easypost/version.rb
 - lib/easypost/webhook.rb
-- spec/address_spec.rb
-- spec/batch_spec.rb
-- spec/carrier_account_spec.rb
-- spec/insurance_spec.rb
-- spec/item_spec.rb
-- spec/order_spec.rb
-- spec/pickup_spec.rb
-- spec/report_spec.rb
-- spec/scan_form_spec.rb
-- spec/shipment_spec.rb
-- spec/spec_helper.rb
-- spec/support/constant.rb
-- spec/tracker_spec.rb
-- spec/user_spec.rb
-- spec/webhook_spec.rb
 homepage: https://www.easypost.com/docs
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -150,33 +139,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: EasyPost Ruby Client Library
-test_files:
-- spec/address_spec.rb
-- spec/batch_spec.rb
-- spec/carrier_account_spec.rb
-- spec/insurance_spec.rb
-- spec/item_spec.rb
-- spec/order_spec.rb
-- spec/pickup_spec.rb
-- spec/report_spec.rb
-- spec/scan_form_spec.rb
-- spec/shipment_spec.rb
-- spec/spec_helper.rb
-- spec/support/constant.rb
-- spec/tracker_spec.rb
-- spec/user_spec.rb
-- spec/webhook_spec.rb
+test_files: []