ruby-pardot 1.0.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9b5a3bceaeff6bb81efc73dfc2ee2fb51e3fce2e
-  data.tar.gz: cdc11f89e0415c6b3d0484d7fe67147a3b8a087e
+SHA256:
+  metadata.gz: e618137557812f8899ff1d06b37bedb49d72cc51e191a091c15b5135780e3bd5
+  data.tar.gz: 22b0992ead0f91fa432af3ccfbad1ea1b1cb65080c7898b8ed9cc9695fbcfa64
 SHA512:
-  metadata.gz: 69f994887ac58cf22de6f963d1793f4dfb0ba35cb3adedc4d3baf3fcabd766ce187bb31047de526545488cbe951c7e31d29872bfe75d5029a675254c7fe60817
-  data.tar.gz: 013ffa24e4853541125c89bcb08c90ce88de3db3a0cd2475fba4bc787682f1e8fd1a9e91550cc1ea702e74c282b8b818e2fa254cba29699a0471a612cc108b16
+  metadata.gz: 3038da0a48d2608cb4395e4ec8ce0a8fcbd3962357279a4ce76b9e74eb936ea22f4942ded8261aa9507af0bb93501b0a07a8c91b05f1fdb6c1b7fb3cf188c87a
+  data.tar.gz: 7fffe6dd67e999a0c294c170dea8929e2885b4957d08bdfc812338696497db02af39015751fed5ea708b9e5090d09fbbb8594f20b548ad4c5a1d5e16e0b5577f

data/Gemfile.lock

@@ -1,37 +1,47 @@
 PATH
   remote: .
   specs:
-    ruby-pardot (1.0.2)
-      crack
-      httparty
+    ruby-pardot (1.3.2)
+      crack (= 0.4.3)
+      httparty (= 0.18.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    crack (0.4.2)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    diff-lcs (1.1.2)
+    diff-lcs (1.4.4)
     fakeweb (1.3.0)
-    httparty (0.13.1)
-      json (~> 1.8)
+    httparty (0.18.1)
+      mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    json (1.8.1)
-    multi_xml (0.5.5)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    safe_yaml (1.0.3)
+    mime-types (3.3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2020.0512)
+    multi_xml (0.6.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    safe_yaml (1.0.5)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (>= 1.10)
   fakeweb
-  rspec
+  rspec (= 3.5.0)
   ruby-pardot!
+
+BUNDLED WITH
+   2.1.4

data/README.rdoc

@@ -10,6 +10,8 @@ Add the following to your Gemfile
 
 The client will authenticate before performing other API calls, but you can manually authenticate as well
 
+  require "ruby-pardot"
+
   client = Pardot::Client.new email, password, user_key
   
   # will raise a Pardot::ResponseError if login fails
@@ -20,6 +22,7 @@ The client will authenticate before performing other API calls, but you can manu
 
 The available objects are:
 
+* custom_fields 
 * emails
 * lists
 * opportunities

data/lib/pardot/authentication.rb

@@ -2,7 +2,8 @@ module Pardot
   module Authentication
     
     def authenticate
-      resp = post "login", nil, :email => @email, :password => @password, :user_key => @user_key
+      resp = post "login", nil, nil, nil, :email => @email, :password => @password, :user_key => @user_key
+      update_version(resp["version"]) if resp && resp["version"]
       @api_key = resp && resp["api_key"]
     end
     
@@ -14,6 +15,15 @@ module Pardot
       @api_key = nil
       authenticate
     end
-    
+
+    private
+
+    def update_version version
+      if version.is_a? Array
+        version = version.last
+      end
+      @version = version if version.to_i > 3
+    end
+
   end
 end

data/lib/pardot/client.rb

@@ -9,6 +9,7 @@ module Pardot
     include Authentication
     include Http
 
+    include Objects::CustomFields
     include Objects::Emails
     include Objects::Lists
     include Objects::ListMemberships
@@ -20,16 +21,16 @@ module Pardot
     include Objects::Visits
     include Objects::VisitorActivities
 
-    attr_accessor :email, :password, :user_key, :api_key, :format
+    attr_accessor :email, :password, :user_key, :api_key, :version, :format
 
-    def initialize email, password, user_key
+    def initialize email, password, user_key, version = 3
       @email = email
       @password = password
       @user_key = user_key
+      @version = version
 
       @format = "simple"
     end
 
-
   end
 end

data/lib/pardot/http.rb

@@ -4,7 +4,8 @@ module Pardot
     def get object, path, params = {}, num_retries = 0
       smooth_params object, params
       full_path = fullpath object, path
-      check_response self.class.get(full_path, :query => params)
+      headers = create_auth_header object
+      check_response self.class.get(full_path, :query => params, :headers => headers)
       
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :get, object, path, params, num_retries, e
@@ -13,10 +14,11 @@ module Pardot
       raise Pardot::NetError.new(e)
     end
     
-    def post object, path, params = {}, num_retries = 0
+    def post object, path, params = {}, num_retries = 0, bodyParams = {}
       smooth_params object, params
       full_path = fullpath object, path
-      check_response self.class.post(full_path, :query => params)
+      headers = create_auth_header object
+      check_response self.class.post(full_path, :query => params, :body => bodyParams, :headers => headers)
       
     rescue Pardot::ExpiredApiKeyError => e
       handle_expired_api_key :post, object, path, params, num_retries, e
@@ -39,7 +41,12 @@ module Pardot
       return if object == "login"
       
       authenticate unless authenticated?
-      params.merge! :user_key => @user_key, :api_key => @api_key, :format => @format
+      params.merge! :format => @format
+    end
+
+    def create_auth_header object
+      return if object == "login"
+      { :Authorization => "Pardot api_key=#{@api_key}, user_key=#{@user_key}" }
     end
     
     def check_response http_response
@@ -58,8 +65,8 @@ module Pardot
       rsp
     end
     
-    def fullpath object, path, version = 3
-      full = File.join("/api", object, "version", version.to_s)
+    def fullpath object, path
+      full = File.join("/api", object, "version", @version.to_s)
       unless path.nil?
         full = File.join(full, path)
       end

data/lib/pardot/objects/custom_fields.rb

@@ -0,0 +1,37 @@
+module Pardot
+  module Objects
+    module CustomFields
+      
+      def custom_fields
+        @custom_fields ||= CustomFields.new self
+      end
+      
+      class CustomFields
+        
+        def initialize client
+          @client = client
+        end
+        
+        def query params
+          result = get "/do/query", params, "result"
+          result["total_results"] = result["total_results"].to_i if result["total_results"]
+          result
+        end
+        
+        protected
+        
+        def get path, params = {}, result = "customField"
+          response = @client.get "customField", path, params
+          result ? response[result] : response
+        end
+        
+        def post path, params = {}, result = "user"
+          response = @client.post "customField", path, params
+          result ? response[result] : response
+        end
+        
+      end
+      
+    end
+  end
+end

data/lib/pardot/objects/prospects.rb

@@ -1,73 +1,111 @@
+require 'cgi'
+
 module Pardot
   module Objects
     module Prospects
-      
+
       def prospects
         @prospects ||= Prospects.new self
       end
-      
+
       class Prospects
-        
+
         def initialize client
           @client = client
         end
-        
+
         def query search_criteria
           result = get "/do/query", search_criteria, "result"
           result["total_results"] = result["total_results"].to_i if result["total_results"]
           result
         end
-        
+
         def assign_by_email email, params
-          post "/do/assign/email/#{email}", params
+          post "/do/assign/email/#{CGI.escape(email)}", params
         end
-        
+
         def assign_by_id id, params
-          post "/do/assign/id/#{id}", params
+          post "/do/assign/id/#{CGI.escape(id)}", params
         end
-        
+
+        def assign_by_fid fid, params
+          post "/do/assign/fid/#{CGI.escape(fid)}", params
+        end
+
         def create email, params = {}
-          post "/do/create/email/#{email}", params
+          post "/do/create/email/#{CGI.escape(email)}", params
+        end
+
+        def delete_by_id id, params = {}
+          post "/do/delete/id/#{CGI.escape(id)}", params
+        end
+
+        def delete_by_fid fid, params = {}
+          post "/do/delete/fid/#{CGI.escape(fid)}", params
         end
-        
+
         def read_by_email email, params = {}
-          post "/do/read/email/#{email}", params
+          post "/do/read/email/#{CGI.escape(email)}", params
         end
-        
+
         def read_by_id id, params = {}
-          post "/do/read/id/#{id}", params
+          post "/do/read/id/#{CGI.escape(id)}", params
+        end
+
+        def read_by_fid fid, params = {}
+          post "/do/read/fid/#{CGI.escape(fid)}", params
+        end
+
+        def unassign_by_email email, params = {}
+          post "/do/unassign/email/#{CGI.escape(email)}", params
         end
-        
+
+        def unassign_by_id id, params = {}
+          post "/do/unassign/id/#{CGI.escape(id)}", params
+        end
+
+        def unassign_by_fid fid, params = {}
+          post "/do/unassign/fid/#{CGI.escape(fid)}", params
+        end
+
         def update_by_email email, params = {}
-          post "/do/update/email/#{email}", params
+          post "/do/update/email/#{CGI.escape(email)}", params
         end
-        
+
         def update_by_id id, params = {}
-          post "/do/update/id/#{id}", params
+          post "/do/update/id/#{CGI.escape(id)}", params
         end
-        
+
+        def update_by_fid fid, params = {}
+          post "/do/update/fid/#{CGI.escape(fid)}", params
+        end
+
         def upsert_by_email email, params = {}
-          post "/do/upsert/email/#{email}", params
+          post "/do/upsert/email/#{CGI.escape(email)}", params
         end
-        
+
         def upsert_by_id id, params = {}
-          post "/do/upsert/id/#{id}", params
+          post "/do/upsert/id/#{CGI.escape(id)}", params
+        end
+
+        def upsert_by_fid fid, params = {}
+          post "/do/upsert/fid/#{CGI.escape(fid)}", params
         end
-        
+
         protected
-        
+
         def get path, params = {}, result = "prospect"
           response = @client.get "prospect", path, params
           result ? response[result] : response
         end
-        
+
         def post path, params = {}, result = "prospect"
           response = @client.post "prospect", path, params
           result ? response[result] : response
         end
-        
+
       end
-      
+
     end
   end
 end

data/lib/pardot/version.rb

@@ -1,3 +1,3 @@
 module Pardot
-  VERSION = "1.0.2"
+  VERSION = "1.3.2"
 end

data/lib/ruby-pardot.rb

@@ -6,6 +6,7 @@ require 'pardot/http'
 require 'pardot/error'
 require 'pardot/authentication'
 
+require 'pardot/objects/custom_fields'
 require 'pardot/objects/emails'
 require 'pardot/objects/lists'
 require 'pardot/objects/list_memberships'

data/ruby-pardot.gemspec

@@ -14,11 +14,11 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "ruby-pardot"
 
-  s.add_dependency "crack"
-  s.add_dependency "httparty"
+  s.add_dependency "crack", "0.4.3"
+  s.add_dependency "httparty", "0.18.1"
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "bundler", ">= 1.10"
+  s.add_development_dependency "rspec", "3.5.0"
   s.add_development_dependency "fakeweb"
 
   s.files        = `git ls-files`.split("\n")

data/spec/pardot/authentication_spec.rb

@@ -11,26 +11,79 @@ describe Pardot::Authentication do
     before do
       @client = create_client
       
-      fake_post "/api/login/version/3?email=user%40test.com&password=foo&user_key=bar",
+      fake_post "/api/login/version/3",
                 %(<?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="ok" version="1.0">\n   <api_key>my_api_key</api_key>\n</rsp>\n)
     end
     
     def authenticate
       @client.authenticate
     end
+
+    def verifyBody
+      expect(FakeWeb.last_request.body).to eq('email=user%40test.com&password=foo&user_key=bar')
+    end
     
     it "should return the api key" do
-      authenticate.should == "my_api_key"
+      expect(authenticate).to eq("my_api_key")
     end
     
     it "should set the api key" do
       authenticate
-      @client.api_key.should == "my_api_key"
+      expect(@client.api_key).to eq("my_api_key")
+      verifyBody
     end
     
     it "should make authenticated? true" do
       authenticate
-      @client.authenticated?.should == true
+      expect(@client.authenticated?).to eq(true)
+      verifyBody
+    end
+
+    it "should use version 3" do
+      authenticate
+      expect(@client.version.to_i).to eq(3)
+      verifyBody
+    end
+    
+  end
+
+  describe "authenticateV4" do
+    
+    before do
+      @client = create_client
+      
+      fake_post "/api/login/version/3",
+                %(<?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="ok" version="1.0">\n   <api_key>my_api_key</api_key>\n<version>4</version>\n</rsp>\n)
+    end
+    
+    def authenticate
+      @client.authenticate
+    end
+
+    def verifyBody
+      expect(FakeWeb.last_request.body).to eq('email=user%40test.com&password=foo&user_key=bar')
+    end
+    
+    it "should return the api key" do
+      expect(authenticate).to eq("my_api_key")
+    end
+    
+    it "should set the api key" do
+      authenticate
+      expect(@client.api_key).to eq("my_api_key")
+      verifyBody
+    end
+    
+    it "should make authenticated? true" do
+      authenticate
+      expect(@client.authenticated?).to eq(true)
+      verifyBody
+    end
+
+    it "should use version 4" do
+      authenticate
+      expect(@client.version.to_i).to eq(4)
+      verifyBody
     end
     
   end

data/spec/pardot/client_spec.rb

@@ -0,0 +1,28 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Pardot::Client do
+  
+  def create_client
+    @client = Pardot::Client.new "user@test.com", "foo", "bar"
+  end
+  
+  describe "client" do
+    after do
+      expect(@client.email).to eq("user@test.com")
+      expect(@client.password).to eq("password")
+      expect(@client.user_key).to eq("user_key")
+      expect(@client.format).to eq("simple")
+    end
+
+    it "should set variables without version" do
+      @client = Pardot::Client.new "user@test.com", "password", "user_key"
+      expect(@client.version).to eq(3)
+    end
+    
+    it "should set variables with version" do
+      @client = Pardot::Client.new "user@test.com", "password", "user_key", 4
+      expect(@client.version).to eq(4)
+    end
+
+  end
+end

data/spec/pardot/error_spec.rb

@@ -21,10 +21,10 @@ describe Pardot::ResponseError do
       described_class.new(@res)
     end
     specify do
-      subject.to_s.should == @res["__content__"]
+      expect(subject.to_s).to eq(@res["__content__"])
     end
     specify do
-      subject.message.should == @res["__content__"]
+      expect(subject.message).to eq(@res["__content__"])
     end
   end
 

data/spec/pardot/http_spec.rb

@@ -18,23 +18,24 @@ describe Pardot::Http do
     end
     
     it "should notice errors and raise them as Pardot::ResponseError" do
-      fake_get "/api/foo/version/3/bar?api_key=my_api_key&format=simple&user_key=bar",
+      fake_get "/api/foo/version/3/bar?format=simple",
                %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Login failed</err>\n</rsp>\n)
       
-      lambda { get }.should raise_error(Pardot::ResponseError)
+
+      expect(lambda { get }).to raise_error(Pardot::ResponseError)
     end
     
     it "should catch and reraise SocketErrors as Pardot::NetError" do
-      Pardot::Client.should_receive(:get).and_raise(SocketError)
+      expect(Pardot::Client).to receive(:get).and_raise(SocketError)
       
-      lambda { get }.should raise_error(Pardot::NetError)
+      expect(lambda { get }).to raise_error(Pardot::NetError)
     end
     
     it "should call handle_expired_api_key when the api key expires" do
-      fake_get "/api/foo/version/3/bar?api_key=my_api_key&format=simple&user_key=bar",
+      fake_get "/api/foo/version/3/bar?format=simple",
                %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Invalid API key or user key</err>\n</rsp>\n)
       
-      @client.should_receive(:handle_expired_api_key)
+      expect(@client).to receive(:handle_expired_api_key)
       get
     end
     
@@ -47,23 +48,83 @@ describe Pardot::Http do
     end
     
     it "should notice errors and raise them as Pardot::ResponseError" do
-      fake_post "/api/foo/version/3/bar?api_key=my_api_key&format=simple&user_key=bar",
+      fake_post "/api/foo/version/3/bar?format=simple",
+                %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Login failed</err>\n</rsp>\n)
+      
+      expect(lambda { post }).to raise_error(Pardot::ResponseError)
+    end
+    
+    it "should catch and reraise SocketErrors as Pardot::NetError" do
+      expect(Pardot::Client).to receive(:post).and_raise(SocketError)
+      
+      expect(lambda { post }).to raise_error(Pardot::NetError)
+    end
+    
+    it "should call handle_expired_api_key when the api key expires" do
+      fake_post "/api/foo/version/3/bar?format=simple",
+                %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Invalid API key or user key</err>\n</rsp>\n)
+      
+      expect(@client).to receive(:handle_expired_api_key)
+      post
+    end
+    
+  end
+
+  describe "getV4" do
+    
+    def get object = "foo", path = "/bar", params = {}
+      @client.version = "4"
+      @client.get object, path, params
+    end
+    
+    it "should notice errors and raise them as Pardot::ResponseError" do
+      fake_get "/api/foo/version/4/bar?format=simple",
+               %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Login failed</err>\n</rsp>\n)
+      
+      expect(lambda { get }).to raise_error(Pardot::ResponseError)
+    end
+    
+    it "should catch and reraise SocketErrors as Pardot::NetError" do
+      expect(Pardot::Client).to receive(:get).and_raise(SocketError)
+      
+      expect(lambda { get }).to raise_error(Pardot::NetError)
+    end
+    
+    it "should call handle_expired_api_key when the api key expires" do
+      fake_get "/api/foo/version/4/bar?format=simple",
+               %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Invalid API key or user key</err>\n</rsp>\n)
+      
+      expect(@client).to receive(:handle_expired_api_key)
+      get
+    end
+    
+  end
+  
+  describe "postV4" do
+    
+    def post object = "foo", path = "/bar", params = {}
+      @client.version = "4"
+      @client.post object, path, params
+    end
+    
+    it "should notice errors and raise them as Pardot::ResponseError" do
+      fake_post "/api/foo/version/4/bar?format=simple",
                 %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Login failed</err>\n</rsp>\n)
       
-      lambda { post }.should raise_error(Pardot::ResponseError)
+      expect(lambda { post }).to raise_error(Pardot::ResponseError)
     end
     
     it "should catch and reraise SocketErrors as Pardot::NetError" do
-      Pardot::Client.should_receive(:post).and_raise(SocketError)
+      expect(Pardot::Client).to receive(:post).and_raise(SocketError)
       
-      lambda { post }.should raise_error(Pardot::NetError)
+      expect(lambda { post }).to raise_error(Pardot::NetError)
     end
     
     it "should call handle_expired_api_key when the api key expires" do
-      fake_post "/api/foo/version/3/bar?api_key=my_api_key&format=simple&user_key=bar",
+      fake_post "/api/foo/version/4/bar?format=simple",
                 %(?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="fail" version="1.0">\n   <err code="15">Invalid API key or user key</err>\n</rsp>\n)
       
-      @client.should_receive(:handle_expired_api_key)
+      expect(@client).to receive(:handle_expired_api_key)
       post
     end
     

data/spec/pardot/objects/custom_fields_spec.rb

@@ -0,0 +1,58 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+describe Pardot::Objects::CustomFields do
+  
+  before do
+    @client = create_client
+  end
+  
+  describe "query" do
+    
+    def sample_results
+      %(<?xml version="1.0" encoding="UTF-8"?>\n<rsp stat="ok" version="1.0">
+        <result>
+          <total_results>1</total_results>
+            <customField>
+              <created_at>2019-11-26 13:40:37</created_at>
+              <crm_id null="true" />
+              <field_id>CustomObject1574793618883</field_id>
+              <id>8932</id>
+              <is_record_multiple_responses>false</is_record_multiple_responses>
+              <is_use_values>false</is_use_values>
+              <name>Ω≈ç√∫˜µ≤≥÷</name>
+              <type>Text</type>
+              <type_id>1</type_id>
+              <updated_at>2019-11-26 13:40:37</updated_at>
+          </customField>
+        </result>
+      </rsp>)
+    end
+    
+    before do
+      @client = create_client
+    end
+    
+    it "should take in some arguments" do
+      fake_get "/api/customField/version/3/do/query?id_greater_than=200&format=simple", sample_results
+      
+      expect(@client.custom_fields.query(:id_greater_than => 200)).to eq({"total_results" => 1, 
+        "customField"=>
+          {
+            "id"=>"8932",
+            "name"=>"Ω≈ç√∫˜µ≤≥÷",
+            "field_id"=>"CustomObject1574793618883",
+            "type"=>"Text",
+            "type_id"=>"1",
+            "crm_id"=>{"null"=>"true"},
+            "is_record_multiple_responses"=>"false",
+            "is_use_values"=>"false",
+            "created_at"=>"2019-11-26 13:40:37",
+            "updated_at"=>"2019-11-26 13:40:37"
+          }
+        })
+      assert_authorization_header
+    end
+    
+  end
+  
+end

data/spec/pardot/objects/emails_spec.rb

@@ -19,18 +19,21 @@ describe Pardot::Objects::Emails do
   end
 
   it "should take in the email ID" do
-    fake_get "/api/email/version/3/do/read/id/12?user_key=bar&api_key=my_api_key&format=simple", sample_response
-    @client.emails.read_by_id(12).should == {"name" => "My Email"}
+    fake_get "/api/email/version/3/do/read/id/12?format=simple", sample_response
+    expect(@client.emails.read_by_id(12)).to eq({"name" => "My Email"})
+    assert_authorization_header
   end
 
   it 'should send to a prospect' do
-    fake_post '/api/email/version/3/do/send/prospect_id/42?campaign_id=765&email_template_id=86&user_key=bar&api_key=my_api_key&format=simple', sample_response
-    @client.emails.send_to_prospect(42, :campaign_id => 765, :email_template_id => 86).should == {"name" => "My Email"}
+    fake_post '/api/email/version/3/do/send/prospect_id/42?campaign_id=765&email_template_id=86&format=simple', sample_response
+    expect(@client.emails.send_to_prospect(42, :campaign_id => 765, :email_template_id => 86)).to eq({"name" => "My Email"})
+    assert_authorization_header
   end
 
   it 'should send to a list' do
-    fake_post '/api/email/version/3/do/send?email_template_id=200&list_ids[]=235&campaign_id=654&user_key=bar&api_key=my_api_key&format=simple', sample_response
-    @client.emails.send_to_list(:email_template_id => 200, 'list_ids[]' => 235, :campaign_id => 654).should == {"name" => "My Email"}
+    fake_post '/api/email/version/3/do/send?email_template_id=200&list_ids[]=235&campaign_id=654&format=simple', sample_response
+    expect(@client.emails.send_to_list(:email_template_id => 200, 'list_ids[]' => 235, :campaign_id => 654)).to eq({"name" => "My Email"})
+    assert_authorization_header
   end
 
 end

data/spec/pardot/objects/lists_spec.rb

@@ -27,13 +27,14 @@ describe Pardot::Objects::Lists do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/list/version/3/do/query?api_key=my_api_key&id_greater_than=200&format=simple&user_key=bar", sample_results
+      fake_get "/api/list/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.lists.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.lists.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "list"=>[
           {"name"=>"Asdf List"}, 
           {"name"=>"Qwerty List"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end

data/spec/pardot/objects/opportunities_spec.rb

@@ -29,13 +29,14 @@ describe Pardot::Objects::Opportunities do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/opportunity/version/3/do/query?api_key=my_api_key&id_greater_than=200&format=simple&user_key=bar", sample_results
+      fake_get "/api/opportunity/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.opportunities.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.opportunities.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "opportunity"=>[
           {"type"=>"Great", "name"=>"Jim"}, 
           {"type"=>"Good", "name"=>"Sue"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -53,10 +54,11 @@ describe Pardot::Objects::Opportunities do
     end
     
     it "should return the prospect" do
-      fake_post "/api/opportunity/version/3/do/create/prospect_email/user@test.com?type=Good&api_key=my_api_key&user_key=bar&format=simple&name=Jim", sample_results
-      
-      @client.opportunities.create_by_email("user@test.com", :name => "Jim", :type => "Good").should == {"name"=>"Jim", "type"=>"Good"}
+      fake_post "/api/opportunity/version/3/do/create/prospect_email/user@test.com?type=Good&format=simple&name=Jim", sample_results
       
+      expect(@client.opportunities.create_by_email("user@test.com", :name => "Jim", :type => "Good")).to eq({"name"=>"Jim", "type"=>"Good"})
+
+      assert_authorization_header
     end
     
   end

data/spec/pardot/objects/prospect_accounts_spec.rb

@@ -24,13 +24,14 @@ describe Pardot::Objects::ProspectAccounts do
     end
 
     it "should take in some arguments and respond with valid items" do
-      fake_get "/api/prospectAccount/version/3/do/query?assigned=true&format=simple&user_key=bar&api_key=my_api_key", sample_results
+      fake_get "/api/prospectAccount/version/3/do/query?assigned=true&format=simple", sample_results
 
-      @client.prospect_accounts.query(:assigned => true).should == {'total_results' => 2,
+      expect(@client.prospect_accounts.query(:assigned => true)).to eq({'total_results' => 2,
         'prospectAccount'=>[
           {'name'=>'Spaceships R Us'},
           {'name'=>'Monsters Inc'}
-        ]}
+        ]})
+      assert_authorization_header
     end
 
   end
@@ -47,9 +48,10 @@ describe Pardot::Objects::ProspectAccounts do
     end
 
     it 'should return a valid account' do
-      fake_post '/api/prospectAccount/version/3/do/read/id/1234?assigned=true&format=simple&user_key=bar&api_key=my_api_key', sample_results
+      fake_post '/api/prospectAccount/version/3/do/read/id/1234?assigned=true&format=simple', sample_results
 
-      @client.prospect_accounts.read('1234', :assigned => true).should == {'id' => '1234', 'name' => 'SupaDupaPanda' }
+      expect(@client.prospect_accounts.read('1234', :assigned => true)).to eq({'id' => '1234', 'name' => 'SupaDupaPanda' })
+      assert_authorization_header
     end
 
   end
@@ -67,10 +69,10 @@ describe Pardot::Objects::ProspectAccounts do
     end
 
     it 'should return the prospect account' do
-      fake_post '/api/prospectAccount/version/3/do/create?api_key=my_api_key&user_key=bar&format=simple&name=SuperPanda', sample_results
-
-      @client.prospect_accounts.create(:name => 'SuperPanda').should == {"name"=>"SuperPanda"}
+      fake_post '/api/prospectAccount/version/3/do/create?format=simple&name=SuperPanda', sample_results
 
+      expect(@client.prospect_accounts.create(:name => 'SuperPanda')).to eq({"name"=>"SuperPanda"})
+      assert_authorization_header
     end
 
   end

data/spec/pardot/objects/prospects_spec.rb

@@ -26,13 +26,14 @@ describe Pardot::Objects::Prospects do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/prospect/version/3/do/query?assigned=true&format=simple&user_key=bar&api_key=my_api_key", sample_results
+      fake_get "/api/prospect/version/3/do/query?assigned=true&format=simple", sample_results
       
-      @client.prospects.query(:assigned => true).should == {"total_results" => 2, 
+      expect(@client.prospects.query(:assigned => true)).to eq({"total_results" => 2, 
         "prospect"=>[
           {"last_name"=>"Smith", "first_name"=>"Jim"}, 
           {"last_name"=>"Green", "first_name"=>"Sue"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -50,12 +51,12 @@ describe Pardot::Objects::Prospects do
     end
     
     it "should return the prospect" do
-      fake_post "/api/prospect/version/3/do/create/email/user@test.com?api_key=my_api_key&user_key=bar&format=simple&first_name=Jim", sample_results
-      
-      @client.prospects.create("user@test.com", :first_name => "Jim").should == {"last_name"=>"Smith", "first_name"=>"Jim"}
-      
+      fake_post "/api/prospect/version/3/do/create/email/user%40test.com?first_name=Jim&format=simple", sample_results
+
+      expect(@client.prospects.create("user@test.com", :first_name => "Jim")).to eq({"last_name"=>"Smith", "first_name"=>"Jim"})
+      assert_authorization_header
     end
     
   end
   
-end
+end

data/spec/pardot/objects/users_spec.rb

@@ -29,13 +29,14 @@ describe Pardot::Objects::Users do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/user/version/3/do/query?api_key=my_api_key&user_key=bar&id_greater_than=200&format=simple", sample_results
+      fake_get "/api/user/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.users.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.users.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "user"=>[
           {"email"=>"user@test.com", "first_name"=>"Jim"}, 
           {"email"=>"user@example.com", "first_name"=>"Sue"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -53,10 +54,10 @@ describe Pardot::Objects::Users do
     end
     
     it "should return the prospect" do
-      fake_post "/api/user/version/3/do/read/email/user@test.com?api_key=my_api_key&user_key=bar&format=simple", sample_results
-      
-      @client.users.read_by_email("user@test.com").should == {"email"=>"user@example.com", "first_name"=>"Sue"}
+      fake_post "/api/user/version/3/do/read/email/user@test.com?format=simple", sample_results
       
+      expect(@client.users.read_by_email("user@test.com")).to eq({"email"=>"user@example.com", "first_name"=>"Sue"})
+      assert_authorization_header
     end
     
   end

data/spec/pardot/objects/visitor_activities_spec.rb

@@ -29,13 +29,14 @@ describe Pardot::Objects::VisitorActivities do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/visitorActivity/version/3/do/query?user_key=bar&api_key=my_api_key&id_greater_than=200&format=simple", sample_results
+      fake_get "/api/visitorActivity/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.visitor_activities.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.visitor_activities.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "visitorActivity"=>[
           {"type_name"=>"Read", "details"=>"Some details"}, 
           {"type_name"=>"Write", "details"=>"More details"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -53,10 +54,10 @@ describe Pardot::Objects::VisitorActivities do
     end
     
     it "should return the prospect" do
-      fake_post "/api/visitorActivity/version/3/do/read/id/10?user_key=bar&api_key=my_api_key&format=simple", sample_results
-      
-      @client.visitor_activities.read(10).should == {"details"=>"More details", "type_name"=>"Write"}
+      fake_post "/api/visitorActivity/version/3/do/read/id/10?format=simple", sample_results
       
+      expect(@client.visitor_activities.read(10)).to eq({"details"=>"More details", "type_name"=>"Write"})
+      assert_authorization_header
     end
     
   end

data/spec/pardot/objects/visitors_spec.rb

@@ -29,13 +29,14 @@ describe Pardot::Objects::Visitors do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/visitor/version/3/do/query?api_key=my_api_key&user_key=bar&id_greater_than=200&format=simple", sample_results
+      fake_get "/api/visitor/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.visitors.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.visitors.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "visitor"=>[
           {"browser"=>"Firefox", "language"=>"en"}, 
           {"browser"=>"Chrome", "language"=>"es"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -53,10 +54,10 @@ describe Pardot::Objects::Visitors do
     end
     
     it "should return the prospect" do
-      fake_post "/api/visitor/version/3/do/assign/id/10?type=Good&api_key=my_api_key&user_key=bar&format=simple&name=Jim", sample_results
-      
-      @client.visitors.assign(10, :name => "Jim", :type => "Good").should == {"browser"=>"Chrome", "language"=>"es"}
+      fake_post "/api/visitor/version/3/do/assign/id/10?type=Good&format=simple&name=Jim", sample_results
       
+      expect(@client.visitors.assign(10, :name => "Jim", :type => "Good")).to eq({"browser"=>"Chrome", "language"=>"es"})
+      assert_authorization_header
     end
     
   end

data/spec/pardot/objects/visits_spec.rb

@@ -29,13 +29,14 @@ describe Pardot::Objects::Visits do
     end
     
     it "should take in some arguments" do
-      fake_get "/api/visit/version/3/do/query?api_key=my_api_key&user_key=bar&id_greater_than=200&format=simple", sample_results
+      fake_get "/api/visit/version/3/do/query?id_greater_than=200&format=simple", sample_results
       
-      @client.visits.query(:id_greater_than => 200).should == {"total_results" => 2, 
+      expect(@client.visits.query(:id_greater_than => 200)).to eq({"total_results" => 2, 
         "visit"=>[
           {"duration_in_seconds"=>"50", "visitor_page_view_count"=>"3"}, 
           {"duration_in_seconds"=>"10", "visitor_page_view_count"=>"1"}
-        ]}
+        ]})
+      assert_authorization_header
     end
     
   end
@@ -53,10 +54,10 @@ describe Pardot::Objects::Visits do
     end
     
     it "should return the prospect" do
-      fake_post "/api/visit/version/3/do/read/id/10?user_key=bar&api_key=my_api_key&format=simple", sample_results
-      
-      @client.visits.read(10).should == {"visitor_page_view_count"=>"1", "duration_in_seconds"=>"10"}
+      fake_post "/api/visit/version/3/do/read/id/10?format=simple", sample_results
       
+      expect(@client.visits.read(10)).to eq({"visitor_page_view_count"=>"1", "duration_in_seconds"=>"10"})
+      assert_authorization_header
     end
     
   end

data/spec/support/fakeweb.rb

@@ -12,3 +12,7 @@ end
 def fake_authenticate client, api_key
   client.api_key = api_key
 end
+
+def assert_authorization_header
+  expect(FakeWeb.last_request[:authorization]).to eq('Pardot api_key=my_api_key, user_key=bar')
+end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pardot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Dan Cunning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2020-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: fakeweb
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/pardot/client.rb
 - lib/pardot/error.rb
 - lib/pardot/http.rb
+- lib/pardot/objects/custom_fields.rb
 - lib/pardot/objects/emails.rb
 - lib/pardot/objects/list_memberships.rb
 - lib/pardot/objects/lists.rb
@@ -111,8 +112,10 @@ files:
 - lib/ruby-pardot.rb
 - ruby-pardot.gemspec
 - spec/pardot/authentication_spec.rb
+- spec/pardot/client_spec.rb
 - spec/pardot/error_spec.rb
 - spec/pardot/http_spec.rb
+- spec/pardot/objects/custom_fields_spec.rb
 - spec/pardot/objects/emails_spec.rb
 - spec/pardot/objects/lists_spec.rb
 - spec/pardot/objects/opportunities_spec.rb
@@ -143,8 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubyforge_project: ruby-pardot
-rubygems_version: 2.4.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Library for interacting with the Pardot API