sendgrid4r 1.11.0 → 1.12.0

data/lib/sendgrid4r/rest/stats/category.rb

@@ -17,7 +17,7 @@ module SendGrid4r::REST
           categories: categories
         }
         resp = get(@auth, "#{BASE_URL}/categories/stats", params, &block)
-        Stats.create_top_stats(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stats(r) }
       end
 
       def get_categories_stats_sums(
@@ -32,7 +32,7 @@ module SendGrid4r::REST
           offset: offset
         }
         resp = get(@auth, "#{BASE_URL}/categories/stats/sums", params, &block)
-        Stats.create_top_stat(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stat(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/stats/global.rb

@@ -17,7 +17,7 @@ module SendGrid4r::REST
           aggregated_by: aggregated_by
         }
         resp = get(@auth, "#{BASE_URL}/stats", params, &block)
-        Stats.create_top_stats(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stats(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/stats/parse.rb

@@ -18,7 +18,7 @@ module SendGrid4r::REST
         }
         endpoint = "#{BASE_URL}/user/webhooks/parse/stats"
         resp = get(@auth, endpoint, params, &block)
-        Stats.create_top_stats(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stats(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/stats/subuser.rb

@@ -28,7 +28,7 @@ module SendGrid4r::REST
           subusers: subusers
         }
         resp = get(@auth, Subuser.url, params, &block)
-        Stats.create_top_stats(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stats(r) }
       end
 
       def get_subusers_stats_sums(
@@ -43,7 +43,7 @@ module SendGrid4r::REST
           offset: offset
         }
         resp = get(@auth, Subuser.url(nil, :sums), params, &block)
-        Stats.create_top_stat(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stat(r) }
       end
 
       def get_subusers_stats_monthly(
@@ -58,7 +58,7 @@ module SendGrid4r::REST
           offset: offset
         }
         resp = get(@auth, Subuser.url(nil, :monthly), params, &block)
-        Stats.create_top_stat(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stat(r) }
       end
 
       def get_subuser_stats_monthly(
@@ -72,7 +72,7 @@ module SendGrid4r::REST
           offset: offset
         }
         resp = get(@auth, Subuser.url(subuser_name, :monthly), params, &block)
-        Stats.create_top_stat(resp)
+        finish(resp, @raw_resp) { |r| Stats.create_top_stat(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/subusers.rb

@@ -52,7 +52,8 @@ module SendGrid4r::REST
       params[:limit] = limit unless limit.nil?
       params[:offset] = offset unless offset.nil?
       params[:username] = username unless username.nil?
-      Subusers.create_subusers(get(@auth, Subusers.url, params, &block))
+      resp = get(@auth, Subusers.url, params, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_subusers(r) }
     end
 
     def post_subuser(username:, email:, password:, ips:, &block)
@@ -62,35 +63,38 @@ module SendGrid4r::REST
         password: password,
         ips: ips
       }
-      Subusers.create_subuser(post(@auth, Subusers.url, params, &block))
+      resp = post(@auth, Subusers.url, params, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_subuser(r) }
     end
 
     def patch_subuser(username:, disabled:, &block)
       payload = { disabled: disabled }
       resp = patch(@auth, Subusers.url(username), payload, &block)
-      Subusers.create_subuser(resp)
+      finish(resp, @raw_resp) { |r| Subusers.create_subuser(r) }
     end
 
     def delete_subuser(username:, &block)
       delete(@auth, Subusers.url(username), &block)
     end
 
-    def get_subuser_monitor(username:, email:, frequency:, &block)
+    def get_subuser_monitor(username:, &block)
       endpoint = Subusers.url_monitor(username)
-      payload = { email: email, frequency: frequency }
-      Subusers.create_monitor(post(@auth, endpoint, payload, &block))
+      resp = get(@auth, endpoint, nil, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_monitor(r) }
     end
 
     def post_subuser_monitor(username:, email:, frequency:, &block)
       endpoint = Subusers.url_monitor(username)
       payload = { email: email, frequency: frequency }
-      Subusers.create_monitor(post(@auth, endpoint, payload, &block))
+      resp = post(@auth, endpoint, payload, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_monitor(r) }
     end
 
     def put_subuser_monitor(username:, email:, frequency:, &block)
       endpoint = Subusers.url_monitor(username)
       payload = { email: email, frequency: frequency }
-      Subusers.create_monitor(put(@auth, endpoint, payload, &block))
+      resp = put(@auth, endpoint, payload, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_monitor(r) }
     end
 
     def delete_subuser_monitor(username:, &block)
@@ -101,12 +105,13 @@ module SendGrid4r::REST
       params = ''
       usernames.each { |username| params += "usernames=#{username}&" }
       endpoint = "#{Subusers.url}/reputations?#{params}"
-      Subusers.create_subusers(get(@auth, endpoint, usernames, &block))
+      resp = get(@auth, endpoint, usernames, &block)
+      finish(resp, @raw_resp) { |r| Subusers.create_subusers(r) }
     end
 
     def put_subuser_assigned_ips(username:, ips:, &block)
       resp = put(@auth, "#{Subusers.url(username)}/ips", ips, &block)
-      Subusers.create_subuser(resp)
+      finish(resp, @raw_resp) { |r| Subusers.create_subuser(r) }
     end
   end
 end

data/lib/sendgrid4r/rest/transactional_templates/templates.rb

@@ -35,24 +35,32 @@ module SendGrid4r::REST
     def post_template(name:, &block)
       endpoint = TransactionalTemplates.url
       resp = post(@auth, endpoint, name: name, &block)
-      TransactionalTemplates.create_template(resp)
+      finish(resp, @raw_resp) do |r|
+        TransactionalTemplates.create_template(r)
+      end
     end
 
     def get_templates(&block)
       resp = get(@auth, TransactionalTemplates.url, &block)
-      TransactionalTemplates.create_templates(resp)
+      finish(resp, @raw_resp) do |r|
+        TransactionalTemplates.create_templates(r)
+      end
     end
 
     def get_template(template_id:, &block)
       endpoint = TransactionalTemplates.url(template_id)
       resp = get(@auth, endpoint, &block)
-      TransactionalTemplates.create_template(resp)
+      finish(resp, @raw_resp) do |r|
+        TransactionalTemplates.create_template(r)
+      end
     end
 
     def patch_template(template_id:, name:, &block)
       endpoint = TransactionalTemplates.url(template_id)
       resp = patch(@auth, endpoint, name: name, &block)
-      TransactionalTemplates.create_template(resp)
+      finish(resp, @raw_resp) do |r|
+        TransactionalTemplates.create_template(r)
+      end
     end
 
     def delete_template(template_id:, &block)

data/lib/sendgrid4r/rest/transactional_templates/versions.rb

@@ -42,13 +42,13 @@ module SendGrid4r::REST
           remove_uneditable_keys(version.to_h),
           &block
         )
-        Versions.create_version(resp)
+        finish(resp, @raw_resp) { |r| Versions.create_version(r) }
       end
 
       def activate_version(template_id:, version_id:, &block)
         url = Versions.url(template_id, version_id)
         resp = post(@auth, "#{url}/activate", &block)
-        Versions.create_version(resp)
+        finish(resp, @raw_resp) { |r| Versions.create_version(r) }
       end
 
       def get_version(template_id:, version_id:, &block)
@@ -57,7 +57,7 @@ module SendGrid4r::REST
           Versions.url(template_id, version_id),
           &block
         )
-        Versions.create_version(resp)
+        finish(resp, @raw_resp) { |r| Versions.create_version(r) }
       end
 
       def patch_version(template_id:, version_id:, version:, &block)
@@ -67,7 +67,7 @@ module SendGrid4r::REST
           remove_uneditable_keys(version.to_h),
           &block
         )
-        Versions.create_version(resp)
+        finish(resp, @raw_resp) { |r| Versions.create_version(r) }
       end
 
       def delete_version(template_id:, version_id:, &block)

data/lib/sendgrid4r/rest/users.rb

@@ -80,44 +80,44 @@ module SendGrid4r::REST
 
     def get_user_profile(&block)
       resp = get(@auth, Users.url(:profile), nil, &block)
-      Users.create_profile(resp)
+      finish(resp, @raw_resp) { |r| Users.create_profile(r) }
     end
 
     def patch_user_profile(params:, &block)
       resp = patch(@auth, Users.url(:profile), params, &block)
-      Users.create_profile(resp)
+      finish(resp, @raw_resp) { |r| Users.create_profile(r) }
     end
 
     def get_user_account(&block)
       resp = get(@auth, Users.url(:account), nil, &block)
-      Users.create_account(resp)
+      finish(resp, @raw_resp) { |r| Users.create_account(r) }
     end
 
     def get_user_email(&block)
       resp = get(@auth, Users.url(:email), nil, &block)
-      Users.create_email(resp)
+      finish(resp, @raw_resp) { |r| Users.create_email(r) }
     end
 
     def put_user_email(email:, &block)
       params = { email: email }
       resp = put(@auth, Users.url(:email), params, &block)
-      Users.create_email(resp)
+      finish(resp, @raw_resp) { |r| Users.create_email(r) }
     end
 
     def get_user_username(&block)
       resp = get(@auth, Users.url(:username), nil, &block)
-      Users.create_username(resp)
+      finish(resp, @raw_resp) { |r| Users.create_username(r) }
     end
 
     def put_user_username(username:, &block)
       params = { username: username }
       resp = put(@auth, Users.url(:username), params, &block)
-      Users.create_username(resp)
+      finish(resp, @raw_resp) { |r| Users.create_username(r) }
     end
 
     def get_user_credits(&block)
       resp = get(@auth, Users.url(:credits), &block)
-      Users.create_credits(resp)
+      finish(resp, @raw_resp) { |r| Users.create_credits(r) }
     end
 
     def put_user_password(new_password:, old_password:, &block)
@@ -126,7 +126,7 @@ module SendGrid4r::REST
         old_password: old_password
       }
       resp = put(@auth, Users.url(:password), params, &block)
-      Users.create_password(resp)
+      finish(resp, @raw_resp) { |r| Users.create_password(r) }
     end
   end
 end

data/lib/sendgrid4r/rest/webhooks/event.rb

@@ -33,12 +33,12 @@ module SendGrid4r::REST
 
       def get_settings_event_notification(&block)
         resp = get(@auth, Event.url_event(:settings), &block)
-        Event.create_event_notification(resp)
+        finish(resp, @raw_resp) { |r| Event.create_event_notification(r) }
       end
 
       def patch_settings_event_notification(params:, &block)
         resp = patch(@auth, Event.url_event(:settings), params.to_h, &block)
-        Event.create_event_notification(resp)
+        finish(resp, @raw_resp) { |r| Event.create_event_notification(r) }
       end
 
       def test_settings_event_notification(url:, &block)

data/lib/sendgrid4r/rest/webhooks/parse.rb

@@ -35,7 +35,7 @@ module SendGrid4r::REST
 
       def get_parse_settings(&block)
         resp = get(@auth, Parse.url, &block)
-        Parse.create_parse_settings(resp)
+        finish(resp, @raw_resp) { |r| Parse.create_parse_settings(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/whitelabel/domains.rb

@@ -120,7 +120,7 @@ module SendGrid4r::REST
         params[:username] = username unless username.nil?
         params[:domain] = domain unless domain.nil?
         resp = get(@auth, Domains.url, params, &block)
-        Domains.create_domains(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domains(r) }
       end
 
       def post_wl_domain(
@@ -139,12 +139,12 @@ module SendGrid4r::REST
         params[:custom_spf] = custom_spf unless custom_spf.nil?
         params[:default] = default unless default.nil?
         resp = post(@auth, Domains.url, params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def get_wl_domain(id:, &block)
         resp = get(@auth, Domains.url(id), nil, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def patch_wl_domain(id:, custom_spf: nil, default: nil, &block)
@@ -152,7 +152,7 @@ module SendGrid4r::REST
         params[:custom_spf] = custom_spf unless custom_spf.nil?
         params[:default] = default unless default.nil?
         resp = patch(@auth, Domains.url(id), params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def delete_wl_domain(id:, &block)
@@ -163,29 +163,28 @@ module SendGrid4r::REST
         params = {}
         params[:domain] = domain unless domain.nil?
         resp = get(@auth, "#{Domains.url}/default", params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def add_ip_to_wl_domain(id:, ip:, &block)
         params = { ip: ip }
         resp = post(@auth, "#{Domains.url(id)}/ips", params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def remove_ip_from_wl_domain(id:, ip:, &block)
-        resp = delete(@auth, Domains.url(id, ip), &block)
-        Domains.create_domain(resp)
+        delete(@auth, Domains.url(id, ip), &block)
       end
 
       def validate_wl_domain(id:, &block)
         resp = post(@auth, "#{Domains.url(id)}/validate", &block)
-        Domains.create_result(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_result(r) }
       end
 
       def get_associated_wl_domain(username:, &block)
         params = { username: username }
         resp = get(@auth, "#{Domains.url}/subuser", params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
 
       def disassociate_wl_domain(username:, &block)
@@ -197,7 +196,7 @@ module SendGrid4r::REST
         endpoint = "#{Domains.url(id)}/subuser"
         params = { username: username }
         resp = post(@auth, endpoint, params, &block)
-        Domains.create_domain(resp)
+        finish(resp, @raw_resp) { |r| Domains.create_domain(r) }
       end
     end
   end

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

@@ -85,7 +85,7 @@ module SendGrid4r::REST
         params[:limit] = limit unless limit.nil?
         params[:offset] = offset unless offset.nil?
         resp = get(@auth, Ips.url, params, &block)
-        Ips.create_ips(resp)
+        finish(resp, @raw_resp) { |r| Ips.create_ips(r) }
       end
 
       def post_wl_ip(ip:, subdomain:, domain:, &block)
@@ -95,12 +95,12 @@ module SendGrid4r::REST
           domain: domain
         }
         resp = post(@auth, Ips.url, params, &block)
-        Ips.create_ip(resp)
+        finish(resp, @raw_resp) { |r| Ips.create_ip(r) }
       end
 
       def get_wl_ip(id:, &block)
         resp = get(@auth, Ips.url(id), nil, &block)
-        Ips.create_ip(resp)
+        finish(resp, @raw_resp) { |r| Ips.create_ip(r) }
       end
 
       def delete_wl_ip(id:, &block)
@@ -109,7 +109,7 @@ module SendGrid4r::REST
 
       def validate_wl_ip(id:, &block)
         resp = post(@auth, "#{Ips.url(id)}/validate", &block)
-        Ips.create_result(resp)
+        finish(resp, @raw_resp) { |r| Ips.create_result(r) }
       end
     end
   end

data/lib/sendgrid4r/rest/whitelabel/links.rb

@@ -96,7 +96,7 @@ module SendGrid4r::REST
         params[:username] = username unless username.nil?
         params[:domain] = domain unless domain.nil?
         resp = get(@auth, Links.url, params, &block)
-        Links.create_links(resp)
+        finish(resp, @raw_resp) { |r| Links.create_links(r) }
       end
 
       def post_wl_link(subdomain:, domain:, default: nil, &block)
@@ -106,18 +106,18 @@ module SendGrid4r::REST
         }
         params[:default] = default unless default.nil?
         resp = post(@auth, Links.url, params, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
 
       def get_wl_link(id:, &block)
         resp = get(@auth, Links.url(id), nil, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
 
       def patch_wl_link(id:, default:, &block)
         params = { default: default }
         resp = patch(@auth, Links.url(id), params, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
 
       def delete_wl_link(id:, &block)
@@ -128,18 +128,18 @@ module SendGrid4r::REST
         params = {}
         params[:domain] = domain unless domain.nil?
         resp = get(@auth, "#{Links.url}/default", params, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
 
       def validate_wl_link(id:, &block)
         resp = post(@auth, "#{Links.url(id)}/validate", &block)
-        Links.create_result(resp)
+        finish(resp, @raw_resp) { |r| Links.create_result(r) }
       end
 
       def get_associated_wl_link(username:, &block)
         params = { username: username }
         resp = get(@auth, "#{Links.url}/subuser", params, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
 
       def disassociate_wl_link(username:, &block)
@@ -150,7 +150,7 @@ module SendGrid4r::REST
       def associate_wl_link(id:, username:, &block)
         params = { username: username }
         resp = post(@auth, "#{Links.url(id)}/subuser", params, &block)
-        Links.create_link(resp)
+        finish(resp, @raw_resp) { |r| Links.create_link(r) }
       end
     end
   end