easypost 2.0.0 → 2.0.1

data/CHANGELOG

@@ -0,0 +1,6 @@
+=== 2.0.1 2013-07-07
+
+* API Addition: Address.create_and_verify returns a verified address in one step.
+* API Addition: Shipment.label forces the creation of additional label formats (pdf, epl2, zpl).
+* API Addition: Shipment.insure purchases insurance for a shipment.
+* Library Update: Added the ability to negatively filter carriers and services with Shipment.lowest_rate (e.g. '!usps').

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    easypost (2.0.0)
+    easypost (2.0.1)
       multi_json (>= 1.0.4, < 2)
       rest-client (~> 1.4)
 

data/VERSION

@@ -1 +1 @@
-2.0.0
+2.0.1

data/easypost.gemspec

@@ -6,7 +6,7 @@ require 'easypost/version'
 Gem::Specification.new do |spec|
   spec.name        = 'easypost'
   spec.version     = EasyPost::VERSION
-  spec.date        = '2013-06-25'
+  spec.date        = '2013-07-07'
   spec.summary     = 'EasyPost Ruby Client Library'
   spec.description = 'Client library for accessing the EasyPost shipping API via Ruby.'
   spec.authors     = ['Jon Calhoun', 'Sawyer Bateman']

data/lib/easypost.rb

@@ -5,6 +5,7 @@ require 'rest_client'
 require 'multi_json'
 
 # Resources
+require 'easypost/version'
 require 'easypost/util'
 require 'easypost/object'
 require 'easypost/resource'
@@ -75,7 +76,7 @@ module EasyPost
     end
 
     headers = {
-      :user_agent => "EasyPost/v2 RubyClient/2.0.0",
+      :user_agent => "EasyPost/v2 RubyClient/#{VERSION}",
       :authorization => "Bearer #{api_key}",
       :content_type => 'application/x-www-form-urlencoded'
     }.merge(headers)

data/lib/easypost/address.rb

@@ -1,6 +1,22 @@
 module EasyPost
   class Address < Resource
 
+    def self.create_and_verify(params={})
+      wrapped_params = {}
+      wrapped_params[self.class_name().to_sym] = params
+      response, api_key = EasyPost.request(:post, url + '/create_and_verify', @api_key, wrapped_params)
+
+      if response.has_key?(:address)
+        if response.has_key?(:message)
+          response[:address][:message] = response[:message]
+        end
+        verified_address = EasyPost::Util::convert_to_easypost_object(response[:address], api_key)
+        return verified_address
+      else
+        raise Error.new("Unable to verify address.")
+      end
+    end
+
     def verify(params={})
       response, api_key = EasyPost.request(:get, url + '/verify', @api_key, params)
 

data/lib/easypost/shipment.rb

@@ -9,12 +9,31 @@ module EasyPost
     end
 
     def buy(params={})
+      if params.instance_of?(EasyPost::Rate)
+        temp = params.clone
+        params = {}
+        params[:rate] = temp
+      end
+
       response, api_key = EasyPost.request(:post, url + '/buy', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
     end
 
+    def insure(params={})
+      if params.is_a?(Integer) || params.is_a?(Float)
+        temp = params.clone
+        params = {}
+        params[:amount] = temp
+      end
+
+      response, api_key = EasyPost.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)
       self.refresh_from(response, @api_key, true)
@@ -22,8 +41,14 @@ module EasyPost
       return self
     end
 
-    def track(params={})
-      response, api_key = EasyPost.request(:get, url + '/track', @api_key, params)
+    def label(params={})
+      if params.is_a?(String)
+        temp = params.clone
+        params = {}
+        params[:file_format] = temp
+      end
+
+      response, api_key = EasyPost.request(:get, url + '/label', @api_key, params)
       self.refresh_from(response, @api_key, true)
 
       return self
@@ -50,11 +75,31 @@ module EasyPost
         carriers = carriers.split(',')
       end
       carriers.map!(&:downcase)
+      carriers.map!(&:strip)
+
+      negative_carriers = []
+      carriers_copy = carriers.clone
+      carriers_copy.each do |carrier|
+        if carrier[0,1] == '!'
+          negative_carriers << carrier[1..-1]
+          carriers.delete(carrier)
+        end
+      end
 
       if !services.is_a?(Array)
         services = services.split(',')
       end
       services.map!(&:downcase)
+      services.map!(&:strip)
+
+      negative_services = []
+      services_copy = services.clone
+      services_copy.each do |service|
+        if service[0,1] == '!'
+          negative_services << service[1..-1]
+          services.delete(service)
+        end
+      end
 
       self.rates.each do |k|
 
@@ -62,11 +107,17 @@ module EasyPost
         if carriers.size() > 0 && !carriers.include?(rate_carrier)
           next
         end
+        if negative_carriers.size() > 0 && negative_carriers.include?(rate_carrier)
+          next
+        end
 
         rate_service = k.service.downcase
         if services.size() > 0 && !services.include?(rate_service)
           next
         end
+        if negative_services.size() > 0 && negative_services.include?(rate_service)
+          next
+        end
 
         if lowest == nil || k.rate.to_f < lowest.rate.to_f          
             lowest = k

data/lib/easypost/version.rb

@@ -1,3 +1,3 @@
 module EasyPost
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

data/spec/shipment_spec.rb

@@ -138,4 +138,21 @@ describe EasyPost::Shipment do
     end
   end
 
+  describe '#lowest_rate' do
+    context 'domestic shipment' do
+      before :all do
+        @shipment = EasyPost::Shipment.create(
+          :from_address => address_california,
+          :to_address   => address_missouri,
+          :parcel => parcel_dimensions
+        )
+      end
+
+      it 'filters negative services' do
+        rate = @shipment.lowest_rate('USPS', '!MediaMail, !LibraryMail')
+        
+        expect(rate.service).to eql('ParcelSelect')
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easypost
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-25 00:00:00.000000000 Z
+date: 2013-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client