paubox 0.2.3 → 0.3.0

data/lib/paubox/mail_to_message.rb

@@ -1,70 +1,94 @@
-module Paubox
-  # The MailToMessage class takes a Ruby Mail object and attempts to parse it
-  # into a Hash formatted for the JSON payload of HTTP api request.
-  class MailToMessage
-    include Paubox::FormatHelper
-    attr_reader :mail
-    require 'tempfile'
-
-    def initialize(mail, args = {})
-      @mail = mail
-      @allow_non_tls = args.fetch(:allow_non_tls, false)
-    end
-
-    def send_message_payload
-      { data: { message: convert_keys_to_json_version(build_parts) } }.to_json
-    end
-
-    private
-
-    def build_attachments
-      attachments = mail.attachments
-      return [] if attachments.empty?
-      packaged_attachments = []
-      attachments.each do |attch|
-        packaged_attachments << { content: convert_binary_to_base64(attch.body.decoded),
-                                  file_name: attch.filename,
-                                  content_type: attch.mime_type }
-      end
-      packaged_attachments
-    end
-
-    def build_content
-      content = {}
-      if mail.multipart?
-        html_content = mail.html_part.body.to_s if mail.html_part
-        text_content = mail.text_part.body.to_s if mail.text_part
-        content[:html_content] = html_content unless html_content.nil?
-        content[:text_content] = text_content unless text_content.nil?
-      elsif mail.content_type.to_s.include? 'text/html'
-        content[:html_content] = mail.body.to_s
-      else
-        content[:text_content] = mail.body.to_s
-      end
-      content
-    end
-
-    def build_headers
-      %i[from reply_to subject].map { |k| [k, mail[k].to_s] }.to_h
-    end
-
-    def build_parts
-      msg = {}
-      msg[:recipients] = string_or_array_to_array(mail.to)
-      msg[:recipients] += string_or_array_to_array(mail.cc)
-      msg[:bcc] = string_or_array_to_array(mail.bcc)
-      msg[:allow_non_tls] = @allow_non_tls
-      msg[:headers] = build_headers
-      msg[:content] = build_content
-      msg[:attachments] = build_attachments
-      msg
-    end
-
-    def convert_binary_to_base64(f)
-      file = Tempfile.new(encoding: 'ascii-8bit')
-      file.write(f)
-      file.rewind
-      Base64.encode64(file.read)
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Paubox
+  # The MailToMessage class takes a Ruby Mail object and attempts to parse it
+  # into a Hash formatted for the JSON payload of HTTP api request.
+  class MailToMessage
+    include Paubox::FormatHelper
+    attr_reader :mail
+    require 'tempfile'
+
+    def initialize(mail, args = {})
+      @mail = mail
+      @allow_non_tls = args.fetch(:allow_non_tls, false)
+      @force_secure_notification = args.fetch(:force_secure_notification, nil)
+    end
+
+    def send_message_payload
+      { data: { message: convert_keys_to_json_version(build_parts) } }.to_json
+    end
+
+    private
+
+    def build_attachments
+      attachments = mail.attachments
+      return [] if attachments.empty?
+
+      packaged_attachments = []
+      attachments.each do |attch|
+        packaged_attachments << { content: convert_binary_to_base64(attch.body.decoded),
+                                  file_name: attch.filename,
+                                  content_type: attch.mime_type }
+      end
+      packaged_attachments
+    end
+
+    def build_content
+      content = {}
+      if mail.multipart?
+        html_content = mail.html_part.body.to_s if mail.html_part
+        text_content = mail.text_part.body.to_s if mail.text_part
+        content[:html_content] = base64_encode_if_needed(html_content) unless html_content.nil?
+        content[:text_content] = text_content unless text_content.nil?
+      elsif mail.content_type.to_s.include? 'text/html'
+        content[:html_content] = base64_encode_if_needed(mail.body.to_s)
+      else
+        content[:text_content] = mail.body.to_s
+      end
+      content
+    end
+
+    def build_headers
+      %i[from reply_to subject].map { |k| [k, mail[k].to_s] }.to_h
+    end
+
+    def build_force_secure_notification
+      if @force_secure_notification.instance_of?(String)
+        unless @force_secure_notification.to_s.empty? # if force_secure_notification is not nil or empty
+          force_secure_notification_val = @force_secure_notification.strip.downcase
+          if force_secure_notification_val == 'true'
+            return true
+          elsif force_secure_notification_val == 'false'
+            return false
+          else
+            return nil
+          end
+        end
+      end
+      nil
+    end
+
+    def build_parts
+      msg = {}
+      msg[:recipients] = string_or_array_to_array(mail.to)
+      msg[:cc] = string_or_array_to_array(mail.cc)
+      msg[:bcc] = string_or_array_to_array(mail.bcc)
+      msg[:allow_non_tls] = @allow_non_tls
+      @force_secure_notification = build_force_secure_notification
+      unless @force_secure_notification.nil?
+        msg[:force_secure_notification] = @force_secure_notification
+      end
+      msg[:headers] = build_headers
+      msg[:content] = build_content
+      msg[:attachments] = build_attachments
+      msg
+    end
+
+    def convert_binary_to_base64(f)
+      file = Tempfile.new(encoding: 'ascii-8bit')
+      file.write(f)
+      file.rewind
+      Base64.encode64(file.read)
+    end
+  end
+end

data/lib/paubox/message.rb

@@ -1,73 +1,98 @@
-module Paubox
-  # The Message class is for building a Paubox email message using a hash.
-  class Message
-    include Paubox::FormatHelper
-    attr_accessor :from, :to, :cc, :bcc, :subject, :reply_to, :text_content,
-                  :html_content, :allow_non_tls
-
-    def initialize(args)
-      @from = args[:from]
-      @to = args[:to]
-      @cc = args[:cc]
-      @bcc = args[:bcc]
-      @subject = args[:subject]
-      @reply_to = args[:reply_to]
-      @text_content = args[:text_content]
-      @html_content = args[:html_content]
-      @packaged_attachments = []
-      @attachments = build_attachments(args[:attachments])
-      @allow_non_tls = args.fetch(:allow_non_tls, false)
-    end
-
-    def send_message_payload
-      { data: { message: convert_keys_to_json_version(build_parts) } }.to_json
-    end
-
-    def add_attachment(file_path)
-      @packaged_attachments << { filename: file_path.split('/').last,
-        content_type: `file --b --mime-type #{file_path}`.chomp,
-        content: Base64.encode64(File.read(file_path)) }
-    end
-
-    def attachments
-      @packaged_attachments
-    end
-
-    def attachments=(args)
-      @attachments = build_attachments(args)
-    end
-
-    private
-
-    def build_attachments(args)
-      return (@packaged_attachments = []) if args.to_a.empty?
-      args.each do |a|
-        a[:content] =  base64_encode_if_needed(a[:content])
-        @packaged_attachments << a
-      end
-      @packaged_attachments
-    end
-
-    def build_content
-      content = {}
-      content[:text_content] = text_content if text_content
-      content[:html_content] = html_content if html_content
-      content
-    end
-
-    def build_headers
-      %i[from reply_to subject].map { |k| [k, self.send(k)] }.to_h
-    end
-
-    def build_parts
-      msg = {}
-      msg[:recipients] = string_or_array_to_array(to) + string_or_array_to_array(cc)
-      msg[:allow_non_tls] = @allow_non_tls
-      msg[:bcc] = string_or_array_to_array(bcc)
-      msg[:headers] = build_headers
-      msg[:content] = build_content
-      msg[:attachments] = attachments
-      msg
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Paubox
+  # The Message class is for building a Paubox email message using a hash.
+  class Message
+    include Paubox::FormatHelper
+    attr_accessor :from, :to, :cc, :bcc, :subject, :reply_to, :text_content,
+                  :html_content, :allow_non_tls, :force_secure_notification
+
+    def initialize(args)
+      @from = args[:from]
+      @to = args[:to]
+      @cc = args[:cc]
+      @bcc = args[:bcc]
+      @subject = args[:subject]
+      @reply_to = args[:reply_to]
+      @text_content = args[:text_content]
+      @html_content = args[:html_content]
+      @packaged_attachments = []
+      @attachments = build_attachments(args[:attachments])
+      @allow_non_tls = args.fetch(:allow_non_tls, false)
+      @force_secure_notification = args.fetch(:force_secure_notification, nil)
+    end
+
+    def send_message_payload
+      { data: { message: convert_keys_to_json_version(build_parts) } }.to_json
+    end
+
+    def add_attachment(file_path)
+      @packaged_attachments << { filename: file_path.split('/').last,
+                                 content_type: `file --b --mime-type #{file_path}`.chomp,
+                                 content: Base64.encode64(File.read(file_path)) }
+    end
+
+    def attachments
+      @packaged_attachments
+    end
+
+    def attachments=(args)
+      @attachments = build_attachments(args)
+    end
+
+    private
+
+    def build_attachments(args)
+      return (@packaged_attachments = []) if args.to_a.empty?
+
+      args.each do |a|
+        a[:content] = base64_encode_if_needed(a[:content])
+        @packaged_attachments << a
+      end
+      @packaged_attachments
+    end
+
+    def build_content
+      content = {}
+      content[:text_content] = text_content if text_content
+      content[:html_content] = base64_encode_if_needed(html_content) if html_content
+      content
+    end
+
+    def build_headers
+      %i[from reply_to subject].map { |k| [k, send(k)] }.to_h
+    end
+
+    def build_force_secure_notification
+      if @force_secure_notification.instance_of?(String)
+        unless @force_secure_notification.to_s.empty? # if force_secure_notification is not nil or empty
+          force_secure_notification_val = @force_secure_notification.strip.downcase
+          if force_secure_notification_val == 'true'
+            return true
+          elsif force_secure_notification_val == 'false'
+            return false
+          else
+            return nil
+          end
+        end
+      end
+      nil
+    end
+
+    def build_parts
+      msg = {}
+      msg[:recipients] = string_or_array_to_array(to)
+      msg[:cc] = string_or_array_to_array(cc)
+      msg[:allow_non_tls] = @allow_non_tls
+      @force_secure_notification = build_force_secure_notification
+      unless @force_secure_notification.nil?
+        msg[:force_secure_notification] = @force_secure_notification
+      end
+      msg[:bcc] = string_or_array_to_array(bcc)
+      msg[:headers] = build_headers
+      msg[:content] = build_content
+      msg[:attachments] = attachments
+      msg
+    end
+  end
+end

data/lib/paubox/version.rb

@@ -1,3 +1,5 @@
-module Paubox
-  VERSION = "0.2.3"
-end
+# frozen_string_literal: true
+
+module Paubox
+  VERSION = '0.3.0'
+end

data/lib/paubox_ruby.rb

@@ -1 +1,3 @@
-require 'paubox'
+# frozen_string_literal: true
+
+require 'paubox'

data/paubox_ruby.gemspec

@@ -1,32 +1,34 @@
-lib = File.expand_path('lib', __dir__)
-
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'paubox/version'
-
-Gem::Specification.new do |spec|
-  spec.name          = 'paubox'
-  spec.version       = Paubox::VERSION
-  spec.authors       = ['Paubox', 'Jonathan Greeley']
-  spec.email         = ['jon.r.greeley@gmail.com']
-
-  spec.summary       = "Paubox's Official Ruby SDK"
-  spec.description   = "Ruby SDK for interacting with the Paubox Transactional Email HTTP API."
-  spec.homepage      = 'https://www.paubox.com'
-  spec.license       = 'Apache-2.0'
-
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
-    f.match(%r{^(test|spec|features)/})
-  end
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
-  spec.required_ruby_version = '>= 2.3'
-  spec.add_development_dependency 'bundler', '~> 1.14'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.2'
-  spec.add_development_dependency 'webmock', '~> 2.1'
-  spec.add_development_dependency 'pry'
-
-  spec.add_dependency 'mail', '>= 2.5'
-  spec.add_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
-end
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
+
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'paubox/version'
+
+Gem::Specification.new do |spec|
+  spec.name          = 'paubox'
+  spec.version       = Paubox::VERSION
+  spec.authors       = ['Paubox', 'Jonathan Greeley']
+  spec.email         = ['jon.r.greeley@gmail.com']
+
+  spec.summary       = "Paubox's Official Ruby SDK"
+  spec.description   = 'Ruby SDK for interacting with the Paubox Transactional Email HTTP API.'
+  spec.homepage      = 'https://www.paubox.com'
+  spec.license       = 'Apache-2.0'
+
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.3'
+  spec.add_development_dependency 'bundler', '~> 2.0.2'
+  spec.add_development_dependency 'pry'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.2'
+  spec.add_development_dependency 'webmock', '~> 2.1'
+
+  spec.add_dependency 'mail', '>= 2.5'
+  spec.add_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paubox
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Paubox
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +17,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: 2.0.2
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -67,20 +81,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: mail
   requirement: !ruby/object:Gem::Requirement
@@ -160,8 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Paubox's Official Ruby SDK