ruby-pardot 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33f862629251e35bc4abea0f50af5fbd34e83d2b561529107dda17f5c5fe5bf8
-  data.tar.gz: 773061f478695e10e26c2f17ea36ba1a81ee2a241797426e1581a02ac59f24d1
+  metadata.gz: 1e4f6eb36b94bd50088dc0d06fe3b229481a7e8299f7a16c265fef8ffb418d72
+  data.tar.gz: 64c099f9b5477692b9a53f8b727f7775c8a29128963a816d8537dbc790f95b7c
 SHA512:
-  metadata.gz: 439fc348827c87938b93035b7b1d6bcdb6a043e49897041b9b45029b9f95dd3b562db3a3cad345b58dde4b9bb0c21823d311f18c90d4f593562b8d7e695f7f29
-  data.tar.gz: b63c4c6083d3c86d2204ea43638a3133bf619a746d5c355d29a47c4c2dd326a68e1a5a77322183655829be0d0959b335a67f816a5bd7ad30609ef23b7b4325e3
+  metadata.gz: ac9660fa6856fabb229fc9e4f2c29ce8261c0f0b2cdf7026662f5f1d1ebfae42ea149c515f168aa7b9b85f6cea4cdfb5851afc61c37ebb1c436b147e1181c9e5
+  data.tar.gz: 4bacace091e84ee091fcabaf744184720a4d8488b8f5caa365c325bc3e5eec88287c2b460945c13183eed88ccaf835bec86a2bf0054694ec236e6c68383f26e4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-pardot (1.2.0)
+    ruby-pardot (1.3.0)
       crack (= 0.4.3)
       httparty (= 0.13.1)
 
@@ -25,7 +25,7 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
 
 PLATFORMS
   ruby

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
@@ -16,7 +17,8 @@ module Pardot
     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, :body => bodyParams)
+      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

data/lib/pardot/version.rb

@@ -1,3 +1,3 @@
 module Pardot
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/ruby-pardot.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.name        = "ruby-pardot"
   s.version     = Pardot::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Dan Cunning", "Chris Little", "Justin Roberts"]
-  s.email       = ["support@pardot.com", "chris.little@salesforce.com", "justin.roberts@salesforce.com"]
+  s.authors     = ["Dan Cunning"]
+  s.email       = ["support@pardot.com"]
   s.homepage    = "http://github.com/pardot/ruby-pardot"
   s.summary     = "Library for interacting with the Pardot API"
   s.description = "Library for interacting with the Pardot API"

data/spec/pardot/http_spec.rb

@@ -18,7 +18,7 @@ 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)
@@ -31,7 +31,7 @@ describe Pardot::Http do
     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)
@@ -47,7 +47,7 @@ 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)
       
       lambda { post }.should raise_error(Pardot::ResponseError)
@@ -60,7 +60,7 @@ describe Pardot::Http do
     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/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)
@@ -77,7 +77,7 @@ describe Pardot::Http do
     end
     
     it "should notice errors and raise them as Pardot::ResponseError" do
-      fake_get "/api/foo/version/4/bar?api_key=my_api_key&format=simple&user_key=bar",
+      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)
       
       lambda { get }.should raise_error(Pardot::ResponseError)
@@ -90,7 +90,7 @@ describe Pardot::Http do
     end
     
     it "should call handle_expired_api_key when the api key expires" do
-      fake_get "/api/foo/version/4/bar?api_key=my_api_key&format=simple&user_key=bar",
+      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)
       
       @client.should_receive(:handle_expired_api_key)
@@ -107,7 +107,7 @@ describe Pardot::Http do
     end
     
     it "should notice errors and raise them as Pardot::ResponseError" do
-      fake_post "/api/foo/version/4/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">Login failed</err>\n</rsp>\n)
       
       lambda { post }.should raise_error(Pardot::ResponseError)
@@ -120,7 +120,7 @@ describe Pardot::Http do
     end
     
     it "should call handle_expired_api_key when the api key expires" do
-      fake_post "/api/foo/version/4/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)

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
+    fake_get "/api/email/version/3/do/read/id/12?format=simple", sample_response
     @client.emails.read_by_id(12).should == {"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
+    fake_post '/api/email/version/3/do/send/prospect_id/42?campaign_id=765&email_template_id=86&format=simple', sample_response
     @client.emails.send_to_prospect(42, :campaign_id => 765, :email_template_id => 86).should == {"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
+    fake_post '/api/email/version/3/do/send?email_template_id=200&list_ids[]=235&campaign_id=654&format=simple', sample_response
     @client.emails.send_to_list(:email_template_id => 200, 'list_ids[]' => 235, :campaign_id => 654).should == {"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, 
         "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, 
         "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
+      fake_post "/api/opportunity/version/3/do/create/prospect_email/user@test.com?type=Good&format=simple&name=Jim", sample_results
       
       @client.opportunities.create_by_email("user@test.com", :name => "Jim", :type => "Good").should == {"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,
         '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' }
+      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
+      fake_post '/api/prospectAccount/version/3/do/create?format=simple&name=SuperPanda', sample_results
 
       @client.prospect_accounts.create(:name => 'SuperPanda').should == {"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, 
         "prospect"=>[
           {"last_name"=>"Smith", "first_name"=>"Jim"}, 
           {"last_name"=>"Green", "first_name"=>"Sue"}
         ]}
+      assert_authorization_header
     end
     
   end
@@ -50,10 +51,10 @@ 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
+      fake_post "/api/prospect/version/3/do/create/email/user@test.com?format=simple&first_name=Jim", sample_results
       
       @client.prospects.create("user@test.com", :first_name => "Jim").should == {"last_name"=>"Smith", "first_name"=>"Jim"}
-      
+      assert_authorization_header
     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, 
         "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
+      fake_post "/api/user/version/3/do/read/email/user@test.com?format=simple", sample_results
       
       @client.users.read_by_email("user@test.com").should == {"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, 
         "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
+      fake_post "/api/visitorActivity/version/3/do/read/id/10?format=simple", sample_results
       
       @client.visitor_activities.read(10).should == {"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, 
         "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
+      fake_post "/api/visitor/version/3/do/assign/id/10?type=Good&format=simple&name=Jim", sample_results
       
       @client.visitors.assign(10, :name => "Jim", :type => "Good").should == {"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, 
         "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
+      fake_post "/api/visit/version/3/do/read/id/10?format=simple", sample_results
       
       @client.visits.read(10).should == {"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,16 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pardot
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Dan Cunning
-- Chris Little
-- Justin Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
@@ -85,8 +83,6 @@ dependencies:
 description: Library for interacting with the Pardot API
 email:
 - support@pardot.com
-- chris.little@salesforce.com
-- justin.roberts@salesforce.com
 executables: []
 extensions: []
 extra_rdoc_files: []