email-verification 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83ce4cfc1479b9a813fbb6070b5404eb49de97d208076ffeddef16acaf3c41b9
-  data.tar.gz: 7e20c62d626b0138d2d0c46a7bd63356dfa81923f11b46a6182098dba60152f9
+  metadata.gz: bd68753b7d1328e375501221b3341bc3742dbd4cc69ea5f061fd8be079f5ca12
+  data.tar.gz: 398c820a3ea4983a3fdc09bfc83c6ebadb27a5e619176b30a3865696f55cecf1
 SHA512:
-  metadata.gz: 40c40dd21330f526b0ef3178d09cb37165e1ba9e1c41afb45a132a757bfdf523463da93d75f922e73b143ae8733898cf56685e2532f65fa326fca8b471dd5850
-  data.tar.gz: '09ba495219c0ac2c4424fb98f5b8e7a0d672b535fc81ceac64e0f68768b8d7cfc9518eb4bc7d85078c0c45d70812bf0b604101a42dae58060e13e3dc285fab4c'
+  metadata.gz: 9b4e9a4ff5f5e37e4ff943fc473f3a467fa79097dd36401c9f3d529e033ba85b01a28a0f66f17da7c2b346ffe8fca06a9a9384c5df207959fc6cb312fc09b8b4
+  data.tar.gz: b7d5476b7d3dae7999e979dc16cf963f9a1e1932474417fbac73341d0a78127583dc2e5a3fd283e090b18e60eecc148c43f1f824466eb87e19d40c39c2149fad

data/lib/email/verification/base.rb

@@ -25,9 +25,10 @@ module Email
               log("From: #{email.from&.first&.strip}. Subject: #{email.subject}")
               
               if settings_provided?(settings)
-                matching_subject    =   settings[:subject].nil? || (!settings[:subject].nil? && email.subject =~ settings[:subject])
+                matching_address    =   email.from&.first&.strip == settings[:address]
+                matching_subject    =   settings[:subject].nil? || (!settings[:subject].nil? && !(email.subject =~ settings[:subject]).nil?)
                 
-                emails  <<  email_body(email) if email.from&.first&.strip == settings[:address] && matching_subject
+                emails  <<  email_body(email) if matching_address && matching_subject
               else
                 emails  <<  email_body(email)
               end
@@ -39,8 +40,8 @@ module Email
         end
         
         if settings_provided?(settings)
-          message   =   emails&.first
-          code      =   message&.match(settings[:regex])&.[](:match)
+          message   =   emails.first&.to_s
+          result    =   message&.match(settings[:regex])&.[](:match)
         else
           result    =   emails
         end
@@ -53,8 +54,17 @@ module Email
       end
       
       def email_body(email)
-        body        =   (email.html_part || email.text_part || email)&.body&.decoded
-        force_utf8(body)
+        body        =   (email.html_part || email.text_part || email)&.body
+        
+        begin
+          body      =   body&.decoded
+        rescue Mail::UnknownEncodingType
+          body      =   body&.encoded
+        end
+        
+        body        =   force_utf8(body) unless body.to_s.empty?
+        
+        return body
       end
       
       def force_utf8(string)

data/lib/email/verification/gmail.rb

@@ -15,7 +15,7 @@ module Email
               
               if settings_provided?(settings)
                 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])
+                matching_subject    =   settings[:subject].nil?     || (!settings[:subject].nil? && !(email.subject =~ settings[:subject]).nil?)
                 
                 emails  <<  email_body(email) if matching_name && matching_subject
               else

data/lib/email/verification/version.rb

@@ -1,5 +1,5 @@
 module Email
   module Verification
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

metadata

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