sendgrid4r 1.8.1 → 1.10.0

data/lib/sendgrid4r/rest/sm/suppressions.rb

@@ -1,81 +1,64 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Sm
-      #
-      # SendGrid Web API v3 Suppression Management - Suppressions
-      #
-      module Suppressions
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Sm
+    #
+    # SendGrid Web API v3 Suppression Management - Suppressions
+    #
+    module Suppressions
+      include Request
 
-        Suppression = Struct.new(:id, :name, :description, :suppressed)
-        Suppressions = Struct.new(:suppressions)
+      Suppression = Struct.new(:id, :name, :description, :suppressed)
+      Suppressions = Struct.new(:suppressions)
 
-        def self.url(group_id, email_address = nil)
-          url = "#{BASE_URL}/asm/groups/#{group_id}/suppressions"
-          url = "#{url}/#{email_address}" unless email_address.nil?
-          url
-        end
-
-        def self.create_suppressions(resp)
-          return resp if resp.nil?
-          suppressions = []
-          resp['suppressions'].each do |suppression|
-            suppressions.push(
-              SendGrid4r::REST::Sm::Suppressions.create_suppression(
-                suppression
-              )
-            )
-          end
-          Suppressions.new(suppressions)
-        end
+      def self.url(group_id, email_address = nil)
+        url = "#{BASE_URL}/asm/groups/#{group_id}/suppressions"
+        url = "#{url}/#{email_address}" unless email_address.nil?
+        url
+      end
 
-        def self.create_suppression(resp)
-          return resp if resp.nil?
-          Suppression.new(
-            resp['id'], resp['name'], resp['description'], resp['suppressed']
-          )
+      def self.create_suppressions(resp)
+        return resp if resp.nil?
+        suppressions = resp['suppressions'].map do |suppression|
+          Sm::Suppressions.create_suppression(suppression)
         end
+        Suppressions.new(suppressions)
+      end
 
-        def self.create_emails(resp)
-          return resp if resp.nil?
-          emails = []
-          resp.each do |email|
-            emails.push(email)
-          end
-          emails
-        end
+      def self.create_suppression(resp)
+        return resp if resp.nil?
+        Suppression.new(
+          resp['id'], resp['name'], resp['description'], resp['suppressed']
+        )
+      end
 
-        def post_suppressed_emails(group_id:, recipient_emails:, &block)
-          resp = post(
-            @auth,
-            SendGrid4r::REST::Sm::Suppressions.url(group_id),
-            recipient_emails: recipient_emails,
-            &block
-          )
-          SendGrid4r::REST::Sm.create_recipient_emails(resp)
-        end
+      def post_suppressed_emails(group_id:, recipient_emails:, &block)
+        resp = post(
+          @auth,
+          Sm::Suppressions.url(group_id),
+          recipient_emails: recipient_emails,
+          &block
+        )
+        Sm.create_recipient_emails(resp)
+      end
 
-        def get_suppressed_emails(group_id:, &block)
-          endpoint = SendGrid4r::REST::Sm::Suppressions.url(group_id)
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Sm::Suppressions.create_emails(resp)
-        end
+      def get_suppressed_emails(group_id:, &block)
+        endpoint = Sm::Suppressions.url(group_id)
+        get(@auth, endpoint, &block)
+      end
 
-        def get_suppressions(email_address:, &block)
-          endpoint = "#{BASE_URL}/asm/suppressions/#{email_address}"
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Sm::Suppressions.create_suppressions(resp)
-        end
+      def get_suppressions(email_address:, &block)
+        endpoint = "#{BASE_URL}/asm/suppressions/#{email_address}"
+        resp = get(@auth, endpoint, &block)
+        Sm::Suppressions.create_suppressions(resp)
+      end
 
-        def delete_suppressed_email(group_id:, email_address:, &block)
-          delete(
-            @auth,
-            SendGrid4r::REST::Sm::Suppressions.url(group_id, email_address),
-            &block
-          )
-        end
+      def delete_suppressed_email(group_id:, email_address:, &block)
+        delete(
+          @auth,
+          Sm::Suppressions.url(group_id, email_address),
+          &block
+        )
       end
     end
   end

data/lib/sendgrid4r/rest/spam_reports.rb

@@ -1,81 +1,61 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    #
-    # SendGrid Web API v3 SpamReports
-    #
-    module SpamReports
-      include SendGrid4r::REST::Request
-
-      SpamReport = Struct.new(
-        :created, :email, :ip
-      )
-
-      def self.url(email = nil)
-        url = "#{BASE_URL}/suppression/spam_reports"
-        url = "#{url}/#{email}" unless email.nil?
-        url
-      end
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 SpamReports
+  #
+  module SpamReports
+    include Request
+
+    SpamReport = Struct.new(:created, :email, :ip)
+
+    def self.url(email = nil)
+      url = "#{BASE_URL}/suppression/spam_reports"
+      url = "#{url}/#{email}" unless email.nil?
+      url
+    end
 
-      def self.create_spam_reports(resp)
-        return resp if resp.nil?
-        spam_reports = []
-        resp.each do |spam_report|
-          spam_reports.push(
-            SendGrid4r::REST::SpamReports.create_spam_report(spam_report)
-          )
-        end
-        spam_reports
-      end
+    def self.create_spam_reports(resp)
+      return resp if resp.nil?
+      resp.map { |spam_report| SpamReports.create_spam_report(spam_report) }
+    end
 
-      def self.create_spam_report(resp)
-        return resp if resp.nil?
-        created = Time.at(resp['created']) unless resp['created'].nil?
-        SpamReport.new(
-          created,
-          resp['email'],
-          resp['ip']
-        )
-      end
+    def self.create_spam_report(resp)
+      return resp if resp.nil?
+      created = Time.at(resp['created']) unless resp['created'].nil?
+      SpamReport.new(created, resp['email'], resp['ip'])
+    end
 
-      def get_spam_reports(
-        start_time: nil, end_time: nil, limit: nil, offset: nil, &block
-      )
-        params = {}
-        params['start_time'] = start_time.to_i unless start_time.nil?
-        params['end_time'] = end_time.to_i unless end_time.nil?
-        params['limit'] = limit.to_i unless limit.nil?
-        params['offset'] = offset.to_i unless offset.nil?
-        resp = get(@auth, SendGrid4r::REST::SpamReports.url, params, &block)
-        SendGrid4r::REST::SpamReports.create_spam_reports(resp)
-      end
+    def get_spam_reports(
+      start_time: nil, end_time: nil, limit: nil, offset: nil, &block
+    )
+      params = {}
+      params[:start_time] = start_time.to_i unless start_time.nil?
+      params[:end_time] = end_time.to_i unless end_time.nil?
+      params[:limit] = limit.to_i unless limit.nil?
+      params[:offset] = offset.to_i unless offset.nil?
+      resp = get(@auth, SpamReports.url, params, &block)
+      SpamReports.create_spam_reports(resp)
+    end
 
-      def delete_spam_reports(delete_all: nil, emails: nil, &block)
-        endpoint = SendGrid4r::REST::SpamReports.url
-        payload = {}
-        if delete_all == true
-          payload['delete_all'] = delete_all
-        else
-          payload['emails'] = emails
-        end
-        delete(@auth, endpoint, nil, payload, &block)
+    def delete_spam_reports(delete_all: nil, emails: nil, &block)
+      if delete_all == true
+        payload = { delete_all: delete_all }
+      else
+        payload = { emails: emails }
       end
+      delete(@auth, SpamReports.url, nil, payload, &block)
+    end
 
-      def get_spam_report(email:, &block)
-        endpoint = SendGrid4r::REST::SpamReports.url(email)
-        params = {}
-        params['email'] = email
-        resp = get(@auth, endpoint, params, &block)
-        SendGrid4r::REST::SpamReports.create_spam_reports(resp)
-      end
+    def get_spam_report(email:, &block)
+      params = { email: email }
+      resp = get(@auth, SpamReports.url(email), params, &block)
+      SpamReports.create_spam_reports(resp)
+    end
 
-      def delete_spam_report(email:, &block)
-        endpoint = SendGrid4r::REST::SpamReports.url(email)
-        params = {}
-        params['email'] = email
-        delete(@auth, endpoint, params, &block)
-      end
+    def delete_spam_report(email:, &block)
+      params = { email: email }
+      delete(@auth, SpamReports.url(email), params, &block)
     end
   end
 end

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

@@ -1,113 +1,111 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Stats
-      #
-      # SendGrid Web API v3 Stats - Advanced
-      #
-      module Advanced
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Stats
+    #
+    # SendGrid Web API v3 Stats - Advanced
+    #
+    module Advanced
+      include Request
 
-        def get_geo_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            country: nil,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by,
-            country: country
-          }
-          resp = get(@auth, "#{BASE_URL}/geo/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_geo_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          country: nil,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by,
+          country: country
+        }
+        resp = get(@auth, "#{BASE_URL}/geo/stats", params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_devices_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by
-          }
-          resp = get(@auth, "#{BASE_URL}/devices/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_devices_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by
+        }
+        resp = get(@auth, "#{BASE_URL}/devices/stats", params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_clients_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by
-          }
-          resp = get(@auth, "#{BASE_URL}/clients/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_clients_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by
+        }
+        resp = get(@auth, "#{BASE_URL}/clients/stats", params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_clients_type_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            client_type:,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by,
-            client_type: client_type
-          }
-          endpoint = "#{BASE_URL}/clients/#{client_type}/stats"
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_clients_type_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          client_type:,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by,
+          client_type: client_type
+        }
+        endpoint = "#{BASE_URL}/clients/#{client_type}/stats"
+        resp = get(@auth, endpoint, params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_mailbox_providers_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            esps: nil,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by,
-            esps: esps
-          }
-          endpoint = "#{BASE_URL}/mailbox_providers/stats"
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_mailbox_providers_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          esps: nil,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by,
+          esps: esps
+        }
+        endpoint = "#{BASE_URL}/mailbox_providers/stats"
+        resp = get(@auth, endpoint, params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_browsers_stats(
-            start_date:,
-            end_date: nil,
-            aggregated_by: nil,
-            browsers: nil,
-            &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by,
-            browsers: browsers
-          }
-          resp = get(@auth, "#{BASE_URL}/browsers/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_browsers_stats(
+          start_date:,
+          end_date: nil,
+          aggregated_by: nil,
+          browsers: nil,
+          &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by,
+          browsers: browsers
+        }
+        resp = get(@auth, "#{BASE_URL}/browsers/stats", params, &block)
+        Stats.create_top_stats(resp)
       end
     end
   end

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

@@ -1,40 +1,38 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Stats
-      #
-      # SendGrid Web API v3 Stats - Category
-      #
-      module Category
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Stats
+    #
+    # SendGrid Web API v3 Stats - Category
+    #
+    module Category
+      include Request
 
-        def get_categories_stats(
-            start_date:, end_date: nil, aggregated_by: nil, categories:, &block)
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by,
-            categories: categories
-          }
-          resp = get(@auth, "#{BASE_URL}/categories/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_categories_stats(
+          start_date:, end_date: nil, aggregated_by: nil, categories:, &block)
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by,
+          categories: categories
+        }
+        resp = get(@auth, "#{BASE_URL}/categories/stats", params, &block)
+        Stats.create_top_stats(resp)
+      end
 
-        def get_categories_stats_sums(
-            start_date:, end_date: nil, sort_by_metric: nil,
-            sort_by_direction: nil, limit: nil, offset: nil, &block)
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            sort_by_metric: sort_by_metric,
-            sort_by_direction: sort_by_direction,
-            limit: limit,
-            offset: offset
-          }
-          resp = get(@auth, "#{BASE_URL}/categories/stats/sums", params, &block)
-          SendGrid4r::REST::Stats.create_top_stat(resp)
-        end
+      def get_categories_stats_sums(
+          start_date:, end_date: nil, sort_by_metric: nil,
+          sort_by_direction: nil, limit: nil, offset: nil, &block)
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          sort_by_metric: sort_by_metric,
+          sort_by_direction: sort_by_direction,
+          limit: limit,
+          offset: offset
+        }
+        resp = get(@auth, "#{BASE_URL}/categories/stats/sums", params, &block)
+        Stats.create_top_stat(resp)
       end
     end
   end

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

@@ -1,25 +1,23 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Stats
-      #
-      # SendGrid Web API v3 Stats - Global
-      #
-      module Global
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Stats
+    #
+    # SendGrid Web API v3 Stats - Global
+    #
+    module Global
+      include Request
 
-        def get_global_stats(
-          start_date:, end_date: nil, aggregated_by: nil, &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by
-          }
-          resp = get(@auth, "#{BASE_URL}/stats", params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_global_stats(
+        start_date:, end_date: nil, aggregated_by: nil, &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by
+        }
+        resp = get(@auth, "#{BASE_URL}/stats", params, &block)
+        Stats.create_top_stats(resp)
       end
     end
   end

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

@@ -1,26 +1,24 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Stats
-      #
-      # SendGrid Web API v3 Stats - Parse
-      #
-      module Parse
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Stats
+    #
+    # SendGrid Web API v3 Stats - Parse
+    #
+    module Parse
+      include Request
 
-        def get_parse_stats(
-          start_date:, end_date: nil, aggregated_by: nil, &block
-        )
-          params = {
-            start_date: start_date,
-            end_date: end_date,
-            aggregated_by: aggregated_by
-          }
-          endpoint = "#{BASE_URL}/user/webhooks/parse/stats"
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Stats.create_top_stats(resp)
-        end
+      def get_parse_stats(
+        start_date:, end_date: nil, aggregated_by: nil, &block
+      )
+        params = {
+          start_date: start_date,
+          end_date: end_date,
+          aggregated_by: aggregated_by
+        }
+        endpoint = "#{BASE_URL}/user/webhooks/parse/stats"
+        resp = get(@auth, endpoint, params, &block)
+        Stats.create_top_stats(resp)
       end
     end
   end