ruby-pardot 1.2.0 → 1.4.1

data/lib/pardot/objects/users.rb

@@ -1,45 +1,41 @@
 module Pardot
   module Objects
     module Users
-      
       def users
         @users ||= Users.new self
       end
-      
+
       class Users
-        
-        def initialize client
+        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"]
+
+        def query(params)
+          result = get '/do/query', params, 'result'
+          result['total_results'] = result['total_results'].to_i if result['total_results']
           result
         end
-        
-        def read_by_email email, params = {}
+
+        def read_by_email(email, params = {})
           post "/do/read/email/#{email}", params
         end
-        
-        def read_by_id id, params = {}
+
+        def read_by_id(id, params = {})
           post "/do/read/id/#{id}", params
         end
-        
+
         protected
-        
-        def get path, params = {}, result = "user"
-          response = @client.get "user", path, params
+
+        def get(path, params = {}, result = 'user')
+          response = @client.get 'user', path, params
           result ? response[result] : response
         end
-        
-        def post path, params = {}, result = "user"
-          response = @client.post "user", path, params
+
+        def post(path, params = {}, result = 'user')
+          response = @client.post 'user', path, params
           result ? response[result] : response
         end
-        
       end
-      
     end
   end
 end

data/lib/pardot/objects/visitor_activities.rb

@@ -1,41 +1,37 @@
 module Pardot
   module Objects
     module VisitorActivities
-      
       def visitor_activities
         @visitor_activities ||= VisitorActivities.new self
       end
-      
+
       class VisitorActivities
-        
-        def initialize client
+        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"]
+
+        def query(params)
+          result = get '/do/query', params, 'result'
+          result['total_results'] = result['total_results'].to_i if result['total_results']
           result
         end
-        
-        def read id, params = {}
+
+        def read(id, params = {})
           post "/do/read/id/#{id}", params
         end
-        
+
         protected
-        
-        def get path, params = {}, result = "visitorActivity"
-          response = @client.get "visitorActivity", path, params
+
+        def get(path, params = {}, result = 'visitorActivity')
+          response = @client.get 'visitorActivity', path, params
           result ? response[result] : response
         end
-        
-        def post path, params = {}, result = "visitorActivity"
-          response = @client.post "visitorActivity", path, params
+
+        def post(path, params = {}, result = 'visitorActivity')
+          response = @client.post 'visitorActivity', path, params
           result ? response[result] : response
         end
-        
       end
-      
     end
   end
 end

data/lib/pardot/objects/visitors.rb

@@ -1,45 +1,41 @@
 module Pardot
   module Objects
     module Visitors
-      
       def visitors
         @visitors ||= Visitors.new self
       end
-      
+
       class Visitors
-        
-        def initialize client
+        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"]
+
+        def query(params)
+          result = get '/do/query', params, 'result'
+          result['total_results'] = result['total_results'].to_i if result['total_results']
           result
         end
-        
-        def assign id, params = {}
+
+        def assign(id, params = {})
           post "/do/assign/id/#{id}", params
         end
-        
-        def read id, params = {}
+
+        def read(id, params = {})
           post "/do/read/id/#{id}", params
         end
-        
+
         protected
-        
-        def get path, params = {}, result = "visitor"
-          response = @client.get "visitor", path, params
+
+        def get(path, params = {}, result = 'visitor')
+          response = @client.get 'visitor', path, params
           result ? response[result] : response
         end
-        
-        def post path, params = {}, result = "visitor"
-          response = @client.post "visitor", path, params
+
+        def post(path, params = {}, result = 'visitor')
+          response = @client.post 'visitor', path, params
           result ? response[result] : response
         end
-        
       end
-      
     end
   end
 end

data/lib/pardot/objects/visits.rb

@@ -1,41 +1,37 @@
 module Pardot
   module Objects
     module Visits
-      
       def visits
         @visits ||= Visits.new self
       end
-      
+
       class Visits
-        
-        def initialize client
+        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"]
+
+        def query(params)
+          result = get '/do/query', params, 'result'
+          result['total_results'] = result['total_results'].to_i if result['total_results']
           result
         end
-        
-        def read id, params = {}
+
+        def read(id, params = {})
           post "/do/read/id/#{id}", params
         end
-        
+
         protected
-        
-        def get path, params = {}, result = "visit"
-          response = @client.get "visit", path, params
+
+        def get(path, params = {}, result = 'visit')
+          response = @client.get 'visit', path, params
           result ? response[result] : response
         end
-        
-        def post path, params = {}, result = "visit"
-          response = @client.post "visit", path, params
+
+        def post(path, params = {}, result = 'visit')
+          response = @client.post 'visit', path, params
           result ? response[result] : response
         end
-        
       end
-      
     end
   end
 end

data/lib/pardot/version.rb

@@ -1,3 +1,3 @@
 module Pardot
-  VERSION = "1.2.0"
+  VERSION = '1.4.1'
 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

@@ -1,27 +1,29 @@
-# -*- encoding: utf-8 -*-
-require File.expand_path("../lib/pardot/version", __FILE__)
+# frozen_string_literal: true
+
+require File.expand_path('lib/pardot/version', __dir__)
 
 Gem::Specification.new do |s|
-  s.name        = "ruby-pardot"
+  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.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"
+  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'
 
+  s.required_ruby_version = '>= 2.6'
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "ruby-pardot"
 
-  s.add_dependency "crack", "0.4.3"
-  s.add_dependency "httparty", "0.13.1"
+  s.add_dependency 'crack', '0.4.3'
+  s.add_dependency 'httparty', '0.18.1'
 
   s.add_development_dependency "bundler", ">= 1.10"
-  s.add_development_dependency "rspec"
-  s.add_development_dependency "fakeweb"
+  s.add_development_dependency "rspec", "3.5.0"
+  s.add_development_dependency "fakeweb", "1.3.0"
 
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f =~ %r{^bin/(.*)} ? Regexp.last_match(1) : nil }.compact
   s.require_path = 'lib'
 end

data/spec/pardot/authentication_spec.rb

@@ -1,91 +1,125 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper")
 
 describe Pardot::Authentication do
-  
   def create_client
-    @client = Pardot::Client.new "user@test.com", "foo", "bar"
+    @client = Pardot::Client.new 'user@test.com', 'foo', 'bar'
+  end
+
+  def create_client_using_salesforce_access_token
+    @client = Pardot::Client.new nil, nil, nil, 3, 'access_token_value', '0Uv000000000001CAA'
+  end
+
+  describe 'authenticate with Salesforce access_token' do
+    before do
+      @client = create_client_using_salesforce_access_token
+    end
+
+    it 'raises error when calling authenticate' do
+      expect do
+        @client.authenticate
+      end.to raise_error.with_message(/Authentication not available when using Salesforce access token/)
+    end
+
+    it 'raises error when calling reauthenticate' do
+      expect do
+        @client.reauthenticate
+      end.to raise_error.with_message(/Reauthentication not available when using Salesforce access token/)
+    end
+
+    it 'returns true for authenticated' do
+      expect(@client.authenticated?).to eq(true)
+    end
+
+    it 'returns true for using_salesforce_access_token' do
+      expect(@client.using_salesforce_access_token?).to eq(true)
+    end
   end
-  
-  describe "authenticate" do
-    
+
+  describe 'authenticate' do
     before do
       @client = create_client
-      
-      fake_post "/api/login/version/3",
+
+      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
-      FakeWeb.last_request.body.should == 'email=user%40test.com&password=foo&user_key=bar'
+    def verify_body
+      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"
+
+    it 'should return the api key' do
+      expect(authenticate).to eq('my_api_key')
     end
-    
-    it "should set the api key" do
+
+    it 'should set the api key' do
       authenticate
-      @client.api_key.should == "my_api_key"
-      verifyBody
+      expect(@client.api_key).to eq('my_api_key')
+      verify_body
     end
-    
-    it "should make authenticated? true" do
+
+    it 'should make authenticated? true' do
       authenticate
-      @client.authenticated?.should == true
-      verifyBody
+      expect(@client.authenticated?).to eq(true)
+      verify_body
     end
 
-    it "should use version 3" do
+    it 'should use version 3' do
       authenticate
-      @client.version.to_i.should == 3
-      verifyBody
+      expect(@client.version.to_i).to eq(3)
+      verify_body
+    end
+
+    it 'returns false for using_salesforce_access_token' do
+      expect(@client.using_salesforce_access_token?).to eq(false)
+
+      authenticate
+      expect(@client.using_salesforce_access_token?).to eq(false)
+      verify_body
     end
-    
   end
 
-  describe "authenticateV4" do
-    
+  describe 'authenticateV4' do
     before do
       @client = create_client
-      
-      fake_post "/api/login/version/3",
+
+      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
-      FakeWeb.last_request.body.should == 'email=user%40test.com&password=foo&user_key=bar'
+    def verify_body
+      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"
+
+    it 'should return the api key' do
+      expect(authenticate).to eq('my_api_key')
     end
-    
-    it "should set the api key" do
+
+    it 'should set the api key' do
       authenticate
-      @client.api_key.should == "my_api_key"
-      verifyBody
+      expect(@client.api_key).to eq('my_api_key')
+      verify_body
     end
-    
-    it "should make authenticated? true" do
+
+    it 'should make authenticated? true' do
       authenticate
-      @client.authenticated?.should == true
-      verifyBody
+      expect(@client.authenticated?).to eq(true)
+      verify_body
     end
 
-    it "should use version 4" do
+    it 'should use version 4' do
       authenticate
-      @client.version.to_i.should == 4
-      verifyBody
+      expect(@client.version.to_i).to eq(4)
+      verify_body
     end
-    
   end
-  
-end
+end