email-verification 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb39ecaf6318a5e68db15bfbec047492fdd2bb3655686ded8a919adf431c9bd4
-  data.tar.gz: f241b6e7e4190e47bb3a52eb2390a99f2d1d7be60af4c5a2d9b936f163c7cac4
+  metadata.gz: 702f0833319b309cd3965f937dc4fc227c49a4d8be80f74189fd8b5c9bab8d3e
+  data.tar.gz: 6993c38b5add429ad7414fb45c8b25fc50da26ccb341578c0723a08091279caa
 SHA512:
-  metadata.gz: 3387c9960d35c6c87e0f86d56d9846eeb154428c7a1b84a5f5f848eb56a235597d68696338166864403c809a4957b185b06a8b05829a7b15d32abe8881f5002b
-  data.tar.gz: b450d1aa34ec71be3c17f8ada6ebc12c7d2cddabe9ac56943d53409573de43269e284c68ed3fad867e5402df65bdb5a7b630d0952beedfad728415520762f8ee
+  metadata.gz: 07f70cc1ed87d500a6b24780833bee31a4b71ce60ee34cc040650835316e6e6548c7cd80f32f692195a0d40ae1234892fd0c9587c93a01135366c5d5e2522ba6
+  data.tar.gz: 9f91d48d9339116f82cbad905b0233f515f4dc4b223b391e1c515a3f78c7d973c0ac0997f86ccfcfda9be51beb971b95b757853ad2a4aa5a9d7149650236b9d3

data/lib/email/verification/base.rb

@@ -25,11 +25,13 @@ module Email
               log("From: #{email.from&.first&.strip}. Subject: #{email.subject}")
               
               if settings_provided?(settings)
-                if email.from&.first&.strip == settings[:address] && email.subject =~ settings[:subject]
-                  emails << (email.html_part || email.text_part || email).body.decoded
+                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
               else
-                emails << (email.html_part || email.text_part || email).body.decoded
+                emails    <<  (email.html_part || email.text_part || email).body.decoded
               end
             end
           end
@@ -40,7 +42,7 @@ module Email
         
         if settings_provided?(settings)
           message   =   emails&.first
-          code      =   message&.match(settings[:regex])&.[](:match) if settings_provided?(settings)
+          code      =   message&.match(settings[:regex])&.[](:match)
         else
           result    =   emails
         end

data/lib/email/verification/gmail.rb

@@ -13,8 +13,11 @@ module Email
             gmail.inbox.emails(args).each do |email|
               log("Email - from: #{email.from.first.name}, subject: #{email.subject}")
               
-              if settings_provided?(settings)                
-                if email.from.first.name == settings[:from] && email.subject =~ settings[:subject]
+              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])
+                
+                if matching_name && matching_subject
                   emails  <<  (email.html_part || email.text_part || email).body.decoded
                   email.read! if mark_as_read
                 end

data/lib/email/verification/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: email-verification
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sebastian Johnsson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gmail