sendgrid4r 1.11.0 → 1.12.0

data/spec/rest/marketing_campaigns/contacts/segments_spec.rb

@@ -37,11 +37,15 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
         end
         # post a custom field and a segment
         @client.post_custom_field(name: @field, type: 'text')
-        @condition = @condition_factory.create(
-          field: @field, value: @value, operator: @operator, and_or: @and_or
+        @condition1 = @condition_factory.create(
+          field: @field, value: @value, operator: @operator
+        )
+        @condition2 = @condition_factory.create(
+          field: @field, value: @value, operator: @operator, and_or: 'and'
         )
         params1 = @segment_factory.create(
-          name: @name1, list_id: nil, conditions: [@condition]
+          name: @name1, list_id: nil,
+          conditions: [@condition1, @condition2]
         )
         @segment1 = @client.post_segment(params: params1)
       end
@@ -50,13 +54,14 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
         it '#post_segment' do
           lists = @client.get_lists
           params2 = @segment_factory.create(
-            name: @name2, list_id: lists.lists[0].id, conditions: [@condition]
+            name: @name2, list_id: lists.lists[0].id,
+            conditions: [@condition1, @condition2]
           )
           segment = @client.post_segment(params: params2)
           expect(segment.id).to be_a(Fixnum)
           expect(segment.name).to eq(@name2)
           expect(segment.list_id).to eq(lists.lists[0].id)
-          expect(segment.conditions.length).to eq(1)
+          expect(segment.conditions.length).to eq(2)
           expect(segment.recipient_count).to eq(0)
           condition = segment.conditions[0]
           expect(condition.field).to eq(@field)
@@ -88,7 +93,7 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
 
         it '#patch_segment' do
           edit_params = @segment_factory.create(
-            name: @edit_name1, conditions: [@condition]
+            name: @edit_name1, conditions: [@condition1, @condition2]
           )
           edit_segment = @client.patch_segment(
             segment_id: @segment1.id, params: edit_params
@@ -117,84 +122,76 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
       end
 
       let(:condition) do
-        JSON.parse(
-          '{'\
-            '"field": "last_name",'\
-            '"value": "Miller",'\
-            '"operator": "eq",'\
-            '"and_or": ""'\
-          '}'
-        )
+        '{'\
+          '"field": "last_name",'\
+          '"value": "Miller",'\
+          '"operator": "eq",'\
+          '"and_or": ""'\
+        '}'
       end
 
       let(:segment) do
-        JSON.parse(
-          '{'\
-            '"id": 1,'\
-            '"name": "Last Name Miller",'\
-            '"list_id": 4,'\
-            '"conditions": ['\
-              '{'\
-                '"field": "last_name",'\
-                '"value": "Miller",'\
-                '"operator": "eq",'\
-                '"and_or": ""'\
-              '}'\
-            '],'\
-            '"recipient_count": 1'\
-          '}'
-        )
+        '{'\
+          '"id": 1,'\
+          '"name": "Last Name Miller",'\
+          '"list_id": 4,'\
+          '"conditions": ['\
+            '{'\
+              '"field": "last_name",'\
+              '"value": "Miller",'\
+              '"operator": "eq",'\
+              '"and_or": ""'\
+            '}'\
+          '],'\
+          '"recipient_count": 1'\
+        '}'
       end
 
       let(:segments) do
-        JSON.parse(
-          '{'\
-            '"segments": ['\
-              '{'\
-                '"id": 1,'\
-                '"name": "Last Name Miller",'\
-                '"list_id": 4,'\
-                '"conditions": ['\
-                  '{'\
-                    '"field": "last_name",'\
-                    '"value": "Miller",'\
-                    '"operator": "eq",'\
-                    '"and_or": ""'\
-                  '}'\
-                '],'\
-                '"recipient_count": 1'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"segments": ['\
+            '{'\
+              '"id": 1,'\
+              '"name": "Last Name Miller",'\
+              '"list_id": 4,'\
+              '"conditions": ['\
+                '{'\
+                  '"field": "last_name",'\
+                  '"value": "Miller",'\
+                  '"operator": "eq",'\
+                  '"and_or": ""'\
+                '}'\
+              '],'\
+              '"recipient_count": 1'\
+            '}'\
+          ']'\
+        '}'
       end
 
       let(:recipients) do
-        JSON.parse(
-          '{'\
-            '"recipients": ['\
-              '{'\
-                '"created_at": 1422313607,'\
-                '"email": "jones@example.com",'\
-                '"first_name": null,'\
-                '"id": "jones@example.com",'\
-                '"last_clicked": null,'\
-                '"last_emailed": null,'\
-                '"last_name": "Jones",'\
-                '"last_opened": null,'\
-                '"updated_at": 1422313790,'\
-                '"custom_fields": ['\
-                  '{'\
-                    '"id": 23,'\
-                    '"name": "pet",'\
-                    '"value": "Fluffy",'\
-                    '"type": "text"'\
-                  '}'\
-                ']'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"recipients": ['\
+            '{'\
+              '"created_at": 1422313607,'\
+              '"email": "jones@example.com",'\
+              '"first_name": null,'\
+              '"id": "jones@example.com",'\
+              '"last_clicked": null,'\
+              '"last_emailed": null,'\
+              '"last_name": "Jones",'\
+              '"last_opened": null,'\
+              '"updated_at": 1422313790,'\
+              '"custom_fields": ['\
+                '{'\
+                  '"id": 23,'\
+                  '"name": "pet",'\
+                  '"value": "Fluffy",'\
+                  '"type": "text"'\
+                '}'\
+              ']'\
+            '}'\
+          ']'\
+        '}'
       end
 
       it '#post_segment' do
@@ -234,7 +231,7 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
       end
 
       it 'creates condition instance' do
-        actual = Segments.create_condition(condition)
+        actual = Segments.create_condition(JSON.parse(condition))
         expect(actual).to be_a(Segments::Condition)
         expect(actual.field).to eq('last_name')
         expect(actual.value).to eq('Miller')
@@ -243,7 +240,7 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
       end
 
       it 'creates segment instance' do
-        actual = Segments.create_segment(segment)
+        actual = Segments.create_segment(JSON.parse(segment))
         expect(actual).to be_a(Segments::Segment)
         expect(actual.id).to eq(1)
         expect(actual.name).to eq('Last Name Miller')
@@ -256,7 +253,7 @@ module SendGrid4r::REST::MarketingCampaigns::Contacts
       end
 
       it 'creates segments instance' do
-        actual = Segments.create_segments(segments)
+        actual = Segments.create_segments(JSON.parse(segments))
         expect(actual).to be_a(Segments::Segments)
         expect(actual.segments).to be_a(Array)
         actual.segments.each do |segment|

data/spec/rest/marketing_campaigns/marketing_campaigns_spec.rb

@@ -210,105 +210,97 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       let(:campaign) do
-        JSON.parse(
-          '{'\
-            '"id": 986724,'\
-            '"title": "March Newsletter",'\
-            '"subject": "New Products for Spring!",'\
-            '"sender_id": 124451,'\
-            '"list_ids": ['\
-              '110,'\
-              '124'\
-            '],'\
-            '"segment_ids": ['\
-              '110'\
-            '],'\
-            '"categories": ['\
-              '"spring line"'\
-            '],'\
-            '"suppression_group_id": 42,'\
-            '"custom_unsubscribe_url": "",'\
-            '"ip_pool": "marketing",'\
-            '"html_content": "<html><head><title></title></head><body>'\
-              '<p>Check out our spring line!</p></body></html>",'\
-            '"plain_content": "Check out our spring line!",'\
-            '"status": "Draft"'\
-          '}'
-        )
+        '{'\
+          '"id": 986724,'\
+          '"title": "March Newsletter",'\
+          '"subject": "New Products for Spring!",'\
+          '"sender_id": 124451,'\
+          '"list_ids": ['\
+            '110,'\
+            '124'\
+          '],'\
+          '"segment_ids": ['\
+            '110'\
+          '],'\
+          '"categories": ['\
+            '"spring line"'\
+          '],'\
+          '"suppression_group_id": 42,'\
+          '"custom_unsubscribe_url": "",'\
+          '"ip_pool": "marketing",'\
+          '"html_content": "<html><head><title></title></head><body>'\
+            '<p>Check out our spring line!</p></body></html>",'\
+          '"plain_content": "Check out our spring line!",'\
+          '"status": "Draft"'\
+        '}'
       end
 
       let(:campaigns) do
-        JSON.parse(
-          '{'\
-            '"result": ['\
-              '{'\
-                '"id": 986724,'\
-                '"title": "March Newsletter",'\
-                '"subject": "New Products for Spring!",'\
-                '"sender_id": 124451,'\
-                '"list_ids": ['\
-                  '110,'\
-                  '124'\
-                '],'\
-                '"segment_ids": ['\
-                  '110'\
-                '],'\
-                '"categories": ['\
-                  '"spring line"'\
-                '],'\
-                '"suppression_group_id": 42,'\
-                '"custom_unsubscribe_url": "",'\
-                '"ip_pool": "marketing",'\
-                '"html_content": "<html><head><title></title></head><body>'\
-                  '<p>Check out our spring line!</p></body></html>",'\
-                '"plain_content": "Check out our spring line!",'\
-                '"status": "Draft"'\
-              '},'\
-              '{'\
-                '"id": 986723,'\
-                '"title": "February Newsletter",'\
-                '"subject": "Final Winter Product Sale!",'\
-                '"sender_id": 124451,'\
-                '"list_ids": ['\
-                  '110,'\
-                  '124'\
-                '],'\
-                '"segment_ids": ['\
-                  '110'\
-                '],'\
-                '"categories": ['\
-                  '"winter line"'\
-                '],'\
-                '"suppression_group_id": 42,'\
-                '"custom_unsubscribe_url": "",'\
-                '"ip_pool": "marketing",'\
-                '"html_content": "<html><head><title></title></head><body>'\
-                  '<p>Last call for winter clothes!</p></body></html>",'\
-                '"plain_content": "Last call for winter clothes!",'\
-                '"status": "Sent"'\
-              '}'\
-            ']'\
-          '}'
-        )
+        '{'\
+          '"result": ['\
+            '{'\
+              '"id": 986724,'\
+              '"title": "March Newsletter",'\
+              '"subject": "New Products for Spring!",'\
+              '"sender_id": 124451,'\
+              '"list_ids": ['\
+                '110,'\
+                '124'\
+              '],'\
+              '"segment_ids": ['\
+                '110'\
+              '],'\
+              '"categories": ['\
+                '"spring line"'\
+              '],'\
+              '"suppression_group_id": 42,'\
+              '"custom_unsubscribe_url": "",'\
+              '"ip_pool": "marketing",'\
+              '"html_content": "<html><head><title></title></head><body>'\
+                '<p>Check out our spring line!</p></body></html>",'\
+              '"plain_content": "Check out our spring line!",'\
+              '"status": "Draft"'\
+            '},'\
+            '{'\
+              '"id": 986723,'\
+              '"title": "February Newsletter",'\
+              '"subject": "Final Winter Product Sale!",'\
+              '"sender_id": 124451,'\
+              '"list_ids": ['\
+                '110,'\
+                '124'\
+              '],'\
+              '"segment_ids": ['\
+                '110'\
+              '],'\
+              '"categories": ['\
+                '"winter line"'\
+              '],'\
+              '"suppression_group_id": 42,'\
+              '"custom_unsubscribe_url": "",'\
+              '"ip_pool": "marketing",'\
+              '"html_content": "<html><head><title></title></head><body>'\
+                '<p>Last call for winter clothes!</p></body></html>",'\
+              '"plain_content": "Last call for winter clothes!",'\
+              '"status": "Sent"'\
+            '}'\
+          ']'\
+        '}'
       end
 
       let(:sent) do
-        JSON.parse(
-          '{'\
-            '"id": 986724,'\
-            '"status": "Scheduled"'\
-          '}'
-        )
+        '{'\
+          '"id": 986724,'\
+          '"status": "Scheduled"'\
+        '}'
       end
 
       let(:schedule) do
-        JSON.parse(
-          '{'\
-            '"id": 986724,'\
-            '"send_at": 1489771528,'\
-            '"status": "Scheduled"'\
-          '}'
-        )
+        '{'\
+          '"id": 986724,'\
+          '"send_at": 1489771528,'\
+          '"status": "Scheduled"'\
+        '}'
       end
 
       it '#post_campaign' do
@@ -379,7 +371,9 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       it 'creates campaign instance' do
-        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(campaign)
+        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(
+          JSON.parse(campaign)
+        )
         expect(actual).to be_a(Campaign)
         expect(actual.id).to eq(986724)
         expect(actual.title).to eq('March Newsletter')
@@ -400,7 +394,7 @@ module SendGrid4r::REST::MarketingCampaigns
 
       it 'creates campaigns instance' do
         actual = SendGrid4r::REST::MarketingCampaigns.create_campaigns(
-          campaigns
+          JSON.parse(campaigns)
         )
         expect(actual).to be_a(Campaigns)
         actual.result.each do |campaign|
@@ -409,14 +403,18 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       it 'creates sent instance' do
-        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(sent)
+        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(
+          JSON.parse(sent)
+        )
         expect(actual).to be_a(Campaign)
         expect(actual.id).to eq(986724)
         expect(actual.status).to eq('Scheduled')
       end
 
       it 'creates schedule instance' do
-        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(schedule)
+        actual = SendGrid4r::REST::MarketingCampaigns.create_campaign(
+          JSON.parse(schedule)
+        )
         expect(actual).to be_a(Campaign)
         expect(actual.id).to eq(986724)
         expect(actual.send_at).to eq(Time.at(1489771528))

data/spec/rest/marketing_campaigns/senders_spec.rb

@@ -87,61 +87,57 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       let(:sender) do
-        JSON.parse(
+        '{'\
+          '"id": 1,'\
+          '"nickname": "My Sender ID",'\
+          '"from": {'\
+            '"email": "from@example.com",'\
+            '"name": "Example INC"'\
+          '},'\
+          '"reply_to": {'\
+            '"email": "replyto@example.com",'\
+            '"name": "Example INC"'\
+          '},'\
+          '"address": "123 Elm St.",'\
+          '"address_2": "Apt. 456",'\
+          '"city": "Denver",'\
+          '"state": "Colorado",'\
+          '"zip": "80202",'\
+          '"country": "United States",'\
+          '"verified":{'\
+            '"status":false,"reason":null'\
+          '},'\
+          '"updated_at": 1449872165,'\
+          '"created_at": 1449872165,'\
+          '"locked": false'\
+        '}'
+      end
+
+      let(:senders) do
+        '['\
           '{'\
-            '"id": 1,'\
-            '"nickname": "My Sender ID",'\
-            '"from": {'\
-              '"email": "from@example.com",'\
-              '"name": "Example INC"'\
+            '"id":1,'\
+            '"nickname":"My Sender ID",'\
+            '"from":{'\
+              '"email":"from@example.com","name":"Example INC"'\
             '},'\
-            '"reply_to": {'\
-              '"email": "replyto@example.com",'\
-              '"name": "Example INC"'\
+            '"reply_to":{'\
+              '"email":"replyto@example.com","name":"Example INC"'\
             '},'\
-            '"address": "123 Elm St.",'\
-            '"address_2": "Apt. 456",'\
-            '"city": "Denver",'\
-            '"state": "Colorado",'\
-            '"zip": "80202",'\
-            '"country": "United States",'\
+            '"address":"123 Elm St.",'\
+            '"address_2":"Apt. 456",'\
+            '"city":"Denver",'\
+            '"state":"Co",'\
+            '"zip":"80202",'\
+            '"country":"United States",'\
             '"verified":{'\
               '"status":false,"reason":null'\
             '},'\
-            '"updated_at": 1449872165,'\
-            '"created_at": 1449872165,'\
-            '"locked": false'\
-          '}'
-        )
-      end
-
-      let(:senders) do
-        JSON.parse(
-          '['\
-            '{'\
-              '"id":1,'\
-              '"nickname":"My Sender ID",'\
-              '"from":{'\
-                '"email":"from@example.com","name":"Example INC"'\
-              '},'\
-              '"reply_to":{'\
-                '"email":"replyto@example.com","name":"Example INC"'\
-              '},'\
-              '"address":"123 Elm St.",'\
-              '"address_2":"Apt. 456",'\
-              '"city":"Denver",'\
-              '"state":"Co",'\
-              '"zip":"80202",'\
-              '"country":"United States",'\
-              '"verified":{'\
-                '"status":false,"reason":null'\
-              '},'\
-              '"updated_at":1464187035,'\
-              '"created_at":1464187035,'\
-              '"locked":false'\
-            '}'\
-          ']'
-        )
+            '"updated_at":1464187035,'\
+            '"created_at":1464187035,'\
+            '"locked":false'\
+          '}'\
+        ']'
       end
 
       it '#post_sender' do
@@ -182,7 +178,9 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       it 'creates sender instance' do
-        actual = SendGrid4r::REST::MarketingCampaigns.create_sender(sender)
+        actual = SendGrid4r::REST::MarketingCampaigns.create_sender(
+          JSON.parse(sender)
+        )
         expect(actual).to be_a(Sender)
         expect(actual.id).to eq(1)
         expect(actual.nickname).to eq('My Sender ID')
@@ -204,7 +202,9 @@ module SendGrid4r::REST::MarketingCampaigns
       end
 
       it 'creates senders instance' do
-        actual = SendGrid4r::REST::MarketingCampaigns.create_senders(senders)
+        actual = SendGrid4r::REST::MarketingCampaigns.create_senders(
+          JSON.parse(senders)
+        )
         expect(actual).to be_a(Array)
         sender = actual[0]
         expect(sender.id).to eq(1)