sendgrid4r 1.8.1 → 1.10.0

data/spec/rest/sm/global_unsubscribes_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe SendGrid4r::REST::Sm::GlobalUnsubscribes do
-  describe 'integration test', :it do
-    before do
-      begin
+module SendGrid4r::REST::Sm
+  describe GlobalUnsubscribes 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'
@@ -32,44 +32,27 @@ describe SendGrid4r::REST::Sm::GlobalUnsubscribes do
         @client.post_global_suppressed_emails(
           recipient_emails: [@email1]
         )
-      rescue RestClient::ExceptionWithResponse => e
-        puts e.inspect
-        raise e
       end
-    end
 
-    context 'without block call' do
-      it '#get_global_unsubscribes' do
-        begin
+      context 'without block call' do
+        it '#get_global_unsubscribes' do
           global_unsubscribes = @client.get_global_unsubscribes
           expect(global_unsubscribes).to be_a(Array)
           global_unsubscribes.each do |global_unsubscribe|
-            expect(global_unsubscribe).to be_a(
-              SendGrid4r::REST::Sm::GlobalUnsubscribes::Unsubscribe
-            )
+            expect(global_unsubscribe).to be_a(GlobalUnsubscribes::Unsubscribe)
           end
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#post_global_suppressed_emails' do
-        begin
+        it '#post_global_suppressed_emails' do
           emails = @client.post_global_suppressed_emails(
             recipient_emails: [@email2, @email3]
           )
           expect(emails.recipient_emails.length).to eq(2)
           expect(emails.recipient_emails.include? @email2).to eq(true)
           expect(emails.recipient_emails.include? @email3).to eq(true)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_global_suppressed_email' do
-        begin
+        it '#get_global_suppressed_email' do
           actual_email1 = @client.get_global_suppressed_email(
             email_address: @email1
           )
@@ -78,14 +61,9 @@ describe SendGrid4r::REST::Sm::GlobalUnsubscribes do
           )
           expect(actual_email1.recipient_email).to eq(@email1)
           expect(actual_notexist.recipient_email).to eq(nil)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_global_suppressed_email' do
-        begin
+        it '#delete_global_suppressed_email' do
           expect(
             @client.delete_global_suppressed_email(email_address: @email1)
           ).to eq('')
@@ -95,54 +73,51 @@ describe SendGrid4r::REST::Sm::GlobalUnsubscribes do
           expect(
             @client.delete_global_suppressed_email(email_address: @email3)
           ).to eq('')
-        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
 
-    it '#post_global_suppressed_emails' do
-      allow(client).to receive(:execute).and_return(recipient_emails)
-      emails = client.post_global_suppressed_emails(recipient_emails: [])
-      expect(emails).to be_a(SendGrid4r::REST::Sm::RecipientEmails)
-    end
+      it '#post_global_suppressed_emails' do
+        allow(client).to receive(:execute).and_return(recipient_emails)
+        emails = client.post_global_suppressed_emails(recipient_emails: [])
+        expect(emails).to be_a(RecipientEmails)
+      end
 
-    it '#get_global_suppressed_email' do
-      allow(client).to receive(:execute).and_return(recipient_email)
-      actual = client.get_global_suppressed_email(email_address: '')
-      expect(actual).to be_a(SendGrid4r::REST::Sm::RecipientEmail)
-    end
+      it '#get_global_suppressed_email' do
+        allow(client).to receive(:execute).and_return(recipient_email)
+        actual = client.get_global_suppressed_email(email_address: '')
+        expect(actual).to be_a(RecipientEmail)
+      end
 
-    it '#delete_global_suppressed_email' do
-      allow(client).to receive(:execute).and_return('')
-      actual = client.delete_global_suppressed_email(email_address: '')
-      expect(actual).to eq('')
+      it '#delete_global_suppressed_email' do
+        allow(client).to receive(:execute).and_return('')
+        actual = client.delete_global_suppressed_email(email_address: '')
+        expect(actual).to eq('')
+      end
     end
   end
 end

data/spec/rest/sm/groups_spec.rb

@@ -1,12 +1,12 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe SendGrid4r::REST::Sm::Groups do
-  describe 'integration test', :it do
-    before do
-      begin
+module SendGrid4r::REST::Sm
+  describe Groups 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'])
         @group_name1 = 'group_test1'
         @group_name2 = 'group_test2'
         @group_name_edit1 = 'group_edit1'
@@ -30,68 +30,43 @@ describe SendGrid4r::REST::Sm::Groups do
         @group1 = @client.post_group(
           name: @group_name1, description: @group_desc
         )
-      rescue RestClient::ExceptionWithResponse => e
-        puts e.inspect
-        raise e
       end
-    end
 
-    context 'without block call' do
-      it '#post_group' do
-        begin
+      context 'without block call' do
+        it '#post_group' do
           group2 = @client.post_group(
             name: @group_name2, description: @group_desc
           )
           expect(@group_name2).to eq(group2.name)
           expect(@group_desc).to eq(group2.description)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#post_group with is_default' do
-        begin
+        it '#post_group with is_default' do
           group2 = @client.post_group(
             name: @group_name2, description: @group_desc, is_default: false
           )
           expect(@group_name2).to eq(group2.name)
           expect(@group_desc).to eq(group2.description)
           expect(false).to eq(group2.is_default)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_groups' do
-        begin
+        it '#get_groups' do
           groups = @client.get_groups
           expect(groups).to be_a(Array)
           groups.each do |group|
-            expect(group).to be_a(SendGrid4r::REST::Sm::Groups::Group)
+            expect(group).to be_a(Groups::Group)
           end
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#get_group' do
-        begin
+        it '#get_group' do
           group = @client.get_group(group_id: @group1.id)
           expect(group.id).to be_a(Fixnum)
           expect(group.name).to eq(@group_name1)
           expect(group.description).to eq(@group_desc)
           expect(group.unsubscribes).to eq(0)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#patch_group' do
-        begin
+        it '#patch_group' do
           @group1.name = @group_name_edit1
           @group1.description = @group_desc_edit
           group_edit1 = @client.patch_group(
@@ -101,44 +76,21 @@ describe SendGrid4r::REST::Sm::Groups do
           expect(group_edit1.name).to eq(@group_name_edit1)
           expect(group_edit1.description).to eq(@group_desc_edit)
           expect(group_edit1.unsubscribes).to eq(nil)
-        rescue RestClient::ExceptionWithResponse => e
-          puts e.inspect
-          raise e
         end
-      end
 
-      it '#delete_group' do
-        begin
+        it '#delete_group' do
           @client.delete_group(group_id: @group1.id)
-        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
 
-    let(:group) do
-      JSON.parse(
-        '{'\
-          '"id": 100,'\
-          '"name": "Newsletters",'\
-          '"description": "Our monthly newsletter.",'\
-          '"last_email_sent_at": null,'\
-          '"is_default": true,'\
-          '"unsubscribes": 400'\
-        '}'
-      )
-    end
+    describe 'unit test', :ut do
+      let(:client) do
+        SendGrid4r::Client.new(api_key: '')
+      end
 
-    let(:groups) do
-      JSON.parse(
-        '['\
+      let(:group) do
+        JSON.parse(
           '{'\
             '"id": 100,'\
             '"name": "Newsletters",'\
@@ -146,70 +98,83 @@ describe SendGrid4r::REST::Sm::Groups do
             '"last_email_sent_at": null,'\
             '"is_default": true,'\
             '"unsubscribes": 400'\
-          '},'\
-          '{'\
-            '"id": 101,'\
-            '"name": "Alerts",'\
-            '"description": "Emails triggered by user-defined rules.",'\
-            '"last_email_sent_at": null,'\
-            '"is_default": false,'\
-            '"unsubscribes": 1'\
-          '}'\
-        ']'
-      )
-    end
+          '}'
+        )
+      end
 
-    it '#post_group' do
-      allow(client).to receive(:execute).and_return(group)
-      actual = client.post_group(name: '', description: '')
-      expect(actual).to be_a(SendGrid4r::REST::Sm::Groups::Group)
-    end
+      let(:groups) do
+        JSON.parse(
+          '['\
+            '{'\
+              '"id": 100,'\
+              '"name": "Newsletters",'\
+              '"description": "Our monthly newsletter.",'\
+              '"last_email_sent_at": null,'\
+              '"is_default": true,'\
+              '"unsubscribes": 400'\
+            '},'\
+            '{'\
+              '"id": 101,'\
+              '"name": "Alerts",'\
+              '"description": "Emails triggered by user-defined rules.",'\
+              '"last_email_sent_at": null,'\
+              '"is_default": false,'\
+              '"unsubscribes": 1'\
+            '}'\
+          ']'
+        )
+      end
 
-    it '#patch_group' do
-      allow(client).to receive(:execute).and_return(group)
-      actual = client.patch_group(group_id: 0, group: nil)
-      expect(actual).to be_a(SendGrid4r::REST::Sm::Groups::Group)
-    end
+      it '#post_group' do
+        allow(client).to receive(:execute).and_return(group)
+        actual = client.post_group(name: '', description: '')
+        expect(actual).to be_a(Groups::Group)
+      end
 
-    it '#get_groups' do
-      allow(client).to receive(:execute).and_return(groups)
-      actual = client.get_groups
-      expect(actual).to be_a(Array)
-      actual.each do |group|
-        expect(group).to be_a(SendGrid4r::REST::Sm::Groups::Group)
+      it '#patch_group' do
+        allow(client).to receive(:execute).and_return(group)
+        actual = client.patch_group(group_id: 0, group: nil)
+        expect(actual).to be_a(Groups::Group)
       end
-    end
 
-    it '#get_group' do
-      allow(client).to receive(:execute).and_return(group)
-      actual = client.get_group(group_id: 0)
-      expect(actual).to be_a(SendGrid4r::REST::Sm::Groups::Group)
-    end
+      it '#get_groups' do
+        allow(client).to receive(:execute).and_return(groups)
+        actual = client.get_groups
+        expect(actual).to be_a(Array)
+        actual.each do |group|
+          expect(group).to be_a(Groups::Group)
+        end
+      end
 
-    it '#delete_group' do
-      allow(client).to receive(:execute).and_return('')
-      actual = client.delete_group(group_id: 0)
-      expect(actual).to eq('')
-    end
+      it '#get_group' do
+        allow(client).to receive(:execute).and_return(group)
+        actual = client.get_group(group_id: 0)
+        expect(actual).to be_a(Groups::Group)
+      end
 
-    it 'creates group instance' do
-      actual = SendGrid4r::REST::Sm::Groups.create_group(group)
-      expect(actual).to be_a(
-        SendGrid4r::REST::Sm::Groups::Group
-      )
-      expect(actual.id).to eq(100)
-      expect(actual.name).to eq('Newsletters')
-      expect(actual.description).to eq('Our monthly newsletter.')
-      expect(actual.last_email_sent_at).to eq(nil)
-      expect(actual.is_default).to eq(true)
-      expect(actual.unsubscribes).to eq(400)
-    end
+      it '#delete_group' do
+        allow(client).to receive(:execute).and_return('')
+        actual = client.delete_group(group_id: 0)
+        expect(actual).to eq('')
+      end
 
-    it 'creates groups instance' do
-      actual = SendGrid4r::REST::Sm::Groups.create_groups(groups)
-      expect(actual).to be_a(Array)
-      actual.each do |group|
-        expect(group).to be_a(SendGrid4r::REST::Sm::Groups::Group)
+      it 'creates group instance' do
+        actual = Groups.create_group(group)
+        expect(actual).to be_a(Groups::Group)
+        expect(actual.id).to eq(100)
+        expect(actual.name).to eq('Newsletters')
+        expect(actual.description).to eq('Our monthly newsletter.')
+        expect(actual.last_email_sent_at).to eq(nil)
+        expect(actual.is_default).to eq(true)
+        expect(actual.unsubscribes).to eq(400)
+      end
+
+      it 'creates groups instance' do
+        actual = Groups.create_groups(groups)
+        expect(actual).to be_a(Array)
+        actual.each do |group|
+          expect(group).to be_a(Groups::Group)
+        end
       end
     end
   end

data/spec/rest/sm/sm_spec.rb

@@ -1,39 +1,41 @@
 # encoding: utf-8
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe SendGrid4r::REST::Sm do
-  let(:recipient_email) do
-    JSON.parse(
-      '{'\
-        '"recipient_email": "test1@example.com"'\
-      '}'
-    )
-  end
-
-  let(:recipient_emails) do
-    JSON.parse(
-      '{'\
-        '"recipient_emails": ['\
-          '"test1@example.com",'\
-          '"test2@example.com"'\
-        ']'\
-      '}'
-    )
-  end
+module SendGrid4r::REST::Sm
+  describe SendGrid4r::REST::Sm do
+    let(:recipient_email) do
+      JSON.parse(
+        '{'\
+          '"recipient_email": "test1@example.com"'\
+        '}'
+      )
+    end
 
-  describe 'unit test', :ut do
-    it 'creates recipient_emails instance' do
-      actual = SendGrid4r::REST::Sm.create_recipient_emails(recipient_emails)
-      expect(actual).to be_a(SendGrid4r::REST::Sm::RecipientEmails)
-      expect(actual.recipient_emails).to be_a(Array)
-      expect(actual.recipient_emails).to include('test1@example.com')
-      expect(actual.recipient_emails).to include('test2@example.com')
+    let(:recipient_emails) do
+      JSON.parse(
+        '{'\
+          '"recipient_emails": ['\
+            '"test1@example.com",'\
+            '"test2@example.com"'\
+          ']'\
+        '}'
+      )
     end
 
-    it 'creates recipient_email instance' do
-      actual = SendGrid4r::REST::Sm.create_recipient_email(recipient_email)
-      expect(actual).to be_a(SendGrid4r::REST::Sm::RecipientEmail)
-      expect(actual.recipient_email).to eq('test1@example.com')
+    describe 'unit test', :ut do
+      it 'creates recipient_emails instance' do
+        actual = SendGrid4r::REST::Sm.create_recipient_emails(recipient_emails)
+        expect(actual).to be_a(RecipientEmails)
+        expect(actual.recipient_emails).to be_a(Array)
+        expect(actual.recipient_emails).to include('test1@example.com')
+        expect(actual.recipient_emails).to include('test2@example.com')
+      end
+
+      it 'creates recipient_email instance' do
+        actual = SendGrid4r::REST::Sm.create_recipient_email(recipient_email)
+        expect(actual).to be_a(RecipientEmail)
+        expect(actual.recipient_email).to eq('test1@example.com')
+      end
     end
   end
 end