sendgrid4r 0.5.0 → 1.0.0

data/spec/rest/asm/suppressions_spec.rb

@@ -6,9 +6,7 @@ describe SendGrid4r::REST::Asm::Suppressions do
     before do
       begin
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
         @email1 = 'test1@test.com'
         @email2 = 'test2@test.com'
         @email3 = 'test3@test.com'
@@ -19,17 +17,21 @@ describe SendGrid4r::REST::Asm::Suppressions do
         grps = @client.get_groups
         grps.each do |grp|
           next if grp.name != @group_name
-          emails = @client.get_suppressed_emails(grp.id)
+          emails = @client.get_suppressed_emails(group_id: grp.id)
           emails.each do |email|
-            @client.delete_suppressed_email(grp.id, email)
+            @client.delete_suppressed_email(
+              group_id: grp.id, email_address: email
+            )
           end
-          @client.delete_group(grp.id)
+          @client.delete_group(group_id: grp.id)
         end
         # post a group
-        @group = @client.post_group(@group_name, @group_desc)
+        @group = @client.post_group(name: @group_name, description: @group_desc)
         # post suppressed email
-        @client.post_suppressed_emails(@group.id, [@email1])
-      rescue => e
+        @client.post_suppressed_emails(
+          group_id: @group.id, recipient_emails: [@email1]
+        )
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
@@ -39,12 +41,12 @@ describe SendGrid4r::REST::Asm::Suppressions do
       it '#post_suppressed_emails' do
         begin
           emails = @client.post_suppressed_emails(
-            @group.id, [@email2, @email3]
+            group_id: @group.id, recipient_emails: [@email2, @email3]
           )
           expect(emails.recipient_emails.length).to eq(2)
           expect(emails.recipient_emails[0]).to eq(@email2)
           expect(emails.recipient_emails[1]).to eq(@email3)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -52,10 +54,10 @@ describe SendGrid4r::REST::Asm::Suppressions do
 
       it '#get_suppressed_emails' do
         begin
-          emails = @client.get_suppressed_emails(@group.id)
+          emails = @client.get_suppressed_emails(group_id: @group.id)
           expect(emails.length).to eq(1)
           expect(emails[0]).to eq(@email1)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -63,7 +65,7 @@ describe SendGrid4r::REST::Asm::Suppressions do
 
       it '#get_suppressions' do
         begin
-          suppressions = @client.get_suppressions(@email1)
+          suppressions = @client.get_suppressions(email_address: @email1)
           expect(suppressions.suppressions).to be_a(Array)
           suppressions.suppressions.each do |suppression|
             next unless suppression.name == @group_name
@@ -71,7 +73,7 @@ describe SendGrid4r::REST::Asm::Suppressions do
             expect(suppression.description).to eq(@group_desc)
             expect(suppression.suppressed).to eq(true)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -79,65 +81,18 @@ describe SendGrid4r::REST::Asm::Suppressions do
 
       it '#delete_suppressed_email' do
         begin
-          @client.delete_suppressed_email(@group.id, @email1)
-          @client.delete_suppressed_email(@group.id, @email2)
-          @client.delete_suppressed_email(@group.id, @email3)
-        rescue => e
-          puts e.inspect
-          raise e
-        end
-      end
-    end
-
-    context 'with block call' do
-      it '#post_suppressed_emails' do
-        @client.post_suppressed_emails(
-          @group.id, [@email2, @email3]
-        ) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Asm.create_recipient_emails(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Asm::RecipientEmails
+          @client.delete_suppressed_email(
+            group_id: @group.id, email_address: @email1
           )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#get_suppressed_emails' do
-        @client.get_suppressed_emails(@group.id) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Asm::Suppressions.create_emails(JSON.parse(resp))
-          expect(resp).to be_a(Array)
-          resp.each do |email|
-            expect(email).to be_a(String)
-          end
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_suppressions' do
-        @client.get_suppressions(@email1) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Asm::Suppressions.create_suppressions(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(
-            SendGrid4r::REST::Asm::Suppressions::Suppressions
+          @client.delete_suppressed_email(
+            group_id: @group.id, email_address: @email2
           )
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#delete_suppressed_email' do
-        @client.delete_suppressed_email(@group.id, @email1) do |resp, req, res|
-          expect(resp).to eq('')
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPNoContent)
+          @client.delete_suppressed_email(
+            group_id: @group.id, email_address: @email3
+          )
+        rescue RestClient::ExceptionWithResponse => e
+          puts e.inspect
+          raise e
         end
       end
     end
@@ -207,19 +162,21 @@ describe SendGrid4r::REST::Asm::Suppressions do
 
     it '#post_suppressed_emails' do
       allow(client).to receive(:execute).and_return(recipient_emails)
-      actual = client.post_suppressed_emails(0, ['', ''])
+      actual = client.post_suppressed_emails(
+        group_id: 0, recipient_emails: ['', '']
+      )
       expect(actual).to be_a(SendGrid4r::REST::Asm::RecipientEmails)
     end
 
     it '#get_suppressed_emails' do
       allow(client).to receive(:execute).and_return(emails)
-      actual = client.get_suppressed_emails(0)
+      actual = client.get_suppressed_emails(group_id: 0)
       expect(actual).to be_a(Array)
     end
 
     it '#get_suppressions' do
       allow(client).to receive(:execute).and_return(suppressions)
-      actual = client.get_suppressions('')
+      actual = client.get_suppressions(email_address: '')
       expect(actual.suppressions).to be_a(Array)
       actual.suppressions.each do |suppression|
         expect(suppression).to be_a(
@@ -230,7 +187,7 @@ describe SendGrid4r::REST::Asm::Suppressions do
 
     it '#delete_suppressed_email' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_suppressed_email(0, '')
+      actual = client.delete_suppressed_email(group_id: 0, email_address: '')
       expect(actual).to eq('')
     end
 

data/spec/rest/categories/categories_spec.rb

@@ -5,9 +5,7 @@ describe SendGrid4r::REST::Categories 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'])
     end
 
     context 'without block call' do
@@ -18,7 +16,7 @@ describe SendGrid4r::REST::Categories do
           categories.each do |category|
             expect(category.category).to be_a(String)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -26,12 +24,12 @@ describe SendGrid4r::REST::Categories do
 
       it '#get_categories if name was specified' do
         begin
-          categories = @client.get_categories('Newsletter')
+          categories = @client.get_categories(category: 'Newsletter')
           expect(categories.length).to eq(1)
           categories.each do |category|
             expect(category.category).to eq('Newsletter')
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -39,36 +37,19 @@ describe SendGrid4r::REST::Categories do
 
       it '#get_categories if offset & limit were specified' do
         begin
-          categories = @client.get_categories(nil, 5, 2)
+          categories = @client.get_categories(
+            category: nil, limit: 5, offset: 2
+          )
           expect(categories.length).to be > 0
           categories.each do |category|
             expect(category.category).to be_a(String)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#get_categories' do
-        @client.get_categories do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Categories::Categories.create_categories(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(Array)
-          resp.each do |category|
-            expect(category).to be_a(
-              SendGrid4r::REST::Categories::Categories::Category
-            )
-          end
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-    end
   end
 
   describe 'unit test', :ut do

data/spec/rest/contacts/custom_fields_spec.rb

@@ -6,9 +6,7 @@ describe SendGrid4r::REST::Contacts::CustomFields do
     before do
       begin
         Dotenv.load
-        @client = SendGrid4r::Client.new(
-          username: ENV['SENDGRID_USERNAME'],
-          password: ENV['SENDGRID_PASSWORD'])
+        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
         @name1 = 'birthday'
         @type1 = 'text'
         @name2 = 'born_at'
@@ -18,11 +16,11 @@ describe SendGrid4r::REST::Contacts::CustomFields do
         fields = @client.get_custom_fields
         fields.custom_fields.each do |field|
           next if field.name != @name1 && field.name != @name2
-          @client.delete_custom_field(field.id)
+          @client.delete_custom_field(custom_field_id: field.id)
         end
         # post a custom field
-        @new_field = @client.post_custom_field(@name1, @type1)
-      rescue => e
+        @new_field = @client.post_custom_field(name: @name1, type: @type1)
+      rescue RestClient::ExceptionWithResponse => e
         puts e.inspect
         raise e
       end
@@ -31,11 +29,11 @@ describe SendGrid4r::REST::Contacts::CustomFields do
     context 'without block call' do
       it '#post_custom_field' do
         begin
-          new_field = @client.post_custom_field(@name2, @type2)
+          new_field = @client.post_custom_field(name: @name2, type: @type2)
           expect(new_field.id).to be_a(Fixnum)
           expect(new_field.name).to eq(@name2)
           expect(new_field.type).to eq(@type2)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -44,9 +42,9 @@ describe SendGrid4r::REST::Contacts::CustomFields do
       it '#post_custom_field for same key' do
         begin
           expect do
-            @client.post_custom_field(@name1, @type1)
+            @client.post_custom_field(name: @name1, type: @type1)
           end.to raise_error(RestClient::BadRequest)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -62,7 +60,7 @@ describe SendGrid4r::REST::Contacts::CustomFields do
             expect(field.name).to eq(@new_field.name)
             expect(field.type).to eq(@new_field.type)
           end
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -70,11 +68,13 @@ describe SendGrid4r::REST::Contacts::CustomFields do
 
       it '#get_custom_field' do
         begin
-          actual_field = @client.get_custom_field(@new_field.id)
+          actual_field = @client.get_custom_field(
+            custom_field_id: @new_field.id
+          )
           expect(actual_field.id).to eq(@new_field.id)
           expect(actual_field.name).to eq(@new_field.name)
           expect(actual_field.type).to eq(@new_field.type)
-        rescue => e
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
@@ -82,66 +82,13 @@ describe SendGrid4r::REST::Contacts::CustomFields do
 
       it '#delete_custom_field' do
         begin
-          @client.delete_custom_field(@new_field.id)
-        rescue => e
+          @client.delete_custom_field(custom_field_id: @new_field.id)
+        rescue RestClient::ExceptionWithResponse => e
           puts e.inspect
           raise e
         end
       end
     end
-
-    context 'with block call' do
-      it '#post_custom_field' do
-        @client.post_custom_field(@name2, @type2) do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::CustomFields.create_field(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPCreated)
-        end
-      end
-
-      it '#post_custom_field for same key' do
-        @client.post_custom_field(@name1, @type1) do |_resp, req, res|
-          # TODO: _resp
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPBadRequest)
-        end
-      end
-
-      it '#get_custom_fields' do
-        @client.get_custom_fields do |resp, req, res|
-          resp =
-            SendGrid4r::REST::Contacts::CustomFields.create_fields(
-              JSON.parse(resp)
-            )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Fields)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#get_custom_field' do
-        @client.get_custom_field(@new_field.id) do |resp, req, res|
-          resp = SendGrid4r::REST::Contacts::CustomFields.create_field(
-            JSON.parse(resp)
-          )
-          expect(resp).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
-          expect(req).to be_a(RestClient::Request)
-          expect(res).to be_a(Net::HTTPOK)
-        end
-      end
-
-      it '#delete_custom_field' do
-        @client.delete_custom_field(@new_field.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
-    end
   end
 
   describe 'unit test', :ut do
@@ -185,7 +132,7 @@ describe SendGrid4r::REST::Contacts::CustomFields do
 
     it '#post_custom_field' do
       allow(client).to receive(:execute).and_return(field)
-      actual = client.post_custom_field('', '')
+      actual = client.post_custom_field(name: '', type: '')
       expect(actual).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
     end
 
@@ -197,13 +144,13 @@ describe SendGrid4r::REST::Contacts::CustomFields do
 
     it '#get_custom_field' do
       allow(client).to receive(:execute).and_return(field)
-      actual = client.get_custom_field(0)
+      actual = client.get_custom_field(custom_field_id: 0)
       expect(actual).to be_a(SendGrid4r::REST::Contacts::CustomFields::Field)
     end
 
     it '#delete_custom_field' do
       allow(client).to receive(:execute).and_return('')
-      actual = client.delete_custom_field(0)
+      actual = client.delete_custom_field(custom_field_id: 0)
       expect(actual).to eq('')
     end