hubspot-ruby 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de21d5dd95f68e46b0d289c9cae19de49423df0d
-  data.tar.gz: afe20a8aeb443ba86a5742140ce488fc50312bfc
+  metadata.gz: 1be19f1656874dfa75e7c0477b26b3c9d615710d
+  data.tar.gz: a70226ee0a0bac7a0fc14d4b7bf8c3a0d4fdac2a
 SHA512:
-  metadata.gz: 45f1b32ab613d5f38f362c2e4aac42b36fbf1cf8c5b4d38ceac935ca259b90fa637d0d49cd717c10015e859fb1dbb826fa79f0ec5d094f42cb811e6df3c916f8
-  data.tar.gz: 20cc23dc732a1c21869e2736cb5c39bd8cecd8a1e07ade008b82a79b3ec404b173528c348a9d96617986c75496d61f62c79583fd436ff463859203ee34cf4501
+  metadata.gz: 120f944669ecb856d410a9490043a7e57a8ad66bbea4cc1dcfaaffbf8c8e0d741e243538b2fdc52bf760430277b54476ab1b79b4202ac18be63b6883c95dd4fe
+  data.tar.gz: 5a5412877b5a4cc50d56321c85b40c9750e4c7ea865beef1d98c0664740656815f0cec6385e1a8c386acf8806b5b800aa480189cadd81cfa90a40e7a5e0da5b5

data/hubspot-ruby.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hubspot-ruby 0.1.7 ruby lib
+# stub: hubspot-ruby 0.1.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hubspot-ruby"
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Andrew DiMichele"]
-  s.date = "2015-01-12"
+  s.date = "2015-05-12"
   s.description = "hubspot-ruby is a wrapper for the HubSpot REST API"
   s.email = "hello@omadahealth.com"
   s.extra_rdoc_files = [
@@ -32,13 +32,17 @@ Gem::Specification.new do |s|
     "lib/hubspot-ruby.rb",
     "lib/hubspot/blog.rb",
     "lib/hubspot/config.rb",
+    "lib/hubspot/connection.rb",
     "lib/hubspot/contact.rb",
+    "lib/hubspot/contact_list.rb",
+    "lib/hubspot/contact_properties.rb",
     "lib/hubspot/deal.rb",
     "lib/hubspot/exceptions.rb",
     "lib/hubspot/form.rb",
     "lib/hubspot/topic.rb",
     "lib/hubspot/utils.rb",
     "lib/hubspot/version.rb",
+    "spec/fixtures/vcr_cassettes/add_contacts_to_lists.yml",
     "spec/fixtures/vcr_cassettes/blog_list.yml",
     "spec/fixtures/vcr_cassettes/blog_posts.yml",
     "spec/fixtures/vcr_cassettes/blog_posts_list.yml",
@@ -49,34 +53,67 @@ Gem::Specification.new do |s|
     "spec/fixtures/vcr_cassettes/contact_destroy.yml",
     "spec/fixtures/vcr_cassettes/contact_example.yml",
     "spec/fixtures/vcr_cassettes/contact_find_by_email.yml",
+    "spec/fixtures/vcr_cassettes/contact_find_by_email_batch_mode.yml",
     "spec/fixtures/vcr_cassettes/contact_find_by_id.yml",
+    "spec/fixtures/vcr_cassettes/contact_find_by_id_batch_mode.yml",
     "spec/fixtures/vcr_cassettes/contact_find_by_utk.yml",
+    "spec/fixtures/vcr_cassettes/contact_find_by_utk_batch_mode.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_batch_find.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_destroy.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_example.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_find.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_refresh.yml",
+    "spec/fixtures/vcr_cassettes/contact_list_update.yml",
     "spec/fixtures/vcr_cassettes/contact_update.yml",
+    "spec/fixtures/vcr_cassettes/contacts_among_list.yml",
+    "spec/fixtures/vcr_cassettes/create_form.yml",
+    "spec/fixtures/vcr_cassettes/create_list.yml",
+    "spec/fixtures/vcr_cassettes/create_list_with_filters.yml",
     "spec/fixtures/vcr_cassettes/deal_create.yml",
     "spec/fixtures/vcr_cassettes/deal_example.yml",
     "spec/fixtures/vcr_cassettes/deal_find.yml",
     "spec/fixtures/vcr_cassettes/destroy_deal.yml",
+    "spec/fixtures/vcr_cassettes/fail_to_create_form.yml",
+    "spec/fixtures/vcr_cassettes/fail_to_create_list.yml",
+    "spec/fixtures/vcr_cassettes/field_among_form.yml",
+    "spec/fixtures/vcr_cassettes/fields_among_form.yml",
     "spec/fixtures/vcr_cassettes/find_all_contacts.yml",
+    "spec/fixtures/vcr_cassettes/find_all_dynamic_lists.yml",
+    "spec/fixtures/vcr_cassettes/find_all_forms.yml",
+    "spec/fixtures/vcr_cassettes/find_all_lists.yml",
+    "spec/fixtures/vcr_cassettes/find_all_recent_contacts.yml",
     "spec/fixtures/vcr_cassettes/find_all_recent_updated_deals.yml",
+    "spec/fixtures/vcr_cassettes/find_all_stastic_lists.yml",
+    "spec/fixtures/vcr_cassettes/form_destroy.yml",
+    "spec/fixtures/vcr_cassettes/form_example.yml",
+    "spec/fixtures/vcr_cassettes/form_find.yml",
     "spec/fixtures/vcr_cassettes/form_post.yml",
+    "spec/fixtures/vcr_cassettes/form_submit_data.yml",
+    "spec/fixtures/vcr_cassettes/form_update.yml",
     "spec/fixtures/vcr_cassettes/one_month_blog_posts_filter_state.yml",
     "spec/fixtures/vcr_cassettes/one_month_blog_posts_list.yml",
+    "spec/fixtures/vcr_cassettes/remove_contacts_from_lists.yml",
     "spec/fixtures/vcr_cassettes/topic_list.yml",
     "spec/fixtures/vcr_cassettes/topics_list.yml",
     "spec/lib/hubspot-ruby_spec.rb",
     "spec/lib/hubspot/blog_spec.rb",
     "spec/lib/hubspot/config_spec.rb",
+    "spec/lib/hubspot/connection_spec.rb",
+    "spec/lib/hubspot/contact_list_spec.rb",
+    "spec/lib/hubspot/contact_properties_spec.rb",
     "spec/lib/hubspot/contact_spec.rb",
     "spec/lib/hubspot/deal_spec.rb",
     "spec/lib/hubspot/form_spec.rb",
     "spec/lib/hubspot/topic_spec.rb",
     "spec/lib/hubspot/utils_spec.rb",
     "spec/live/contacts_integration_spec.rb",
+    "spec/live/deals_integration_spec.rb",
     "spec/spec_helper.rb",
-    "spec/support/cassette_helper.rb"
+    "spec/support/cassette_helper.rb",
+    "spec/support/tests_helper.rb"
   ]
   s.homepage = "http://github.com/omadahealth/hubspot-ruby"
-  s.rubygems_version = "2.4.1"
+  s.rubygems_version = "2.2.2"
   s.summary = "hubspot-ruby is a wrapper for the HubSpot REST API"
 
   if s.respond_to? :specification_version then

data/lib/hubspot-ruby.rb

@@ -2,7 +2,10 @@ require 'active_support/core_ext'
 require 'httparty'
 require 'hubspot/exceptions'
 require 'hubspot/config'
+require 'hubspot/connection'
 require 'hubspot/contact'
+require 'hubspot/contact_properties'
+require 'hubspot/contact_list'
 require 'hubspot/form'
 require 'hubspot/blog'
 require 'hubspot/topic'

data/lib/hubspot/blog.rb

@@ -1,16 +1,8 @@
-require 'hubspot/utils'
-require 'httparty'
-
 module Hubspot
   #
   # HubSpot Contacts API
   #
-  # {https://developers.hubspot.com/docs/endpoints#contacts-api}
-  #
   class Blog
-    class InvalidParams < StandardError
-    end
-
     BLOG_LIST_PATH = "/content/api/v2/blogs"
     BLOG_POSTS_PATH = "/content/api/v2/blog-posts"
     GET_BLOG_BY_ID_PATH = "/content/api/v2/blogs/:blog_id"
@@ -19,30 +11,18 @@ module Hubspot
       # Lists the blogs
       # {https://developers.hubspot.com/docs/methods/blogv2/get_blogs}
       # No param filtering is currently implemented
-      # @return [Hubspot::Blog, []] the first 20 blogs or empty_array
+      # @return [Hubspot::Blog] the first 20 blogs or empty_array
       def list
-        url = Hubspot::Utils.generate_url(BLOG_LIST_PATH)
-        resp = HTTParty.get(url, format: :json)
-        if resp.success?
-          resp.parsed_response['objects'].map do |blog_hash|
-            Blog.new(blog_hash)
-          end
-        else
-          []
-        end
+        response = Hubspot::Connection.get_json(BLOG_LIST_PATH, {})
+        response['objects'].map { |b| new(b) }
       end
 
       # Finds a specific blog by its ID
       # {https://developers.hubspot.com/docs/methods/blogv2/get_blogs_blog_id}
-      # @return Hubspot::Blog or nil
+      # @return Hubspot::Blog
       def find_by_id(id)
-        url = Hubspot::Utils.generate_url(GET_BLOG_BY_ID_PATH, blog_id: id)
-        resp = HTTParty.get(url, format: :json)
-        if resp.success?
-          Blog.new(resp.parsed_response)
-        else
-          nil
-        end
+        response = Hubspot::Connection.get_json(GET_BLOG_BY_ID_PATH, { blog_id: id })
+        new(response)
       end
     end
 
@@ -61,7 +41,7 @@ module Hubspot
     #   defaults to returning the last 2 months worth of published blog posts
     #   in date descending order (i.e. most recent first)
     # {https://developers.hubspot.com/docs/methods/blogv2/get_blog_posts}
-    # @return [Hubspot::BlogPost] or []
+    # @return [Hubspot::BlogPost] 
     def posts(params = {})
       default_params = {
         content_group_id: self["id"],
@@ -69,23 +49,14 @@ module Hubspot
         created__gt: Time.now - 2.month,
         state: 'PUBLISHED'
       }
-      raise InvalidParams.new('params must be passed as a hash') unless params.is_a?(Hash)
+      raise Hubspot::InvalidParams.new('params must be passed as a hash') unless params.is_a?(Hash)
       params = default_params.merge(params)
 
-      raise InvalidParams.new('State parameter was invalid') unless [false, 'PUBLISHED', 'DRAFT'].include?(params[:state])
+      raise Hubspot::InvalidParams.new('State parameter was invalid') unless [false, 'PUBLISHED', 'DRAFT'].include?(params[:state])
       params.each { |k, v| params.delete(k) if v == false }
 
-      url = Hubspot::Utils.generate_url(BLOG_POSTS_PATH, params)
-
-      resp = HTTParty.get(url, format: :json)
-      if resp.success?
-        blog_post_objects = resp.parsed_response['objects']
-        blog_post_objects.map do |blog_post_hash|
-          BlogPost.new(blog_post_hash)
-        end
-      else
-        []
-      end
+      response = Hubspot::Connection.get_json(BLOG_POSTS_PATH, params)
+      response['objects'].map { |p| BlogPost.new(p) }
     end
   end
 
@@ -94,15 +65,10 @@ module Hubspot
 
     # Returns a specific blog post by ID
     # {https://developers.hubspot.com/docs/methods/blogv2/get_blog_posts_blog_post_id}
-    # @return [Hubspot::BlogPost] or nil
+    # @return Hubspot::BlogPost
     def self.find_by_blog_post_id(id)
-      url = Hubspot::Utils.generate_url(GET_BLOG_POST_BY_ID_PATH, blog_post_id: id)
-      resp = HTTParty.get(url, format: :json)
-      if resp.success?
-        BlogPost.new(resp.parsed_response)
-      else
-        nil
-      end
+      response = Hubspot::Connection.get_json(GET_BLOG_POST_BY_ID_PATH, { blog_post_id: id })
+      new(response)
     end
 
     def initialize(response_hash)

data/lib/hubspot/connection.rb

@@ -0,0 +1,95 @@
+module Hubspot
+  class Connection
+    include HTTParty
+
+    class << self
+      def get_json(path, opts)
+        url = generate_url(path, opts)
+        response = get(url, format: :json)
+        raise(Hubspot::RequestError.new(response)) unless response.success?
+        response.parsed_response
+      end
+
+      def post_json(path, opts)
+        no_parse = opts[:params].delete(:no_parse) { false }
+
+        url = generate_url(path, opts[:params])
+        response = post(url, body: opts[:body].to_json, headers: { 'Content-Type' => 'application/json' }, format: :json)
+        raise(Hubspot::RequestError.new(response)) unless response.success?
+
+        no_parse ? response : response.parsed_response
+      end
+
+      def put_json(path, opts)
+        url = generate_url(path, opts[:params])
+        response = put(url, body: opts[:body].to_json, headers: { 'Content-Type' => 'application/json' }, format: :json)
+        raise(Hubspot::RequestError.new(response)) unless response.success?
+        response.parsed_response
+      end
+
+      def delete_json(path, opts)
+        url = generate_url(path, opts)
+        response = delete(url, format: :json)
+        raise(Hubspot::RequestError.new(response)) unless response.success?
+        response
+      end
+
+      protected
+
+      def generate_url(path, params={}, options={})
+        Hubspot::Config.ensure! :hapikey
+        path = path.clone
+        params = params.clone
+        base_url = options[:base_url] || Hubspot::Config.base_url
+        params["hapikey"] = Hubspot::Config.hapikey unless options[:hapikey] == false
+
+        if path =~ /:portal_id/
+          Hubspot::Config.ensure! :portal_id
+          params["portal_id"] = Hubspot::Config.portal_id if path =~ /:portal_id/
+        end
+
+        params.each do |k,v|
+          if path.match(":#{k}")
+            path.gsub!(":#{k}",v.to_s)
+            params.delete(k)
+          end
+        end
+        raise(Hubspot::MissingInterpolation.new("Interpolation not resolved")) if path =~ /:/
+
+        query = params.map do |k,v|
+          v.is_a?(Array) ? v.map { |value| param_string(k,value) } : param_string(k,v)
+        end.join("&")
+
+        path += "?" if query.present?
+        base_url + path + query
+      end
+
+      # convert into milliseconds since epoch
+      def converted_value(value)
+        value.is_a?(Time) ? (value.to_i * 1000) : value
+      end
+
+      def param_string(key,value)
+        case key
+        when /range/
+          raise "Value must be a range" unless value.is_a?(Range)
+          "#{key}=#{converted_value(value.begin)}&#{key}=#{converted_value(value.end)}"
+        when /^batch_(.*)$/
+          key = $1.gsub(/(_.)/) { |w| w.last.upcase }
+          "#{key}=#{converted_value(value)}"
+        else
+          "#{key}=#{converted_value(value)}"
+        end
+      end
+    end
+  end
+
+  class FormsConnection < Connection
+    follow_redirects false
+
+    def self.submit(path, opts)
+      url = generate_url(path, opts[:params], { base_url: 'https://forms.hubspot.com' })
+      post(url, body: opts[:body].to_json, headers: { 'Content-Type' => 'application/x-www-form-urlencoded' })
+    end
+  end
+end

data/lib/hubspot/contact.rb

@@ -1,116 +1,104 @@
-require 'hubspot/utils'
-require 'httparty'
-
 module Hubspot
   #
   # HubSpot Contacts API
   #
-  # {https://developers.hubspot.com/docs/endpoints#contacts-api}
+  # {https://developers.hubspot.com/docs/methods/contacts/contacts-overview}
   #
+  # TODO: work on all endpoints that can specify contact properties, property mode etc... as params. cf pending specs
   class Contact
-    CREATE_CONTACT_PATH = "/contacts/v1/contact"
-    GET_CONTACT_BY_EMAIL_PATH = "/contacts/v1/contact/email/:contact_email/profile"
-    GET_CONTACT_BY_ID_PATH = "/contacts/v1/contact/vid/:contact_id/profile"
-    GET_CONTACT_BY_UTK_PATH = "/contacts/v1/contact/utk/:contact_utk/profile"
-    UPDATE_CONTACT_PATH = "/contacts/v1/contact/vid/:contact_id/profile"
-    DESTROY_CONTACT_PATH = "/contacts/v1/contact/vid/:contact_id"
-    CONTACTS_PATH = "/contacts/v1/lists/all/contacts/all"
+    CREATE_CONTACT_PATH        = "/contacts/v1/contact"
+    GET_CONTACT_BY_EMAIL_PATH  = "/contacts/v1/contact/email/:contact_email/profile"
+    GET_CONTACTS_BY_EMAIL_PATH = "/contacts/v1/contact/emails/batch"
+    GET_CONTACT_BY_ID_PATH     = "/contacts/v1/contact/vid/:contact_id/profile"
+    CONTACT_BATCH_PATH         = '/contacts/v1/contact/vids/batch'
+    GET_CONTACT_BY_UTK_PATH    = "/contacts/v1/contact/utk/:contact_utk/profile"
+    GET_CONTACTS_BY_UTK_PATH   = '/contacts/v1/contact/utks/batch'
+    UPDATE_CONTACT_PATH        = "/contacts/v1/contact/vid/:contact_id/profile"
+    DESTROY_CONTACT_PATH       = "/contacts/v1/contact/vid/:contact_id"
+    CONTACTS_PATH              = "/contacts/v1/lists/all/contacts/all"
+    RECENT_CONTACTS_PATH       = '/contacts/v1/lists/recently_updated/contacts/recent'
 
     class << self
-      # Creates a new contact
       # {https://developers.hubspot.com/docs/methods/contacts/create_contact}
-      # @param email [Hash] unique email of the new contact
-      # @param params [Hash] hash of properties to set on the contact
-      # @return [Hubspot::Contact] the newly created contact
       def create!(email, params={})
         params_with_email = params.stringify_keys.merge("email" => email)
-        url = Hubspot::Utils.generate_url(CREATE_CONTACT_PATH)
         post_data = {properties: Hubspot::Utils.hash_to_properties(params_with_email)}
-        resp = HTTParty.post(url, body: post_data.to_json, format: :json)
-        raise(Hubspot::ContactExistsError.new(resp, "Contact already exists with email: #{email}")) if resp.code == 409
-        raise(Hubspot::RequestError.new(resp, "Cannot create contact with email: #{email}")) unless resp.success?
-        Hubspot::Contact.new(resp.parsed_response)
+        response = Hubspot::Connection.post_json(CREATE_CONTACT_PATH, params: {}, body: post_data )
+        new(response)
       end
 
-      # Finds a contact by email
-      # {https://developers.hubspot.com/docs/methods/contacts/get_contact_by_email}
-      # @param email [String] the email of the contact to find
-      # @return [Hubspot::Contact, nil] the contact found or nil
-      def find_by_email(email)
-        url = Hubspot::Utils.generate_url(GET_CONTACT_BY_EMAIL_PATH, {contact_email: email})
-        resp = HTTParty.get(url, format: :json)
-        if resp.success?
-          Hubspot::Contact.new(resp.parsed_response)
-        else
-          nil
+      # {https://developers.hubspot.com/docs/methods/contacts/get_contacts}
+      # {https://developers.hubspot.com/docs/methods/contacts/get_recently_updated_contacts}
+      def all(opts={})
+        recent = opts.delete(:recent) { false } 
+        path, opts = 
+        if recent 
+          [RECENT_CONTACTS_PATH, Hubspot::ContactProperties.add_default_parameters(opts)] 
+        else 
+          [CONTACTS_PATH, opts]
         end
-      end
 
-      # Finds a contact by vid
-      # @param vid [String] the vid of the contact to find
-      # @return [Hubspot::Contact, nil] the contact found or nil
-      def find_by_id(vid)
-        url = Hubspot::Utils.generate_url(GET_CONTACT_BY_ID_PATH, {contact_id: vid})
-        resp = HTTParty.get(url, format: :json)
-        if resp.success?
-          Hubspot::Contact.new(resp.parsed_response)
-        else
-          nil
-        end
+        response = Hubspot::Connection.get_json(path, opts)
+        response['contacts'].map { |c| new(c) }
       end
 
-      # Finds a contact by its User Token (hubspotutk cookie value)
-      # {https://developers.hubspot.com/docs/methods/contacts/get_contact_by_utk}
-      # @param utk [String] hubspotutk cookie value
-      # @return [Hubspot::Contact, nil] the contact found or nil
-      def find_by_utk(utk)
-        url = Hubspot::Utils.generate_url(GET_CONTACT_BY_UTK_PATH, {contact_utk: utk})
-        resp = HTTParty.get(url, format: :json)
-        if resp.success?
-          Hubspot::Contact.new(resp.parsed_response)
-        else
-          nil
+      # TODO: create or update a contact
+      # PATH /contacts/v1/contact/createOrUpdate/email/:contact_email
+      # API endpoint: https://developers.hubspot.com/docs/methods/contacts/create_or_update
+      # + batch mode: https://developers.hubspot.com/docs/methods/contacts/batch_create_or_update
+
+      # NOTE: problem with batch api endpoint
+      # {https://developers.hubspot.com/docs/methods/contacts/get_contact}
+      # {https://developers.hubspot.com/docs/methods/contacts/get_batch_by_vid}
+      def find_by_id(vids)
+        batch_mode, path, params = case vids
+        when Integer then [false, GET_CONTACT_BY_ID_PATH, { contact_id: vids }]
+        when Array then [true, CONTACT_BATCH_PATH, { batch_vid: vids }]
+        else raise Hubspot::InvalidParams, 'expecting Integer or Array of Integers parameter'
         end
-      end
 
-      # TODO: Get all contacts
-      # {https://developers.hubspot.com/docs/methods/contacts/get_contacts}
-      # @param count [Fixnum] number of contacts per page; default 20; max 100
-      # @param vidOffset [Fixnum] page through the contacts
-      # @return [Hubspot::ContactCollection] the paginated collection of contacts
-      def all(opts = {})
-        url = Hubspot::Utils.generate_url(CONTACTS_PATH, opts)
-        request = HTTParty.get(url, format: :json)
+        response = Hubspot::Connection.get_json(path, params)
+        raise Hubspot::ApiError if batch_mode
+        new(response)
+      end
 
-        raise(Hubspot::RequestError.new(request)) unless request.success?
+      # {https://developers.hubspot.com/docs/methods/contacts/get_contact_by_email}
+      # {https://developers.hubspot.com/docs/methods/contacts/get_batch_by_email}
+      def find_by_email(emails)
+        batch_mode, path, params = case emails
+        when String then [false, GET_CONTACT_BY_EMAIL_PATH, { contact_email: emails }]
+        when Array then [true, GET_CONTACTS_BY_EMAIL_PATH, { batch_email: emails }]
+        else raise Hubspot::InvalidParams, 'expecting String or Array of Strings parameter'
+        end
 
-        found = request.parsed_response['contacts']
-        return found.map{|h| new(h) }
+        response = Hubspot::Connection.get_json(path, params)
+        if batch_mode
+          #TODO: transform response
+          response
+        else 
+          new(response)
+        end
       end
 
-      # TODO: Get recently updated and created contacts
-      # {https://developers.hubspot.com/docs/methods/contacts/get_recently_updated_contacts}
-      # @param count [Fixnum] number of contacts per page; max 100
-      # @return [Hubspot::ContactCollection] the paginated collection of contacts
-      def recent(count=100)
-        raise NotImplementedError
+      # NOTE: problem with batch api endpoint
+      # {https://developers.hubspot.com/docs/methods/contacts/get_contact_by_utk}
+      # {https://developers.hubspot.com/docs/methods/contacts/get_batch_by_utk} 
+      def find_by_utk(utks)
+        batch_mode, path, params = case utks
+        when String then [false, GET_CONTACT_BY_UTK_PATH, { contact_utk: utks }]
+        when Array then [true, GET_CONTACTS_BY_UTK_PATH, { batch_utk: utks }]
+        else raise Hubspot::InvalidParams, 'expecting String or Array of Strings parameter'
+        end
+
+        response = Hubspot::Connection.get_json(path, params)
+        raise Hubspot::ApiError if batch_mode
+        new(response)
       end
 
-      # TODO: Search for contacts by various crieria
       # {https://developers.hubspot.com/docs/methods/contacts/search_contacts}
-      # @param query [String] The search term for what you're searching for
-      # @param count [Fixnum] number of contacts per page; max 100
-      # @return [Hubspot::ContactCollection] the collection of contacts; no pagination
       def search(query, count=100)
         raise NotImplementedError
       end
-
-      # TODO: Get statistics about all contacts
-      # {https://developers.hubspot.com/docs/methods/contacts/get_contact_statistics}
-      # @return [Hash] hash of statistics
-      def statistics
-        raise NotImplementedError
-      end
     end
 
     attr_reader :properties
@@ -138,11 +126,8 @@ module Hubspot
     # @param params [Hash] hash of properties to update
     # @return [Hubspot::Contact] self
     def update!(params)
-      params.stringify_keys!
-      url = Hubspot::Utils.generate_url(UPDATE_CONTACT_PATH, {contact_id: vid})
-      query = {"properties" => Hubspot::Utils.hash_to_properties(params)}
-      resp = HTTParty.post(url, body: query.to_json, format: :json)
-      raise(Hubspot::RequestError.new(resp)) unless resp.success?
+      query = {"properties" => Hubspot::Utils.hash_to_properties(params.stringify_keys!)}
+      response = Hubspot::Connection.post_json(UPDATE_CONTACT_PATH, params: { contact_id: vid }, body: query)
       @properties.merge!(params)
       self
     end
@@ -151,9 +136,7 @@ module Hubspot
     # {https://developers.hubspot.com/docs/methods/contacts/delete_contact}
     # @return [TrueClass] true
     def destroy!
-      url = Hubspot::Utils.generate_url(DESTROY_CONTACT_PATH, {contact_id: vid})
-      resp = HTTParty.delete(url, format: :json)
-      raise(Hubspot::RequestError.new(resp)) unless resp.success?
+      response = Hubspot::Connection.delete_json(DESTROY_CONTACT_PATH, { contact_id: vid })
       @destroyed = true
     end