easypost 3.0.0 → 3.1.5

data/lib/easypost/object.rb

@@ -1,149 +1,147 @@
-module EasyPost
-  class EasyPostObject
-    include Enumerable
-
-    attr_accessor :parent, :name, :api_key, :unsaved_values
-    @@immutable_values = Set.new([:api_key, :id])
-
-    def initialize(id=nil, api_key=nil, parent=nil, name=nil)
-      @api_key = api_key
-      @values = {}
-      @unsaved_values = Set.new
-      @transient_values = Set.new
-      @parent = parent
-      @name = name
-      self.id = id if id
-    end
-
-    def self.construct_from(values, api_key=nil, parent=nil, name=nil)
-      obj = self.new(values[:id], api_key, parent, name)
-      obj.refresh_from(values, api_key)
-      obj
-    end
+require "set"
+
+class EasyPost::EasyPostObject
+  include Enumerable
+
+  attr_accessor :parent, :name, :api_key, :unsaved_values
+  @@immutable_values = Set.new([:api_key, :id])
+
+  def initialize(id=nil, api_key=nil, parent=nil, name=nil)
+    @api_key = api_key
+    @values = {}
+    @unsaved_values = Set.new
+    @transient_values = Set.new
+    @parent = parent
+    @name = name
+    self.id = id if id
+  end
 
-    def to_s(*args)
-      MultiJson.dump(@values, :pretty => true)
-    end
+  def self.construct_from(values, api_key=nil, parent=nil, name=nil)
+    obj = self.new(values[:id], api_key, parent, name)
+    obj.refresh_from(values, api_key)
+    obj
+  end
 
-    def inspect()
-      id_string = (self.respond_to?(:id) && !self.id.nil?) ? " id=#{self.id}" : ""
-      "#<#{self.class}:#{id_string}> JSON: " + MultiJson.dump(@values, :pretty => true)
-    end
+  def to_s(*args)
+    JSON.dump(@values)
+  end
 
-    def refresh_from(values, api_key, partial=false)
-      @api_key = api_key
+  def inspect
+    id_string = (self.respond_to?(:id) && !self.id.nil?) ? " id=#{self.id}" : ""
+    "#<#{self.class}:#{id_string}> JSON: " + to_json
+  end
 
-      added = Set.new(values.keys - @values.keys)
+  def refresh_from(values, api_key, partial=false)
+    @api_key = api_key
 
-      instance_eval do
-        add_accessors(added)
-      end
+    added = Set.new(values.keys - @values.keys)
 
-      values.each do |k, v|
-        @values[k] = Util.convert_to_easypost_object(v, api_key, self, k)
-        @transient_values.delete(k)
-        @unsaved_values.delete(k)
-      end
+    instance_eval do
+      add_accessors(added)
     end
 
-    def [](k)
-      k = k.to_sym if k.is_a?(String)
-      @values[k]
+    values.each do |k, v|
+      @values[k.to_s] = EasyPost::Util.convert_to_easypost_object(v, api_key, self, k)
+      @transient_values.delete(k)
+      @unsaved_values.delete(k)
     end
+  end
 
-    def []=(k, v)
-      send(:"#{k}=", v)
-    end
+  def [](k)
+    @values[k.to_s]
+  end
 
-    def keys
-      @values.keys
-    end
+  def []=(k, v)
+    send(:"#{k}=", v)
+  end
 
-    def values
-      @values.values
-    end
+  def keys
+    @values.keys
+  end
 
-    def to_json(options = {})
-      MultiJson.dump(@values)
-    end
+  def values
+    @values.values
+  end
 
-    def as_json(options = {})
-      @values.as_json
-    end
+  def to_json(options = {})
+    JSON.dump(@values)
+  end
 
-    def to_hash
-      @values
-    end
+  def as_json(options = {})
+    @values.as_json
+  end
 
-    def each(&blk)
-      @values.each(&blk)
-    end
+  def to_hash
+    @values
+  end
 
-    def id=(id)
-      @values[:id] = id
-    end
+  def each(&blk)
+    @values.each(&blk)
+  end
 
-    def id
-      @values[:id]
-    end
+  def id=(id)
+    @values[:id] = id
+  end
 
-    protected
+  def id
+    @values[:id]
+  end
 
-    def flatten_unsaved
-      values = {}
-      for key in @unsaved_values
-        value = @values[key]
+  protected
 
-        values[key] = value
+  def flatten_unsaved
+    values = {}
+    for key in @unsaved_values
+      value = @values[key]
 
-        if value.is_a?(EasyPost::EasyPostObject)
-          values[key] = flatten_unsaved(value)
-        end
-      end
+      values[key] = value
 
-      return values
+      if value.is_a?(EasyPost::EasyPostObject)
+        values[key] = flatten_unsaved(value)
+      end
     end
 
-    def metaclass
-      class << self; self; end
-    end
+    return values
+  end
 
-    def remove_accessors(keys)
-      metaclass.instance_eval do
-        keys.each do |k|
-          next if @@immutable_values.include?(k)
-          k_eq = :"#{k}="
-          remove_method(k) if method_defined?(k)
-          remove_method(k_eq) if method_defined?(k_eq)
-        end
+  def metaclass
+    class << self; self; end
+  end
+
+  def remove_accessors(keys)
+    metaclass.instance_eval do
+      keys.each do |k|
+        next if @@immutable_values.include?(k)
+        k_eq = :"#{k}="
+        remove_method(k) if method_defined?(k)
+        remove_method(k_eq) if method_defined?(k_eq)
       end
     end
+  end
 
-    def add_accessors(keys)
-      metaclass.instance_eval do
-        keys.each do |k|
-          next if @@immutable_values.include?(k)
-          k_eq = :"#{k}="
-          define_method(k) { @values[k] }
-          define_method(k_eq) do |v|
-            @values[k] = v
-            @unsaved_values.add(k)
-
-            cur = self
-            cur_parent = self.parent
-            param = {}
-            while cur_parent
-              if cur.name
-                cur_parent.unsaved_values.add(cur.name)
-              end
-
-              cur = cur_parent
-              cur_parent = cur.parent
+  def add_accessors(keys)
+    metaclass.instance_eval do
+      keys.each do |k|
+        next if @@immutable_values.include?(k)
+        k = k.to_s
+        k_eq = :"#{k}="
+        define_method(k) { @values[k] }
+        define_method(k_eq) do |v|
+          @values[k] = v
+          @unsaved_values.add(k)
+
+          cur = self
+          cur_parent = self.parent
+          while cur_parent
+            if cur.name
+              cur_parent.unsaved_values.add(cur.name)
             end
+
+            cur = cur_parent
+            cur_parent = cur.parent
           end
         end
       end
     end
-
   end
 end

data/lib/easypost/order.rb

@@ -1,26 +1,28 @@
-module EasyPost
-  class Order < Resource
+class EasyPost::Order < EasyPost::Resource
 
-    def get_rates(params={})
-      response, api_key = EasyPost.request(:get, url + '/rates', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+  def get_rates(params={})
+    response = EasyPost.make_request(:get, url + '/rates', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-      return self
-    end
+    return self
+  end
 
-    def buy(params={})
-      if params.instance_of?(EasyPost::Rate)
-        temp = params.clone
-        params = {}
-        params[:carrier] = temp.carrier
-        params[:service] = temp.service
-      end
+  def buy(params={})
+    if params.instance_of?(EasyPost::Rate)
+      temp = params.clone
+      params = {}
+      params[:carrier] = temp.carrier
+      params[:service] = temp.service
+    end
 
-      response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    response = EasyPost.make_request(:post, url + '/buy', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-      return self
-    end
+    return self
+  end
 
+  def self.all(filters={}, api_key=nil)
+    raise NotImplementedError.new('Order.all not implemented.')
   end
+
 end

data/lib/easypost/parcel.rb

@@ -1,4 +1,2 @@
-module EasyPost
-  class Parcel < Resource
-  end
+class EasyPost::Parcel < EasyPost::Resource
 end

data/lib/easypost/pickup.rb

@@ -1,25 +1,26 @@
-module EasyPost
-  class Pickup < Resource
+class EasyPost::Pickup < EasyPost::Resource
+  def buy(params={})
+    if params.instance_of?(EasyPost::PickupRate)
+      temp = params.clone
+      params = {}
+      params[:carrier] = temp.carrier
+      params[:service] = temp.service
+    end
 
-    def buy(params={})
-      if params.instance_of?(EasyPost::PickupRate)
-        temp = params.clone
-        params = {}
-        params[:carrier] = temp.carrier
-        params[:service] = temp.service
-      end
+    response = EasyPost.make_request(:post, url + '/buy', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-      response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return self
+  end
 
-      return self
-    end
+  def cancel(params={})
+    response = EasyPost.make_request(:post, url + '/cancel', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-    def cancel(params={})
-      response, api_key = EasyPost.request(:post, url + '/cancel', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return self
+  end
 
-      return self
-    end
+  def self.all(filters={}, api_key=nil)
+    raise NotImplementedError.new('Pickup.all not implemented.')
   end
 end

data/lib/easypost/pickup_rate.rb

@@ -1,5 +1,3 @@
-module EasyPost
-  class PickupRate < Resource
+class EasyPost::PickupRate < EasyPost::Resource
 
-  end
 end

data/lib/easypost/postage_label.rb

@@ -1,4 +1,2 @@
-module EasyPost
-  class PostageLabel < Resource
-  end
+class EasyPost::PostageLabel < EasyPost::Resource
 end

data/lib/easypost/print_job.rb

@@ -1,6 +1,2 @@
-module EasyPost
-  class PrintJob < Resource
-  end
+class EasyPost::PrintJob < EasyPost::Resource
 end
-
-

data/lib/easypost/printer.rb

@@ -1,28 +1,24 @@
-module EasyPost
-  class Printer < Resource
+class EasyPost::Printer < EasyPost::Resource
 
-    def job
-      response, api_key = EasyPost.request(
-        :get, url + '/jobs', @api_key
-      )
-      return EasyPost::Util::convert_to_easypost_object(response, api_key)
-    end
-
-    def print(params={})
-      if params.instance_of?(EasyPost::PostageLabel)
-        temp = params.clone
-        params = {}
-        params[:postage_label] = temp
-      end
+  def job
+    response = EasyPost.make_request(
+      :get, url + '/jobs', @api_key
+    )
+    return EasyPost::Util::convert_to_easypost_object(response, api_key)
+  end
 
-      response, api_key = EasyPost.request(
-        :post, url + '/print_postage_label', @api_key, params
-      )
-      return true
-    rescue
-      return false
+  def print(params={})
+    if params.instance_of?(EasyPost::PostageLabel)
+      temp = params.clone
+      params = {}
+      params[:postage_label] = temp
     end
 
+    response = EasyPost.make_request(
+      :post, url + '/print_postage_label', @api_key, params
+    )
+    true
+  rescue
+    false
   end
 end
-

data/lib/easypost/rate.rb

@@ -1,4 +1,2 @@
-module EasyPost
-  class Rate < Resource
-  end
+class EasyPost::Rate < EasyPost::Resource
 end

data/lib/easypost/refund.rb

@@ -1,4 +1,2 @@
-module EasyPost
-  class Refund < Resource
-  end
+class EasyPost::Refund < EasyPost::Resource
 end

data/lib/easypost/report.rb

@@ -1,31 +1,29 @@
-module EasyPost
-  class Report < Resource
-    def self.create(params={}, api_key=nil)
-      url = "#{self.url}/#{params[:type]}"
-      wrapped_params = {}
-      wrapped_params[class_name.to_sym] = params
+class EasyPost::Report < EasyPost::Resource
+  def self.create(params={}, api_key=nil)
+    url = "#{self.url}/#{params[:type]}"
+    wrapped_params = {}
+    wrapped_params[class_name.to_sym] = params
 
-      response, api_key = EasyPost.request(:post, url, api_key, params)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
-
-    def self.retrieve(params, api_key=nil)
-      id = if params.is_a?(String)
-        params
-      else
-        params[:id]
-      end
+    response = EasyPost.make_request(:post, url, api_key, params)
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
 
-      instance = self.new(id, api_key)
-      instance.refresh
-      return instance
+  def self.retrieve(params, api_key=nil)
+    id = if params.is_a?(String)
+      params
+    else
+      params[:id]
     end
 
-    def self.all(filters={}, api_key=nil)
-      url = "#{self.url}/#{filters[:type]}"
+    instance = self.new(id, api_key)
+    instance.refresh
+    return instance
+  end
 
-      response, api_key = EasyPost.request(:get, url, api_key, filters)
-      return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
-    end
+  def self.all(filters={}, api_key=nil)
+    url = "#{self.url}/#{filters[:type]}"
+
+    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

@@ -1,77 +1,75 @@
-module EasyPost
-  class Resource < EasyPostObject
-    def self.class_name
-      camel = self.name.split('::')[-1]
-      snake = camel[0..0] + camel[1..-1].gsub(/([A-Z])/, '_\1')
-      return snake.downcase
-    end
+class EasyPost::Resource < EasyPost::EasyPostObject
+  def self.class_name
+    camel = self.name.split('::')[-1]
+    snake = camel[0..0] + camel[1..-1].gsub(/([A-Z])/, '_\1')
+    return snake.downcase
+  end
 
-    def self.url
-      if self.class_name == 'resource'
-        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"
-      else
-        return "/#{CGI.escape(class_name.downcase)}s"
-      end
+  def self.url
+    if self.class_name == 'resource'
+      raise NotImplementedError.new('Resource is an abstract class.  You should perform actions on its subclasses (Address, Shipment, etc.)')
     end
-
-    def url
-      unless self.id
-        raise Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
-      end
-      return "#{self.class.url}/#{CGI.escape(id)}"
+    if(self.class_name[-1..-1] == 's' || self.class_name[-1..-1] == 'h')
+      return "/v2/#{CGI.escape(self.class_name.downcase)}es"
+    else
+      return "/v2/#{CGI.escape(class_name.downcase)}s"
     end
+  end
 
-    def refresh
-      response, api_key = EasyPost.request(:get, url, @api_key, @retrieve_options)
-      refresh_from(response, api_key)
-      return self
+  def url
+    unless self.id
+      raise EasyPost::Error.new("Could not determine which URL to request: #{self.class} instance has invalid ID: #{self.id.inspect}")
     end
+    return "#{self.class.url}/#{CGI.escape(id)}"
+  end
 
-    def self.all(filters={}, api_key=nil)
-      response, api_key = EasyPost.request(:get, url, api_key, filters)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
+  def refresh
+    response = EasyPost.make_request(:get, url, @api_key, @retrieve_options)
+    refresh_from(response, api_key)
+    return self
+  end
 
-    def self.retrieve(id, api_key=nil)
-      instance = self.new(id, api_key)
-      instance.refresh
-      return instance
-    end
+  def self.all(filters={}, api_key=nil)
+    response = EasyPost.make_request(:get, url, api_key, filters)
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
 
-    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)
-      return Util.convert_to_easypost_object(response, api_key)
-    end
+  def self.retrieve(id, api_key=nil)
+    instance = self.new(id, api_key)
+    instance.refresh
+    return instance
+  end
 
-    def delete
-      response, api_key = EasyPost.request(:delete, url, @api_key)
-      refresh_from(response, api_key)
-      return self
-    end
+  def self.create(params={}, api_key=nil)
+    wrapped_params = {}
+    wrapped_params[self.class_name().to_sym] = params
+    response = EasyPost.make_request(:post, self.url, api_key, wrapped_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 delete
+    response = EasyPost.make_request(:delete, url, @api_key)
+    refresh_from(response, api_key)
+    return self
+  end
+
+  def save
+    if @unsaved_values.length > 0
+      values = {}
+      @unsaved_values.each { |k| values[k] = @values[k] }
 
-        for key in @unsaved_values
-          value = values[key]
-          if value.is_a?(EasyPost::EasyPostObject)
-            values[key] = value.flatten_unsaved
-          end
+      for key in @unsaved_values
+        value = values[key]
+        if value.is_a?(EasyPost::EasyPostObject)
+          values[key] = value.flatten_unsaved
         end
+      end
 
-        wrapped_params = {self.class.class_name => values}
+      wrapped_params = {self.class.class_name => 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
 end

data/lib/easypost/scan_form.rb

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