sendgrid4r 1.11.0 → 1.12.0

data/spec/rest/transactional_templates/templates_spec.rb

@@ -91,40 +91,36 @@ module SendGrid4r::REST::TransactionalTemplates
       end
 
       let(:template) do
-        JSON.parse(
-          '{'\
-            '"id": "733ba07f-ead1-41fc-933a-3976baa23716",'\
-            '"name": "example_name",'\
-            '"versions": []'\
-          '}'
-        )
+        '{'\
+          '"id": "733ba07f-ead1-41fc-933a-3976baa23716",'\
+          '"name": "example_name",'\
+          '"versions": []'\
+        '}'
       end
 
       let(:templates) do
-        JSON.parse(
-          '{'\
-            '"templates": ['\
-              '{'\
-                '"id": "e8ac01d5-a07a-4a71-b14c-4721136fe6aa",'\
-                '"name": "example template name",'\
-                '"versions": ['\
-                  '{'\
-                    '"id": "de37d11b-082a-42c0-9884-c0c143015a47",'\
-                    '"user_id": 1234,'\
-                    '"template_id": "d51480ba-ca3f-465c-bc3e-ceb71d73c38d",'\
-                    '"active": 1,'\
-                    '"name": "example version",'\
-                    '"html_content": "<%body%><strong>Click '\
-                      'to Reset</strong>",'\
-                    '"plain_content": "Click to Reset<%body%>",'\
-                    '"subject": "<%subject%>",'\
-                    '"updated_at": "2014-05-22 20:05:21"'\
-                  '}'\
-                ']'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"templates": ['\
+            '{'\
+              '"id": "e8ac01d5-a07a-4a71-b14c-4721136fe6aa",'\
+              '"name": "example template name",'\
+              '"versions": ['\
+                '{'\
+                  '"id": "de37d11b-082a-42c0-9884-c0c143015a47",'\
+                  '"user_id": 1234,'\
+                  '"template_id": "d51480ba-ca3f-465c-bc3e-ceb71d73c38d",'\
+                  '"active": 1,'\
+                  '"name": "example version",'\
+                  '"html_content": "<%body%><strong>Click '\
+                    'to Reset</strong>",'\
+                  '"plain_content": "Click to Reset<%body%>",'\
+                  '"subject": "<%subject%>",'\
+                  '"updated_at": "2014-05-22 20:05:21"'\
+                '}'\
+              ']'\
+            '}'\
+          ']'\
+        '}'
       end
 
       it '#post_template' do
@@ -159,7 +155,7 @@ module SendGrid4r::REST::TransactionalTemplates
 
       it 'creates template instance' do
         actual = SendGrid4r::REST::TransactionalTemplates.create_template(
-          template
+          JSON.parse(template)
         )
         expect(actual).to be_a(Template)
         expect(actual.id).to eq('733ba07f-ead1-41fc-933a-3976baa23716')
@@ -169,7 +165,7 @@ module SendGrid4r::REST::TransactionalTemplates
 
       it 'creates templates instance' do
         actual = SendGrid4r::REST::TransactionalTemplates.create_templates(
-          templates
+          JSON.parse(templates)
         )
         expect(actual).to be_a(Templates)
         expect(actual.templates).to be_a(Array)

data/spec/rest/transactional_templates/versions_spec.rb

@@ -77,86 +77,6 @@ module SendGrid4r::REST::TransactionalTemplates
           )
         end
       end
-
-      context 'with block call' do
-        it '#post_version' do
-          ver2 = @factory.create(name: @version2_name)
-          @client.post_version(
-            template_id: @template.id, version: ver2
-          ) do |resp, req, res|
-            resp = Versions.create_version(JSON.parse(resp))
-            expect(resp).to be_a(Versions::Version)
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPCreated)
-          end
-        end
-
-        it '#post_version without body and subject tag' do
-          ver2 = @factory.create(
-            name: @version2_name, subject: 'Hello',
-            html_content: 'This is the body.',
-            plain_content: 'This is the body.'
-          )
-          @client.post_version(
-            template_id: @template.id, version: ver2
-          ) do |resp, req, res|
-            resp = Versions.create_version(JSON.parse(resp))
-            expect(resp).to be_a(Versions::Version)
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPCreated)
-          end
-        end
-
-        it '#activate_version' do
-          @client.activate_version(
-            template_id: @template.id, version_id: @version1.id
-          ) do |resp, req, res|
-            resp = Versions.create_version(JSON.parse(resp))
-            expect(resp).to be_a(Versions::Version)
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPOK)
-          end
-        end
-
-        it '#get_version' do
-          @client.get_version(
-            template_id: @template.id, version_id: @version1.id
-          ) do |resp, req, res|
-            resp = Versions.create_version(JSON.parse(resp))
-            expect(resp).to be_a(Versions::Version)
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPOK)
-          end
-        end
-
-        it '#patch_version' do
-          edit_ver1 = @version1.dup
-          edit_ver1.name = 'edit_version'
-          edit_ver1.subject = 'edit<%subject%>edit'
-          edit_ver1.html_content = 'edit<%body%>edit'
-          edit_ver1.plain_content = 'edit<%body%>edit'
-          edit_ver1.active = 0
-          @client.patch_version(
-            template_id: @template.id, version_id: @version1.id,
-            version: edit_ver1
-          ) do |resp, req, res|
-            resp = Versions.create_version(JSON.parse(resp))
-            expect(resp).to be_a(Versions::Version)
-            expect(req).to be_a(RestClient::Request)
-            expect(res).to be_a(Net::HTTPOK)
-          end
-        end
-
-        it '#delete_version' do
-          @client.delete_version(
-            template_id: @template.id, version_id: @version1.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
@@ -165,18 +85,16 @@ module SendGrid4r::REST::TransactionalTemplates
       end
 
       let(:version) do
-        JSON.parse(
-          '{'\
-            '"id": "8aefe0ee-f12b-4575-b5b7-c97e21cb36f3",'\
-            '"template_id": "ddb96bbc-9b92-425e-8979-99464621b543",'\
-            '"active": 1,'\
-            '"name": "example_version_name",'\
-            '"html_content": "<%body%>",'\
-            '"plain_content": "<%body%>",'\
-            '"subject": "<%subject%>",'\
-            '"updated_at": "2014-03-19 18:56:33"'\
-          '}'
-        )
+        '{'\
+          '"id": "8aefe0ee-f12b-4575-b5b7-c97e21cb36f3",'\
+          '"template_id": "ddb96bbc-9b92-425e-8979-99464621b543",'\
+          '"active": 1,'\
+          '"name": "example_version_name",'\
+          '"html_content": "<%body%>",'\
+          '"plain_content": "<%body%>",'\
+          '"subject": "<%subject%>",'\
+          '"updated_at": "2014-03-19 18:56:33"'\
+        '}'
       end
 
       it '#post_version' do
@@ -212,7 +130,7 @@ module SendGrid4r::REST::TransactionalTemplates
       end
 
       it 'creates version instance' do
-        actual = Versions.create_version(version)
+        actual = Versions.create_version(JSON.parse(version))
         expect(actual).to be_a(Versions::Version)
         expect(actual.id).to eq('8aefe0ee-f12b-4575-b5b7-c97e21cb36f3')
         expect(actual.template_id).to eq('ddb96bbc-9b92-425e-8979-99464621b543')

data/spec/rest/users_spec.rb

@@ -70,69 +70,57 @@ module SendGrid4r::REST
       end
 
       let(:profile) do
-        JSON.parse(
-          '{'\
-            '"address":"814 West Chapman Avenue",'\
-            '"city":"Orange",'\
-            '"company":"SendGrid",'\
-            '"country":"US",'\
-            '"first_name":"Test",'\
-            '"last_name":"User",'\
-            '"phone":"555-555-5555",'\
-            '"state":"CA",'\
-            '"website":"http://www.sendgrid.com",'\
-            '"zip":"92868"'\
-          '}'
-        )
+        '{'\
+          '"address":"814 West Chapman Avenue",'\
+          '"city":"Orange",'\
+          '"company":"SendGrid",'\
+          '"country":"US",'\
+          '"first_name":"Test",'\
+          '"last_name":"User",'\
+          '"phone":"555-555-5555",'\
+          '"state":"CA",'\
+          '"website":"http://www.sendgrid.com",'\
+          '"zip":"92868"'\
+        '}'
       end
 
       let(:account) do
-        JSON.parse(
-          '{'\
-            '"type": "free",'\
-            '"reputation": 99.7'\
-          '}'
-        )
+        '{'\
+          '"type": "free",'\
+          '"reputation": 99.7'\
+        '}'
       end
 
       let(:email) do
-        JSON.parse(
-          '{'\
-            '"email": "test@example.com"'\
-          '}'
-        )
+        '{'\
+          '"email": "test@example.com"'\
+        '}'
       end
 
       let(:username) do
-        JSON.parse(
-          '{'\
-            '"username": "test_username",'\
-            '"user_id": 1'\
-          '}'
-        )
+        '{'\
+          '"username": "test_username",'\
+          '"user_id": 1'\
+        '}'
       end
 
       let(:credits) do
-        JSON.parse(
-          '{'\
-            '"remain": 200,'\
-            '"total": 200,'\
-            '"overage": 0,'\
-            '"used": 0,'\
-            '"last_reset": "2013-01-01",'\
-            '"next_reset": "2013-02-01",'\
-            '"reset_frequency": "monthly"'\
-          '}'
-        )
+        '{'\
+          '"remain": 200,'\
+          '"total": 200,'\
+          '"overage": 0,'\
+          '"used": 0,'\
+          '"last_reset": "2013-01-01",'\
+          '"next_reset": "2013-02-01",'\
+          '"reset_frequency": "monthly"'\
+        '}'
       end
 
       let(:password) do
-        JSON.parse(
-          '{'\
-            '"new_password": "new_password",'\
-            '"old_password": "old_password"'\
-          '}'
-        )
+        '{'\
+          '"new_password": "new_password",'\
+          '"old_password": "old_password"'\
+        '}'
       end
 
       it '#get_user_profile' do
@@ -156,7 +144,7 @@ module SendGrid4r::REST
       end
 
       it 'creates profile instance' do
-        actual = Users.create_profile(profile)
+        actual = Users.create_profile(JSON.parse(profile))
         expect(actual.address).to eq('814 West Chapman Avenue')
         expect(actual.city).to eq('Orange')
         expect(actual.company).to eq('SendGrid')
@@ -169,24 +157,24 @@ module SendGrid4r::REST
       end
 
       it 'creates account instance' do
-        actual = Users.create_account(account)
+        actual = Users.create_account(JSON.parse(account))
         expect(actual.type).to eq('free')
         expect(actual.reputation).to eq(99.7)
       end
 
       it 'creates email instance' do
-        actual = Users.create_email(email)
+        actual = Users.create_email(JSON.parse(email))
         expect(actual.email).to eq('test@example.com')
       end
 
       it 'creates username instance' do
-        actual = Users.create_username(username)
+        actual = Users.create_username(JSON.parse(username))
         expect(actual.username).to eq('test_username')
         expect(actual.user_id).to eq(1)
       end
 
       it 'creates credits instance' do
-        actual = Users.create_credits(credits)
+        actual = Users.create_credits(JSON.parse(credits))
         expect(actual.remain).to eq(200)
         expect(actual.total).to eq(200)
         expect(actual.overage).to eq(0)
@@ -197,7 +185,7 @@ module SendGrid4r::REST
       end
 
       it 'creates password instance' do
-        actual = Users.create_password(password)
+        actual = Users.create_password(JSON.parse(password))
         expect(actual.new_password).to eq('new_password')
         expect(actual.old_password).to eq('old_password')
       end

data/spec/rest/webhooks/event_spec.rb

@@ -60,23 +60,21 @@ module SendGrid4r::REST::Webhooks
       end
 
       let(:event_notification) do
-        JSON.parse(
-          '{'\
-            '"enabled": true,'\
-            '"url": "url",'\
-            '"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'\
-          '}'
-        )
+        '{'\
+          '"enabled": true,'\
+          '"url": "url",'\
+          '"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'\
+        '}'
       end
 
       it '#get_settings_event_notification' do
@@ -92,7 +90,7 @@ module SendGrid4r::REST::Webhooks
       end
 
       it 'creates event_notification instance' do
-        actual = Event.create_event_notification(event_notification)
+        actual = Event.create_event_notification(JSON.parse(event_notification))
         expect(actual.enabled).to eq(true)
         expect(actual.url).to eq('url')
         expect(actual.group_resubscribe).to eq(true)

data/spec/rest/webhooks/parse_spec.rb

@@ -24,27 +24,23 @@ module SendGrid4r::REST::Webhooks
       end
 
       let(:parse_settings) do
-        JSON.parse(
-          '{'\
-            '"result": ['\
-              '{'\
-                '"url": "http://mydomain.com/parse",'\
-                '"hostname": "mail.mydomain.com",'\
-                '"spam_check_outgoing": true'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"result": ['\
+            '{'\
+              '"url": "http://mydomain.com/parse",'\
+              '"hostname": "mail.mydomain.com",'\
+              '"spam_check_outgoing": true'\
+            '}'\
+          ']'\
+        '}'
       end
 
       let(:parse_setting) do
-        JSON.parse(
-          '{'\
-            '"url": "http://mydomain.com/parse",'\
-            '"hostname": "mail.mydomain.com",'\
-            '"spam_check_outgoing": true'\
-          '}'\
-        )
+        '{'\
+          '"url": "http://mydomain.com/parse",'\
+          '"hostname": "mail.mydomain.com",'\
+          '"spam_check_outgoing": true'\
+        '}'\
       end
 
       it '#get_parse_settings' do
@@ -54,7 +50,7 @@ module SendGrid4r::REST::Webhooks
       end
 
       it 'creates parse_setting instance' do
-        actual = Parse.create_parse_setting(parse_setting)
+        actual = Parse.create_parse_setting(JSON.parse(parse_setting))
         expect(actual).to be_a(Parse::ParseSetting)
         expect(actual.url).to eq('http://mydomain.com/parse')
         expect(actual.hostname).to eq('mail.mydomain.com')
@@ -62,7 +58,7 @@ module SendGrid4r::REST::Webhooks
       end
 
       it 'creates parse_settings instance' do
-        actual = Parse.create_parse_settings(parse_settings)
+        actual = Parse.create_parse_settings(JSON.parse(parse_settings))
         expect(actual).to be_a(Parse::ParseSettings)
         expect(actual.result).to be_a(Array)
       end