sendgrid4r 1.11.0 → 1.12.0

data/spec/cli/whitelabel/whitelabel_spec.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module SendGrid4r::CLI::Whitelabel
+  describe Whitelabel do
+    describe 'integration test', :it do
+      before do
+        Dotenv.load
+      end
+
+      it '#domain subcommand' do
+        args = ['domain' 'help']
+        Whitelabel.start(args)
+      end
+
+      it '#link subcommand' do
+        args = ['link']
+        Whitelabel.start(args)
+      end
+
+      it '#ip subcommand' do
+        args = ['ip']
+        Whitelabel.start(args)
+      end
+    end
+  end
+end

data/spec/client_spec.rb

@@ -324,7 +324,7 @@ describe SendGrid4r::Client do
 
     describe 'VERSION' do
       it 'returns VERSION value' do
-        expect(SendGrid4r::VERSION).to eq('1.11.0')
+        expect(SendGrid4r::VERSION).to eq('1.12.0')
       end
     end
   end

data/spec/factory/campaign_factory_spec.rb

@@ -48,8 +48,8 @@ module SendGrid4r::Factory
         address = CampaignFactory.new.create_address(
           email: 'from@example.com', name: 'Example INC'
         )
-        expect(address.email).to eq('from@example.com')
-        expect(address.name).to eq('Example INC')
+        expect(address[:email]).to eq('from@example.com')
+        expect(address[:name]).to eq('Example INC')
       end
 
       it 'create sender with full parameters' do

data/spec/factory/event_factory_spec.rb

@@ -0,0 +1,36 @@
+# encoding: utf-8
+require File.dirname(__FILE__) + '/../spec_helper'
+
+module SendGrid4r::Factory
+  describe EventFactory do
+    describe 'unit test', :ut do
+      before do
+        Dotenv.load
+      end
+
+      it 'create with full parameters' do
+        event = EventFactory.create(
+          enabled: true, url: 'test.test.test', group_resubscribe: true,
+          delivered: true, group_unsubscribe: true, spam_report: true,
+          bounce: true, deferred: true, unsubscribe: true, processed: true,
+          open: true, click: true, dropped: true)
+        expect(event).to be_a(
+          SendGrid4r::REST::Webhooks::Event::EventNotification
+        )
+        expect(event.enabled).to eq(true)
+        expect(event.url).to eq('test.test.test')
+        expect(event.group_resubscribe).to eq(true)
+        expect(event.delivered).to eq(true)
+        expect(event.group_unsubscribe).to eq(true)
+        expect(event.spam_report).to eq(true)
+        expect(event.bounce).to eq(true)
+        expect(event.deferred).to eq(true)
+        expect(event.unsubscribe).to eq(true)
+        expect(event.processed).to eq(true)
+        expect(event.open).to eq(true)
+        expect(event.click).to eq(true)
+        expect(event.dropped).to eq(true)
+      end
+    end
+  end
+end

data/spec/rest/api_keys_management/api_keys_spec.rb

@@ -92,31 +92,27 @@ module SendGrid4r::REST::ApiKeysManagement
       end
 
       let(:api_keys) do
-        JSON.parse(
-          '{'\
-            '"result": ['\
-              '{'\
-                '"name": "A New Hope",'\
-                '"api_key_id": "xxxxxxxx"'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"result": ['\
+            '{'\
+              '"name": "A New Hope",'\
+              '"api_key_id": "xxxxxxxx"'\
+            '}'\
+          ']'\
+        '}'
       end
 
       let(:api_key) do
-        JSON.parse(
-          '{'\
-            '"api_key": "SG.xxxxxxxx.yyyyyyyy",'\
-            '"api_key_id": "xxxxxxxx",'\
-            '"name": "My API Key",'\
-            '"scopes": ['\
-              '"mail.send",'\
-              '"alerts.create",'\
-              '"alerts.read"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"api_key": "SG.xxxxxxxx.yyyyyyyy",'\
+          '"api_key_id": "xxxxxxxx",'\
+          '"name": "My API Key",'\
+          '"scopes": ['\
+            '"mail.send",'\
+            '"alerts.create",'\
+            '"alerts.read"'\
+          ']'\
+        '}'
       end
 
       it '#get_api_keys' do
@@ -150,7 +146,9 @@ module SendGrid4r::REST::ApiKeysManagement
       end
 
       it 'creates api_key instance' do
-        actual = SendGrid4r::REST::ApiKeysManagement.create_api_key(api_key)
+        actual = SendGrid4r::REST::ApiKeysManagement.create_api_key(
+          JSON.parse(api_key)
+        )
         expect(actual).to be_a(ApiKey)
         expect(actual.api_key).to eq('SG.xxxxxxxx.yyyyyyyy')
         expect(actual.api_key_id).to eq('xxxxxxxx')
@@ -161,7 +159,9 @@ module SendGrid4r::REST::ApiKeysManagement
       end
 
       it 'creates api_keys instance' do
-        actual = SendGrid4r::REST::ApiKeysManagement.create_api_keys(api_keys)
+        actual = SendGrid4r::REST::ApiKeysManagement.create_api_keys(
+          JSON.parse(api_keys)
+        )
         expect(actual).to be_a(ApiKeys)
         expect(actual.result).to be_a(Array)
         actual.result.each do |api_key|

data/spec/rest/api_keys_management/permissions_spec.rb

@@ -24,15 +24,13 @@ module SendGrid4r::REST::ApiKeysManagement
       end
 
       let(:permissions) do
-        JSON.parse(
-          '{'\
-            '"scopes": ['\
-              '"alerts.create",'\
-              '"alerts.read",'\
-              '"alerts.update"'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"scopes": ['\
+            '"alerts.create",'\
+            '"alerts.read",'\
+            '"alerts.update"'\
+          ']'\
+        '}'
       end
 
       it '#get_permissions' do
@@ -42,7 +40,7 @@ module SendGrid4r::REST::ApiKeysManagement
       end
 
       it 'creates permissions instance' do
-        actual = Permissions.create_permissions(permissions)
+        actual = Permissions.create_permissions(JSON.parse(permissions))
         expect(actual).to be_a(Permissions::Permissions)
         expect(actual.scopes).to be_a(Array)
         expect(actual.scopes[0]).to eq('alerts.create')

data/spec/rest/blocks_spec.rb

@@ -50,21 +50,7 @@ module SendGrid4r::REST
       end
 
       let(:blocks) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"created": 1443651154,'\
-              '"email": "user1@example.com",'\
-              '"reason": "error dialing remote address: dial tcp '\
-              '10.57.152.165:25: no route to host",'\
-              '"status": "4.0.0"'\
-            '}'\
-          ']'
-        )
-      end
-
-      let(:block) do
-        JSON.parse(
+        '['\
           '{'\
             '"created": 1443651154,'\
             '"email": "user1@example.com",'\
@@ -72,7 +58,17 @@ module SendGrid4r::REST
             '10.57.152.165:25: no route to host",'\
             '"status": "4.0.0"'\
           '}'\
-        )
+        ']'
+      end
+
+      let(:block) do
+        '{'\
+          '"created": 1443651154,'\
+          '"email": "user1@example.com",'\
+          '"reason": "error dialing remote address: dial tcp '\
+          '10.57.152.165:25: no route to host",'\
+          '"status": "4.0.0"'\
+        '}'\
       end
 
       it '#get_blocks' do
@@ -111,7 +107,7 @@ module SendGrid4r::REST
       end
 
       it 'creates blocks instance' do
-        actual = Blocks.create_blocks(blocks)
+        actual = Blocks.create_blocks(JSON.parse(blocks))
         expect(actual).to be_a(Array)
         actual.each do |subuser|
           expect(subuser).to be_a(Blocks::Block)
@@ -119,7 +115,7 @@ module SendGrid4r::REST
       end
 
       it 'creates block instance' do
-        actual = Blocks.create_block(block)
+        actual = Blocks.create_block(JSON.parse(block))
         expect(actual).to be_a(Blocks::Block)
         expect(actual.created).to eq(Time.at(1443651154))
         expect(actual.email).to eq('user1@example.com')

data/spec/rest/bounces_spec.rb

@@ -50,41 +50,37 @@ module SendGrid4r::REST
       end
 
       let(:bounces) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"created": 1443651125,'\
-              '"email": "testemail1@test.com",'\
-              '"reason": "550 5.1.1 The email account that you tried to reach '\
-              'does not exist.'\
-              'Please try double-checking the recipient\'s email address for '\
-              'typos or unnecessary spaces. Learn more at '\
-              'https://support.google.com/mail/answer/6596'\
-              'o186si2389584ioe.63 - gsmtp ",'\
-              '"status": "5.1.1"'\
-            '},'\
-            '{'\
-              '"created": 1433800303,'\
-              '"email": "testemail2@testing.com",'\
-              '"reason": "550 5.1.1 <testemail2@testing.com>: '\
-                'Recipient address '\
-              'rejected: User unknown in virtual alias table ",'\
-              '"status": "5.1.1"'\
-            '}'\
-          ']'
-        )
-      end
-
-      let(:bounce) do
-        JSON.parse(
+        '['\
+          '{'\
+            '"created": 1443651125,'\
+            '"email": "testemail1@test.com",'\
+            '"reason": "550 5.1.1 The email account that you tried to reach '\
+            'does not exist.'\
+            'Please try double-checking the recipient\'s email address for '\
+            'typos or unnecessary spaces. Learn more at '\
+            'https://support.google.com/mail/answer/6596'\
+            'o186si2389584ioe.63 - gsmtp ",'\
+            '"status": "5.1.1"'\
+          '},'\
           '{'\
             '"created": 1433800303,'\
             '"email": "testemail2@testing.com",'\
-            '"reason": "550 5.1.1 <testemail2@testing.com>: Recipient address '\
+            '"reason": "550 5.1.1 <testemail2@testing.com>: '\
+              'Recipient address '\
             'rejected: User unknown in virtual alias table ",'\
             '"status": "5.1.1"'\
-          '}'
-        )
+          '}'\
+        ']'
+      end
+
+      let(:bounce) do
+        '{'\
+          '"created": 1433800303,'\
+          '"email": "testemail2@testing.com",'\
+          '"reason": "550 5.1.1 <testemail2@testing.com>: Recipient address '\
+          'rejected: User unknown in virtual alias table ",'\
+          '"status": "5.1.1"'\
+        '}'
       end
 
       it '#get_bounces' do
@@ -123,7 +119,7 @@ module SendGrid4r::REST
       end
 
       it 'creates bounces instance' do
-        actual = Bounces.create_bounces(bounces)
+        actual = Bounces.create_bounces(JSON.parse(bounces))
         expect(actual).to be_a(Array)
         actual.each do |subuser|
           expect(subuser).to be_a(Bounces::Bounce)
@@ -131,7 +127,7 @@ module SendGrid4r::REST
       end
 
       it 'creates bounce instance' do
-        actual = Bounces.create_bounce(bounce)
+        actual = Bounces.create_bounce(JSON.parse(bounce))
         expect(actual).to be_a(Bounces::Bounce)
         expect(actual.created).to eq(Time.at(1433800303))
         expect(actual.email).to eq('testemail2@testing.com')

data/spec/rest/cancel_scheduled_sends_spec.rb

@@ -65,26 +65,22 @@ module SendGrid4r::REST
       end
 
       let(:scheduled_send) do
-        JSON.parse(
-          '{'\
-            '"batch_id": "YOUR_BATCH_ID"'\
-          '}'
-        )
+        '{'\
+          '"batch_id": "YOUR_BATCH_ID"'\
+        '}'
       end
 
       let(:scheduled_sends) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"batch_id": "BATCH_ID_1",'\
-              '"status": "cancel"'\
-            '},'\
-            '{'\
-              '"batch_id": "BATCH_ID_2",'\
-              '"status": "pause"'\
-            '}'\
-          ']'
-        )
+        '['\
+          '{'\
+            '"batch_id": "BATCH_ID_1",'\
+            '"status": "cancel"'\
+          '},'\
+          '{'\
+            '"batch_id": "BATCH_ID_2",'\
+            '"status": "pause"'\
+          '}'\
+        ']'
       end
 
       it '#generate_batch_id' do
@@ -131,7 +127,7 @@ module SendGrid4r::REST
 
       it 'creates scheduled_sends instance' do
         actual = CancelScheduledSends.create_scheduled_sends(
-          scheduled_sends
+          JSON.parse(scheduled_sends)
         )
         expect(actual).to be_a(Array)
         actual.each do |scheduled_send|
@@ -145,7 +141,7 @@ module SendGrid4r::REST
 
       it 'creates scheduled_send instance' do
         actual = CancelScheduledSends.create_scheduled_send(
-          scheduled_send
+          JSON.parse(scheduled_send)
         )
         expect(actual).to be_a(CancelScheduledSends::ScheduledSend)
         expect(actual.batch_id).to eq('YOUR_BATCH_ID')

data/spec/rest/categories_spec.rb

@@ -44,15 +44,13 @@ module SendGrid4r::REST
       end
 
       let(:categories) do
-        JSON.parse(
-          '['\
-            '{"category": "cat1"},'\
-            '{"category": "cat2"},'\
-            '{"category": "cat3"},'\
-            '{"category": "cat4"},'\
-            '{"category": "cat5"}'\
-          ']'
-        )
+        '['\
+          '{"category": "cat1"},'\
+          '{"category": "cat2"},'\
+          '{"category": "cat3"},'\
+          '{"category": "cat4"},'\
+          '{"category": "cat5"}'\
+        ']'
       end
 
       it '#get_categories' do
@@ -65,7 +63,7 @@ module SendGrid4r::REST
       end
 
       it 'creates categories instance' do
-        actual = Categories.create_categories(categories)
+        actual = Categories.create_categories(JSON.parse(categories))
         expect(actual).to be_a(Array)
         actual.each do |category|
           expect(category).to be_a(Categories::Category)

data/spec/rest/email_activity_spec.rb

@@ -80,25 +80,7 @@ module SendGrid4r::REST
       end
 
       let(:activities) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"email": "test@example.com",'\
-              '"event": "processed",'\
-              '"created": 1431624000,'\
-              '"category": ["my_category"],'\
-              '"smtp_id": "filter001-2348927389",'\
-              '"asm_group_id": null,'\
-              '"msg_id": "xxx-abc-123",'\
-              '"ip": null,'\
-              '"url": null'\
-            '}'\
-          ']'
-        )
-      end
-
-      let(:activity) do
-        JSON.parse(
+        '['\
           '{'\
             '"email": "test@example.com",'\
             '"event": "processed",'\
@@ -110,7 +92,21 @@ module SendGrid4r::REST
             '"ip": null,'\
             '"url": null'\
           '}'\
-        )
+        ']'
+      end
+
+      let(:activity) do
+        '{'\
+          '"email": "test@example.com",'\
+          '"event": "processed",'\
+          '"created": 1431624000,'\
+          '"category": ["my_category"],'\
+          '"smtp_id": "filter001-2348927389",'\
+          '"asm_group_id": null,'\
+          '"msg_id": "xxx-abc-123",'\
+          '"ip": null,'\
+          '"url": null'\
+        '}'\
       end
 
       it '#get_email_activities' do
@@ -123,7 +119,7 @@ module SendGrid4r::REST
       end
 
       it 'creates activity instance' do
-        actual = EmailActivity.create_activity(activity)
+        actual = EmailActivity.create_activity(JSON.parse(activity))
         expect(actual).to be_a(EmailActivity::Activity)
         expect(actual.email).to eq('test@example.com')
         expect(actual.event).to eq('processed')
@@ -140,7 +136,7 @@ module SendGrid4r::REST
       end
 
       it 'creates activities instance' do
-        actual = EmailActivity.create_activities(activities)
+        actual = EmailActivity.create_activities(JSON.parse(activities))
         expect(actual).to be_a(Array)
         actual.each do |activity|
           expect(activity).to be_a(EmailActivity::Activity)