ruby-pardot 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b5a3bceaeff6bb81efc73dfc2ee2fb51e3fce2e
-  data.tar.gz: cdc11f89e0415c6b3d0484d7fe67147a3b8a087e
+  metadata.gz: d1399136219ec0bea476ce3d8719d50664a2cbca
+  data.tar.gz: c24bfb39f4efbf9c228725f60d8cbe029d9b3eab
 SHA512:
-  metadata.gz: 69f994887ac58cf22de6f963d1793f4dfb0ba35cb3adedc4d3baf3fcabd766ce187bb31047de526545488cbe951c7e31d29872bfe75d5029a675254c7fe60817
-  data.tar.gz: 013ffa24e4853541125c89bcb08c90ce88de3db3a0cd2475fba4bc787682f1e8fd1a9e91550cc1ea702e74c282b8b818e2fa254cba29699a0471a612cc108b16
+  metadata.gz: 349bf990141ef0c54deaae2a8a85859bd2d18f4619e2b561d6248bbe20223d013771b63bc83f72d81844df6e1affe136d3bc6afbd32e48f11553a74b6f6c1ae0
+  data.tar.gz: f678e13f8963b06ca5e4cb636ea04407280e10b1fa8fa24f3b5da264722347bdf3508aa9042ca363f090e00b0ee5e0f651a5e8b411b9abae5de7322944a81a36

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ruby-pardot (1.0.2)
+    ruby-pardot (1.1.0)
       crack
       httparty
 
@@ -15,7 +15,7 @@ GEM
     httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    json (1.8.1)
+    json (1.8.3)
     multi_xml (0.5.5)
     rspec (2.5.0)
       rspec-core (~> 2.5.0)
@@ -25,13 +25,16 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    safe_yaml (1.0.3)
+    safe_yaml (1.0.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.0.0)
+  bundler (>= 1.10)
   fakeweb
   rspec
   ruby-pardot!
+
+BUNDLED WITH
+   1.11.2

data/lib/pardot/authentication.rb

@@ -3,6 +3,7 @@ module Pardot
     
     def authenticate
       resp = post "login", 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

@@ -20,16 +20,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

@@ -58,8 +58,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/prospects.rb

@@ -26,10 +26,22 @@ module Pardot
           post "/do/assign/id/#{id}", params
         end
         
+        def assign_by_fid fid, params
+          post "/do/assign/fid/#{fid}", params
+        end
+        
         def create email, params = {}
           post "/do/create/email/#{email}", params
         end
         
+        def delete_by_id id, params = {}
+          post "/do/delete/id/#{id}", params
+        end
+        
+        def delete_by_fid fid, params = {}
+          post "/do/delete/fid/#{fid}", params
+        end
+        
         def read_by_email email, params = {}
           post "/do/read/email/#{email}", params
         end
@@ -38,6 +50,22 @@ module Pardot
           post "/do/read/id/#{id}", params
         end
         
+        def read_by_fid fid, params = {}
+          post "/do/read/fid/#{fid}", params
+        end
+        
+        def unassign_by_email email, params = {}
+          post "/do/unassign/email/#{email}", params
+        end
+        
+        def unassign_by_id id, params = {}
+          post "/do/unassign/id/#{id}", params
+        end
+        
+        def unassign_by_fid fid, params = {}
+          post "/do/unassign/fid/#{fid}", params
+        end
+        
         def update_by_email email, params = {}
           post "/do/update/email/#{email}", params
         end
@@ -46,6 +74,10 @@ module Pardot
           post "/do/update/id/#{id}", params
         end
         
+        def update_by_fid fid, params = {}
+          post "/do/update/fid/#{fid}", params
+        end
+        
         def upsert_by_email email, params = {}
           post "/do/upsert/email/#{email}", params
         end
@@ -54,6 +86,10 @@ module Pardot
           post "/do/upsert/id/#{id}", params
         end
         
+        def upsert_by_fid fid, params = {}
+          post "/do/upsert/fid/#{fid}", params
+        end
+        
         protected
         
         def get path, params = {}, result = "prospect"

data/lib/pardot/version.rb

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

data/ruby-pardot.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency "crack"
   s.add_dependency "httparty"
 
-  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "bundler", ">= 1.10"
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakeweb"
 

data/spec/pardot/authentication_spec.rb

@@ -32,6 +32,45 @@ describe Pardot::Authentication do
       authenticate
       @client.authenticated?.should == true
     end
+
+    it "should use version 3" do
+      authenticate
+      @client.version.to_i.should == 3
+    end
+    
+  end
+
+  describe "authenticateV4" do
+    
+    before do
+      @client = create_client
+      
+      fake_post "/api/login/version/3?email=user%40test.com&password=foo&user_key=bar",
+                %(<?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
+    
+    it "should return the api key" do
+      authenticate.should == "my_api_key"
+    end
+    
+    it "should set the api key" do
+      authenticate
+      @client.api_key.should == "my_api_key"
+    end
+    
+    it "should make authenticated? true" do
+      authenticate
+      @client.authenticated?.should == true
+    end
+
+    it "should use version 4" do
+      authenticate
+      @client.version.to_i.should == 4
+    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
+      @client.email.should == "user@test.com"
+      @client.password.should == "password"
+      @client.user_key.should == "user_key"
+      @client.format.should == "simple"
+    end
+
+    it "should set variables without version" do
+      @client = Pardot::Client.new "user@test.com", "password", "user_key"
+      @client.version.should == 3
+    end
+    
+    it "should set variables with version" do
+      @client = Pardot::Client.new "user@test.com", "password", "user_key", 4
+      @client.version.should == 4
+    end
+
+  end
+end

data/spec/pardot/http_spec.rb

@@ -68,5 +68,65 @@ describe Pardot::Http do
     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?api_key=my_api_key&format=simple&user_key=bar",
+               %(?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)
+    end
+    
+    it "should catch and reraise SocketErrors as Pardot::NetError" do
+      Pardot::Client.should_receive(:get).and_raise(SocketError)
+      
+      lambda { get }.should 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?api_key=my_api_key&format=simple&user_key=bar",
+               %(?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)
+      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?api_key=my_api_key&format=simple&user_key=bar",
+                %(?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)
+    end
+    
+    it "should catch and reraise SocketErrors as Pardot::NetError" do
+      Pardot::Client.should_receive(:post).and_raise(SocketError)
+      
+      lambda { post }.should raise_error(Pardot::NetError)
+    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",
+                %(?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)
+      post
+    end
+    
+  end
   
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pardot
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Dan Cunning
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: crack
@@ -44,14 +44,14 @@ dependencies:
     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
@@ -111,6 +111,7 @@ 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/emails_spec.rb
@@ -144,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: ruby-pardot
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Library for interacting with the Pardot API