sendgrid4r 1.8.1 → 1.10.0

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

@@ -1,136 +1,115 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 Whitelabel
+  #
+  module Whitelabel
     #
-    # SendGrid Web API v3 Whitelabel
+    # SendGrid Web API v3 Whitelabel Ips
     #
-    module Whitelabel
-      #
-      # SendGrid Web API v3 Whitelabel Ips
-      #
-      module Ips
-        include SendGrid4r::REST::Request
-
-        Ip = Struct.new(
-          :id, :ip, :rdns, :users, :subdomain, :domain, :valid, :legacy,
-          :a_record
+    module Ips
+      include Request
+
+      Ip = Struct.new(
+        :id, :ip, :rdns, :users, :subdomain, :domain, :valid, :legacy,
+        :a_record
+      )
+      User = Struct.new(:username, :user_id)
+      ARecord = Struct.new(:host, :type, :data, :valid)
+
+      def self.url(id = nil)
+        url = "#{BASE_URL}/whitelabel/ips"
+        url = "#{url}/#{id}" unless id.nil?
+        url
+      end
+
+      def self.create_ips(resp)
+        return resp if resp.nil?
+        resp.map { |ip| Ips.create_ip(ip) }
+      end
+
+      def self.create_ip(resp)
+        return resp if resp.nil?
+        Ip.new(
+          resp['id'],
+          resp['ip'],
+          resp['rdns'],
+          Ips.create_users(resp['users']),
+          resp['subdomain'],
+          resp['domain'],
+          resp['valid'],
+          resp['legacy'],
+          Ips.create_a_record(resp['a_record'])
+        )
+      end
+
+      def self.create_users(resp)
+        return resp if resp.nil?
+        resp.map { |user| Ips.create_a_record(user) }
+      end
+
+      def self.create_a_record(resp)
+        return resp if resp.nil?
+        ARecord.new(resp['host'], resp['type'], resp['data'], resp['valid'])
+      end
+
+      Result = Struct.new(:id, :valid, :validation_results)
+      ValidationResults = Struct.new(:a_record)
+      ValidationResult = Struct.new(:valid, :reason)
+
+      def self.create_result(resp)
+        return resp if resp.nil?
+        Result.new(
+          resp['id'],
+          resp['valid'],
+          Ips.create_validation_results(resp['validation_results'])
         )
-        User = Struct.new(:username, :user_id)
-        ARecord = Struct.new(:host, :type, :data, :valid)
-
-        def self.url(id = nil)
-          url = "#{BASE_URL}/whitelabel/ips"
-          url = "#{url}/#{id}" unless id.nil?
-          url
-        end
-
-        def self.create_ips(resp)
-          return resp if resp.nil?
-          ips = []
-          resp.each do |ip|
-            ips.push(
-              SendGrid4r::REST::Whitelabel::Ips.create_ip(ip)
-            )
-          end
-          ips
-        end
-
-        def self.create_ip(resp)
-          return resp if resp.nil?
-          Ip.new(
-            resp['id'],
-            resp['ip'],
-            resp['rdns'],
-            SendGrid4r::REST::Whitelabel::Ips.create_users(resp['users']),
-            resp['subdomain'],
-            resp['domain'],
-            resp['valid'],
-            resp['legacy'],
-            SendGrid4r::REST::Whitelabel::Ips.create_a_record(resp['a_record'])
-          )
-        end
-
-        def self.create_users(resp)
-          return resp if resp.nil?
-          users = []
-          resp.each do |user|
-            users.push(SendGrid4r::REST::Whitelabel::Ips.create_a_record(user))
-          end
-          users
-        end
-
-        def self.create_a_record(resp)
-          return resp if resp.nil?
-          ARecord.new(resp['host'], resp['type'], resp['data'], resp['valid'])
-        end
-
-        Result = Struct.new(:id, :valid, :validation_results)
-        ValidationResults = Struct.new(:a_record)
-        ValidationResult = Struct.new(:valid, :reason)
-
-        def self.create_result(resp)
-          return resp if resp.nil?
-          Result.new(
-            resp['id'],
-            resp['valid'],
-            SendGrid4r::REST::Whitelabel::Ips.create_validation_results(
-              resp['validation_results']
-            )
-          )
-        end
-
-        def self.create_validation_results(resp)
-          return resp if resp.nil?
-          ValidationResults.new(
-            SendGrid4r::REST::Whitelabel::Ips.create_validation_result(
-              resp['a_record']
-            )
-          )
-        end
-
-        def self.create_validation_result(resp)
-          return resp if resp.nil?
-          ValidationResult.new(resp['valid'], resp['reason'])
-        end
-
-        def get_wl_ips(ip: nil, limit: nil, offset: nil, &block)
-          params = {}
-          params['ip'] = ip unless ip.nil?
-          params['limit'] = limit unless limit.nil?
-          params['offset'] = offset unless offset.nil?
-          endpoint = SendGrid4r::REST::Whitelabel::Ips.url
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Ips.create_ips(resp)
-        end
-
-        def post_wl_ip(ip:, subdomain:, domain:, &block)
-          params = {}
-          params['ip'] = ip
-          params['subdomain'] = subdomain
-          params['domain'] = domain
-          endpoint = SendGrid4r::REST::Whitelabel::Ips.url
-          resp = post(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Ips.create_ip(resp)
-        end
-
-        def get_wl_ip(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Ips.url(id)
-          resp = get(@auth, endpoint, nil, &block)
-          SendGrid4r::REST::Whitelabel::Ips.create_ip(resp)
-        end
-
-        def delete_wl_ip(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Ips.url(id)
-          delete(@auth, endpoint, &block)
-        end
-
-        def validate_wl_ip(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Ips.url(id)
-          endpoint = "#{endpoint}/validate"
-          resp = post(@auth, endpoint, &block)
-          SendGrid4r::REST::Whitelabel::Ips.create_result(resp)
-        end
+      end
+
+      def self.create_validation_results(resp)
+        return resp if resp.nil?
+        ValidationResults.new(
+          Ips.create_validation_result(resp['a_record'])
+        )
+      end
+
+      def self.create_validation_result(resp)
+        return resp if resp.nil?
+        ValidationResult.new(resp['valid'], resp['reason'])
+      end
+
+      def get_wl_ips(ip: nil, limit: nil, offset: nil, &block)
+        params = {}
+        params[:ip] = ip unless ip.nil?
+        params[:limit] = limit unless limit.nil?
+        params[:offset] = offset unless offset.nil?
+        resp = get(@auth, Ips.url, params, &block)
+        Ips.create_ips(resp)
+      end
+
+      def post_wl_ip(ip:, subdomain:, domain:, &block)
+        params = {
+          ip: ip,
+          subdomain: subdomain,
+          domain: domain
+        }
+        resp = post(@auth, Ips.url, params, &block)
+        Ips.create_ip(resp)
+      end
+
+      def get_wl_ip(id:, &block)
+        resp = get(@auth, Ips.url(id), nil, &block)
+        Ips.create_ip(resp)
+      end
+
+      def delete_wl_ip(id:, &block)
+        delete(@auth, Ips.url(id), &block)
+      end
+
+      def validate_wl_ip(id:, &block)
+        resp = post(@auth, "#{Ips.url(id)}/validate", &block)
+        Ips.create_result(resp)
       end
     end
   end

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

@@ -1,192 +1,156 @@
 # -*- encoding: utf-8 -*-
 
-module SendGrid4r
-  module REST
+module SendGrid4r::REST
+  #
+  # SendGrid Web API v3 Whitelabel
+  #
+  module Whitelabel
     #
-    # SendGrid Web API v3 Whitelabel
+    # SendGrid Web API v3 Whitelabel Links
     #
-    module Whitelabel
-      #
-      # SendGrid Web API v3 Whitelabel Links
-      #
-      module Links
-        include SendGrid4r::REST::Request
-
-        Link = Struct.new(
-          :id, :domain, :subdomain, :username, :user_id, :default,
-          :valid, :legacy, :dns
-        )
-        Dns = Struct.new(:domain_cname, :owner_cname)
-        Record = Struct.new(:host, :type, :data, :valid)
+    module Links
+      include Request
+
+      Link = Struct.new(
+        :id, :domain, :subdomain, :username, :user_id, :default,
+        :valid, :legacy, :dns
+      )
+      Dns = Struct.new(:domain_cname, :owner_cname)
+      Record = Struct.new(:host, :type, :data, :valid)
+
+      def self.url(id = nil)
+        url = "#{BASE_URL}/whitelabel/links"
+        url = "#{url}/#{id}" unless id.nil?
+        url
+      end
 
-        def self.url(id = nil)
-          url = "#{BASE_URL}/whitelabel/links"
-          url = "#{url}/#{id}" unless id.nil?
-          url
-        end
+      def self.create_links(resp)
+        return resp if resp.nil?
+        resp.map { |link| Links.create_link(link) }
+      end
 
-        def self.create_links(resp)
-          return resp if resp.nil?
-          links = []
-          resp.each do |link|
-            links.push(
-              SendGrid4r::REST::Whitelabel::Links.create_link(link)
-            )
-          end
-          links
-        end
+      def self.create_link(resp)
+        return resp if resp.nil?
+        Link.new(
+          resp['id'],
+          resp['domain'],
+          resp['subdomain'],
+          resp['username'],
+          resp['user_id'],
+          resp['default'],
+          resp['valid'],
+          resp['legacy'],
+          Links.create_dns(resp['dns'])
+        )
+      end
 
-        def self.create_link(resp)
-          return resp if resp.nil?
-          Link.new(
-            resp['id'],
-            resp['domain'],
-            resp['subdomain'],
-            resp['username'],
-            resp['user_id'],
-            resp['default'],
-            resp['valid'],
-            resp['legacy'],
-            SendGrid4r::REST::Whitelabel::Links.create_dns(resp['dns'])
-          )
-        end
+      def self.create_dns(resp)
+        return resp if resp.nil?
+        Dns.new(
+          Links.create_record(resp['domain_cname']),
+          Links.create_record(resp['owner_cname'])
+        )
+      end
 
-        def self.create_dns(resp)
-          return resp if resp.nil?
-          Dns.new(
-            SendGrid4r::REST::Whitelabel::Links.create_record(
-              resp['domain_cname']
-            ),
-            SendGrid4r::REST::Whitelabel::Links.create_record(
-              resp['owner_cname']
-            )
-          )
-        end
+      def self.create_record(resp)
+        return resp if resp.nil?
+        Record.new(resp['host'], resp['type'], resp['data'], resp['valid'])
+      end
 
-        def self.create_record(resp)
-          return resp if resp.nil?
-          Record.new(resp['host'], resp['type'], resp['data'], resp['valid'])
-        end
+      Result = Struct.new(:id, :valid, :validation_results)
+      ValidationResults = Struct.new(:domain_cname, :owner_cname)
+      ValidationResult = Struct.new(:valid, :reason)
 
-        Result = Struct.new(:id, :valid, :validation_results)
-        ValidationResults = Struct.new(:domain_cname, :owner_cname)
-        ValidationResult = Struct.new(:valid, :reason)
-
-        def self.create_result(resp)
-          return resp if resp.nil?
-          Result.new(
-            resp['id'],
-            resp['valid'],
-            SendGrid4r::REST::Whitelabel::Links.create_validation_results(
-              resp['validation_results']
-            )
-          )
-        end
+      def self.create_result(resp)
+        return resp if resp.nil?
+        Result.new(
+          resp['id'],
+          resp['valid'],
+          Links.create_validation_results(resp['validation_results'])
+        )
+      end
 
-        def self.create_validation_results(resp)
-          return resp if resp.nil?
-          ValidationResults.new(
-            SendGrid4r::REST::Whitelabel::Links.create_validation_result(
-              resp['domain_cname']
-            ),
-            SendGrid4r::REST::Whitelabel::Links.create_validation_result(
-              resp['owner_cname']
-            )
-          )
-        end
+      def self.create_validation_results(resp)
+        return resp if resp.nil?
+        ValidationResults.new(
+          Links.create_validation_result(resp['domain_cname']),
+          Links.create_validation_result(resp['owner_cname'])
+        )
+      end
 
-        def self.create_validation_result(resp)
-          return resp if resp.nil?
-          ValidationResult.new(resp['valid'], resp['reason'])
-        end
+      def self.create_validation_result(resp)
+        return resp if resp.nil?
+        ValidationResult.new(resp['valid'], resp['reason'])
+      end
 
-        def get_wl_links(
-          limit: nil, offset: nil, exclude_subusers: nil, username: nil,
-          domain: nil, &block
-        )
-          params = {}
-          params['limit'] = limit unless limit.nil?
-          params['offset'] = offset unless offset.nil?
-          unless exclude_subusers.nil?
-            params['exclude_subusers'] = exclude_subusers
-          end
-          params['username'] = username unless username.nil?
-          params['domain'] = domain unless domain.nil?
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_links(resp)
-        end
+      def get_wl_links(
+        limit: nil, offset: nil, exclude_subusers: nil, username: nil,
+        domain: nil, &block
+      )
+        params = {}
+        params[:limit] = limit unless limit.nil?
+        params[:offset] = offset unless offset.nil?
+        unless exclude_subusers.nil?
+          params[:exclude_subusers] = exclude_subusers
+        end
+        params[:username] = username unless username.nil?
+        params[:domain] = domain unless domain.nil?
+        resp = get(@auth, Links.url, params, &block)
+        Links.create_links(resp)
+      end
 
-        def post_wl_link(subdomain:, domain:, default: nil, &block)
-          params = {}
-          params['subdomain'] = subdomain
-          params['domain'] = domain
-          params['default'] = default unless default.nil?
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          resp = post(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def post_wl_link(subdomain:, domain:, default: nil, &block)
+        params = {
+          subdomain: subdomain,
+          domain: domain
+        }
+        params[:default] = default unless default.nil?
+        resp = post(@auth, Links.url, params, &block)
+        Links.create_link(resp)
+      end
 
-        def get_wl_link(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url(id)
-          resp = get(@auth, endpoint, nil, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def get_wl_link(id:, &block)
+        resp = get(@auth, Links.url(id), nil, &block)
+        Links.create_link(resp)
+      end
 
-        def patch_wl_link(id:, default:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url(id)
-          params = {}
-          params['default'] = default
-          resp = patch(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def patch_wl_link(id:, default:, &block)
+        params = { default: default }
+        resp = patch(@auth, Links.url(id), params, &block)
+        Links.create_link(resp)
+      end
 
-        def delete_wl_link(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url(id)
-          delete(@auth, endpoint, &block)
-        end
+      def delete_wl_link(id:, &block)
+        delete(@auth, Links.url(id), &block)
+      end
 
-        def get_default_wl_link(domain: nil, &block)
-          params = {}
-          params['domain'] = domain unless domain.nil?
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          endpoint = "#{endpoint}/default"
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def get_default_wl_link(domain: nil, &block)
+        params = {}
+        params[:domain] = domain unless domain.nil?
+        resp = get(@auth, "#{Links.url}/default", params, &block)
+        Links.create_link(resp)
+      end
 
-        def validate_wl_link(id:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url(id)
-          endpoint = "#{endpoint}/validate"
-          resp = post(@auth, endpoint, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_result(resp)
-        end
+      def validate_wl_link(id:, &block)
+        resp = post(@auth, "#{Links.url(id)}/validate", &block)
+        Links.create_result(resp)
+      end
 
-        def get_associated_wl_link(username:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          endpoint = "#{endpoint}/subuser"
-          params = {}
-          params['username'] = username
-          resp = get(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def get_associated_wl_link(username:, &block)
+        params = { username: username }
+        resp = get(@auth, "#{Links.url}/subuser", params, &block)
+        Links.create_link(resp)
+      end
 
-        def disassociate_wl_link(username:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url
-          endpoint = "#{endpoint}/subuser"
-          params = {}
-          params['username'] = username
-          delete(@auth, endpoint, params, &block)
-        end
+      def disassociate_wl_link(username:, &block)
+        params = { username: username }
+        delete(@auth, "#{Links.url}/subuser", params, &block)
+      end
 
-        def associate_wl_link(id:, username:, &block)
-          endpoint = SendGrid4r::REST::Whitelabel::Links.url(id)
-          endpoint = "#{endpoint}/subuser"
-          params = {}
-          params['username'] = username
-          resp = post(@auth, endpoint, params, &block)
-          SendGrid4r::REST::Whitelabel::Links.create_link(resp)
-        end
+      def associate_wl_link(id:, username:, &block)
+        params = { username: username }
+        resp = post(@auth, "#{Links.url(id)}/subuser", params, &block)
+        Links.create_link(resp)
       end
     end
   end

data/lib/sendgrid4r/version.rb

@@ -2,5 +2,5 @@
 # SendGrid API v3 wrapper implementation.
 #
 module SendGrid4r
-  VERSION = '1.8.1'
+  VERSION = '1.10.0'
 end

data/lib/sendgrid4r.rb

@@ -6,11 +6,11 @@ require 'sendgrid4r/rest/request'
 require 'sendgrid4r/rest/subusers'
 require 'sendgrid4r/rest/users'
 
-require 'sendgrid4r/rest/templates/templates'
-require 'sendgrid4r/rest/templates/versions'
+require 'sendgrid4r/rest/transactional_templates/templates'
+require 'sendgrid4r/rest/transactional_templates/versions'
 
-require 'sendgrid4r/rest/api_keys/api_keys'
-require 'sendgrid4r/rest/api_keys/permissions'
+require 'sendgrid4r/rest/api_keys_management/api_keys'
+require 'sendgrid4r/rest/api_keys_management/permissions'
 
 require 'sendgrid4r/rest/sm/sm'
 require 'sendgrid4r/rest/sm/global_unsubscribes'
@@ -23,17 +23,17 @@ require 'sendgrid4r/rest/invalid_emails'
 require 'sendgrid4r/rest/spam_reports'
 require 'sendgrid4r/rest/cancel_scheduled_sends'
 
-require 'sendgrid4r/rest/campaigns/campaigns'
+require 'sendgrid4r/rest/marketing_campaigns/marketing_campaigns'
+require 'sendgrid4r/rest/marketing_campaigns/senders'
+require 'sendgrid4r/rest/marketing_campaigns/contacts/custom_fields'
+require 'sendgrid4r/rest/marketing_campaigns/contacts/lists'
+require 'sendgrid4r/rest/marketing_campaigns/contacts/recipients'
+require 'sendgrid4r/rest/marketing_campaigns/contacts/reserved_fields'
+require 'sendgrid4r/rest/marketing_campaigns/contacts/segments'
 
-require 'sendgrid4r/rest/categories/categories'
+require 'sendgrid4r/rest/categories'
 
-require 'sendgrid4r/rest/contacts/custom_fields'
-require 'sendgrid4r/rest/contacts/lists'
-require 'sendgrid4r/rest/contacts/recipients'
-require 'sendgrid4r/rest/contacts/reserved_fields'
-require 'sendgrid4r/rest/contacts/segments'
-
-require 'sendgrid4r/rest/email_activity/email_activity'
+require 'sendgrid4r/rest/email_activity'
 
 require 'sendgrid4r/rest/ip_access_management'
 
@@ -61,10 +61,20 @@ require 'sendgrid4r/rest/whitelabel/domains'
 require 'sendgrid4r/rest/whitelabel/ips'
 require 'sendgrid4r/rest/whitelabel/links'
 
+require 'sendgrid4r/rest/mail/attachment'
+require 'sendgrid4r/rest/mail/content'
+require 'sendgrid4r/rest/mail/address'
+require 'sendgrid4r/rest/mail/mail_settings'
+require 'sendgrid4r/rest/mail/mail'
+require 'sendgrid4r/rest/mail/params'
+require 'sendgrid4r/rest/mail/personalization'
+require 'sendgrid4r/rest/mail/tracking_settings'
+
 require 'sendgrid4r/factory/campaign_factory'
 require 'sendgrid4r/factory/condition_factory'
 require 'sendgrid4r/factory/segment_factory'
 require 'sendgrid4r/factory/version_factory'
+require 'sendgrid4r/factory/mail_factory'
 
 require 'sendgrid4r/rest/api'
 

data/sendgrid4r.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency('rest-client', '>=1.8.0', '<1.9.0')
   spec.add_development_dependency('rubocop', '>=0.29.0', '<0.34.3')
-  spec.add_development_dependency('bundler', '>=1.6.0', '<1.12.0')
+  spec.add_development_dependency('bundler', '>=1.6.0', '<1.13.0')
   spec.add_development_dependency('rspec', '3.3.0')
   spec.add_development_dependency('dotenv', '=0.11.0', '<=2.0.2')
 end