sendgrid4r 1.8.1 → 1.10.0

data/spec/rest/sm/suppressions_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe SendGrid4r::REST::Sm::Suppressions do
-  describe 'integration test', :it do
-    before do
-      begin
+module SendGrid4r::REST::Sm
+  describe Suppressions do
+    describe 'integration test', :it do
+      before do
         Dotenv.load
-        @client = SendGrid4r::Client.new(api_key: ENV['API_KEY'])
+        @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
         @email1 = 'test1@test.com'
         @email2 = 'test2@test.com'
         @email3 = 'test3@test.com'
@@ -31,40 +31,25 @@ describe SendGrid4r::REST::Sm::Suppressions do
         @client.post_suppressed_emails(
           group_id: @group.id, recipient_emails: [@email1]
         )
-      rescue RestClient::ExceptionWithResponse => e
-        puts e.inspect
-        raise e
       end
-    end
 
-    context 'wthout block call' do
-      it '#post_suppressed_emails' do
-        begin
+      context 'wthout block call' do
+        it '#post_suppressed_emails' do
           emails = @client.post_suppressed_emails(
             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 RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_suppressed_emails' do
-        begin
+        it '#get_suppressed_emails' do
           emails = @client.get_suppressed_emails(group_id: @group.id)
           expect(emails.length).to eq(1)
           expect(emails[0]).to eq(@email1)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_suppressions' do
-        begin
+        it '#get_suppressions' do
           suppressions = @client.get_suppressions(email_address: @email1)
           expect(suppressions.suppressions).to be_a(Array)
           suppressions.suppressions.each do |suppression|
@@ -73,14 +58,9 @@ describe SendGrid4r::REST::Sm::Suppressions do
             expect(suppression.description).to eq(@group_desc)
             expect(suppression.suppressed).to eq(true)
           end
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_suppressed_email' do
-        begin
+        it '#delete_suppressed_email' do
           @client.delete_suppressed_email(
             group_id: @group.id, email_address: @email1
           )
@@ -90,132 +70,117 @@ describe SendGrid4r::REST::Sm::Suppressions do
           @client.delete_suppressed_email(
             group_id: @group.id, email_address: @email3
           )
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
       end
     end
-  end
 
-  describe 'unit test', :ut do
-    let(:client) do
-      SendGrid4r::Client.new(api_key: '')
-    end
+    describe 'unit test', :ut do
+      let(:client) do
+        SendGrid4r::Client.new(api_key: '')
+      end
 
-    let(:recipient_emails) do
-      JSON.parse(
-        '{'\
-          '"recipient_emails": ['\
-            '"test1@example.com",'\
-            '"test2@example.com"'\
-          ']'\
-        '}'
-      )
-    end
+      let(:recipient_emails) do
+        JSON.parse(
+          '{'\
+            '"recipient_emails": ['\
+              '"test1@example.com",'\
+              '"test2@example.com"'\
+            ']'\
+          '}'
+        )
+      end
 
-    let(:recipient_email) do
-      JSON.parse(
-        '{'\
-          '"recipient_email": "test1@example.com"'\
-        '}'
-      )
-    end
+      let(:recipient_email) do
+        JSON.parse(
+          '{'\
+            '"recipient_email": "test1@example.com"'\
+          '}'
+        )
+      end
 
-    let(:emails) do
-      JSON.parse(
-        '["test1@example.com","test2@example.com"]'
-      )
-    end
+      let(:emails) do
+        JSON.parse(
+          '["test1@example.com","test2@example.com"]'
+        )
+      end
 
-    let(:suppression) do
-      JSON.parse(
-        '{'\
-          '"id": 4,'\
-          '"name": "Special Offers",'\
-          '"description": "Special offers and coupons",'\
-          '"suppressed": false'\
-        '}'
-      )
-    end
+      let(:suppression) do
+        JSON.parse(
+          '{'\
+            '"id": 4,'\
+            '"name": "Special Offers",'\
+            '"description": "Special offers and coupons",'\
+            '"suppressed": false'\
+          '}'
+        )
+      end
 
-    let(:suppressions) do
-      JSON.parse(
-        '{'\
-          '"suppressions": ['\
-            '{'\
-              '"id": 1,'\
-              '"name": "Weekly Newsletter",'\
-              '"description": "The weekly newsletter",'\
-              '"suppressed": false'\
-            '},'\
-            '{'\
-              '"id": 4,'\
-              '"name": "Special Offers",'\
-              '"description": "Special offers and coupons",'\
-              '"suppressed": false'\
-            '}'\
-          ']'\
-        '}'
-      )
-    end
+      let(:suppressions) do
+        JSON.parse(
+          '{'\
+            '"suppressions": ['\
+              '{'\
+                '"id": 1,'\
+                '"name": "Weekly Newsletter",'\
+                '"description": "The weekly newsletter",'\
+                '"suppressed": false'\
+              '},'\
+              '{'\
+                '"id": 4,'\
+                '"name": "Special Offers",'\
+                '"description": "Special offers and coupons",'\
+                '"suppressed": false'\
+              '}'\
+            ']'\
+          '}'
+        )
+      end
 
-    it '#post_suppressed_emails' do
-      allow(client).to receive(:execute).and_return(recipient_emails)
-      actual = client.post_suppressed_emails(
-        group_id: 0, recipient_emails: ['', '']
-      )
-      expect(actual).to be_a(SendGrid4r::REST::Sm::RecipientEmails)
-    end
+      it '#post_suppressed_emails' do
+        allow(client).to receive(:execute).and_return(recipient_emails)
+        actual = client.post_suppressed_emails(
+          group_id: 0, recipient_emails: ['', '']
+        )
+        expect(actual).to be_a(RecipientEmails)
+      end
 
-    it '#get_suppressed_emails' do
-      allow(client).to receive(:execute).and_return(emails)
-      actual = client.get_suppressed_emails(group_id: 0)
-      expect(actual).to be_a(Array)
-    end
+      it '#get_suppressed_emails' do
+        allow(client).to receive(:execute).and_return(emails)
+        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(email_address: '')
-      expect(actual.suppressions).to be_a(Array)
-      actual.suppressions.each do |suppression|
-        expect(suppression).to be_a(
-          SendGrid4r::REST::Sm::Suppressions::Suppression
-        )
+      it '#get_suppressions' do
+        allow(client).to receive(:execute).and_return(suppressions)
+        actual = client.get_suppressions(email_address: '')
+        expect(actual.suppressions).to be_a(Array)
+        actual.suppressions.each do |suppression|
+          expect(suppression).to be_a(Suppressions::Suppression)
+        end
       end
-    end
 
-    it '#delete_suppressed_email' do
-      allow(client).to receive(:execute).and_return('')
-      actual = client.delete_suppressed_email(group_id: 0, email_address: '')
-      expect(actual).to eq('')
-    end
+      it '#delete_suppressed_email' do
+        allow(client).to receive(:execute).and_return('')
+        actual = client.delete_suppressed_email(group_id: 0, email_address: '')
+        expect(actual).to eq('')
+      end
 
-    it 'creates suppression instance' do
-      actual = SendGrid4r::REST::Sm::Suppressions.create_suppression(
-        suppression
-      )
-      expect(actual).to be_a(
-        SendGrid4r::REST::Sm::Suppressions::Suppression
-      )
-      expect(actual.id).to eq(4)
-      expect(actual.name).to eq('Special Offers')
-      expect(actual.description).to eq('Special offers and coupons')
-      expect(actual.suppressed).to eq(false)
-    end
+      it 'creates suppression instance' do
+        actual = Suppressions.create_suppression(suppression)
+        expect(actual).to be_a(Suppressions::Suppression)
+        expect(actual.id).to eq(4)
+        expect(actual.name).to eq('Special Offers')
+        expect(actual.description).to eq('Special offers and coupons')
+        expect(actual.suppressed).to eq(false)
+      end
 
-    it 'creates suppressions instance' do
-      actual = SendGrid4r::REST::Sm::Suppressions.create_suppressions(
-        suppressions
-      )
-      expect(actual).to be_a(
-        SendGrid4r::REST::Sm::Suppressions::Suppressions
-      )
-      expect(actual.suppressions).to be_a(Array)
-      actual.suppressions.each do |suppression|
-        expect(suppression).to be_a(
-          SendGrid4r::REST::Sm::Suppressions::Suppression
-        )
+      it 'creates suppressions instance' do
+        actual = Suppressions.create_suppressions(suppressions)
+        expect(actual).to be_a(Suppressions::Suppressions)
+        expect(actual.suppressions).to be_a(Array)
+        actual.suppressions.each do |suppression|
+          expect(suppression).to be_a(Suppressions::Suppression)
+        end
       end
     end
   end

data/spec/rest/spam_reports_spec.rb

@@ -1,24 +1,19 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../spec_helper'
 
-describe SendGrid4r::REST::SpamReports do
-  describe 'integration test', :it do
-    before do
-      begin
+module SendGrid4r::REST
+  describe SpamReports do
+    describe 'integration test', :it do
+      before do
         Dotenv.load
         @client = SendGrid4r::Client.new(api_key: ENV['SILVER_API_KEY'])
         @emails = [
           'a1@spam_report.com', 'a2@spam_report.com', 'a3@spam_report.com'
         ]
-      rescue RestClient::ExceptionWithResponse => e
-        puts e.inspect
-        raise e
       end
-    end
 
-    context 'without block call' do
-      it '#get_spam_reports' do
-        begin
+      context 'without block call' do
+        it '#get_spam_reports' do
           start_time = Time.now - 60 * 60 * 24 * 365
           end_time = Time.now
           spam_reports = @client.get_spam_reports(
@@ -27,137 +22,114 @@ describe SendGrid4r::REST::SpamReports do
           expect(spam_reports).to be_a(Array)
           spam_reports.each do |spam_report|
             expect(spam_report).to be_a(
-              SendGrid4r::REST::SpamReports::SpamReport
+              SpamReports::SpamReport
             )
           end
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_spam_reports(delete_all: true)' do
-        begin
+        it '#delete_spam_reports(delete_all: true)' do
           @client.delete_spam_reports(delete_all: true)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_spam_reports(emails: [])' do
-        begin
+        it '#delete_spam_reports(emails: [])' do
           @client.delete_spam_reports(emails: @emails)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_spam_report' do
-        begin
+        it '#get_spam_report' do
           spam_report = @client.get_spam_report(email: @email)
           expect(spam_report).to be_a(Array)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_spam_report' do
-        begin
+        it '#delete_spam_report' do
           expect do
             @client.delete_spam_report(email: 'a1@spam_report.com')
           end.to raise_error(RestClient::ResourceNotFound)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
       end
     end
-  end
 
-  describe 'unit test', :ut do
-    let(:client) do
-      SendGrid4r::Client.new(api_key: '')
-    end
+    describe 'unit test', :ut do
+      let(:client) do
+        SendGrid4r::Client.new(api_key: '')
+      end
 
-    let(:spam_reports) do
-      JSON.parse(
-        '['\
-          '{'\
-            '"created": 1443651141,'\
-            '"email": "user1@example.com",'\
-            '"ip": "10.63.202.100"'\
-          '},'\
-          '{'\
-            '"created": 1443651154,'\
-            '"email": "user2@example.com",'\
-            '"ip": "10.63.202.100"'\
-          '}'\
-        ']'
-      )
-    end
+      let(:spam_reports) do
+        JSON.parse(
+          '['\
+            '{'\
+              '"created": 1443651141,'\
+              '"email": "user1@example.com",'\
+              '"ip": "10.63.202.100"'\
+            '},'\
+            '{'\
+              '"created": 1443651154,'\
+              '"email": "user2@example.com",'\
+              '"ip": "10.63.202.100"'\
+            '}'\
+          ']'
+        )
+      end
 
-    let(:spam_report) do
-      JSON.parse(
-        '{'\
-          '"created": 1454433146,'\
-          '"email": "test1@example.com",'\
-          '"ip": "10.89.32.5"'\
-        '}'
-      )
-    end
+      let(:spam_report) do
+        JSON.parse(
+          '{'\
+            '"created": 1454433146,'\
+            '"email": "test1@example.com",'\
+            '"ip": "10.89.32.5"'\
+          '}'
+        )
+      end
 
-    it '#get_spam_reports' do
-      allow(client).to receive(:execute).and_return(spam_reports)
-      actual = client.get_spam_reports
-      expect(actual).to be_a(Array)
-      actual.each do |spam_report|
-        expect(spam_report).to be_a(SendGrid4r::REST::SpamReports::SpamReport)
+      it '#get_spam_reports' do
+        allow(client).to receive(:execute).and_return(spam_reports)
+        actual = client.get_spam_reports
+        expect(actual).to be_a(Array)
+        actual.each do |spam_report|
+          expect(spam_report).to be_a(SpamReports::SpamReport)
+        end
       end
-    end
 
-    it '#delete_spam_reports(delete_all: true)' do
-      allow(client).to receive(:execute).and_return('')
-      client.delete_spam_reports(delete_all: true)
-    end
+      it '#delete_spam_reports(delete_all: true)' do
+        allow(client).to receive(:execute).and_return('')
+        client.delete_spam_reports(delete_all: true)
+      end
 
-    it '#delete_spam_reports(emails: [])' do
-      allow(client).to receive(:execute).and_return('')
-      actual = client.delete_spam_reports(emails: [])
-      expect(actual).to eq('')
-    end
+      it '#delete_spam_reports(emails: [])' do
+        allow(client).to receive(:execute).and_return('')
+        actual = client.delete_spam_reports(emails: [])
+        expect(actual).to eq('')
+      end
 
-    it '#get_spam_report' do
-      allow(client).to receive(:execute).and_return(spam_reports)
-      actual = client.get_spam_report(email: '')
-      expect(actual).to be_a(Array)
-      actual.each do |spam_report|
-        expect(spam_report).to be_a(SendGrid4r::REST::SpamReports::SpamReport)
+      it '#get_spam_report' do
+        allow(client).to receive(:execute).and_return(spam_reports)
+        actual = client.get_spam_report(email: '')
+        expect(actual).to be_a(Array)
+        actual.each do |spam_report|
+          expect(spam_report).to be_a(SpamReports::SpamReport)
+        end
       end
-    end
 
-    it '#delete_spam_report' do
-      allow(client).to receive(:execute).and_return('')
-      actual = client.delete_spam_report(email: '')
-      expect(actual).to eq('')
-    end
+      it '#delete_spam_report' do
+        allow(client).to receive(:execute).and_return('')
+        actual = client.delete_spam_report(email: '')
+        expect(actual).to eq('')
+      end
 
-    it 'creates spam_reports instance' do
-      actual = SendGrid4r::REST::SpamReports.create_spam_reports(spam_reports)
-      expect(actual).to be_a(Array)
-      actual.each do |subuser|
-        expect(subuser).to be_a(SendGrid4r::REST::SpamReports::SpamReport)
+      it 'creates spam_reports instance' do
+        actual = SpamReports.create_spam_reports(spam_reports)
+        expect(actual).to be_a(Array)
+        actual.each do |subuser|
+          expect(subuser).to be_a(SpamReports::SpamReport)
+        end
       end
-    end
 
-    it 'creates spam_report instance' do
-      actual = SendGrid4r::REST::SpamReports.create_spam_report(spam_report)
-      expect(actual).to be_a(SendGrid4r::REST::SpamReports::SpamReport)
-      expect(actual.created).to eq(Time.at(1454433146))
-      expect(actual.email).to eq('test1@example.com')
-      expect(actual.ip).to eq('10.89.32.5')
+      it 'creates spam_report instance' do
+        actual = SpamReports.create_spam_report(spam_report)
+        expect(actual).to be_a(SpamReports::SpamReport)
+        expect(actual.created).to eq(Time.at(1454433146))
+        expect(actual.email).to eq('test1@example.com')
+        expect(actual.ip).to eq('10.89.32.5')
+      end
     end
   end
 end