hubspot-ruby 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 16ee939bb4d593cc623309e093902d9a937b9fda
-  data.tar.gz: d5c6b6765d4a3a7adda09fbb6b9a1768c91b1d86
+  metadata.gz: 1ab6604b85e4945f699f88491ad18191a9ceda03
+  data.tar.gz: 8b01545c2f8c6d5e51d610233abcd55b2d9027d0
 SHA512:
-  metadata.gz: 6f22e580fac3d5a5f4b1ac812cf21040c6105e8fc86ad4e03dc71b0aa0276bf48f4b89cf826d806eb2a7cef5be90a820c47a81a23ca27d34833bdf77a4076dfe
-  data.tar.gz: d322208c51497e956f63d9cb7453ce90540691af81661bcea456ca3118deb53da6fcb95a9ecd8a91f2dc433a12a47a482bb2eec1fd7043a12e7fd27ef425c32c
+  metadata.gz: a5b5d2e3c28f811c44b14e232e308cc2af19cf4050f6963dfa00ce7c0b59022c73fde892adf9e7fe0a5a73cb6d067b512cefdae13510b06164dd0630e4430b63
+  data.tar.gz: 3381873ef4e85c46cbf4a17608c66c29414fa40fdf911fb7463a58be117f7a307b06905d3db269f5a56f8d98b68f70f4ed632a6816a7c8d6ffb6801af7770281

data/README.md

@@ -37,6 +37,12 @@ Here's what you can do for now:
 Hubspot::Contact.create!("email@address.com", {firstname: "First", lastname: "Last"})
 ```
 
+#### In batches
+
+```ruby
+Hubspot::Contact.create_or_update!([{email: 'smith@example.com', firstname: 'First', lastname: 'Last'}])
+```
+
 ### Find a contact
 
 These methods will return a `Hubspot::Contact` object if successful, `nil` otherwise:
@@ -54,6 +60,11 @@ Given an instance of `Hubspot::Contact`, update its attributes with:
 contact.update!({firstname: "First", lastname: "Last"})
 ```
 
+#### In batches
+
+```ruby
+Hubspot::Contact.create_or_update!([{vid: '12345', firstname: 'First', lastname: 'Last'}])
+```
 ## 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,11 +1,12 @@
 Gem::Specification.new do |s|
   s.name = "hubspot-ruby"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.require_paths = ["lib"]
   s.authors = ["Andrew DiMichele"]
   s.description = "hubspot-ruby is a wrapper for the HubSpot REST API"
-  s.files = [".rspec", "Gemfile", "Gemfile.lock", "Guardfile", "LICENSE.txt", "README.md", "RELEASING.md", "Rakefile", "hubspot-ruby.gemspec"]
+  s.files = [".rspec", "Gemfile", "Guardfile", "LICENSE.txt", "README.md", "RELEASING.md", "Rakefile", "hubspot-ruby.gemspec"]
   s.files += Dir["lib/**/*.rb"]
+  s.files += Dir["lib/**/*.rake"]
   s.files += Dir["spec/**/*.rb"]
   s.homepage = "http://github.com/adimichele/hubspot-ruby"
   s.summary = "hubspot-ruby is a wrapper for the HubSpot REST API"
@@ -16,7 +17,7 @@ Gem::Specification.new do |s|
 
   # Add development-only dependencies here
   s.add_development_dependency("rake")
-  s.add_development_dependency("rspec")
+  s.add_development_dependency("rspec", "~> 2.0")
   s.add_development_dependency("rr")
   s.add_development_dependency("webmock", "< 1.10")
   s.add_development_dependency("vcr")

data/lib/hubspot/connection.rb

@@ -58,7 +58,7 @@ module Hubspot
 
         params.each do |k,v|
           if path.match(":#{k}")
-            path.gsub!(":#{k}",v.to_s)
+            path.gsub!(":#{k}", CGI.escape(v.to_s))
             params.delete(k)
           end
         end
@@ -68,13 +68,13 @@ module Hubspot
           v.is_a?(Array) ? v.map { |value| param_string(k,value) } : param_string(k,v)
         end.join("&")
 
-        path += "?" if query.present?
+        path += path.include?('?') ? '&' : "?" 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
+        value.is_a?(Time) ? (value.to_i * 1000) : CGI.escape(value.to_s)
       end
 
       def param_string(key,value)

data/lib/hubspot/contact.rb

@@ -6,24 +6,26 @@ module Hubspot
   #
   # 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_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'
-    CREATE_OR_UPDATE_PATH      = '/contacts/v1/contact/createOrUpdate/email/:contact_email'
-    QUERY_PATH                 = '/contacts/v1/search/query'
+    CREATE_CONTACT_PATH          = '/contacts/v1/contact'
+    BATCH_CREATE_OR_UPDATE_PATH  = '/contacts/v1/contact/batch/'
+    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'
+    RECENTLY_UPDATED_PATH        = '/contacts/v1/lists/recently_updated/contacts/recent'
+    CREATE_OR_UPDATE_PATH        = '/contacts/v1/contact/createOrUpdate/email/:contact_email'
+    QUERY_PATH                   = '/contacts/v1/search/query'
 
     class << self
       # {https://developers.hubspot.com/docs/methods/contacts/create_contact}
       def create!(email, params={})
-        params_with_email = params.stringify_keys.merge('email' => email)
+        params_with_email = params.stringify_keys
+        params_with_email = params.stringify_keys.merge('email' => email) if email
         post_data = {properties: Hubspot::Utils.hash_to_properties(params_with_email)}
         response = Hubspot::Connection.post_json(CREATE_CONTACT_PATH, params: {}, body: post_data )
         new(response)
@@ -33,21 +35,22 @@ module Hubspot
       # {https://developers.hubspot.com/docs/methods/contacts/get_recently_updated_contacts}
       def all(opts={})
         recent = opts.delete(:recent) { false }
+        paged = opts.delete(:paged) { false }
         path, opts =
         if recent
-          [RECENT_CONTACTS_PATH, Hubspot::ContactProperties.add_default_parameters(opts)]
+          [RECENTLY_UPDATED_PATH, Hubspot::ContactProperties.add_default_parameters(opts)]
         else
           [CONTACTS_PATH, opts]
         end
 
         response = Hubspot::Connection.get_json(path, opts)
-        response['contacts'].map { |c| new(c) }
+        response['contacts'].map! { |c| new(c) }
+        paged ? response : response['contacts']
       end
 
       # 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
       def createOrUpdate(email, params={})
         post_data = {properties: Hubspot::Utils.hash_to_properties(params.stringify_keys)}
         response = Hubspot::Connection.post_json(CREATE_OR_UPDATE_PATH, params: { contact_email: email }, body: post_data )
@@ -56,6 +59,28 @@ module Hubspot
         contact
       end
 
+      # NOTE: Performance is best when calls are limited to 100 or fewer contacts
+      # {https://developers.hubspot.com/docs/methods/contacts/batch_create_or_update}
+      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])
+          elsif contact_hash[:email]
+            contact_param.merge!(email: contact_hash[:email])
+          else
+            raise Hubspot::InvalidParams, 'expecting vid or email for contact'
+          end
+          contact_param
+        end
+        Hubspot::Connection.post_json(BATCH_CREATE_OR_UPDATE_PATH,
+                                      params: {},
+                                      body: query)
+      end
+
       # 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}
@@ -119,10 +144,12 @@ module Hubspot
     end
 
     attr_reader :properties, :vid, :is_new
+    attr_reader :is_contact
 
     def initialize(response_hash)
       props = response_hash['properties']
       @properties = Hubspot::Utils.properties_to_hash(props) unless props.blank?
+      @is_contact = response_hash["is-contact"]
       @vid = response_hash['vid']
     end
 

data/lib/hubspot/contact_list.rb

@@ -78,13 +78,15 @@ module Hubspot
       # NOTE: caching functionality can be dependant of the nature of the list, if dynamic or not ...
       bypass_cache = opts.delete(:bypass_cache) { false }
       recent = opts.delete(:recent) { false }
+      paged = opts.delete(:paged) { false }
 
       if bypass_cache || @contacts.nil?
         path = recent ? RECENT_CONTACTS_PATH : CONTACTS_PATH
         opts[:list_id] = @id
 
         response = Hubspot::Connection.get_json(path, Hubspot::ContactProperties.add_default_parameters(opts))
-        @contacts = response['contacts'].map { |c| Hubspot::Contact.new(c) }
+        @contacts = response['contacts'].map! { |c| Hubspot::Contact.new(c) }
+        paged ? response : @contacts
       else
         @contacts
       end

data/lib/hubspot/deal.rb

@@ -11,6 +11,8 @@ module Hubspot
     DEAL_PATH = "/deals/v1/deal/:deal_id"
     RECENT_UPDATED_PATH = "/deals/v1/deal/recent/modified"
     UPDATE_DEAL_PATH = '/deals/v1/deal/:deal_id'
+    ASSOCIATE_DEAL_PATH = '/deals/v1/deal/:deal_id/associations/:OBJECTTYPE?id=:objectId'
+    ASSOCIATED_DEAL_PATH = "/deals/v1/deal/associated/:objectType/:objectId"
 
     attr_reader :properties
     attr_reader :portal_id
@@ -36,6 +38,17 @@ module Hubspot
         new(response)
       end
 
+       # Associate a deal with a contact or company
+       # {http://developers.hubspot.com/docs/methods/deals/associate_deal}
+       # Usage
+       # Hubspot::Deal.associate!(45146940, [], [52])
+       def associate!(deal_id, company_ids=[], vids=[])
+         objecttype = company_ids.any? ? 'COMPANY' : 'CONTACT'
+         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)
@@ -49,6 +62,17 @@ 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)
+        path = ASSOCIATED_DEAL_PATH
+        params = { objectType: :company, objectId: company.vid }
+        response = Hubspot::Connection.get_json(path, params)
+        response["results"].map { |deal_id| find(deal_id) }
+      end
 
     end
 

data/lib/hubspot/deal_pipeline.rb

@@ -34,6 +34,21 @@ module Hubspot
         response = Hubspot::Connection.get_json(PIPELINES_PATH, {})
         response.map { |p| new(p) }
       end
+
+      # Creates a DealPipeline
+      # {https://developers.hubspot.com/docs/methods/deal-pipelines/create-deal-pipeline}
+      # @return [Hubspot::PipeLine] Company record
+      def create!(post_data={})
+        response = Hubspot::Connection.post_json(PIPELINES_PATH, params: {}, body: post_data)
+        new(response)
+      end
+    end
+
+    # Destroys deal_pipeline
+    # {http://developers.hubspot.com/docs/methods/companies/delete_company}
+    # @return [TrueClass] true
+    def destroy!
+      Hubspot::Connection.delete_json(PIPELINE_PATH, pipeline_id: @pipeline_id)
     end
 
     def [](stage)

data/lib/hubspot/engagement.rb

@@ -33,7 +33,7 @@ module Hubspot
       def find(engagement_id)
         begin
           response = Hubspot::Connection.get_json(ENGAGEMENT_PATH, { engagement_id: engagement_id })
-          new(HashWithIndifferentAccess.new(response))
+          response ? new(HashWithIndifferentAccess.new(response)) : nil
         rescue Hubspot::RequestError => ex
           if ex.response.code == 404
             return nil
@@ -130,4 +130,47 @@ module Hubspot
       end
     end
   end
+
+  class EngagementCall < Engagement
+    def body
+      metadata['body']
+    end
+
+    def contact_ids
+      associations['contactIds']
+    end
+
+    def company_ids
+      associations['companyIds']
+    end
+
+    def deal_ids
+      associations['dealIds']
+    end
+
+    class << self
+      def create!(contact_vid, body, duration, owner_id = nil, deal_id = nil, status = 'COMPLETED', time = nil)
+        data = {
+          engagement: {
+            type: 'CALL'
+          },
+          associations: {
+            contactIds: [contact_vid],
+            dealIds: [deal_id],
+            ownerIds: [owner_id]
+          },
+          metadata: {
+            body: body,
+            status: status,
+            durationMilliseconds: duration
+          }
+        }
+
+        data[:engagement][:timestamp] = (time.to_i) * 1000 if time
+        data[:engagement][:owner_id] = owner_id if owner_id
+
+        super(data)
+      end
+    end
+  end
 end

data/lib/hubspot/properties.rb

@@ -3,18 +3,22 @@ module Hubspot
 
     PROPERTY_SPECS = {
       group_field_names: %w(name displayName displayOrder properties),
-      field_names:       %w(name groupName description fieldType formField type displayOrder label options),
-      valid_field_types: %w(textarea select text date file number radio checkbox),
+      field_names:       %w(name groupName description fieldType formField type displayOrder label options showCurrencySymbol),
+      valid_field_types: %w(textarea select text date file number radio checkbox booleancheckbox),
       valid_types:       %w(string number bool datetime enumeration),
       options:           %w(description value label hidden displayOrder)
     }
+    DEFAULT_PROPERTY = 'email'
 
     class << self
       # TODO: properties can be set as configuration
       # TODO: find the way how to set a list of Properties + merge same property key if present from opts
       def add_default_parameters(opts={})
-        properties = 'email'
-        opts.merge(property: properties)
+        if opts.keys.map(&:to_s).include? 'property'
+          opts
+        else
+          opts.merge(property: DEFAULT_PROPERTY)
+        end
       end
 
       def all(path, opts={}, filter={})

data/lib/hubspot/subscription.rb

@@ -0,0 +1,29 @@
+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'
+
+	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']
+    end
+
+	class << self 
+	  def status(email)
+	  	response = Hubspot::Connection.get_json(SUBSCRIPTION_PATH, {email_address: email})
+	  	new(response)
+	  end 
+	end 
+
+  end 
+end 

data/lib/hubspot-ruby.rb

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

data/lib/tasks/properties.rake

@@ -0,0 +1,49 @@
+require 'hubspot-ruby'
+
+namespace :hubspot do
+  desc 'Dump properties to file'
+  task :dump_properties, [:kind, :file, :hapikey, :include, :exclude] do |_, args|
+    hapikey = args[:hapikey] || ENV['HUBSPOT_API_KEY']
+    kind = args[:kind]
+    unless %w(contact deal).include?(kind)
+      raise ArgumentError, ':kind must be either "contact" or "deal"'
+    end
+    klass = kind == 'contact' ? Hubspot::ContactProperties : Hubspot::DealProperties
+    props = Hubspot::Utils::dump_properties(klass, hapikey, build_filter(args))
+    if args[:file].blank?
+      puts JSON.pretty_generate(props)
+    else
+      File.open(args[:file], 'w') do |f|
+        f.write(JSON.pretty_generate(props))
+      end
+    end
+  end
+
+  desc 'Restore properties from file'
+  task :restore_properties, [:kind, :file, :hapikey, :dry_run] do |_, args|
+    hapikey = args[:hapikey] || ENV['HUBSPOT_API_KEY']
+    if args[:file].blank?
+      raise ArgumentError, ':file is a required parameter'
+    end
+    kind = args[:kind]
+    unless %w(contact deal).include?(kind)
+      raise ArgumentError, ':kind must be either "contact" or "deal"'
+    end
+    klass = kind == 'contact' ? Hubspot::ContactProperties : Hubspot::DealProperties
+    file = File.read(args[:file])
+    props = JSON.parse(file)
+    Hubspot::Utils.restore_properties(klass, hapikey, props, args[:dry_run] != 'false')
+  end
+
+  private
+
+  def build_filter(args)
+    { include: val_to_array(args[:include]),
+      exclude: val_to_array(args[:exclude])
+    }
+  end
+
+  def val_to_array(val)
+    val.blank? ? val : val.split(/\W+/)
+  end
+end

data/spec/lib/hubspot/company_properties_spec.rb

@@ -1,8 +1,16 @@
 describe Hubspot::CompanyProperties do
   describe '.add_default_parameters' do
-    subject { Hubspot::CompanyProperties.add_default_parameters({}) }
+    let(:opts) { {} }
+    subject { Hubspot::CompanyProperties.add_default_parameters(opts) }
     context 'default parameters' do
-      its([:property]) { should == 'email' }
+      context 'without property parameter' do
+        its([:property]) { should == 'email' }
+      end
+
+      context 'with property parameter' do
+        let(:opts) { {property: 'name' } }
+        its([:property]) { should == 'name'}
+      end
     end
   end
 

data/spec/lib/hubspot/company_spec.rb

@@ -108,15 +108,15 @@ describe Hubspot::Contact do
       cassette 'find_all_recent_companies'
 
       it 'must get the companies list' do
-        companies = Hubspot::Company.all(recent: true)
+        companies = Hubspot::Company.all(recently_updated: true)
         expect(companies.size).to eql 20
 
         first, last = companies.first, companies.last
         expect(first).to be_a Hubspot::Company
-        expect(first.vid).to eql 42866817
+        expect(first.vid).to eql 318615742
 
         expect(last).to be_a Hubspot::Company
-        expect(last.vid).to eql 42861017
+        expect(last.vid).to eql 359899290
       end
     end
   end

data/spec/lib/hubspot/connection_spec.rb

@@ -76,30 +76,36 @@ describe Hubspot::Connection do
 
       context "with an interpolated param" do
         let(:params){ {email: "email@address.com"} }
-        it{ should == "https://api.hubapi.com/test/email@address.com/profile?hapikey=demo" }
+        it{ should == "https://api.hubapi.com/test/email%40address.com/profile?hapikey=demo" }
       end
 
       context "with multiple interpolated params" do
         let(:path){ "/test/:email/:id/profile" }
         let(:params){{email: "email@address.com", id: 1234}}
-        it{ should == "https://api.hubapi.com/test/email@address.com/1234/profile?hapikey=demo" }
+        it{ should == "https://api.hubapi.com/test/email%40address.com/1234/profile?hapikey=demo" }
       end
 
       context "with query params" do
         let(:params){{email: "email@address.com", id: 1234}}
-        it{ should == "https://api.hubapi.com/test/email@address.com/profile?id=1234&hapikey=demo" }
+        it{ should == "https://api.hubapi.com/test/email%40address.com/profile?id=1234&hapikey=demo" }
 
         context "containing a time" do
           let(:start_time) { Time.now }
           let(:params){{email: "email@address.com", id: 1234, start: start_time}}
-          it{ should == "https://api.hubapi.com/test/email@address.com/profile?id=1234&start=#{start_time.to_i * 1000}&hapikey=demo" }
+          it{ should == "https://api.hubapi.com/test/email%40address.com/profile?id=1234&start=#{start_time.to_i * 1000}&hapikey=demo" }
         end
 
         context "containing a range" do
           let(:start_time) { Time.now }
           let(:end_time) { Time.now + 1.year }
           let(:params){{email: "email@address.com", id: 1234, created__range: start_time..end_time }}
-          it{ should == "https://api.hubapi.com/test/email@address.com/profile?id=1234&created__range=#{start_time.to_i * 1000}&created__range=#{end_time.to_i * 1000}&hapikey=demo" }
+          it{ should == "https://api.hubapi.com/test/email%40address.com/profile?id=1234&created__range=#{start_time.to_i * 1000}&created__range=#{end_time.to_i * 1000}&hapikey=demo" }
+        end
+
+        context "containing an array of strings" do
+          let(:path){ "/test/emails" }
+          let(:params){{batch_email: %w(email1@example.com email2@example.com)}}
+          it{ should == "https://api.hubapi.com/test/emails?email=email1%40example.com&email=email2%40example.com&hapikey=demo" }
         end
       end
 

data/spec/lib/hubspot/contact_list_spec.rb

@@ -32,12 +32,24 @@ describe Hubspot::ContactList do
 
     let(:list) { Hubspot::ContactList.new(example_contact_list_hash) }
 
-    it 'returns by defaut 20 contact lists' do
+    it 'returns by default 20 contact lists' do
       expect(list.contacts.count).to eql 20
       contact = list.contacts.first
       expect(contact).to be_a(Hubspot::Contact)
     end
 
+    it 'returns by default 20 contact lists with paging data' do
+      contact_data = list.contacts({paged: true})
+      contacts = contact_data['contacts']
+
+      expect(contact_data).to have_key 'vid-offset'
+      expect(contact_data).to have_key 'has-more'
+
+      expect(contacts.count).to eql 20
+      contact = contacts.first
+      expect(contact).to be_a(Hubspot::Contact)
+    end
+
     it 'add default properties to the contacts returned' do
       contact = list.contacts.first
       expect(contact.email).to_not be_empty
@@ -86,7 +98,7 @@ describe Hubspot::ContactList do
     context 'all list types' do
       cassette 'find_all_lists'
 
-      it 'returns by defaut 20 contact lists' do
+      it 'returns by default 20 contact lists' do
         lists = Hubspot::ContactList.all
         expect(lists.count).to eql 20
 

data/spec/lib/hubspot/contact_properties_spec.rb

@@ -1,8 +1,16 @@
 describe Hubspot::ContactProperties do
   describe '.add_default_parameters' do
-    subject { Hubspot::ContactProperties.add_default_parameters({}) }
+    let(:opts) { {} }
+    subject { Hubspot::ContactProperties.add_default_parameters(opts) }
     context 'default parameters' do
-      its([:property]) { should == 'email' }
+      context 'without property parameter' do
+        its([:property]) { should == 'email' }
+      end
+
+      context 'with property parameter' do
+        let(:opts) { {property: 'firstname' } }
+        its([:property]) { should == 'firstname'}
+      end
     end
   end
 

data/spec/lib/hubspot/contact_spec.rb

@@ -84,6 +84,38 @@ describe Hubspot::Contact do
     end
   end
 
+  describe '.create_or_update!' do
+    cassette 'create_or_update'
+    let(:existing_contact) do
+      Hubspot::Contact.create!("morpheus@example.com", firstname: 'Morpheus')
+    end
+    before do
+      Hubspot::Contact.create_or_update!(params)
+    end
+
+    let(:params) do
+      [
+        {
+          vid: existing_contact.vid,
+          email: existing_contact.email,
+          firstname: 'Neo'
+        },
+        {
+          email: 'smith@example.com',
+          firstname: 'Smith'
+        }
+      ]
+    end
+
+    it 'creates and updates contacts' do
+      contact = Hubspot::Contact.find_by_id existing_contact.vid
+      expect(contact.properties['firstname']).to eql 'Neo'
+      latest_contact_email = Hubspot::Contact.all(recent: true).first.email
+      new_contact = Hubspot::Contact.find_by_email(latest_contact_email)
+      expect(new_contact.properties['firstname']).to eql 'Smith'
+    end
+  end
+
   describe '.find_by_email' do
     context 'given an uniq email' do
       cassette 'contact_find_by_email'
@@ -229,6 +261,31 @@ describe Hubspot::Contact do
         expect(last['lastname']).to eql 'Morgan'
       end
 
+      it 'must get the contacts list with paging data' do
+        contact_data = Hubspot::Contact.all({paged: true})
+        contacts = contact_data['contacts']
+
+        expect(contacts.size).to eql 20 # default page size
+
+        first = contacts.first
+        last = contacts.last
+
+        expect(contact_data).to have_key 'vid-offset'
+        expect(contact_data).to have_key 'has-more'
+
+        expect(first).to be_a Hubspot::Contact
+        expect(first.vid).to eql 154835
+        expect(first['firstname']).to eql 'HubSpot'
+        expect(first['lastname']).to eql 'Test'
+
+        expect(last).to be_a Hubspot::Contact
+        expect(last.vid).to eql 196199
+        expect(last['firstname']).to eql 'Eleanor'
+        expect(last['lastname']).to eql 'Morgan'
+        expect(contact_data['has-more']).to eql true
+        expect(contact_data['vid-offset']).to eql 196199
+      end
+
       it 'must filter only 2 contacts' do
         contacts = Hubspot::Contact.all(count: 2)
         expect(contacts.size).to eql 2

data/spec/lib/hubspot/deal_properties_spec.rb

@@ -1,8 +1,16 @@
 describe Hubspot::DealProperties do
   describe '.add_default_parameters' do
-    subject { Hubspot::DealProperties.add_default_parameters({}) }
+    let(:opts) { {} }
+    subject { Hubspot::DealProperties.add_default_parameters(opts) }
     context 'default parameters' do
-      its([:property]) { should == 'email' }
+      context 'without property parameter' do
+        its([:property]) { should == 'email' }
+      end
+
+      context 'with property parameter' do
+        let(:opts) { {property: 'dealname' } }
+        its([:property]) { should == 'dealname'}
+      end
     end
   end
 

data/spec/lib/hubspot/engagement_spec.rb

@@ -19,69 +19,113 @@ describe Hubspot::Engagement do
     its (:id) { should == 51484873 }
   end
 
-  describe ".create!" do
-    cassette "engagement_create"
-    body = "Test note"
-    subject { Hubspot::EngagementNote.create!(nil, body) }
-    its(:id) { should_not be_nil }
-    its(:body) { should eql body }
-  end
+  describe 'EngagementNote' do
+    describe ".create!" do
+      cassette "engagement_create"
+      body = "Test note"
+      subject { Hubspot::EngagementNote.create!(nil, body) }
+      its(:id) { should_not be_nil }
+      its(:body) { should eql body }
+    end
 
-  describe ".find" do
-    cassette "engagement_find"
-    let(:engagement) {Hubspot::EngagementNote.new(example_engagement_hash)}
+    describe ".find" do
+      cassette "engagement_find"
+      let(:engagement) {Hubspot::EngagementNote.new(example_engagement_hash)}
 
-    it 'must find by the engagement id' do
-      find_engagement = Hubspot::EngagementNote.find(engagement.id)
-      find_engagement.id.should eql engagement.id
-      find_engagement.body.should eql engagement.body
+      it 'must find by the engagement id' do
+        find_engagement = Hubspot::EngagementNote.find(engagement.id)
+        find_engagement.id.should eql engagement.id
+        find_engagement.body.should eql engagement.body
+      end
     end
-  end
 
-  describe ".find_by_company" do
-    cassette "engagement_find_by_country"
-    let(:engagement) {Hubspot::EngagementNote.new(example_associated_engagement_hash)}
+    describe ".find_by_company" do
+      cassette "engagement_find_by_country"
+      let(:engagement) {Hubspot::EngagementNote.new(example_associated_engagement_hash)}
 
-    it 'must find by company id' do
-      find_engagements = Hubspot::EngagementNote.find_by_company(engagement.associations["companyIds"].first)
-      find_engagements.should_not be_nil
-      find_engagements.any?{|engagement| engagement.id == engagement.id and engagement.body == engagement.body}.should be_true
+      it 'must find by company id' do
+        find_engagements = Hubspot::EngagementNote.find_by_company(engagement.associations["companyIds"].first)
+        find_engagements.should_not be_nil
+        find_engagements.any?{|engagement| engagement.id == engagement.id and engagement.body == engagement.body}.should be_true
+      end
     end
-  end
 
-  describe ".find_by_contact" do
-    cassette "engagement_find_by_contact"
-    let(:engagement) {Hubspot::EngagementNote.new(example_associated_engagement_hash)}
+    describe ".find_by_contact" do
+      cassette "engagement_find_by_contact"
+      let(:engagement) {Hubspot::EngagementNote.new(example_associated_engagement_hash)}
 
-    it 'must find by contact id' do
-      find_engagements = Hubspot::EngagementNote.find_by_contact(engagement.associations["contactIds"].first)
-      find_engagements.should_not be_nil
-      find_engagements.any?{|engagement| engagement.id == engagement.id and engagement.body == engagement.body}.should be_true
+      it 'must find by contact id' do
+        find_engagements = Hubspot::EngagementNote.find_by_contact(engagement.associations["contactIds"].first)
+        find_engagements.should_not be_nil
+        find_engagements.any?{|engagement| engagement.id == engagement.id and engagement.body == engagement.body}.should be_true
+      end
     end
-  end
 
-  describe ".find_by_association" do
-    cassette "engagement_find_by_association"
+    describe ".find_by_association" do
+      cassette "engagement_find_by_association"
+
+      it 'must raise for fake association type' do
+        expect {
+          Hubspot::EngagementNote.find_by_association(1, 'FAKE_TYPE')
+        }.to raise_error
+      end
+    end
+
+    describe '#destroy!' do
+      cassette 'engagement_destroy'
+
+      let(:engagement) {Hubspot::EngagementNote.create!(nil, 'test note') }
 
-    it 'must raise for fake association type' do
-      expect {
-        Hubspot::EngagementNote.find_by_association(1, 'FAKE_TYPE')
-      }.to raise_error
+      it 'should remove from hubspot' do
+        expect(Hubspot::Engagement.find(engagement.id)).to_not be_nil
+
+        expect(engagement.destroy!).to be_true
+        expect(engagement.destroyed?).to be_true
+
+        expect(Hubspot::Engagement.find(engagement.id)).to be_nil
+      end
     end
   end
 
-  describe '#destroy!' do
-    cassette 'engagement_destroy'
+  describe 'EngagementCall' do
+    let(:example_engagement_hash) do
+      VCR.use_cassette("engagement_call_example") do
+        HTTParty.get("https://api.hubapi.com/engagements/v1/engagements/4709059?hapikey=demo").parsed_response
+      end
+    end
+
+    describe ".create!" do
+      cassette "engagement_call_create"
+      body = "Test call"
+      subject { Hubspot::EngagementCall.create!(nil, body, 0) }
+      its(:id) { should_not be_nil }
+      its(:body) { should eql body }
+    end
+
+    describe ".find" do
+      cassette "engagement_call_find"
+      let(:engagement) { Hubspot::EngagementNote.new(example_engagement_hash) }
+
+      it 'must find by the engagement id' do
+        find_engagement = Hubspot::EngagementNote.find(engagement.id)
+        find_engagement.id.should eql engagement.id
+        find_engagement.body.should eql engagement.body
+      end
+    end
+
+    describe '#destroy!' do
+      cassette 'engagement_call_destroy'
 
-    let(:engagement) {Hubspot::EngagementNote.create!(nil, 'test note') }
+      let(:engagement) { Hubspot::EngagementCall.create!(nil, 'test call', 0) }
 
-    it 'should remove from hubspot' do
-      expect(Hubspot::Engagement.find(engagement.id)).to_not be_nil
+      it 'should remove from hubspot' do
+        expect(Hubspot::Engagement.find(engagement.id)).to_not be_nil
 
-      expect(engagement.destroy!).to be_true
-      expect(engagement.destroyed?).to be_true
+        expect(engagement.destroy!).to be_true
+        expect(engagement.destroyed?).to be_true
 
-      expect(Hubspot::Engagement.find(engagement.id)).to be_nil
+        expect(Hubspot::Engagement.find(engagement.id)).to be_nil
+      end
     end
   end
 end

data/spec/live/deal_pipeline_spec.rb

@@ -0,0 +1,35 @@
+describe 'Deals pipeline API Live test', live: true do
+
+  before do
+    Hubspot.configure hapikey: 'demo'
+  end
+
+  let(:params) do
+    {
+      'label' => 'auto pipeline1',
+      'stages' => [
+        {
+          'label' => 'initial state',
+          'displayOrder' => 0,
+          'probability' => 0.5
+        },
+        {
+          'label' => 'next state',
+          'displayOrder' => 1,
+          'probability' => 0.9
+        }
+      ]
+    }
+  end
+
+  it 'should create, find, update and destroy' do
+    pipeline = Hubspot::DealPipeline.create!(params)
+
+    expect(pipeline.label).to eql 'auto pipeline1'
+    expect(pipeline.stages.size).to eql 2
+    expect(pipeline.stages.first['label']).to eql 'initial state'
+    expect(pipeline.stages[1]['label']).to eql 'next state'
+
+    pipeline.destroy!
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubspot-ruby
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Andrew DiMichele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2017-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -56,16 +56,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -200,7 +200,6 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - Gemfile
-- Gemfile.lock
 - Guardfile
 - LICENSE.txt
 - README.md
@@ -225,8 +224,10 @@ files:
 - lib/hubspot/owner.rb
 - lib/hubspot/properties.rb
 - lib/hubspot/railtie.rb
+- lib/hubspot/subscription.rb
 - lib/hubspot/topic.rb
 - lib/hubspot/utils.rb
+- lib/tasks/properties.rake
 - spec/lib/hubspot-ruby_spec.rb
 - spec/lib/hubspot/blog_spec.rb
 - spec/lib/hubspot/company_properties_spec.rb
@@ -249,6 +250,7 @@ files:
 - spec/live/companies_properties_integration_spec.rb
 - spec/live/contacts_integration_spec.rb
 - spec/live/contacts_properties_integration_spec.rb
+- spec/live/deal_pipeline_spec.rb
 - spec/live/deal_properties_integration_spec.rb
 - spec/live/deals_integration_spec.rb
 - spec/spec_helper.rb
@@ -273,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
 summary: hubspot-ruby is a wrapper for the HubSpot REST API

data/Gemfile.lock

@@ -1,99 +0,0 @@
-PATH
-  remote: .
-  specs:
-    hubspot-ruby (0.2.0)
-      activesupport (>= 3.0.0)
-      httparty (>= 0.10.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activesupport (3.2.12)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    addressable (2.3.6)
-    awesome_print (1.1.0)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    coderay (1.1.0)
-    crack (0.4.2)
-      safe_yaml (~> 1.0.0)
-    diff-lcs (1.2.1)
-    ffi (1.9.6)
-    formatador (0.2.5)
-    guard (2.6.1)
-      formatador (>= 0.2.4)
-      listen (~> 2.7)
-      lumberjack (~> 1.0)
-      pry (>= 0.9.12)
-      thor (>= 0.18.1)
-    guard-rspec (3.1.0)
-      guard (>= 1.8)
-      rspec (~> 2.13)
-    hitimes (1.2.2)
-    httparty (0.10.2)
-      multi_json (~> 1.0)
-      multi_xml (>= 0.5.2)
-    i18n (0.6.4)
-    json (1.8.3)
-    listen (2.7.11)
-      celluloid (>= 0.15.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
-    method_source (0.8.2)
-    multi_json (1.6.1)
-    multi_xml (0.5.3)
-    pry (0.10.1)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (10.4.2)
-    rb-fsevent (0.9.4)
-    rb-inotify (0.9.5)
-      ffi (>= 0.5.0)
-    rdoc (4.0.0)
-      json (~> 1.4)
-    rr (1.0.4)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.0)
-    safe_yaml (1.0.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.6.0)
-    thor (0.19.1)
-    timecop (0.7.1)
-    timers (4.0.1)
-      hitimes
-    vcr (2.4.0)
-    webmock (1.9.3)
-      addressable (>= 2.2.7)
-      crack (>= 0.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  awesome_print
-  bundler
-  guard-rspec
-  hubspot-ruby!
-  rake
-  rdoc
-  rr
-  rspec
-  simplecov
-  timecop
-  vcr
-  webmock (< 1.10)
-
-BUNDLED WITH
-   1.13.2