easypost 3.1.4 → 3.1.5

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 = EasyPost.make_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 = EasyPost.make_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,47 +1,45 @@
-module EasyPost
-  class User < Resource
-    def self.create(params={}, api_key=nil)
-      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
+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 = EasyPost.make_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 = EasyPost.make_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,112 +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.normalize_string_list(lst)
-      lst = lst.is_a?(String) ? lst.split(',') : Array(lst)
-      lst.map(&:to_s).map(&:downcase).map(&:strip)
-    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,
-        '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,
-        'RefundReport' => Report,
-        'ShipmentInvoiceReport' => Report,
-        'Webhook' => Webhook
-      }
+  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
+    }
 
-      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,
-        'refrep' => Report,
-        'shpinvrep' => Report,
-        'hook' => Webhook
-      }
+    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
+    }
 
-      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
+    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 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
-
-        cls ||= EasyPostObject
-        return cls.construct_from(response, api_key, parent, name)
-      else
-        return response
       end
+
+      cls ||= EasyPost::EasyPostObject
+      return cls.construct_from(response, api_key, parent, name)
+    else
+      return response
     end
   end
 end

data/lib/easypost/webhook.rb

@@ -1,31 +1,29 @@
-module EasyPost
-  class Webhook < Resource
-    def update(params={})
-      # 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)
-
-      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 = EasyPost.make_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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Jake Epstein
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-30 00:00:00.000000000 Z
+date: 2020-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry