sendgrid4r 1.11.0 → 1.12.0

data/lib/sendgrid4r/rest/api_keys_management/permissions.rb

@@ -24,7 +24,9 @@ module SendGrid4r::REST
 
       def get_permissions(&block)
         resp = get(@auth, ApiKeysManagement::Permissions.url, &block)
-        ApiKeysManagement::Permissions.create_permissions(resp)
+        finish(resp, @raw_resp) do |r|
+          ApiKeysManagement::Permissions.create_permissions(r)
+        end
       end
     end
   end

data/lib/sendgrid4r/rest/blocks.rb

@@ -35,7 +35,7 @@ module SendGrid4r::REST
       params[:limit] = limit.to_i unless limit.nil?
       params[:offset] = offset.to_i unless offset.nil?
       resp = get(@auth, Blocks.url, params, &block)
-      Blocks.create_blocks(resp)
+      finish(resp, @raw_resp) { |r| Blocks.create_blocks(r) }
     end
 
     def delete_blocks(delete_all: nil, emails: nil, &block)
@@ -50,7 +50,7 @@ module SendGrid4r::REST
     def get_block(email:, &block)
       params = { email: email }
       resp = get(@auth, Blocks.url(email), params, &block)
-      Blocks.create_blocks(resp)
+      finish(resp, @raw_resp) { |r| Blocks.create_blocks(r) }
     end
 
     def delete_block(email:, &block)

data/lib/sendgrid4r/rest/bounces.rb

@@ -31,7 +31,7 @@ module SendGrid4r::REST
       params[:start_time] = start_time.to_i unless start_time.nil?
       params[:end_time] = end_time.to_i unless end_time.nil?
       resp = get(@auth, Bounces.url, params, &block)
-      Bounces.create_bounces(resp)
+      finish(resp, @raw_resp) { |r| Bounces.create_bounces(r) }
     end
 
     def delete_bounces(delete_all: nil, emails: nil, &block)
@@ -46,7 +46,7 @@ module SendGrid4r::REST
     def get_bounce(email:, &block)
       params = { email: email }
       resp = get(@auth, Bounces.url(email), params, &block)
-      Bounces.create_bounces(resp)
+      finish(resp, @raw_resp) { |r| Bounces.create_bounces(r) }
     end
 
     def delete_bounce(email:, &block)

data/lib/sendgrid4r/rest/cancel_scheduled_sends.rb

@@ -35,25 +35,33 @@ module SendGrid4r::REST
 
     def generate_batch_id(&block)
       resp = post(@auth, CancelScheduledSends.batch_url, nil, &block)
-      CancelScheduledSends.create_scheduled_send(resp)
+      finish(resp, @raw_resp) do |r|
+        CancelScheduledSends.create_scheduled_send(r)
+      end
     end
 
     def validate_batch_id(batch_id:, &block)
       resp = get(@auth, CancelScheduledSends.batch_url(batch_id), nil, &block)
-      CancelScheduledSends.create_scheduled_send(resp)
+      finish(resp, @raw_resp) do |r|
+        CancelScheduledSends.create_scheduled_send(r)
+      end
     end
 
     def post_scheduled_send(batch_id:, status:, &block)
       endpoint = CancelScheduledSends.scheduled_sends_url
       payload = { batch_id: batch_id, status: status }
       resp = post(@auth, endpoint, payload, &block)
-      CancelScheduledSends.create_scheduled_send(resp)
+      finish(resp, @raw_resp) do |r|
+        CancelScheduledSends.create_scheduled_send(r)
+      end
     end
 
     def get_scheduled_sends(batch_id: nil, &block)
       endpoint = CancelScheduledSends.scheduled_sends_url(batch_id)
       resp = get(@auth, endpoint, nil, nil, &block)
-      CancelScheduledSends.create_scheduled_sends(resp)
+      finish(resp, @raw_resp) do |r|
+        CancelScheduledSends.create_scheduled_sends(r)
+      end
     end
 
     def patch_scheduled_send(batch_id:, status:, &block)

data/lib/sendgrid4r/rest/categories.rb

@@ -25,7 +25,7 @@ module SendGrid4r::REST
       params['limit'] = limit unless limit.nil?
       params['offset'] = offset unless limit.nil?
       resp = get(@auth, "#{BASE_URL}/categories", params, &block)
-      Categories.create_categories(resp)
+      finish(resp, @raw_resp) { |r| Categories.create_categories(r) }
     end
   end
 end

data/lib/sendgrid4r/rest/email_activity.rb

@@ -66,7 +66,7 @@ module SendGrid4r::REST
       params['start_time'] = start_time.to_i unless start_time.nil?
       params['end_time'] = end_time.to_i unless end_time.nil?
       resp = get(@auth, EmailActivity.url, params, &block)
-      EmailActivity.create_activities(resp)
+      finish(resp, @raw_resp) { |r| EmailActivity.create_activities(r) }
     end
   end
 end

data/lib/sendgrid4r/rest/invalid_emails.rb

@@ -37,7 +37,7 @@ module SendGrid4r::REST
       params[:limit] = limit.to_i unless limit.nil?
       params[:offset] = offset.to_i unless offset.nil?
       resp = get(@auth, InvalidEmails.url, params, &block)
-      InvalidEmails.create_invalid_emails(resp)
+      finish(resp, @raw_resp) { |r| InvalidEmails.create_invalid_emails(r) }
     end
 
     def delete_invalid_emails(delete_all: nil, emails: nil, &block)
@@ -52,7 +52,7 @@ module SendGrid4r::REST
     def get_invalid_email(email:, &block)
       params = { email: email }
       resp = get(@auth, InvalidEmails.url(email), params, &block)
-      InvalidEmails.create_invalid_emails(resp)
+      finish(resp, @raw_resp) { |r| InvalidEmails.create_invalid_emails(r) }
     end
 
     def delete_invalid_email(email:, &block)

data/lib/sendgrid4r/rest/ip_access_management.rb

@@ -77,19 +77,25 @@ module SendGrid4r::REST
       params = {}
       params[:limit] = limit unless limit.nil?
       resp = get(@auth, IpAccessManagement.url_activity, params, &block)
-      IpAccessManagement.create_ip_activities(resp)
+      finish(resp, @raw_resp) do |r|
+        IpAccessManagement.create_ip_activities(r)
+      end
     end
 
     def get_whitelisted_ips(&block)
       resp = get(@auth, IpAccessManagement.url_whitelist, &block)
-      IpAccessManagement.create_whitelisted_ips(resp)
+      finish(resp, @raw_resp) do |r|
+        IpAccessManagement.create_whitelisted_ips(r)
+      end
     end
 
     def post_whitelisted_ips(ips:, &block)
       ips_param = ips.map { |ip| { ip: ip } }
       params = { ips: ips_param }
       resp = post(@auth, IpAccessManagement.url_whitelist, params, &block)
-      IpAccessManagement.create_whitelisted_ips(resp)
+      finish(resp, @raw_resp) do |r|
+        IpAccessManagement.create_whitelisted_ips(r)
+      end
     end
 
     def delete_whitelisted_ips(ids:, &block)
@@ -99,7 +105,9 @@ module SendGrid4r::REST
 
     def get_whitelisted_ip(rule_id:, &block)
       resp = get(@auth, IpAccessManagement.url_whitelist(rule_id), nil, &block)
-      IpAccessManagement.create_whitelisted_ip(resp)
+      finish(resp, @raw_resp) do |r|
+        IpAccessManagement.create_whitelisted_ip(r)
+      end
     end
 
     def delete_whitelisted_ip(rule_id:, &block)

data/lib/sendgrid4r/rest/ips/addresses.rb

@@ -41,22 +41,22 @@ module SendGrid4r::REST
 
       def post_ip_to_pool(pool_name:, ip:, &block)
         resp = post(@auth, Ips::Pools.url(pool_name, :ips), ip: ip, &block)
-        Ips::Addresses.create_address(resp)
+        finish(resp, @raw_resp) { |r| Ips::Addresses.create_address(r) }
       end
 
       def get_ips(&block)
         resp = get(@auth, Ips::Addresses.url, &block)
-        Ips::Addresses.create_addresses(resp)
+        finish(resp, @raw_resp) { |r| Ips::Addresses.create_addresses(r) }
       end
 
       def get_ips_assigned(&block)
         resp = get(@auth, Ips::Addresses.url(:assigned), &block)
-        Ips::Addresses.create_addresses(resp)
+        finish(resp, @raw_resp) { |r| Ips::Addresses.create_addresses(r) }
       end
 
       def get_ip(ip:, &block)
         resp = get(@auth, Ips::Addresses.url(ip), &block)
-        Ips::Addresses.create_address(resp)
+        finish(resp, @raw_resp) { |r| Ips::Addresses.create_address(r) }
       end
 
       def delete_ip_from_pool(pool_name:, ip:, &block)

data/lib/sendgrid4r/rest/ips/pools.rb

@@ -33,22 +33,22 @@ module SendGrid4r::REST
 
       def post_pool(name:, &block)
         resp = post(@auth, Ips::Pools.url, name: name, &block)
-        Ips::Pools.create_pool(resp)
+        finish(resp, @raw_resp) { |r| Ips::Pools.create_pool(r) }
       end
 
       def get_pools(&block)
         resp = get(@auth, Ips::Pools.url, &block)
-        Ips::Pools.create_pools(resp)
+        finish(resp, @raw_resp) { |r| Ips::Pools.create_pools(r) }
       end
 
       def get_pool(name:, &block)
         resp = get(@auth, Ips::Pools.url(name), &block)
-        Ips::Pools.create_pool(resp)
+        finish(resp, @raw_resp) { |r| Ips::Pools.create_pool(r) }
       end
 
       def put_pool(name:, new_name:, &block)
         resp = put(@auth, Ips::Pools.url(name), name: new_name, &block)
-        Ips::Pools.create_pool(resp)
+        finish(resp, @raw_resp) { |r| Ips::Pools.create_pool(r) }
       end
 
       def delete_pool(name:, &block)

data/lib/sendgrid4r/rest/ips/warmup.rb

@@ -31,17 +31,17 @@ module SendGrid4r::REST
 
       def get_warmup_ips(&block)
         resp = get(@auth, Ips::Warmup.url, &block)
-        Ips::Warmup.create_warmup_ips(resp)
+        finish(resp, @raw_resp) { |r| Ips::Warmup.create_warmup_ips(r) }
       end
 
       def get_warmup_ip(ip:, &block)
         resp = get(@auth, Ips::Warmup.url(ip), &block)
-        Ips::Warmup.create_warmup_ip(resp)
+        finish(resp, @raw_resp) { |r| Ips::Warmup.create_warmup_ip(r) }
       end
 
       def post_warmup_ip(ip:, &block)
         resp = post(@auth, Ips::Warmup.url, ip: ip, &block)
-        Ips::Warmup.create_warmup_ip(resp)
+        finish(resp, @raw_resp) { |r| Ips::Warmup.create_warmup_ip(r) }
       end
 
       def delete_warmup_ip(ip:, &block)

data/lib/sendgrid4r/rest/marketing_campaigns/contacts/custom_fields.rb

@@ -45,17 +45,23 @@ module SendGrid4r::REST
           params['name'] = name
           params['type'] = type
           resp = post(@auth, Contacts::CustomFields.url, params, &block)
-          Contacts::CustomFields.create_field(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::CustomFields.create_field(r)
+          end
         end
 
         def get_custom_fields(&block)
           resp = get(@auth, Contacts::CustomFields.url, &block)
-          Contacts::CustomFields.create_fields(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::CustomFields.create_fields(r)
+          end
         end
 
         def get_custom_field(custom_field_id:, &block)
           resp = get(@auth, Contacts::CustomFields.url(custom_field_id), &block)
-          Contacts::CustomFields.create_field(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::CustomFields.create_field(r)
+          end
         end
 
         def delete_custom_field(custom_field_id:, &block)

data/lib/sendgrid4r/rest/marketing_campaigns/contacts/lists.rb

@@ -39,24 +39,24 @@ module SendGrid4r::REST
           params = {}
           params['name'] = name
           resp = post(@auth, Contacts::Lists.url, params, &block)
-          Contacts::Lists.create_list(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Lists.create_list(r) }
         end
 
         def get_lists(&block)
           resp = get(@auth, Contacts::Lists.url, &block)
-          Contacts::Lists.create_lists(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Lists.create_lists(r) }
         end
 
         def get_list(list_id:, &block)
           resp = get(@auth, Contacts::Lists.url(list_id), &block)
-          Contacts::Lists.create_list(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Lists.create_list(r) }
         end
 
         def patch_list(list_id:, name:, &block)
           params = {}
           params['name'] = name
           resp = patch(@auth, Contacts::Lists.url(list_id), params, &block)
-          Contacts::Lists.create_list(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Lists.create_list(r) }
         end
 
         def delete_list(list_id:, &block)
@@ -77,7 +77,9 @@ module SendGrid4r::REST
           params['page_size'] = page_size unless page_size.nil?
           endpoint = Contacts::Lists.recipients_url(list_id)
           resp = get(@auth, endpoint, params, &block)
-          Contacts::Recipients.create_recipients(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipients(r)
+          end
         end
 
         def post_recipient_to_list(list_id:, recipient_id:, &block)

data/lib/sendgrid4r/rest/marketing_campaigns/contacts/recipients.rb

@@ -24,6 +24,8 @@ module SendGrid4r::REST
 
         Recipients = Struct.new(:recipients)
 
+        Count = Struct.new(:recipient_count)
+
         def self.create_recipient(resp)
           return resp if resp.nil?
           custom_fields = []
@@ -47,6 +49,11 @@ module SendGrid4r::REST
           Recipients.new(recipients)
         end
 
+        def self.create_recipient_count(resp)
+          return resp if resp.nil?
+          Count.new(resp['recipient_count'])
+        end
+
         def self.url(recipient_id = nil)
           url = "#{BASE_URL}/contactdb/recipients"
           url = "#{url}/#{recipient_id}" unless recipient_id.nil?
@@ -55,12 +62,12 @@ module SendGrid4r::REST
 
         def post_recipients(params:, &block)
           resp = post(@auth, Contacts::Recipients.url, params, &block)
-          Contacts::Recipients.create_result(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Recipients.create_result(r) }
         end
 
         def patch_recipients(params:, &block)
           resp = patch(@auth, Contacts::Recipients.url, params, &block)
-          Contacts::Recipients.create_result(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Recipients.create_result(r) }
         end
 
         def delete_recipients(recipient_ids:, &block)
@@ -72,12 +79,16 @@ module SendGrid4r::REST
           params['page_size'] = page_size unless page_size.nil?
           params['page'] = page unless page.nil?
           resp = get(@auth, Contacts::Recipients.url, params, &block)
-          Contacts::Recipients.create_recipients(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipients(r)
+          end
         end
 
         def get_recipient(recipient_id:, &block)
           resp = get(@auth, Contacts::Recipients.url(recipient_id), &block)
-          Contacts::Recipients.create_recipient(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipient(r)
+          end
         end
 
         def delete_recipient(recipient_id:, &block)
@@ -88,18 +99,22 @@ module SendGrid4r::REST
           resp = get(
             @auth, "#{Contacts::Recipients.url(recipient_id)}/lists", &block
           )
-          Contacts::Lists.create_lists(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Lists.create_lists(r) }
         end
 
         def get_recipients_count(&block)
           resp = get(@auth, "#{Contacts::Recipients.url}/count", &block)
-          resp['recipient_count'] unless resp.nil?
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipient_count(r).recipient_count
+          end
         end
 
         def search_recipients(params:, &block)
           endpoint = "#{Contacts::Recipients.url}/search"
           resp = get(@auth, endpoint, params, &block)
-          Contacts::Recipients.create_recipients(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipients(r)
+          end
         end
 
         Result = Struct.new(

data/lib/sendgrid4r/rest/marketing_campaigns/contacts/reserved_fields.rb

@@ -36,7 +36,9 @@ module SendGrid4r::REST
 
         def get_reserved_fields(&block)
           resp = get(@auth, "#{BASE_URL}/contactdb/reserved_fields", &block)
-          Contacts::ReservedFields.create_fields(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::ReservedFields.create_fields(r)
+          end
         end
       end
     end

data/lib/sendgrid4r/rest/marketing_campaigns/contacts/segments.rb

@@ -52,23 +52,23 @@ module SendGrid4r::REST
 
         def post_segment(params:, &block)
           resp = post(@auth, Contacts::Segments.url, params.to_h, &block)
-          Contacts::Segments.create_segment(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Segments.create_segment(r) }
         end
 
         def get_segments(&block)
           resp = get(@auth, Contacts::Segments.url, &block)
-          Contacts::Segments.create_segments(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Segments.create_segments(r) }
         end
 
         def get_segment(segment_id:, &block)
           resp = get(@auth, Contacts::Segments.url(segment_id), &block)
-          Contacts::Segments.create_segment(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Segments.create_segment(r) }
         end
 
         def patch_segment(segment_id:, params:, &block)
           endpoint = Contacts::Segments.url(segment_id)
           resp = patch(@auth, endpoint, params, &block)
-          Contacts::Segments.create_segment(resp)
+          finish(resp, @raw_resp) { |r| Contacts::Segments.create_segment(r) }
         end
 
         def delete_segment(segment_id:, &block)
@@ -78,7 +78,9 @@ module SendGrid4r::REST
         def get_recipients_on_segment(segment_id:, &block)
           endpoint = "#{Contacts::Segments.url(segment_id)}/recipients"
           resp = get(@auth, endpoint, nil, &block)
-          Contacts::Recipients.create_recipients(resp)
+          finish(resp, @raw_resp) do |r|
+            Contacts::Recipients.create_recipients(r)
+          end
         end
       end
     end

data/lib/sendgrid4r/rest/marketing_campaigns/marketing_campaigns.rb

@@ -44,19 +44,19 @@ module SendGrid4r::REST
     def post_campaign(params:, &block)
       endpoint = MarketingCampaigns.url
       resp = post(@auth, endpoint, params, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def get_campaigns(&block)
       endpoint = MarketingCampaigns.url
       resp = get(@auth, endpoint, &block)
-      MarketingCampaigns.create_campaigns(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaigns(r) }
     end
 
     def get_campaign(campaign_id:, &block)
       endpoint = MarketingCampaigns.url(campaign_id)
       resp = get(@auth, endpoint, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def delete_campaign(campaign_id:, &block)
@@ -67,14 +67,14 @@ module SendGrid4r::REST
     def patch_campaign(campaign_id:, params:, &block)
       endpoint = MarketingCampaigns.url(campaign_id)
       resp = patch(@auth, endpoint, params.to_h, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def send_campaign(campaign_id:, &block)
       endpoint = MarketingCampaigns.url(campaign_id)
       endpoint = "#{endpoint}/schedules/now"
       resp = post(@auth, endpoint, nil, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def schedule_campaign(campaign_id:, send_at:, &block)
@@ -83,7 +83,7 @@ module SendGrid4r::REST
       payload = {}
       payload['send_at'] = send_at.to_i
       resp = post(@auth, endpoint, payload, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def reschedule_campaign(campaign_id:, send_at:, &block)
@@ -92,14 +92,14 @@ module SendGrid4r::REST
       payload = {}
       payload['send_at'] = send_at.to_i
       resp = patch(@auth, endpoint, payload, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def get_schedule_time_campaign(campaign_id:, &block)
       endpoint = MarketingCampaigns.url(campaign_id)
       endpoint = "#{endpoint}/schedules"
       resp = get(@auth, endpoint, &block)
-      MarketingCampaigns.create_campaign(resp)
+      finish(resp, @raw_resp) { |r| MarketingCampaigns.create_campaign(r) }
     end
 
     def unschedule_campaign(campaign_id:, &block)