email-verification 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702f0833319b309cd3965f937dc4fc227c49a4d8be80f74189fd8b5c9bab8d3e
-  data.tar.gz: 6993c38b5add429ad7414fb45c8b25fc50da26ccb341578c0723a08091279caa
+  metadata.gz: 7f255eb6d2773f206b9c43a2df45012c5c342a755483f39862d519e191bdc1f8
+  data.tar.gz: c43048bd9c00b2410624d4fb75aebddf73d42542f4ab47e99159a9c0bab86458
 SHA512:
-  metadata.gz: 07f70cc1ed87d500a6b24780833bee31a4b71ce60ee34cc040650835316e6e6548c7cd80f32f692195a0d40ae1234892fd0c9587c93a01135366c5d5e2522ba6
-  data.tar.gz: 9f91d48d9339116f82cbad905b0233f515f4dc4b223b391e1c515a3f78c7d973c0ac0997f86ccfcfda9be51beb971b95b757853ad2a4aa5a9d7149650236b9d3
+  metadata.gz: 1f5d037971474115d513de1b47337bb6c7fdd0b03ed4745eb06e58f55155f6704342dc3894bf53879ec05ca32061141db71ef82a67ab6aa0c68235389f2988fd
+  data.tar.gz: ad29ae280885a522eb3f4d915c10bb917b1291a6fe14363dd32f69cc7e6c6100c73a23f61f764e3e8cdb22d71595e0c371bd64aaf77628f8b3f98d37afe3d63c

data/lib/email/verification/base.rb

@@ -27,11 +27,9 @@ module Email
               if settings_provided?(settings)
                 matching_subject    =   settings[:subject].nil? || (!settings[:subject].nil? && email.subject =~ settings[:subject])
                 
-                if email.from&.first&.strip == settings[:address] && matching_subject
-                  emails  <<  (email.html_part || email.text_part || email).body.decoded
-                end
+                emails  <<  email_body(email) if email.from&.first&.strip == settings[:address] && matching_subject
               else
-                emails    <<  (email.html_part || email.text_part || email).body.decoded
+                emails  <<  email_body(email)
               end
             end
           end
@@ -54,6 +52,15 @@ module Email
         settings && !settings.empty?
       end
       
+      def email_body(email)
+        body        =   (email.html_part || email.text_part || email)&.body&.decoded
+        force_utf8(body)
+      end
+      
+      def force_utf8(string)
+        string&.encode("UTF-8", invalid: :replace, undef: :replace, replace: '')&.force_encoding('UTF-8')
+      end
+      
       def log(message)
         puts "[Email::Verification] - #{Time.now.to_s}: #{message}" if self.configuration.verbose
       end

data/lib/email/verification/gmail.rb

@@ -17,14 +17,12 @@ module Email
                 matching_name       =   settings[:from].to_s.empty? || (!settings[:from].to_s.empty? && email.from.first.name == settings[:from])
                 matching_subject    =   settings[:subject].nil?     || (!settings[:subject].nil? && email.subject =~ settings[:subject])
                 
-                if matching_name && matching_subject
-                  emails  <<  (email.html_part || email.text_part || email).body.decoded
-                  email.read! if mark_as_read
-                end
+                emails  <<  email_body(email) if matching_name && matching_subject
               else
-                emails    <<  (email.html_part || email.text_part || email).body.decoded
-                email.read! if mark_as_read
+                emails  <<  email_body(email)
               end
+              
+              email.read! if mark_as_read
             end
           end
         

data/lib/email/verification/version.rb

@@ -1,5 +1,5 @@
 module Email
   module Verification
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: email-verification
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Sebastian Johnsson