hubspot-ruby 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f3a1711f64e0786c4ea7fea3ae863130e3f8a3d5
-  data.tar.gz: 7c350471fe6a943453353c4a54021a104abb6b1b
+  metadata.gz: 1ed5f2aa1fbcdc87f14f1197d9b78dad4380f057
+  data.tar.gz: 2184008548937dbbbb103f30d3eb96c11f3c0d8c
 SHA512:
-  metadata.gz: dbf007dcda9eed037c323f4f9209b9cfed55926458b923fc9a7bbf95c88cf5ef0bd7e01857affd32c8d8d4649613ebfa1a614d84897ec8e9ba7ca4398550c615
-  data.tar.gz: 96a5651da299bdd400c02da77be240d76aecdf7acc72bc1c6e93b9dd6b24fbb3653dcbbb8da09413b83a90c6bc4c0557ef4a5dfa0c06c3fcb0e6b536a895c9b6
+  metadata.gz: 20f5233aa72b00ce366785e64b0ac385c8a48d86e2c79df9196958b668c573e32018cb2924e86c0216d489049535ce443dad9e7227a9b35941160e938f22023c
+  data.tar.gz: bea00d2e9baf596c71a2fcbaeaaa89b081dbbec0b900f03226bdfbbef8fc7ebab1bb0618739a660e1ccf624199341607f79412a97877ed87d1fde0732dec2feb

data/Gemfile

@@ -1,3 +1,3 @@
 source "http://rubygems.org"
 # Add dependencies to hubspot-ruby.gemspec
-gemspec
+gemspec

data/Guardfile

@@ -1,7 +1,7 @@
 # A sample Guardfile
 # More info at https://github.com/guard/guard#readme
 
-guard :rspec do
+guard :rspec, cmd: 'bundle exec rspec' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }

data/README.md

@@ -14,18 +14,66 @@ Or with bundler,
 gem "hubspot-ruby"
 ```
 
-Before using the library, you must initialize it with your HubSpot API key. If you're using Rails, put this code in an
-initializer:
+## Authentication with an API key
+
+Before using the library, you must initialize it with your HubSpot API key. If you're using Rails, put this code in an initializer:
 
 ```ruby
 Hubspot.configure(hapikey: "YOUR_API_KEY")
 ```
 
-If you're have a HubSpot account, you can get your api key by logging in and visiting this url: https://app.hubspot.com/keys/get
+If you have a HubSpot account, you can get your api key by logging in and visiting this url: https://app.hubspot.com/keys/get
+
+## Authentication with OAuth 2.0
+
+Configure the library with the client ID and secret from your [HubSpot App](https://developers.hubspot.com/docs/faq/how-do-i-create-an-app-in-hubspot)
+
+```ruby
+Hubspot.configure(
+    client_id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+    client_secret: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+    redirect_uri: "https://myapp.com/oauth")
+```
+
+To initiate an OAuth connection to your app, create a URL with the required scopes:
+
+```ruby
+Hubspot::OAuth.authorize_url(["contacts", "content"])
+```
+
+After the user accepts the scopes and installs the integration with their HubSpot account, they will be redirected to the URI requested with the query parameter `code` appended to the URL. `code` can then be passed to HubSpot to generate an access token:
+
+```ruby
+Hubspot::OAuth.create(params[:code])
+```
+
+To use the returned `access_token` string for authentication, you'll need to update the configuration:
+
+```ruby
+Hubspot.configure(
+    client_id: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+    client_secret: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
+    redirect_uri: "https://myapp.com/oauth",
+    access_token: access_token)
+```
+
+Now all requests will use the provided access token when querying the API:
+
+```ruby
+Hubspot::Contact.all
+```
+
+### Refreshing the token
+
+When you create a HubSpot OAuth token, it will have an expiration date given by the `expires_in` field returned from the create API. If you with to continue using the token without needing to create another, you'll need to refresh the token:
 
-### Note about authentication
+```ruby
+Hubspot::OAuth.refresh(refresh_token)
+```
 
-For now, this library only supports authentication with a HubSpot API key (aka "hapikey"). OAuth is not yet supported.
+### A note on OAuth credentials
+
+At this time, OAuth tokens are configured globally rather than on a per-connection basis.
 
 ## Usage
 
@@ -65,6 +113,13 @@ contact.update!({firstname: "First", lastname: "Last"})
 ```ruby
 Hubspot::Contact.create_or_update!([{vid: '12345', firstname: 'First', lastname: 'Last'}])
 ```
+
+### Create a deal
+
+```ruby
+Hubspot::Deal.create!(nil, [company.vid], [contact.vid], pipeline: 'default', dealstage: 'initial_contact')
+```
+
 ## Contributing to hubspot-ruby
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/hubspot-ruby.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "hubspot-ruby"
-  s.version = "0.4.0"
+  s.version = "0.5.0"
   s.require_paths = ["lib"]
   s.authors = ["Andrew DiMichele", "Chris Bisnett"]
   s.description = "hubspot-ruby is a wrapper for the HubSpot REST API"
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake", "~> 11.0")
   s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("rr")
-  s.add_development_dependency("webmock", "< 1.10")
+  s.add_development_dependency("webmock")
   s.add_development_dependency("vcr")
   s.add_development_dependency("rdoc")
   s.add_development_dependency("bundler")

data/lib/hubspot-ruby.rb

@@ -19,6 +19,7 @@ require 'hubspot/deal_properties'
 require 'hubspot/owner'
 require 'hubspot/engagement'
 require 'hubspot/subscription'
+require 'hubspot/oauth'
 
 module Hubspot
   def self.configure(config={})

data/lib/hubspot/company.rb

@@ -5,15 +5,17 @@ module Hubspot
   # {http://developers.hubspot.com/docs/methods/companies/companies-overview}
   #
   class Company
-    CREATE_COMPANY_PATH               = "/companies/v2/companies/"
-    RECENTLY_CREATED_COMPANIES_PATH   = "/companies/v2/companies/recent/created"
-    RECENTLY_MODIFIED_COMPANIES_PATH  = "/companies/v2/companies/recent/modified"
-    GET_COMPANY_BY_ID_PATH            = "/companies/v2/companies/:company_id"
-    GET_COMPANY_BY_DOMAIN_PATH        = "/companies/v2/domains/:domain/companies"
-    UPDATE_COMPANY_PATH               = "/companies/v2/companies/:company_id"
-    ADD_CONTACT_TO_COMPANY_PATH       = "/companies/v2/companies/:company_id/contacts/:vid"
-    DESTROY_COMPANY_PATH              = "/companies/v2/companies/:company_id"
-    GET_COMPANY_CONTACTS_PATH         = "/companies/v2/companies/:company_id/contacts"
+    CREATE_COMPANY_PATH              = "/companies/v2/companies/"
+    RECENTLY_CREATED_COMPANIES_PATH  = "/companies/v2/companies/recent/created"
+    RECENTLY_MODIFIED_COMPANIES_PATH = "/companies/v2/companies/recent/modified"
+    GET_COMPANY_BY_ID_PATH           = "/companies/v2/companies/:company_id"
+    GET_COMPANY_BY_DOMAIN_PATH       = "/companies/v2/domains/:domain/companies"
+    UPDATE_COMPANY_PATH              = "/companies/v2/companies/:company_id"
+    GET_COMPANY_CONTACT_VIDS_PATH    = "/companies/v2/companies/:company_id/vids"
+    ADD_CONTACT_TO_COMPANY_PATH      = "/companies/v2/companies/:company_id/contacts/:vid"
+    DESTROY_COMPANY_PATH             = "/companies/v2/companies/:company_id"
+    GET_COMPANY_CONTACTS_PATH        = "/companies/v2/companies/:company_id/contacts"
+    BATCH_UPDATE_PATH                = "/companies/v1/batch-async/update"
 
     class << self
       # Find all companies by created date (descending)
@@ -96,6 +98,46 @@ module Hubspot
         response = Hubspot::Connection.post_json(CREATE_COMPANY_PATH, params: {}, body: post_data )
         new(response)
       end
+
+      # Updates the properties of companies
+      # NOTE: Up to 100 companies can be updated in a single request. There is no limit to the number of properties that can be updated per company.
+      # {https://developers.hubspot.com/docs/methods/companies/batch-update-companies}
+      # Returns a 202 Accepted response on success.
+      def batch_update!(companies)
+        query = companies.map do |company|
+          company_hash = company.with_indifferent_access
+          if company_hash[:vid]
+            # For consistency - Since vid has been used everywhere.
+            company_param = {
+              objectId: company_hash[:vid],
+              properties: Hubspot::Utils.hash_to_properties(company_hash.except(:vid).stringify_keys!, key_name: 'name'),
+            }
+          elsif company_hash[:objectId]
+            company_param = {
+              objectId: company_hash[:objectId],
+              properties: Hubspot::Utils.hash_to_properties(company_hash.except(:objectId).stringify_keys!, key_name: 'name'),
+            }
+          else
+            raise Hubspot::InvalidParams, 'expecting vid or objectId for company'
+          end
+          company_param
+        end
+        Hubspot::Connection.post_json(BATCH_UPDATE_PATH, params: {}, body: query)
+      end
+    
+      # Adds contact to a company
+      # {http://developers.hubspot.com/docs/methods/companies/add_contact_to_company}
+      # @param company_vid [Integer] The ID of a company to add a contact to
+      # @param contact_vid [Integer] contact id to add
+      # @return parsed response
+      def add_contact!(company_vid, contact_vid)
+        Hubspot::Connection.put_json(ADD_CONTACT_TO_COMPANY_PATH,
+                                     params: {
+                                       company_id: company_vid,
+                                       vid: contact_vid,
+                                     },
+                                     body: nil)
+      end
     end
 
     attr_reader :properties
@@ -122,6 +164,24 @@ module Hubspot
       self
     end
 
+    # Gets ALL contact vids of a company
+    # May make many calls if the company has a mega-ton of contacts
+    # {http://developers.hubspot.com/docs/methods/companies/get_company_contacts_by_id}
+    # @return [Array] contact vids
+    def get_contact_vids
+      vid_offset = nil
+      vids = []
+      loop do
+        data = Hubspot::Connection.get_json(GET_COMPANY_CONTACT_VIDS_PATH,
+                                            company_id: vid,
+                                            vidOffset: vid_offset)
+        vids += data['vids']
+        return vids unless data['hasMore']
+        vid_offset = data['vidOffset']
+      end
+      vids # this statement will never be executed.
+    end
+
     # Adds contact to a company
     # {http://developers.hubspot.com/docs/methods/companies/add_contact_to_company}
     # @param id [Integer] contact id to add
@@ -132,12 +192,7 @@ module Hubspot
                     else
                       contact_or_vid
                     end
-      Hubspot::Connection.put_json(ADD_CONTACT_TO_COMPANY_PATH,
-                                   params: {
-                                     company_id: vid,
-                                     vid: contact_vid,
-                                   },
-                                   body: nil)
+      self.class.add_contact!(vid, contact_vid)
       self
     end
 

data/lib/hubspot/config.rb

@@ -1,10 +1,14 @@
 require 'logger'
+require 'hubspot/connection'
 
 module Hubspot
   class Config
 
-    CONFIG_KEYS = [:hapikey, :base_url, :portal_id, :logger]
-    DEFAULT_LOGGER = Logger.new('/dev/null')
+    CONFIG_KEYS = [
+      :hapikey, :base_url, :portal_id, :logger, :access_token, :client_id,
+      :client_secret, :redirect_uri
+    ]
+    DEFAULT_LOGGER = Logger.new(nil)
 
     class << self
       attr_accessor *CONFIG_KEYS
@@ -14,7 +18,18 @@ module Hubspot
         @hapikey = config["hapikey"]
         @base_url = config["base_url"] || "https://api.hubapi.com"
         @portal_id = config["portal_id"]
-        @logger = config['logger'] || DEFAULT_LOGGER
+        @logger = config["logger"] || DEFAULT_LOGGER
+        @access_token = config["access_token"]
+        @client_id = config["client_id"] if config["client_id"].present?
+        @client_secret = config["client_secret"] if config["client_secret"].present?
+        @redirect_uri = config["redirect_uri"] if config["redirect_uri"].present?
+
+        unless access_token.present? ^ hapikey.present?
+          Hubspot::ConfigurationError.new("You must provide either an access_token or an hapikey")
+        end
+        if access_token.present?
+          Hubspot::Connection.headers("Authorization" => "Bearer #{access_token}")
+        end
         self
       end
 
@@ -23,6 +38,8 @@ module Hubspot
         @base_url = "https://api.hubapi.com"
         @portal_id = nil
         @logger = DEFAULT_LOGGER
+        @access_token = nil
+        Hubspot::Connection.headers({})
       end
 
       def ensure!(*params)

data/lib/hubspot/connection.rb

@@ -45,7 +45,11 @@ module Hubspot
       end
 
       def generate_url(path, params={}, options={})
-        Hubspot::Config.ensure! :hapikey
+        if Hubspot::Config.access_token.present?
+          options[:hapikey] = false
+        else
+          Hubspot::Config.ensure! :hapikey
+        end
         path = path.clone
         params = params.clone
         base_url = options[:base_url] || Hubspot::Config.base_url

data/lib/hubspot/contact.rb

@@ -16,6 +16,7 @@ module Hubspot
     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'
+    MERGE_CONTACT_PATH           = '/contacts/v1/contact/merge-vids/:contact_id'
     CONTACTS_PATH                = '/contacts/v1/lists/all/contacts/all'
     RECENTLY_UPDATED_PATH        = '/contacts/v1/lists/recently_updated/contacts/recent'
     RECENTLY_CREATED_PATH        = '/contacts/v1/lists/all/contacts/recent'
@@ -69,13 +70,16 @@ module Hubspot
       def create_or_update!(contacts)
         query = contacts.map do |ch|
           contact_hash = ch.with_indifferent_access
-          contact_param = {
-            properties: Hubspot::Utils.hash_to_properties(contact_hash.except(:vid))
-          }
           if contact_hash[:vid]
-            contact_param.merge!(vid: contact_hash[:vid])
+            contact_param = {
+              vid: contact_hash[:vid],
+              properties: Hubspot::Utils.hash_to_properties(contact_hash.except(:vid))
+            }
           elsif contact_hash[:email]
-            contact_param.merge!(email: contact_hash[:email])
+            contact_param = {
+              email: contact_hash[:email],
+              properties: Hubspot::Utils.hash_to_properties(contact_hash.except(:email))
+            }
           else
             raise Hubspot::InvalidParams, 'expecting vid or email for contact'
           end
@@ -146,15 +150,29 @@ module Hubspot
         response = Hubspot::Connection.get_json(QUERY_PATH, { q: query, count: count, offset: offset })
         response.merge("contacts" => response["contacts"].map { |contact_hash| new(contact_hash) })
       end
+
+      # Merge two contacts
+      # Properties of the secondary contact will be applied to the primary contact
+      # The main email will be the primary contact's
+      # The secondary email still won't be available for new contacts
+      # {https://developers.hubspot.com/docs/methods/contacts/merge-contacts}
+      def merge!(primary_contact_vid, secondary_contact_vid)
+        Hubspot::Connection.post_json(
+          MERGE_CONTACT_PATH,
+          params: { contact_id: primary_contact_vid, no_parse: true },
+          body: { vidToMerge: secondary_contact_vid }
+        )
+      end
     end
 
     attr_reader :properties, :vid, :is_new
-    attr_reader :is_contact
+    attr_reader :is_contact, :list_memberships
 
     def initialize(response_hash)
       props = response_hash['properties']
       @properties = Hubspot::Utils.properties_to_hash(props) unless props.blank?
       @is_contact = response_hash["is-contact"]
+      @list_memberships = response_hash["list-memberships"] || []
       @vid = response_hash['vid']
     end
 

data/lib/hubspot/deal.rb

@@ -7,6 +7,7 @@ module Hubspot
   # {http://developers.hubspot.com/docs/methods/deals/deals_overview}
   #
   class Deal
+    ALL_DEALS_PATH = "/deals/v1/deal/paged"
     CREATE_DEAL_PATH = "/deals/v1/deal"
     DEAL_PATH = "/deals/v1/deal/:deal_id"
     RECENT_UPDATED_PATH = "/deals/v1/deal/recent/modified"
@@ -47,13 +48,26 @@ module Hubspot
          object_ids = (company_ids.any? ? company_ids : vids).join('&id=')
          Hubspot::Connection.put_json(ASSOCIATE_DEAL_PATH, params: { deal_id: deal_id, OBJECTTYPE: objecttype, objectId: object_ids}, body: {})
        end
- 
+
 
       def find(deal_id)
         response = Hubspot::Connection.get_json(DEAL_PATH, { deal_id: deal_id })
         new(response)
       end
 
+      def all(opts = {})
+        path = ALL_DEALS_PATH
+
+        opts[:includeAssociations] = true # Needed for initialize to work
+        response = Hubspot::Connection.get_json(path, opts)
+
+        result = {}
+        result['deals'] = response['deals'].map { |d| new(d) }
+        result['offset'] = response['offset']
+        result['hasMore'] = response['hasMore']
+        return result
+      end
+
       # Find recent updated deals.
       # {http://developers.hubspot.com/docs/methods/deals/get_deals_modified}
       # @param count [Integer] the amount of deals to return.
@@ -62,18 +76,39 @@ module Hubspot
         response = Hubspot::Connection.get_json(RECENT_UPDATED_PATH, opts)
         response['results'].map { |d| new(d) }
       end
-      
+
       # Find all deals associated to a company
       # {http://developers.hubspot.com/docs/methods/deals/get-associated-deals}
       # @param company [Hubspot::Company] the company
       # @return [Array] Array of Hubspot::Deal records
       def find_by_company(company)
+        find_by_association company
+      end
+
+      # Find all deals associated to a contact
+      # {http://developers.hubspot.com/docs/methods/deals/get-associated-deals}
+      # @param contact [Hubspot::Contact] the contact
+      # @return [Array] Array of Hubspot::Deal records
+      def find_by_contact(contact)
+        find_by_association contact
+      end
+
+      # Find all deals associated to a contact or company
+      # {http://developers.hubspot.com/docs/methods/deals/get-associated-deals}
+      # @param object [Hubspot::Contact || Hubspot::Company] a contact or company
+      # @return [Array] Array of Hubspot::Deal records
+      def find_by_association(object)
         path = ASSOCIATED_DEAL_PATH
-        params = { objectType: :company, objectId: company.vid }
+        objectType =  case object
+                      when Hubspot::Company then :company
+                      when Hubspot::Contact then :contact
+                      else raise(Hubspot::InvalidParams, "Instance type not supported")
+                      end
+
+        params = { objectType: objectType, objectId: object.vid }
         response = Hubspot::Connection.get_json(path, params)
         response["results"].map { |deal_id| find(deal_id) }
       end
-
     end
 
     # Archives the contact in hubspot

data/lib/hubspot/engagement.rb

@@ -9,17 +9,20 @@ module Hubspot
   class Engagement
     CREATE_ENGAGMEMENT_PATH = '/engagements/v1/engagements'
     ENGAGEMENT_PATH = '/engagements/v1/engagements/:engagement_id'
+    ASSOCIATE_ENGAGEMENT_PATH = '/engagements/v1/engagements/:engagement_id/associations/:object_type/:object_vid'
     GET_ASSOCIATED_ENGAGEMENTS = '/engagements/v1/engagements/associated/:objectType/:objectId/paged'
 
     attr_reader :id
     attr_reader :engagement
     attr_reader :associations
+    attr_reader :attachments
     attr_reader :metadata
 
     def initialize(response_hash)
 
       @engagement = response_hash["engagement"]
       @associations = response_hash["associations"]
+      @attachments = response_hash["attachments"]
       @metadata = response_hash["metadata"]
       @id = engagement["id"]
     end
@@ -66,6 +69,20 @@ module Hubspot
         end
         engagements
       end
+
+      # Associates an engagement with an object
+      # {https://developers.hubspot.com/docs/methods/engagements/associate_engagement}
+      # @param engagement_id [int] id of the engagement to associate
+      # @param object_type [string] one of contact, company, or deal
+      # @param object_vid [int] id of the contact, company, or deal to associate
+      def associate!(engagement_id, object_type, object_vid)
+        Hubspot::Connection.put_json(ASSOCIATE_ENGAGEMENT_PATH,
+                                     params: {
+                                       engagement_id: engagement_id,
+                                       object_type: object_type,
+                                       object_vid: object_vid
+                                     })
+      end
     end
 
     # Archives the engagement in hubspot
@@ -90,9 +107,10 @@ module Hubspot
     # @return [Hubspot::Engagement] self
     def update!(params)
       data = {
-        engagement: engagement,
-        associations: associations,
-        metadata: metadata
+        engagement: params[:engagement]     || engagement,
+        associations: params[:associations] || associations,
+        attachments: params[:attachments]   || attachments,
+        metadata: params[:metadata]         || metadata
       }
 
       Hubspot::Connection.put_json(ENGAGEMENT_PATH, params: { engagement_id: id }, body: data)
@@ -110,7 +128,7 @@ module Hubspot
     end
 
     class << self
-      def create!(contact_id, note_body, owner_id = nil)
+      def create!(contact_id, note_body, owner_id = nil, deal_id = nil)
         data = {
           engagement: {
             type: 'NOTE'
@@ -125,6 +143,8 @@ module Hubspot
 
         # if the owner id has been provided, append it to the engagement
         data[:engagement][:owner_id] = owner_id if owner_id
+        # if the deal id has been provided, associate the note with the deal
+        data[:associations][:dealIds] = [deal_id] if deal_id
 
         super(data)
       end

data/lib/hubspot/form.rb

@@ -88,7 +88,7 @@ module Hubspot
 
     def assign_properties(hash)
       @guid = hash['guid']
-      @fields = hash['formFieldGroups'].inject([]){ |result, fg| result | fg['fields'] }
+      @fields = (hash['formFieldGroups'] || []).inject([]) { |result, fg| result | fg['fields'] }
       @properties = hash
     end
   end

data/lib/hubspot/oauth.rb

@@ -0,0 +1,50 @@
+require 'httparty'
+
+module Hubspot
+  class OAuth < Connection
+    include HTTParty
+
+    DEFAULT_OAUTH_HEADERS = {"Content-Type" => "application/x-www-form-urlencoded;charset=utf-8"}
+
+    class << self
+      def refresh(token, params={}, options={})
+        oauth_post(token_url, { grant_type: "refresh_token", refresh_token: token }.merge(params),
+          options)
+      end
+
+      def create(code, params={}, options={})
+        oauth_post(token_url, { grant_type: "authorization_code", code: code }.merge(params),
+          options)
+      end
+
+      def authorize_url(scopes, params={})
+        client_id = params[:client_id] || Hubspot::Config.client_id
+        redirect_uri = params[:redirect_uri] || Hubspot::Config.redirect_uri
+        scopes = Array.wrap(scopes)
+
+        "https://app.hubspot.com/oauth/authorize?client_id=#{client_id}&scope=#{scopes.join("%20")}&redirect_uri=#{redirect_uri}"
+      end
+
+      def token_url
+        token_url = Hubspot::Config.base_url + "/oauth/v1/token"
+      end
+
+      def oauth_post(url, params, options={})
+        no_parse = options[:no_parse] || false
+
+        body = {
+          client_id: Hubspot::Config.client_id,
+          client_secret: Hubspot::Config.client_secret,
+          redirect_uri: Hubspot::Config.redirect_uri,
+        }.merge(params)
+
+        response = post(url, body: body, headers: DEFAULT_OAUTH_HEADERS)
+        log_request_and_response url, response, body
+
+        raise(Hubspot::RequestError.new(response)) unless response.success?
+
+        no_parse ? response : response.parsed_response
+      end
+    end
+  end
+end

data/lib/hubspot/subscription.rb

@@ -1,29 +1,28 @@
 module Hubspot
   class Subscription
-	SUBSCRIPTIONS_PATH = '/email/public/v1/subscriptions'
-	TIMELINE_PATH 	   = '/email/public/v1/subscriptions/timeline'
-	SUBSCRIPTION_PATH  = '/email/public/v1/subscriptions/:email_address'
+    SUBSCRIPTIONS_PATH = '/email/public/v1/subscriptions'
+    TIMELINE_PATH      = '/email/public/v1/subscriptions/timeline'
+    SUBSCRIPTION_PATH  = '/email/public/v1/subscriptions/:email_address'
 
-	attr_reader :subscribed
-	attr_reader :marked_as_spam
-	attr_reader :bounced
-	attr_reader :status
-	attr_reader :subscription_statuses
+    attr_reader :subscribed
+    attr_reader :marked_as_spam
+    attr_reader :bounced
+    attr_reader :status
+    attr_reader :subscription_statuses
 
-	def initialize(response_hash)
-      @subscribed		= response_hash['subscribed']
-      @marked_as_spam 		= response_hash['markedAsSpam']
-      @bounced			= response_hash['bounced']
-      @status 			= response_hash['status']
-      @subscription_statuses	= response_hash['SubscriptionStatuses']
+    def initialize(response_hash)
+      @subscribed     = response_hash['subscribed']
+      @marked_as_spam = response_hash['markedAsSpam']
+      @bounced        = response_hash['bounced']
+      @status         = response_hash['status']
+      @subscription_statuses  = response_hash['SubscriptionStatuses']
     end
 
-	class << self 
-	  def status(email)
-	  	response = Hubspot::Connection.get_json(SUBSCRIPTION_PATH, {email_address: email})
-	  	new(response)
-	  end 
-	end 
-
-  end 
-end 
+    class << self
+      def status(email)
+        response = Hubspot::Connection.get_json(SUBSCRIPTION_PATH, {email_address: email})
+        new(response)
+      end
+    end
+  end
+end

data/spec/lib/hubspot/company_spec.rb

@@ -39,7 +39,17 @@ describe Hubspot::Contact do
     end
   end
 
-   describe ".find_by_id" do
+  describe ".add_contact!" do
+    cassette "add_contact_to_company_class"
+    let(:company){ Hubspot::Company.create!("company_#{Time.now.to_i}@example.com") }
+    let(:contact){ Hubspot::Contact.create!("contact_#{Time.now.to_i}@example.com") }
+    subject { Hubspot::Company.find_by_id(company.vid) }
+
+    before { Hubspot::Company.add_contact! company.vid, contact.vid }
+    its(['num_associated_contacts']) { should eql '1' }
+  end
+
+  describe ".find_by_id" do
     context 'given an uniq id' do
       cassette "company_find_by_id"
       subject{ Hubspot::Company.find_by_id(vid) }
@@ -163,6 +173,39 @@ describe Hubspot::Contact do
     end
   end
 
+  describe "#batch_update!" do
+    cassette "company_batch_update"
+    let(:company){ Hubspot::Company.create!("company_#{Time.now.to_i}@example.com") }
+
+    context 'update via vid' do
+      let(:updated_companies) { [{ vid: company.vid, name: "Carol H" }] }
+
+      it 'should update companies' do
+        Hubspot::Company.batch_update!(updated_companies)
+        checked_company = Hubspot::Company.find_by_id(company.vid)
+        expect(checked_company.properties["name"]).to eq("Carol H")
+      end
+    end
+
+    context 'update via objectId' do
+      let(:updated_companies) { [{ objectId: company.vid, name: "Carol H" }] }
+
+      it 'should update companies' do
+        Hubspot::Company.batch_update!(updated_companies)
+        checked_company = Hubspot::Company.find_by_id(company.vid)
+        expect(checked_company.properties["name"]).to eq("Carol H")
+      end
+    end
+
+    context 'missing vid or objectId' do
+      let(:updated_companies) { [{ name: "Carol H" }] }
+
+      it 'should raise error with expected message' do
+        expect { Hubspot::Company.batch_update!(updated_companies) }.to raise_error(Hubspot::InvalidParams, 'expecting vid or objectId for company')
+      end
+    end
+  end
+
   describe "#destroy!" do
     cassette "company_destroy"
     let(:company){ Hubspot::Company.create!("newcompany_y_#{Time.now.to_i}@hsgem.com") }
@@ -181,11 +224,22 @@ describe Hubspot::Contact do
     end
   end
 
+  describe "#get_contact_vids" do
+    cassette "company_get_contact_vids"
+    let(:company) { Hubspot::Company.create!("company_#{Time.now.to_i}@example.com") }
+    let(:contact) { Hubspot::Contact.create!("contact_#{Time.now.to_i}@example.com") }
+    before { company.add_contact(contact) }
+    subject { company.get_contact_vids }
+
+    it { is_expected.to eq [contact.vid] }
+  end
+
   describe "#add_contact" do
-    cassette "add_contact_to_company"
+    cassette "add_contact_to_company_instance"
     let(:company){ Hubspot::Company.create!("company_#{Time.now.to_i}@example.com") }
     let(:contact){ Hubspot::Contact.create!("contact_#{Time.now.to_i}@example.com") }
-    subject { Hubspot::Company.all(recent: true).last }
+    subject { Hubspot::Company.find_by_id(company.vid) }
+
     context "with Hubspot::Contact instance" do
       before { company.add_contact contact }
       its(['num_associated_contacts']) { should eql '1' }

data/spec/lib/hubspot/contact_list_spec.rb

@@ -105,7 +105,7 @@ describe Hubspot::ContactList do
         list = lists.first
         expect(list).to be_a(Hubspot::ContactList)
         expect(list.id).to be_an(Integer)
-  	  end
+      end
 
       expect_count_and_offset { |params| Hubspot::ContactList.all(params) }
     end
@@ -114,7 +114,7 @@ describe Hubspot::ContactList do
       cassette 'find_all_stastic_lists'
 
       it 'returns by defaut all the static contact lists' do
-      	lists = Hubspot::ContactList.all(static: true)
+        lists = Hubspot::ContactList.all(static: true)
         expect(lists.count).to be > 20
 
         list = lists.first
@@ -127,7 +127,7 @@ describe Hubspot::ContactList do
       cassette 'find_all_dynamic_lists'
 
       it 'returns by defaut all the static contact lists' do
-      	lists = Hubspot::ContactList.all(dynamic: true)
+        lists = Hubspot::ContactList.all(dynamic: true)
         expect(lists.count).to be > 20
 
         list = lists.first

data/spec/lib/hubspot/contact_spec.rb

@@ -336,6 +336,32 @@ describe Hubspot::Contact do
     end
   end
 
+  describe '.merge!' do
+    cassette 'contact_merge'
+    let(:primary_params) { { firstname: 'Hugh', lastname: 'Jackman' } }
+    let(:primary_contact) { Hubspot::Contact.create!("primary_#{Time.now.to_i}@hsgem.com", primary_params) }
+    let(:secondary_params) { { firstname: 'Wolverine' } }
+    let(:secondary_contact) { Hubspot::Contact.create!("secondary_#{Time.now.to_i}@hsgem.com", secondary_params) }
+
+    subject { Hubspot::Contact.merge!(primary_contact.vid, secondary_contact.vid) }
+
+    it 'merges the contacts' do
+      subject
+
+      primary_find_by_id = Hubspot::Contact.find_by_id primary_contact.vid
+      primary_find_by_email = Hubspot::Contact.find_by_email primary_contact.email
+      secondary_find_by_id = Hubspot::Contact.find_by_id secondary_contact.vid
+      secondary_find_by_email = Hubspot::Contact.find_by_email secondary_contact.email
+
+      primary_find_by_id.email.should == primary_contact.email
+      primary_find_by_id.email.should == primary_find_by_email.email
+      primary_find_by_id.email.should == secondary_find_by_id.email
+      primary_find_by_id.email.should == secondary_find_by_email.email
+      primary_find_by_id['firstname'].should == 'Wolverine'
+      primary_find_by_id['lastname'].should == 'Jackman'
+    end
+  end
+
   describe '#update!' do
     cassette 'contact_update'
     let(:contact){ Hubspot::Contact.new(example_contact_hash) }

data/spec/lib/hubspot/engagement_spec.rb

@@ -71,6 +71,20 @@ describe Hubspot::Engagement do
       end
     end
 
+    describe ".associate!" do
+      cassette "engagement_associate"
+
+      let(:engagement) { Hubspot::EngagementNote.create!(nil, 'note') }
+      let(:contact) { Hubspot::Contact.create!("newcontact#{Time.now.to_i}@hsgem.com") }
+      subject { Hubspot::Engagement.associate!(engagement.id, 'contact', contact.vid) }
+
+      it 'associate an engagement to a resource' do
+        subject
+        found_by_contact = Hubspot::Engagement.find_by_contact(contact.vid)
+        expect(found_by_contact.first.id).to eql engagement.id
+      end
+    end
+
     describe '#destroy!' do
       cassette 'engagement_destroy'
 

data/spec/lib/hubspot/form_spec.rb

@@ -142,6 +142,18 @@ describe Hubspot::Form do
         result.should be false
       end
     end
+
+    context 'when initializing Hubspot::Form directly' do
+      let(:form) { Hubspot::Form.new('guid' => '561d9ce9-bb4c-45b4-8e32-21cdeaa3a7f0') }
+
+      before { Hubspot.configure(hapikey: 'demo', portal_id: '62515') }
+
+      it 'returns true if the form submission is successful' do
+        params = {}
+        result = form.submit(params)
+        result.should be true
+      end
+    end
   end
 
   describe '#update!' do

data/spec/live/companies_integration_spec.rb

@@ -5,7 +5,7 @@ describe "Companies API Live test", live: true do
     Hubspot.configure hapikey: "demo"
   end
 
-  it 'find, update and destroy a company' do
+  it 'find, update, batch_update and destroy a company' do
     companies = Hubspot::Company.find_by_domain("create-delete-test.com")
     companies.first.destroy! if companies.any?
 
@@ -15,9 +15,17 @@ describe "Companies API Live test", live: true do
     company.update! name: "Create Delete Test 2"
     company = Hubspot::Company.find_by_id(company.vid)
 
+
     expect(company["name"]).to eql "Create Delete Test 2"
 
+    Hubspot::Company.batch_update!([{objectId: company.vid, name: 'Batch Update'}])
+    sleep 0.5 # prevent bulk update hasn't finished propagation
+    company = Hubspot::Company.find_by_id(company.vid)
+
+    expect(company["name"]).to eql "Batch Update"
+
     expect(company.destroy!).to be_true
     expect(Hubspot::Company.find_by_domain("create-delete-test.com")).to eq []
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew DiMichele
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2018-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -85,16 +85,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/hubspot/engagement.rb
 - lib/hubspot/exceptions.rb
 - lib/hubspot/form.rb
+- lib/hubspot/oauth.rb
 - lib/hubspot/owner.rb
 - lib/hubspot/properties.rb
 - lib/hubspot/railtie.rb