easypost 3.0.1 → 3.3.0

data/lib/easypost/batch.rb

@@ -1,53 +1,49 @@
-module EasyPost
-  class Batch < Resource
+class EasyPost::Batch < EasyPost::Resource
+  def self.create_and_buy(params={}, api_key=nil)
+    wrapped_params = {}
+    wrapped_params[self.class_name().to_sym] = params
+    response = EasyPost.make_request(:post, url + '/create_and_buy', api_key, wrapped_params)
 
-    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)
-
-      return Util.convert_to_easypost_object(response, api_key)
-    end
-
-    def buy(params={})
-      response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return EasyPost::Util.convert_to_easypost_object(response, api_key)
+  end
 
-      return self
-    end
+  def buy(params={})
+    response = EasyPost.make_request(:post, url + '/buy', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-    def label(params={})
-      response, api_key = EasyPost.request(:post, url + '/label', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return self
+  end
 
-      return self
-    end
+  def label(params={})
+    response = EasyPost.make_request(:post, url + '/label', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-    def remove_shipments(params={})
-      response, api_key = EasyPost.request(:post, url + '/remove_shipments', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return self
+  end
 
-      return self
-    end
+  def remove_shipments(params={})
+    response = EasyPost.make_request(:post, url + '/remove_shipments', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-    def add_shipments(params={})
-      response, api_key = EasyPost.request(:post, url + '/add_shipments', @api_key, params)
-      self.refresh_from(response, @api_key, true)
+    return self
+  end
 
-      return self
-    end
+  def add_shipments(params={})
+    response = EasyPost.make_request(:post, url + '/add_shipments', @api_key, params)
+    self.refresh_from(response, @api_key, true)
 
-    def stamp_and_barcode_by_reference(params={})
-      response, api_key = EasyPost.request(:get, url + '/stamp_and_barcode_by_reference', @api_key, params)
+    return self
+  end
 
-      return response
-    end
+  def stamp_and_barcode_by_reference(params={})
+    response = EasyPost.make_request(:get, url + '/stamp_and_barcode_by_reference', @api_key, params)
 
-    def create_scan_form(params={})
-      response, api_key = EasyPost.request(:post, url + '/scan_form', @api_key, params)
+    return response
+  end
 
-      return response
-    end
+  def create_scan_form(params={})
+    response = EasyPost.make_request(:post, url + '/scan_form', @api_key, params)
 
+    return response
   end
 end

data/lib/easypost/carrier_account.rb

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

data/lib/easypost/carrier_type.rb

@@ -0,0 +1,2 @@
+class EasyPost::CarrierType < EasyPost::Resource
+end

data/lib/easypost/customs_info.rb

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

data/lib/easypost/customs_item.rb

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

data/lib/easypost/error.rb

@@ -1,39 +1,31 @@
-module EasyPost
-  class Error < StandardError
-    attr_reader :message
-    attr_reader :http_status
-    attr_reader :http_body
-    attr_reader :json_body
-    attr_reader :param
-    attr_reader :code
-    attr_reader :errors
+class EasyPost::Error < StandardError
+  attr_reader :message
+  attr_reader :status
+  attr_reader :http_status # deprecated
+  attr_reader :http_body
+  attr_reader :code
+  attr_reader :errors
 
-    def initialize(message=nil, http_status=nil, http_body=nil, json_body={})
-      @message = message
-      @http_status = http_status
-      @http_body = http_body
-      @json_body = json_body
+  def initialize(message = nil, status = nil, code = nil, errors = nil, http_body = nil)
+    @message = message
+    @status = status
+    @http_status = status # deprecated
+    @code = code
+    @errors = errors
+    @http_body = http_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
 
-      super(message)
-    end
+  def to_s
+    "#{code} (#{status}): #{message} #{errors}".strip
+  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
-    end
+  def ==(other)
+    other.is_a?(EasyPost::Error) &&
+      message == other.message &&
+      status == other.status &&
+      code == other.code &&
+      errors == other.errors
   end
 end
-

data/lib/easypost/event.rb

@@ -1,10 +1,7 @@
 require 'json'
 
-module EasyPost
-  class Event < Resource
-      
-    def self.receive(values)
-        return EasyPost::Util::convert_to_easypost_object(JSON.parse(values), nil)
-    end
+class EasyPost::Event < EasyPost::Resource
+  def self.receive(values)
+      return EasyPost::Util::convert_to_easypost_object(JSON.parse(values), nil)
   end
 end

data/lib/easypost/insurance.rb

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

data/lib/easypost/item.rb

@@ -1,10 +1,6 @@
-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)
-      return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
-    end
-
+class EasyPost::Item < EasyPost::Resource
+  def self.retrieve_reference(params={}, api_key=nil)
+    response = EasyPost.make_request(:get, url + '/retrieve_reference', api_key, params)
+    return EasyPost::Util::convert_to_easypost_object(response, api_key) if response
   end
 end

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