sendgrid4r 1.8.1 → 1.10.0

data/lib/sendgrid4r/rest/settings/settings.rb

@@ -1,29 +1,24 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    #
-    # SendGrid Web API v3 Settings
-    #
-    module Settings
-      Results = Struct.new(:result)
-      Result = Struct.new(:name, :title, :description, :enabled)
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 Settings
+  #
+  module Settings
+    Results = Struct.new(:result)
+    Result = Struct.new(:name, :title, :description, :enabled)
 
-      def self.create_results(resp)
-        return resp if resp.nil?
-        results = []
-        resp['result'].each do |result|
-          results.push(SendGrid4r::REST::Settings.create_result(result))
-        end
-        Results.new(results)
-      end
+    def self.create_results(resp)
+      return resp if resp.nil?
+      results = resp['result'].map { |result| Settings.create_result(result) }
+      Results.new(results)
+    end
 
-      def self.create_result(resp)
-        return resp if resp.nil?
-        Result.new(
-          resp['name'], resp['title'], resp['description'], resp['enabled']
-        )
-      end
+    def self.create_result(resp)
+      return resp if resp.nil?
+      Result.new(
+        resp['name'], resp['title'], resp['description'], resp['enabled']
+      )
     end
   end
 end

data/lib/sendgrid4r/rest/settings/tracking.rb

@@ -1,119 +1,109 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Settings
-      #
-      # SendGrid Web API v3 Settings - Tracking
-      #
-      module Tracking
-        include SendGrid4r::REST::Request
-
-        Click = Struct.new(:enabled)
-
-        def self.create_click(resp)
-          return resp if resp.nil?
-          Click.new(resp['enabled'])
-        end
-
-        GoogleAnalytics = Struct.new(
-          :enabled, :utm_source, :utm_medium, :utm_term, :utm_content,
-          :utm_campaign
+module SendGrid4r::REST
+  module Settings
+    #
+    # SendGrid Web API v3 Settings - Tracking
+    #
+    module Tracking
+      include Request
+
+      Click = Struct.new(:enabled)
+
+      def self.create_click(resp)
+        return resp if resp.nil?
+        Click.new(resp['enabled'])
+      end
+
+      GoogleAnalytics = Struct.new(
+        :enabled, :utm_source, :utm_medium, :utm_term, :utm_content,
+        :utm_campaign
+      )
+
+      def self.create_google_analytics(resp)
+        return resp if resp.nil?
+        GoogleAnalytics.new(
+          resp['enabled'], resp['utm_source'], resp['utm_medium'],
+          resp['utm_term'], resp['utm_content'], resp['utm_campaign']
         )
+      end
 
-        def self.create_google_analytics(resp)
-          return resp if resp.nil?
-          GoogleAnalytics.new(
-            resp['enabled'], resp['utm_source'], resp['utm_medium'],
-            resp['utm_term'], resp['utm_content'], resp['utm_campaign']
-          )
-        end
+      Open = Struct.new(:enabled)
 
-        Open = Struct.new(:enabled)
+      def self.create_open(resp)
+        return resp if resp.nil?
+        Open.new(resp['enabled'])
+      end
 
-        def self.create_open(resp)
-          return resp if resp.nil?
-          Open.new(resp['enabled'])
-        end
+      Subscription = Struct.new(
+        :enabled, :landing, :url, :replace, :html_content, :plain_content
+      )
 
-        Subscription = Struct.new(
-          :enabled, :landing, :url, :replace, :html_content, :plain_content
+      def self.create_subscription(resp)
+        return resp if resp.nil?
+        Subscription.new(
+          resp['enabled'], resp['landing'], resp['url'], resp['replace'],
+          resp['html_content'], resp['plain_content']
         )
+      end
+
+      def self.url(name = nil)
+        url = "#{BASE_URL}/tracking_settings"
+        url = "#{url}/#{name}" unless name.nil?
+        url
+      end
+
+      def get_tracking_settings(limit: nil, offset: nil, &block)
+        params = {}
+        params[:limit] = limit unless limit.nil?
+        params[:offset] = offset unless offset.nil?
+        resp = get(@auth, Settings::Tracking.url, params, &block)
+        Settings.create_results(resp)
+      end
+
+      def get_settings_click(&block)
+        resp = get(@auth, Settings::Tracking.url(:click), &block)
+        Settings::Tracking.create_click(resp)
+      end
+
+      def patch_settings_click(params:, &block)
+        endpoint = Settings::Tracking.url(:click)
+        resp = patch(@auth, endpoint, params.to_h, &block)
+        Settings::Tracking.create_click(resp)
+      end
+
+      def get_settings_google_analytics(&block)
+        endpoint = Settings::Tracking.url(:google_analytics)
+        resp = get(@auth, endpoint, &block)
+        Settings::Tracking.create_google_analytics(resp)
+      end
+
+      def patch_settings_google_analytics(params:, &block)
+        endpoint = Settings::Tracking.url(:google_analytics)
+        resp = patch(@auth, endpoint, params.to_h, &block)
+        Settings::Tracking.create_google_analytics(resp)
+      end
+
+      def get_settings_open(&block)
+        resp = get(@auth, Settings::Tracking.url(:open), &block)
+        Settings::Tracking.create_open(resp)
+      end
+
+      def patch_settings_open(params:, &block)
+        resp = patch(@auth, Settings::Tracking.url(:open), params.to_h, &block)
+        Settings::Tracking.create_open(resp)
+      end
+
+      def get_settings_subscription(&block)
+        endpoint = Settings::Tracking.url(:subscription)
+        resp = get(@auth, endpoint, &block)
+        Settings::Tracking.create_subscription(resp)
+      end
 
-        def self.create_subscription(resp)
-          return resp if resp.nil?
-          Subscription.new(
-            resp['enabled'], resp['landing'], resp['url'], resp['replace'],
-            resp['html_content'], resp['plain_content']
-          )
-        end
-
-        def self.url(name = nil)
-          url = "#{BASE_URL}/tracking_settings"
-          url = "#{url}/#{name}" unless name.nil?
-          url
-        end
-
-        def get_tracking_settings(limit: nil, offset: nil, &block)
-          params = {}
-          params['limit'] = limit unless limit.nil?
-          params['offset'] = offset unless offset.nil?
-          endpoint = SendGrid4r::REST::Settings::Tracking.url
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Settings.create_results(resp)
-        end
-
-        def get_settings_click(&block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('click')
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Settings::Tracking.create_click(resp)
-        end
-
-        def patch_settings_click(params:, &block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('click')
-          resp = patch(@auth, endpoint, params.to_h, &block)
-          SendGrid4r::REST::Settings::Tracking.create_click(resp)
-        end
-
-        def get_settings_google_analytics(&block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url(
-            'google_analytics'
-          )
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Settings::Tracking.create_google_analytics(resp)
-        end
-
-        def patch_settings_google_analytics(params:, &block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url(
-            'google_analytics'
-          )
-          resp = patch(@auth, endpoint, params.to_h, &block)
-          SendGrid4r::REST::Settings::Tracking.create_google_analytics(resp)
-        end
-
-        def get_settings_open(&block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('open')
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Settings::Tracking.create_open(resp)
-        end
-
-        def patch_settings_open(params:, &block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('open')
-          resp = patch(@auth, endpoint, params.to_h, &block)
-          SendGrid4r::REST::Settings::Tracking.create_open(resp)
-        end
-
-        def get_settings_subscription(&block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('subscription')
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Settings::Tracking.create_subscription(resp)
-        end
-
-        def patch_settings_subscription(params:, &block)
-          endpoint = SendGrid4r::REST::Settings::Tracking.url('subscription')
-          resp = patch(@auth, endpoint, params.to_h, &block)
-          SendGrid4r::REST::Settings::Tracking.create_subscription(resp)
-        end
+      def patch_settings_subscription(params:, &block)
+        endpoint = Settings::Tracking.url(:subscription)
+        resp = patch(@auth, endpoint, params.to_h, &block)
+        Settings::Tracking.create_subscription(resp)
       end
     end
   end

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

@@ -1,75 +1,67 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Sm
-      #
-      # SendGrid Web API v3 Suppression Management - Global Unsubscribes
-      #
-      module GlobalUnsubscribes
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Sm
+    #
+    # SendGrid Web API v3 Suppression Management - Global Unsubscribes
+    #
+    module GlobalUnsubscribes
+      include Request
 
-        Unsubscribe = Struct.new(:created, :email)
+      Unsubscribe = Struct.new(:created, :email)
 
-        def self.url(email_address = nil)
-          url = "#{BASE_URL}/asm/suppressions/global"
-          url = "#{url}/#{email_address}" unless email_address.nil?
-          url
-        end
-
-        def self.url_unsubscribes
-          "#{BASE_URL}/suppression/unsubscribes"
-        end
+      def self.url(email_address = nil)
+        url = "#{BASE_URL}/asm/suppressions/global"
+        url = "#{url}/#{email_address}" unless email_address.nil?
+        url
+      end
 
-        def self.create_supressions(resp)
-          return resp if resp.nil?
-          suppressions = []
-          resp.each do |suppression|
-            created = Time.at(suppression['created'])
-            suppressions.push(Unsubscribe.new(created, suppression['email']))
-          end
-          suppressions
-        end
+      def self.url_unsubscribes
+        "#{BASE_URL}/suppression/unsubscribes"
+      end
 
-        def get_global_unsubscribes(
-          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?
-          endpoint = SendGrid4r::REST::Sm::GlobalUnsubscribes.url_unsubscribes
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Sm::GlobalUnsubscribes.create_supressions(resp)
+      def self.create_supressions(resp)
+        return resp if resp.nil?
+        resp.map do |suppression|
+          created = Time.at(suppression['created'])
+          Unsubscribe.new(created, suppression['email'])
         end
+      end
 
-        def post_global_suppressed_emails(recipient_emails:, &block)
-          params = { recipient_emails: recipient_emails }
-          endpoint = SendGrid4r::REST::Sm::GlobalUnsubscribes.url
-          resp = post(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Sm.create_recipient_emails(resp)
-        end
+      def get_global_unsubscribes(
+        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?
+        endpoint = Sm::GlobalUnsubscribes.url_unsubscribes
+        resp = get(@auth, endpoint, params, &block)
+        Sm::GlobalUnsubscribes.create_supressions(resp)
+      end
 
-        def get_global_suppressed_email(email_address:, &block)
-          endpoint =
-            SendGrid4r::REST::Sm::GlobalUnsubscribes.url(email_address)
-          resp = get(@auth, endpoint, &block)
-          SendGrid4r::REST::Sm.create_recipient_email(resp)
-        end
+      def post_global_suppressed_emails(recipient_emails:, &block)
+        params = { recipient_emails: recipient_emails }
+        endpoint = Sm::GlobalUnsubscribes.url
+        resp = post(@auth, endpoint, params, &block)
+        Sm.create_recipient_emails(resp)
+      end
 
-        def delete_global_suppressed_email(email_address:, &block)
-          endpoint =
-            SendGrid4r::REST::Sm::GlobalUnsubscribes.url(email_address)
-          delete(@auth, endpoint, &block)
-        end
+      def get_global_suppressed_email(email_address:, &block)
+        resp = get(@auth, Sm::GlobalUnsubscribes.url(email_address), &block)
+        Sm.create_recipient_email(resp)
+      end
 
-        alias_method(:post_global_unsubscribes, :post_global_suppressed_emails)
-        alias_method(:get_global_unsubscribe, :get_global_suppressed_email)
-        alias_method(
-          :delete_global_unsubscribe, :delete_global_suppressed_email
-        )
+      def delete_global_suppressed_email(email_address:, &block)
+        delete(@auth, Sm::GlobalUnsubscribes.url(email_address), &block)
       end
+
+      alias_method(:post_global_unsubscribes, :post_global_suppressed_emails)
+      alias_method(:get_global_unsubscribe, :get_global_suppressed_email)
+      alias_method(
+        :delete_global_unsubscribe, :delete_global_suppressed_email
+      )
     end
   end
 end

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

@@ -1,72 +1,66 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    module Sm
-      #
-      # SendGrid Web API v3 Suppression Management - Groups
-      #
-      module Groups
-        include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  module Sm
+    #
+    # SendGrid Web API v3 Suppression Management - Groups
+    #
+    module Groups
+      include Request
 
-        Group = Struct.new(
-          :id, :name, :description, :last_email_sent_at, :is_default,
-          :unsubscribes
-        )
+      Group = Struct.new(
+        :id, :name, :description, :last_email_sent_at, :is_default,
+        :unsubscribes
+      )
 
-        def self.url(group_id = nil)
-          url = "#{BASE_URL}/asm/groups"
-          url = "#{url}/#{group_id}" unless group_id.nil?
-          url
-        end
+      def self.url(group_id = nil)
+        url = "#{BASE_URL}/asm/groups"
+        url = "#{url}/#{group_id}" unless group_id.nil?
+        url
+      end
 
-        def self.create_groups(resp)
-          return resp if resp.nil?
-          groups = []
-          resp.each do |group|
-            groups.push(SendGrid4r::REST::Sm::Groups.create_group(group))
-          end
-          groups
-        end
+      def self.create_groups(resp)
+        return resp if resp.nil?
+        resp.map { |group| Sm::Groups.create_group(group) }
+      end
 
-        def self.create_group(resp)
-          return resp if resp.nil?
-          Group.new(
-            resp['id'],
-            resp['name'],
-            resp['description'],
-            resp['last_email_sent_at'],
-            resp['is_default'],
-            resp['unsubscribes']
-          )
-        end
+      def self.create_group(resp)
+        return resp if resp.nil?
+        Group.new(
+          resp['id'],
+          resp['name'],
+          resp['description'],
+          resp['last_email_sent_at'],
+          resp['is_default'],
+          resp['unsubscribes']
+        )
+      end
 
-        def post_group(name:, description:, is_default: nil, &block)
-          params = { name: name, description: description }
-          params['is_default'] = is_default unless is_default.nil?
-          resp = post(@auth, SendGrid4r::REST::Sm::Groups.url, params, &block)
-          SendGrid4r::REST::Sm::Groups.create_group(resp)
-        end
+      def post_group(name:, description:, is_default: nil, &block)
+        params = { name: name, description: description }
+        params[:is_default] = is_default unless is_default.nil?
+        resp = post(@auth, Sm::Groups.url, params, &block)
+        Sm::Groups.create_group(resp)
+      end
 
-        def get_groups(&block)
-          resp = get(@auth, SendGrid4r::REST::Sm::Groups.url, &block)
-          SendGrid4r::REST::Sm::Groups.create_groups(resp)
-        end
+      def get_groups(&block)
+        resp = get(@auth, Sm::Groups.url, &block)
+        Sm::Groups.create_groups(resp)
+      end
 
-        def get_group(group_id:, &block)
-          resp = get(@auth, SendGrid4r::REST::Sm::Groups.url(group_id), &block)
-          SendGrid4r::REST::Sm::Groups.create_group(resp)
-        end
+      def get_group(group_id:, &block)
+        resp = get(@auth, Sm::Groups.url(group_id), &block)
+        Sm::Groups.create_group(resp)
+      end
 
-        def patch_group(group_id:, group:, &block)
-          endpoint = SendGrid4r::REST::Sm::Groups.url(group_id)
-          resp = patch(@auth, endpoint, group.to_h, &block)
-          SendGrid4r::REST::Sm::Groups.create_group(resp)
-        end
+      def patch_group(group_id:, group:, &block)
+        endpoint = Sm::Groups.url(group_id)
+        resp = patch(@auth, endpoint, group.to_h, &block)
+        Sm::Groups.create_group(resp)
+      end
 
-        def delete_group(group_id:, &block)
-          delete(@auth, SendGrid4r::REST::Sm::Groups.url(group_id), &block)
-        end
+      def delete_group(group_id:, &block)
+        delete(@auth, Sm::Groups.url(group_id), &block)
       end
     end
   end

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

@@ -1,25 +1,23 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
-    #
-    # SendGrid Web API v3 Suppression Management
-    #
-    module Sm
-      include SendGrid4r::REST::Request
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 Suppression Management
+  #
+  module Sm
+    include Request
 
-      RecipientEmails = Struct.new(:recipient_emails)
-      RecipientEmail = Struct.new(:recipient_email)
+    RecipientEmails = Struct.new(:recipient_emails)
+    RecipientEmail = Struct.new(:recipient_email)
 
-      def self.create_recipient_emails(resp)
-        return resp if resp.nil?
-        RecipientEmails.new(resp['recipient_emails'])
-      end
+    def self.create_recipient_emails(resp)
+      return resp if resp.nil?
+      RecipientEmails.new(resp['recipient_emails'])
+    end
 
-      def self.create_recipient_email(resp)
-        return resp if resp.nil?
-        RecipientEmail.new(resp['recipient_email'])
-      end
+    def self.create_recipient_email(resp)
+      return resp if resp.nil?
+      RecipientEmail.new(resp['recipient_email'])
     end
   end
 end