sendgrid4r 0.5.0 → 1.0.0

data/spec/rest/contacts/recipients_spec.rb

@@ -7,9 +7,7 @@ describe SendGrid4r::REST::Contacts::Recipients do
       begin
         pending 'waiting sendgrid documentation update'
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
         @email1 = 'jones@example.com'
         @email2 = 'miller@example.com'
         @last_name1 = 'Jones'
@@ -22,21 +20,21 @@ describe SendGrid4r::REST::Contacts::Recipients do
         recipients = @client.get_recipients
         recipients.recipients.each do |recipient|
           next if recipient.email != @email1 && recipient.email != @email2
-          @client.delete_recipient(recipient.id)
+          @client.delete_recipient(recipient_id: recipient.id)
         end
         custom_fields = @client.get_custom_fields
         custom_fields.custom_fields.each do |custom_field|
           next if custom_field.name != @custom_field_name
-          @client.delete_custom_field(custom_field.id)
+          @client.delete_custom_field(custom_field_id: custom_field.id)
         end
-        @client.post_custom_field(@custom_field_name, 'text')
+        @client.post_custom_field(name: @custom_field_name, type: 'text')
         # post a recipient
         params = {}
         params['email'] = @email1
         params['last_name'] = @last_name1
         params[@custom_field_name] = @pet1
-        @new_recipient = @client.post_recipient(params)
-      rescue => e
+        @new_recipient = @client.post_recipient(params: params)
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
@@ -49,7 +47,7 @@ describe SendGrid4r::REST::Contacts::Recipients do
           params['email'] = @email2
           params['last_name'] = @last_name2
           params[@custom_field_name] = @pet2
-          new_recipient = @client.post_recipient(params)
+          new_recipient = @client.post_recipient(params: params)
           expect(new_recipient.created_at).to be_a(Time)
           new_recipient.custom_fields.each do |custom_field|
             expect(
@@ -64,7 +62,7 @@ describe SendGrid4r::REST::Contacts::Recipients do
           expect(new_recipient.last_name).to eq(@last_name2)
           expect(new_recipient.last_opened).to eq(nil)
           expect(new_recipient.updated_at).to be_a(Time)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -76,8 +74,8 @@ describe SendGrid4r::REST::Contacts::Recipients do
           params['email'] = @email1
           params['last_name'] = @last_name1
           params[@custom_field_name] = @pet1
-          @client.post_recipient(params)
-        rescue => e
+          @client.post_recipient(params: params)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -85,14 +83,14 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
       it '#get_recipients' do
         begin
-          recipients = @client.get_recipients(100, 0)
+          recipients = @client.get_recipients(limit: 100, offset: 0)
           expect(recipients.recipients.length).to be > 0
           recipients.recipients.each do |recipient|
             expect(
               recipient
             ).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -102,7 +100,7 @@ describe SendGrid4r::REST::Contacts::Recipients do
         begin
           actual_count = @client.get_recipients_count
           expect(actual_count).to be >= 0
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -112,9 +110,9 @@ describe SendGrid4r::REST::Contacts::Recipients do
         begin
           params = {}
           params['email'] = @email1
-          recipients = @client.search_recipients(params)
+          recipients = @client.search_recipients(params: params)
           expect(recipients.recipients).to be_a(Array)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -122,11 +120,11 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
       it '#get_recipient' do
         begin
-          recipient = @client.get_recipient(@new_recipient.id)
+          recipient = @client.get_recipient(recipient_id: @new_recipient.id)
           expect(
             recipient
           ).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -134,13 +132,15 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
       it '#get_lists_recipient_belong' do
         begin
-          lists = @client.get_lists_recipient_belong(@new_recipient.id)
+          lists = @client.get_lists_recipient_belong(
+            recipient_id: @new_recipient.id
+          )
           lists.lists.each do |list|
             expect(
               list.is_a?(SendGrid4r::REST::Contacts::Lists::List)
             ).to eq(true)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -157,14 +157,14 @@ describe SendGrid4r::REST::Contacts::Recipients do
           recipient2['last_name'] = @last_name2
           recipient2[@custom_field_name] = @pet2
           params = [recipient1, recipient2]
-          result = @client.post_recipients(params)
+          result = @client.post_recipients(params: params)
           expect(result.error_count).to eq(0)
           result.error_indices.each do |index|
             expect(index).to be_a(Fixnum)
           end
           expect(result.new_count).to be_a(Fixnum)
           expect(result.updated_count).to be_a(Fixnum)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -173,7 +173,9 @@ describe SendGrid4r::REST::Contacts::Recipients do
       it '#get_recipients_by_id' do
         begin
           recipient_ids = [@email1, @email2]
-          actual_recipients = @client.get_recipients_by_id(recipient_ids)
+          actual_recipients = @client.get_recipients_by_id(
+            recipient_ids: recipient_ids
+          )
           expect(actual_recipients.recipients).to be_a(Array)
           expect(actual_recipients.recipients.length).to eq(1)
           actual_recipients.recipients.each do |recip|
@@ -181,7 +183,7 @@ describe SendGrid4r::REST::Contacts::Recipients do
               recip
             ).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -189,11 +191,11 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
       it '#delete_recipient' do
         begin
-          @client.delete_recipient(@new_recipient.id)
+          @client.delete_recipient(recipient_id: @new_recipient.id)
           expect do
-            @client.get_recipient(@new_recipient.id)
+            @client.get_recipient(recipient_id: @new_recipient.id)
           end.to raise_error(RestClient::ResourceNotFound)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -201,170 +203,13 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
       it '#delete_recipients' do
         begin
-          @client.delete_recipients([@email1, @email2])
-        rescue => e
+          @client.delete_recipients(emails: [@email1, @email2])
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#post_recipient' do
-        params = {}
-        params['email'] = @email2
-        params['last_name'] = @last_name2
-        params[@custom_field_name] = @pet2
-        @client.post_recipient(params) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipient(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipient
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#delete_recipient' do
-        params = {}
-        params['email'] = @email1
-        params['last_name'] = @last_name1
-        params[@custom_field_name] = @pet1
-        recipient = @client.post_recipient(params)
-        @client.delete_recipient(recipient.id) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-
-      it '#delete_recipients' do
-        @client.delete_recipients([@email1, @email2]) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
-        end
-      end
-
-      it '#get_recipients' do
-        @client.get_recipients do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipients(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipients
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_recipients_by_id' do
-        params = {}
-        params['email'] = @email1
-        params['last_name'] = @last_name1
-        params[@custom_field_name] = @pet1
-        recipient = @client.post_recipient(params)
-        @client.get_recipients_by_id([recipient.id]) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipients(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipients
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_recipients_count' do
-        @client.get_recipients_count do |resp, req, res|
-          expect(JSON.parse(resp)['recipient_count']).to be_a(Fixnum)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#search_recipients' do
-        params = {}
-        params['email'] = @email1
-        @client.search_recipients(params) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipients(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipients
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_recipient' do
-        params = {}
-        params['email'] = @email1
-        params['last_name'] = @last_name1
-        params[@custom_field_name] = @pet1
-        recipient = @client.post_recipient(params)
-        @client.get_recipient(recipient.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_recipient(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::Recipient
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_lists_recipient_belong' do
-        params = {}
-        params['email'] = @email1
-        params['last_name'] = @last_name1
-        params[@custom_field_name] = @pet1
-        recipient = @client.post_recipient(params)
-        @client.get_lists_recipient_belong(recipient.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Lists.create_lists(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::Lists::Lists)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#post_recipients' do
-        recipient1 = {}
-        recipient1['email'] = @email1
-        recipient1['last_name'] = @last_name1
-        recipient1[@custom_field_name] = @pet1
-        recipient2 = {}
-        recipient2['email'] = @email2
-        recipient2['last_name'] = @last_name2
-        recipient2[@custom_field_name] = @pet2
-        params = [recipient1, recipient2]
-        @client.post_recipients(params) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::Recipients.create_result(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::Recipients::ResultAddMultiple
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-    end
   end
 
   describe 'unit test', :ut do
@@ -464,13 +309,13 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
     it '#post_recipient' do
       allow(client).to receive(:execute).and_return(recipient)
-      actual = client.post_recipient({})
+      actual = client.post_recipient(params: {})
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
     end
 
     it '#get_recipients' do
       allow(client).to receive(:execute).and_return(recipients)
-      actual = client.get_recipients(0, 0)
+      actual = client.get_recipients(limit: 0, offset: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipients)
     end
 
@@ -482,25 +327,25 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
     it '#search_recipients' do
       allow(client).to receive(:execute).and_return(recipients)
-      actual = client.search_recipients({})
+      actual = client.search_recipients(params: {})
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipients)
     end
 
     it '#get_recipient' do
       allow(client).to receive(:execute).and_return(recipient)
-      actual = client.get_recipient(0)
+      actual = client.get_recipient(recipient_id: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipient)
     end
 
     it '#get_lists_recipient_belong' do
       allow(client).to receive(:execute).and_return(lists)
-      actual = client.get_lists_recipient_belong(0)
+      actual = client.get_lists_recipient_belong(recipient_id: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Lists::Lists)
     end
 
     it '#post_recipients' do
       allow(client).to receive(:execute).and_return(result)
-      actual = client.post_recipients([{}, {}])
+      actual = client.post_recipients(recipients: [{}, {}])
       expect(actual).to be_a(
         SendGrid4r::REST::Contacts::Recipients::ResultAddMultiple
       )
@@ -508,19 +353,19 @@ describe SendGrid4r::REST::Contacts::Recipients do
 
     it '#get_recipients_by_id' do
       allow(client).to receive(:execute).and_return(recipients)
-      actual = client.get_recipients_by_id(['', ''])
+      actual = client.get_recipients_by_id(recipient_ids: ['', ''])
       expect(actual).to be_a(SendGrid4r::REST::Contacts::Recipients::Recipients)
     end
 
     it '#delete_recipient' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_recipient(0)
+      actual = client.delete_recipient(recipient_id: 0)
       expect(actual).to eq('')
     end
 
     it '#delete_recipients' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_recipients(['', ''])
+      actual = client.delete_recipients(emails: ['', ''])
       expect(actual).to eq('')
     end
 

data/spec/rest/contacts/reserved_fields_spec.rb

@@ -5,9 +5,7 @@ describe SendGrid4r::REST::Contacts::ReservedFields do
   describe 'integration test', :it do
     before do
       Dotenv.load
-      @client = SendGrid4r::Client.new(
-        username: ENV['SENDGRID_USERNAME'],
-        password: ENV['SENDGRID_PASSWORD'])
+      @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
       @first_name =
         SendGrid4r::REST::Contacts::ReservedFields::Field.new(
           'first_name', 'text'
@@ -57,28 +55,12 @@ describe SendGrid4r::REST::Contacts::ReservedFields do
           expect(set.include?(@last_emailed)).to eq(true)
           expect(set.include?(@last_clicked)).to eq(true)
           expect(set.include?(@last_opened)).to eq(true)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#get_reserved_fields' do
-        @client.get_reserved_fields do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::ReservedFields.create_fields(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Contacts::ReservedFields::Fields
-          )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-    end
   end
 
   describe 'unit test', :ut do