sendgrid-ruby 6.3.4 → 6.3.5

data/lib/sendgrid/helpers/mail/mail_settings.rb

@@ -1,5 +1,9 @@
+require 'json'
+
 module SendGrid
   class MailSettings
+    attr_writer :sandbox_mode, :footer, :bcc, :spam_check, :bypass_list_management
+
     def initialize
       @bcc = nil
       @bypass_list_management = nil
@@ -8,53 +12,33 @@ module SendGrid
       @spam_check = nil
     end
 
-    def sandbox_mode=(sandbox_mode)
-      @sandbox_mode = sandbox_mode
-    end
-
     def sandbox_mode
       @sandbox_mode.nil? ? nil : @sandbox_mode.to_json
     end
 
-    def bypass_list_management=(bypass_list_management)
-      @bypass_list_management = bypass_list_management
-    end
-
     def bypass_list_management
       @bypass_list_management.nil? ? nil : @bypass_list_management.to_json
     end
 
-    def footer=(footer)
-      @footer = footer
-    end
-
     def footer
       @footer.nil? ? nil : @footer.to_json
     end
 
-    def bcc=(bcc)
-      @bcc = bcc
-    end
-
     def bcc
       @bcc.nil? ? nil : @bcc.to_json
     end
 
-    def spam_check=(spam_check)
-      @spam_check = spam_check
-    end
-
     def spam_check
       @spam_check.nil? ? nil : @spam_check.to_json
     end
 
     def to_json(*)
       {
-        'bcc' => self.bcc,
-        'bypass_list_management' => self.bypass_list_management,
-        'footer' => self.footer,
-        'sandbox_mode' => self.sandbox_mode,
-        'spam_check' => self.spam_check
+        'bcc' => bcc,
+        'bypass_list_management' => bypass_list_management,
+        'footer' => footer,
+        'sandbox_mode' => sandbox_mode,
+        'spam_check' => spam_check
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/open_tracking.rb

@@ -1,30 +1,18 @@
+require 'json'
+
 module SendGrid
   class OpenTracking
-    def initialize(enable: nil, substitution_tag: nil)
-      @enable = enable
-      @substitution_tag = substitution_tag
-    end
+    attr_accessor :enable, :substitution_tag
 
-    def enable=(enable)
+    def initialize(enable: nil, substitution_tag: nil)
       @enable = enable
-    end
-
-    def enable
-      @enable
-    end
-
-    def substitution_tag=(substitution_tag)
       @substitution_tag = substitution_tag
     end
 
-    def substitution_tag
-      @substitution_tag
-    end
-
     def to_json(*)
       {
-        'enable' => self.enable,
-        'substitution_tag' => self.substitution_tag
+        'enable' => enable,
+        'substitution_tag' => substitution_tag
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/personalization.rb

@@ -1,8 +1,11 @@
+require 'json'
+
 module SendGrid
   class Personalization
-
     attr_reader :tos, :ccs, :bccs, :headers, :substitutions, :custom_args,
-      :dynamic_template_data
+                :dynamic_template_data
+
+    attr_accessor :send_at, :subject
 
     def initialize
       @tos = []
@@ -17,23 +20,21 @@ module SendGrid
     end
 
     def add_to(to)
+      raise DuplicatePersonalizationError if duplicate?(to)
+
       @tos << to.to_json
     end
 
     def add_cc(cc)
+      raise DuplicatePersonalizationError if duplicate?(cc)
+
       @ccs << cc.to_json
     end
 
     def add_bcc(bcc)
-      @bccs << bcc.to_json
-    end
-
-    def subject=(subject)
-      @subject = subject
-    end
+      raise DuplicatePersonalizationError if duplicate?(bcc)
 
-    def subject
-      @subject
+      @bccs << bcc.to_json
     end
 
     def add_header(header)
@@ -55,26 +56,32 @@ module SendGrid
       @dynamic_template_data.merge!(dynamic_template_data)
     end
 
-    def send_at=(send_at)
-      @send_at = send_at
+    def to_json(*)
+      {
+        'to' => tos,
+        'cc' => ccs,
+        'bcc' => bccs,
+        'subject' => subject,
+        'headers' => headers,
+        'substitutions' => substitutions,
+        'custom_args' => custom_args,
+        'dynamic_template_data' => dynamic_template_data,
+        'send_at' => send_at
+      }.delete_if { |_, value| value.to_s.strip == '' || value == [] || value == {} }
     end
 
-    def send_at
-      @send_at
-    end
+    private
 
-    def to_json(*)
-      {
-        'to' => self.tos,
-        'cc' => self.ccs,
-        'bcc' => self.bccs,
-        'subject' => self.subject,
-        'headers' => self.headers,
-        'substitutions' => self.substitutions,
-        'custom_args' => self.custom_args,
-        'dynamic_template_data' => self.dynamic_template_data,
-        'send_at' => self.send_at
-      }.delete_if { |_, value| value.to_s.strip == '' || value == [] || value == {}}
+    def duplicate?(addition)
+      additional_email = addition.email.downcase
+
+      [@tos, @ccs, @bccs].flatten.each do |elm|
+        return true if elm&.dig('email') == additional_email
+      end
+
+      false
     end
   end
+
+  class DuplicatePersonalizationError < StandardError; end
 end

data/lib/sendgrid/helpers/mail/section.rb

@@ -1,21 +1,17 @@
+require 'json'
+
 module SendGrid
   class Section
+    attr_accessor :section
+
     def initialize(key: nil, value: nil)
       @section = {}
-      (key.nil? || value.nil?) ? @section = nil : @section[key] = value
-    end
-
-    def section=(section)
-      @section = section
-    end
-
-    def section
-      @section
+      key.nil? || value.nil? ? @section = nil : @section[key] = value
     end
 
     def to_json(*)
       {
-        'section' => self.section
+        'section' => section
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/spam_check.rb

@@ -1,40 +1,20 @@
+require 'json'
+
 module SendGrid
   class SpamCheck
+    attr_accessor :enable, :threshold, :post_to_url
+
     def initialize(enable: nil, threshold: nil, post_to_url: nil)
       @enable = enable
       @threshold = threshold
       @post_to_url = post_to_url
     end
 
-    def enable=(enable)
-      @enable = enable
-    end
-
-    def enable
-      @enable
-    end
-
-    def threshold=(threshold)
-      @threshold = threshold
-    end
-
-    def threshold
-      @threshold
-    end
-
-    def post_to_url=(post_to_url)
-      @post_to_url = post_to_url
-    end
-
-    def post_to_url
-      @post_to_url
-    end
-
     def to_json(*)
       {
-        'enable' => self.enable,
-        'threshold' => self.threshold,
-        'post_to_url' => self.post_to_url
+        'enable' => enable,
+        'threshold' => threshold,
+        'post_to_url' => post_to_url
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/subscription_tracking.rb

@@ -1,50 +1,22 @@
+require 'json'
+
 module SendGrid
   class SubscriptionTracking
-    def initialize(enable: nil, text: nil, html: nil, substitution_tag: nil)
-      @enable = enable
-      @text = text
-      @html = html
-      @substitution_tag = substitution_tag
-    end
+    attr_accessor :enable, :text, :html, :substitution_tag
 
-    def enable=(enable)
+    def initialize(enable: nil, text: nil, html: nil, substitution_tag: nil)
       @enable = enable
-    end
-
-    def enable
-      @enable
-    end
-
-    def text=(text)
       @text = text
-    end
-
-    def text
-      @text
-    end
-
-    def html=(html)
       @html = html
-    end
-
-    def html
-      @html
-    end
-
-    def substitution_tag=(substitution_tag)
       @substitution_tag = substitution_tag
     end
 
-    def substitution_tag
-      @substitution_tag
-    end
-
     def to_json(*)
       {
-        'enable' => self.enable,
-        'text' => self.text,
-        'html' => self.html,
-        'substitution_tag' => self.substitution_tag
+        'enable' => enable,
+        'text' => text,
+        'html' => html,
+        'substitution_tag' => substitution_tag
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/substitution.rb

@@ -1,21 +1,17 @@
+require 'json'
+
 module SendGrid
   class Substitution
+    attr_accessor :substitution
+
     def initialize(key: nil, value: nil)
       @substitution = {}
-      (key.nil? || value.nil?) ? @substitution = nil : @substitution[key] = value
-    end
-
-    def substitution=(substitution)
-      @substitution = substitution
-    end
-
-    def substitution
-      @substitution
+      key.nil? || value.nil? ? @substitution = nil : @substitution[key] = value
     end
 
     def to_json(*)
       {
-        'substitution' => self.substitution
+        'substitution' => substitution
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/mail/tracking_settings.rb

@@ -1,5 +1,8 @@
+require 'json'
+
 module SendGrid
   class TrackingSettings
+    attr_writer :click_tracking, :open_tracking, :subscription_tracking, :ganalytics
     def initialize
       @click_tracking = nil
       @open_tracking = nil
@@ -7,44 +10,28 @@ module SendGrid
       @ganalytics = nil
     end
 
-    def click_tracking=(click_tracking)
-      @click_tracking = click_tracking
-    end
-
     def click_tracking
       @click_tracking.nil? ? nil : @click_tracking.to_json
     end
 
-    def open_tracking=(open_tracking)
-      @open_tracking = open_tracking
-    end
-
     def open_tracking
       @open_tracking.nil? ? nil : @open_tracking.to_json
     end
 
-    def subscription_tracking=(subscription_tracking)
-      @subscription_tracking = subscription_tracking
-    end
-
     def subscription_tracking
       @subscription_tracking.nil? ? nil : @subscription_tracking.to_json
     end
 
-    def ganalytics=(ganalytics)
-      @ganalytics = ganalytics
-    end
-
     def ganalytics
       @ganalytics.nil? ? nil : @ganalytics.to_json
     end
 
     def to_json(*)
       {
-        'click_tracking' => self.click_tracking,
-        'open_tracking' => self.open_tracking,
-        'subscription_tracking' => self.subscription_tracking,
-        'ganalytics' => self.ganalytics
+        'click_tracking' => click_tracking,
+        'open_tracking' => open_tracking,
+        'subscription_tracking' => subscription_tracking,
+        'ganalytics' => ganalytics
       }.delete_if { |_, value| value.to_s.strip == '' }
     end
   end

data/lib/sendgrid/helpers/permissions/scope.rb

@@ -4,7 +4,7 @@ require 'yaml'
 module SendGrid
   class Scope
     SCOPES = YAML.load_file(File.dirname(__FILE__) + '/scopes.yml').freeze
-    
+
     class << self
       def admin_permissions
         SCOPES.values.map(&:values).flatten

data/lib/sendgrid/helpers/settings/settings.rb

@@ -8,7 +8,7 @@ module SendGrid
     attr_accessor :sendgrid_client
 
     SETTING_TYPES = [SendGrid::MailSettingsDto, SendGrid::TrackingSettingsDto,
-                     SendGrid::PartnerSettingsDto, SendGrid::UserSettingsDto]
+                     SendGrid::PartnerSettingsDto, SendGrid::UserSettingsDto].freeze
 
     def initialize(sendgrid_client:)
       @sendgrid_client = sendgrid_client

data/lib/sendgrid/helpers/settings/tracking_settings_dto.rb

@@ -1,9 +1,9 @@
 module SendGrid
   class TrackingSettingsDto
     attr_reader :open, :click, :google_analytics, :subscription
-    alias :click_tracking :click
-    alias :open_tracking :open
-    alias :subscription_tracking :subscription
+    alias click_tracking click
+    alias open_tracking open
+    alias subscription_tracking subscription
 
     def self.fetch(sendgrid_client:, name:, query_params:)
       name = scrub_alias_names(name.to_s)
@@ -15,8 +15,6 @@ module SendGrid
       sendgrid_client.tracking_settings.public_send(name).patch(request_body: request_body)
     end
 
-    private
-
     def self.scrub_alias_names(name)
       name.gsub(/_tracking/, '')
     end