sendgrid_webapi 0.1.1 → 0.2.0

data/spec/cassettes/client/_modules/_bounce/should_get_bounce_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/bounces.get.json
+    uri: https://api.sendgrid.com/v3/suppression/bounces
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_bounce/should_get_bounce_emails_using_params.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.sendgrid.com/v3/suppression/bounces?limit=2&offset=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.8.9
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.2
+      Date:
+      - Fri, 17 Jan 2014 01:39:31 GMT
+      Content-Type:
+      - text/html
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '["email1@test.com", "email2@test.com"]'
+    http_version: 
+  recorded_at: Fri, 17 Jan 2014 01:39:31 GMT
+recorded_with: VCR 2.8.0

data/spec/cassettes/client/_modules/_bounce/should_try_delete_not_existing_bounce_email.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/bounces.delete.json?email=test@example.com
+    method: delete
+    uri: https://api.sendgrid.com/v3/suppression/bounces/test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_invalid_email/should_get_invalid_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/invalidemails.get.json
+    uri: https://api.sendgrid.com/v3/suppression/invalid_emails
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_invalid_email/should_get_invalid_emails_emails_using_params.yml

@@ -0,0 +1,37 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.sendgrid.com/v3/suppression/invalid_emails?limit=2&offset=1
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Authorization:
+      - Bearer apikey
+      User-Agent:
+      - Faraday v1.10.3
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - nginx
+      Date:
+      - Thu, 11 May 2023 20:57:30 GMT
+      Content-Type:
+      - application/json
+      Content-Length:
+      - '52'
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '{"errors":[{"field":null,"message":"unauthorized"}]}'
+  recorded_at: Thu, 11 May 2023 20:57:30 GMT
+recorded_with: VCR 6.1.0

data/spec/cassettes/client/_modules/_invalid_email/should_get_invalid_emails_using_params.yml

@@ -0,0 +1,36 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: https://api.sendgrid.com/v3/suppression/invalid_emails?limit=3&offset=2
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.8.9
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - '*/*'
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Server:
+      - nginx/1.4.2
+      Date:
+      - Fri, 17 Jan 2014 01:39:56 GMT
+      Content-Type:
+      - text/html
+      Transfer-Encoding:
+      - chunked
+      Connection:
+      - keep-alive
+    body:
+      encoding: UTF-8
+      string: '["test@example.com", "test2@example.com", "test3@example.com"]'
+    http_version: 
+  recorded_at: Fri, 17 Jan 2014 01:39:57 GMT
+recorded_with: VCR 2.8.0

data/spec/cassettes/client/_modules/_invalid_email/should_try_delete_not_existing_invalid_emails.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/invalidemails.delete.json?email=test@example.com
+    method: delete
+    uri: https://api.sendgrid.com/v3/suppression/invalid_emails/test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_spam/should_get_spam_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/spamreports.get.json
+    uri: https://api.sendgrid.com/v3/suppression/spam_reports
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_spam/should_try_delete_not_existing_spam_emails.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/spamreports.delete.json?email=test@example.com
+    method: delete
+    uri: https://api.sendgrid.com/v3/suppression/spam_reports/test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_add_unsubscribe_emails.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.add.json?email=test@example.com
+    method: post
+    uri: https://api.sendgrid.com/v3/asm/suppressions/global
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_delete_unsubscribe_email.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?email=test@example.com
+    method: delete
+    uri: https://api.sendgrid.com/v3/asm/suppressions/global/test@example.com
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_get_unsubscribe_emails.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.get.json
+    uri: https://api.sendgrid.com/v3/suppression/unsubscribes
     body:
       encoding: US-ASCII
       string: ''

data/spec/cassettes/client/_modules/_unsubscribe/should_try_delete_not_existing_unsubscribe_emails.yml

@@ -1,8 +1,8 @@
 ---
 http_interactions:
 - request:
-    method: get
-    uri: https://api.sendgrid.com/api/unsubscribes.delete.json?email=test@example.com
+    method: delete
+    uri: https://api.sendgrid.com/v3/asm/suppressions/global/test@example.com
     body:
       encoding: US-ASCII
       string: ''
@@ -30,7 +30,7 @@ http_interactions:
       - keep-alive
     body:
       encoding: UTF-8
-      string: '{"message": "Email does not exist"}'
+      string: '{"errors":[{"field":"null","message":"resource not found"}]}'
     http_version: 
   recorded_at: Fri, 17 Jan 2014 01:49:19 GMT
 recorded_with: VCR 2.8.0

data/spec/client_spec.rb

@@ -6,128 +6,144 @@ describe "client" do
   
   describe "#base", :vcr do
     it "should return api url" do
-      client.base_url.should eql "https://api.sendgrid.com/api/"
+      expect(client.base_url).to eql "https://api.sendgrid.com/api/"
     end
-  
+
     it "should return request url" do
-      client.make_request_url("blocks.get.json", {:data => 1}).
-        should eql "blocks.get.json?data=1"
+      expect(client.make_request_url("blocks.get.json", {:data => 1})).
+        to eql "blocks.get.json?data=1"
     end
-    
+
     it "should convert hash to url params" do
-      client.to_query({:value_one => "foo_one", :value_two => "foo_two"}).
-        should eql "value_one=foo_one&value_two=foo_two"
+      expect(client.to_query({:value_one => "foo_one", :value_two => "foo_two"})).
+        to eql "value_one=foo_one&value_two=foo_two"
     end    
   end
   
   describe "#modules", :vcr do
     describe "#block" do
       it "should get block emails" do
-        client.blocks.get.should eql []
+        expect(client.blocks.get).to eql []
       end
+
       it "should try delete not existing block email" do
-        client.blocks.delete(:email => "test@example.com").should == {"message"=>"Email does not exist"}
+        expect(client.blocks.delete({email: "test@example.com"})).to eql ({"message"=>"Email does not exist"})
       end
+
       it "should get totals blocks" do
-        client.blocks.count.should eql({"count"=>0})
+        expect(client.blocks.count).to eql({:count=>0})
       end
     end
     
     describe "#bounce", :vcr do
       it "should get bounce emails" do
-        client.bounces.get.should eql []
+        expect(client.bounces.get).to eql []
       end
+
+      it "should get bounce emails using params" do
+        expect(client.bounces.get({limit: 2, offset: 1}).count).to eql 2
+      end
+
       it "should try delete not existing bounce email" do
-        client.bounces.delete(:email => "test@example.com").should == {"message"=>"Email does not exist"}
+        expect(client.bounces.delete({email: "test@example.com"})).to eql ({"message"=>"Email does not exist"})
       end
     end
     
     describe "#invalid_email", :vcr do
       it "should get invalid emails" do
-        client.invalid_emails.get.should eql []
+        expect(client.invalid_emails.get).to eql []
+      end
+
+      it "should get invalid emails using params" do
+        expect(client.invalid_emails.get({limit: 3, offset: 2}).count).to eql 3
       end
+
       it "should try delete not existing invalid emails" do
-        client.invalid_emails.delete(:email => "test@example.com").should == {"message"=>"Email does not exist"}
+        expect(client.invalid_emails.delete(:email => "test@example.com")).to eql ({"message"=>"Email does not exist"})
       end
     end
     
     describe "#spam" do
       it "should get spam emails", :vcr do
-        client.spam.get.should eql []
+        expect(client.spam.get).to eql []
       end
+
       it "should try delete not existing spam emails" do
-        client.spam.delete(:email => "test@example.com").should == {"message"=>"Email does not exist"}
+        expect(client.spam.delete({:email => "test@example.com"})).to eql ({"message"=>"Email does not exist"})
       end
     end
     
     describe "#unsubscribe", :vcr do
       it "should add unsubscribe emails" do
-        client.unsubscribes.add(:email => "test@example.com").
-          should == {"message"=>"success"}
+        expect(client.unsubscribes.add({recipient_emails: ["test@example.com"]})).
+          to eql ({"message"=>"success"})
       end
+
       it "should get unsubscribe emails" do
-        client.unsubscribes.get.
-          should eql [{"email"=>"test@example.com"}]
+        expect(client.unsubscribes.get).
+          to eql [{"email"=>"test@example.com"}]
       end
+
       it "should delete unsubscribe email" do
-        client.unsubscribes.delete(:email => "test@example.com").
-          should == {"message"=>"success"}
+        expect(client.unsubscribes.delete(:email => "test@example.com")).
+          to eql ({"message"=>"success"})
       end
+
       it "should try delete not existing unsubscribe emails" do
-        client.unsubscribes.delete(:email => "test@example.com").
-          should == {"message"=>"Email does not exist"}
+        expect(client.unsubscribes.delete({email: "test@example.com"})).
+          to eql ({"errors" => [{"field"=>"null", "message"=>"resource not found"}]})
       end
     end
-  
+
     describe "#parse_email", :vcr do      
       it "should set parse email" do
-        client.parse_email.set(:hostname => "www.example.com", :url => "www.mydomain.com/parse.php", :spam_check => "1").
-          should == {"message"=>"success"}
+        expect(client.parse_email.set(:hostname => "www.example.com", :url => "www.mydomain.com/parse.php", :spam_check => "1")).
+          to eql ({"message"=>"success"})
       end
-      
+
       it "should get parse email", :vcr do
-        client.parse_email.get.
-          should == {"parse"=>[{"hostname"=>"www.example.com", "url"=>"www.mydomain.com/parse.php", "spam_check"=>1}]}
+        expect(client.parse_email.get).
+          to eql ({"parse"=>[{"hostname"=>"www.example.com", "url"=>"www.mydomain.com/parse.php", "spam_check"=>1}]})
       end
-    
+
       it "should delete parse email", :vcr do
-        client.parse_email.delete(:hostname => "www.example.com").
-          should == {"message"=>"success"}
-        client.parse_email.get.
-          should == {"parse" => []}          
+        expect(client.parse_email.delete(:hostname => "www.example.com")).
+          to eql ({"message"=>"success"})
+        expect(client.parse_email.get).
+          to eql ({"parse" => []})
       end
     end
     
     describe "#event_notification", :vcr do      
       it "should set event notification url" do
-        client.event_notification.set(:url => "http://www.yourposturlhere.com").
-          should == {"message"=>"success"}
+        expect(client.event_notification.set(:url => "http://www.yourposturlhere.com")).
+          to eql ({"message"=>"success"})
       end
-      
+
       it "should get event notification url" do
-        client.event_notification.get.
-          should == [{"url" => "http:\/\/www.yourposturlhere.com"}]
+        expect(client.event_notification.get).
+          to eql ([{"url" => "http:\/\/www.yourposturlhere.com"}])
       end
-    
+
       it "should delete event notification url" do
-        client.event_notification.delete.
-          should == {"message"=>"success"}
+        expect(client.event_notification.delete).
+          to eql ({"message"=>"success"})
       end
     end
     
     describe "#profile", :vcr do      
       it "should get profile" do
-        client.profile.get.
-          should == [{"username"=>"user", "email"=>"user", "active"=>"true", "first_name"=>"Reseller", "last_name"=>"Customer", "address"=>"555 Any Street", "address2"=>"", "city"=>"City", "state"=>"State", "zip"=>"90000", "country"=>"US", "phone"=>"555-555-5555", "website"=>"http://Website", "website_access"=>"true"}]
+        expect(client.profile.get).
+          to eql ([{"username"=>"user", "email"=>"user", "active"=>"true", "first_name"=>"Reseller", "last_name"=>"Customer", "address"=>"555 Any Street", "address2"=>"", "city"=>"City", "state"=>"State", "zip"=>"90000", "country"=>"US", "phone"=>"555-555-5555", "website"=>"http://Website", "website_access"=>"true"}])
       end
-    
+
       it "should set first name" do
-        client.profile.set(:first_name => "test").
-          should == {"message" => "success"}
-        client.profile.get.first["first_name"].
-          should == "test"
-        client.profile.set(:first_name => "Reseller").
-          should == {"message" => "success"}
+        expect(client.profile.set(:first_name => "test")).
+          to eql ({"message" => "success"})
+        expect(client.profile.get.first["first_name"]).
+          to eql "test"
+        expect(client.profile.set(:first_name => "Reseller")).
+          to eql ({"message" => "success"})
       end
     end
   end

data/spec/helper_spec.rb

@@ -30,11 +30,10 @@ describe "helper" do
       apps = { :opentrack => {:name => "eventnotify", :processed => "0", :dropped => "1", :deferred => "1",
                               :delivered => "0", :bounce => "1", :click => "1", :open => "1", :unsubscribe => "1", :spamreport => "1", 
                               :url => "https://example.com"},
-               :clicktrack => {:enable_text => "1"},
-               :opentrack => {}
+               :clicktrack => {}
       }
   
-      @users = {"test-6" => {:account => user_hash, :applications => apps, :assigned_ips => ["192.254.126.178"]}}
+      @users = {"test-6" => {:account => user_hash, :applications => apps, :assigned_ips => []}}
       
     end
     

data/spec/internal/config/database-standard.yml

@@ -0,0 +1,24 @@
+common: &common
+  adapter: postgresql
+  encoding: utf8
+  host: <%= ENV["DBHOST"] || "127.0.0.1" %>
+  port: <%= ENV["DBPORT"] || "5432" %>
+  database: <%= ENV["DBNAME"] || "has_helpers_test" %>
+  username: <%= ENV["DBUSER"] || "postgres" %>
+  password: <%= ENV["DBPASSWORD"] || "" %>
+  pool: 5
+  reconnect: true
+  timeout: 5000
+
+development:
+  <<: *common
+
+test:
+  <<: *common
+
+staging:
+  <<: *common
+
+production:
+  <<: *common
+  pool: 10

data/spec/spec_helper.rb

@@ -7,7 +7,3 @@ VCR.configure do |c|
   c.hook_into :webmock
   c.configure_rspec_metadata!
 end
-
-RSpec.configure do |c|
-  c.treat_symbols_as_metadata_keys_with_true_values = true
-end