webspicy 0.20.13 → 0.20.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b2fecc83c9d660dc6eba242b306e965196a6ecf9ad12b9b0e5929d9394e1ab
-  data.tar.gz: 16e008749db41f89755e9c0cc65457e438383044aaf54c6e171fc565b2da8ba0
+  metadata.gz: 2a89789c42cdaf51eb907eaf6053eef356acff66102ccb1f579bbb2a85168e56
+  data.tar.gz: 8afcba7ec470f2689300f2f9fe4122b7e0e11981617812fc5ce031df213adeb3
 SHA512:
-  metadata.gz: 0f7a18cbbfead965fefc954c07ea8ebb2d91e60cfd0e72c2658ec5e7c5c1425b6d9f0c8e2d3c09e7b3399697ab299c36f9873e1837422f785e96e1a298cccfaa
-  data.tar.gz: 12377e4af44a7b6d65c6daf3c83a41d1201ec3deab8922343b25f8f6483f07fb997dca45ed6e3fbc243c5f869c915642a7e6a867bf90dc0e5f8bae5fda7fb726
+  metadata.gz: fe767864fe5185515cfc9e20a7e5941ba1907979f86904920811c0c44821b8dcf7901f847b310db703497c83a18278b340b6ba30a018c44233660c82657625ec
+  data.tar.gz: 749a0253312d49f05f46e5bd3022c2b657ddccfa0046fc0bdc70a68028161fc68c6f53d0c8e1b3e1cae00e333eb8b8c6429a3034090f5a1e54ea9b8958e81f2f

data/lib/webspicy/tester/fakesendgrid/email.rb

@@ -18,6 +18,23 @@ module Webspicy
           @to ||= data["personalizations"]
             .select{|h| h.key? "to" }
             .map{|(h)| h["to"] }
+            .flatten
+            .map{|(h)| h["email"] }
+        end
+
+        def cc
+          @cc ||= data["personalizations"]
+            .select{|h| h.key? "cc" }
+            .map{|(h)| h["cc"] }
+            .flatten
+            .map{|(h)| h["email"] }
+        end
+
+        def bcc
+          @bcc ||= data["personalizations"]
+            .select{|h| h.key? "bcc" }
+            .map{|(h)| h["bcc"] }
+            .flatten
             .map{|(h)| h["email"] }
         end
 

data/lib/webspicy/tester/fakeses/email.rb

@@ -1,3 +1,5 @@
+require 'mail'
+
 module Webspicy
   class Tester
     class Fakeses
@@ -9,13 +11,10 @@ module Webspicy
         attr_reader :data
 
         def from
-          rx = /^From:\s*(.*)$/
-          raw_data
-            .each_line
-            .find{|l| l =~ rx }[rx, 1].strip
+          email.from
         end
 
-        def to
+        def recipients
           data["body"]
             .each_pair
             .select{|(k,v)|
@@ -24,11 +23,24 @@ module Webspicy
             .map{|(k,v)| v.strip }
         end
 
+        def to
+          email.to
+        end
+
         def subject
-          rx = /^Subject:\s*(.*)$/
-          raw_data
-            .each_line
-            .find{|l| l =~ rx }[rx, 1].strip
+          email.subject
+        end
+
+        def cc
+          email.cc
+        end
+
+        def bcc
+          recipients - cc - to
+        end
+
+        def email
+          @email ||= Mail.read_from_string(raw_data)
         end
 
         def raw_data

data/lib/webspicy/tester/fakesmtp/email.rb

@@ -16,9 +16,13 @@ module Webspicy
         end
 
         def to
-          @to ||= data["headerLines"]
-            .select{|h| h["key"] == "to" }
-            .map{|h| h["line"][/To:\s*(.*)$/, 1] }
+          @to ||= data["to"]["value"]
+            .map{|h| h["address"] }
+        end
+
+        def cc
+          @cc ||= data["cc"]["value"]
+            .map{|h| h["address"] }
         end
 
         def reply_to

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 13
+    TINY  = 14
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/unit/tester/fakesendgrid/test_email.rb

@@ -9,15 +9,28 @@ module Webspicy
         {
           "datetime": "2021-06-02T15:29:27.161Z",
           "from": {
-            "email": "info@mydomain.be",
-            "name": "Foo Bar"
+            "email": "noreply@webspicy.io",
+            "name": "Webspicy"
           },
           "subject": "Hello World",
           "personalizations": [
             {
               "to": [
                 {
-                  "email": "support@mydomain.fr"
+                  "email": "someone@world.com"
+                },
+                {
+                  "email": "someoneelse@world.com"
+                }
+              ],
+              "cc": [
+                {
+                  "email": "a-cc-recipient@world.com"
+                }
+              ],
+              "bcc": [
+                {
+                  "email": "a-bcc-recipient@world.com"
                 }
               ]
             }
@@ -40,8 +53,10 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("Foo Bar <info@mydomain.be>")
-          expect(subject.to).to eql(["support@mydomain.fr"])
+          expect(subject.from).to eql("Webspicy <noreply@webspicy.io>")
+          expect(subject.to).to eql(["someone@world.com", "someoneelse@world.com"])
+          expect(subject.cc).to eql(["a-cc-recipient@world.com"])
+          expect(subject.bcc).to eql(["a-bcc-recipient@world.com"])
           expect(subject.subject).to eql("Hello World")
         end
 

data/spec/unit/tester/fakeses/test_email.rb

@@ -9,7 +9,8 @@ module Webspicy
         Content-Type: multipart/alternative;
         boundary="--_NmP-d246fd025a6652c9-Part_1"
         From: Webspicy <noreply@webspicy.io>
-        To: david.parloir@gmail.com
+        To: someone@world.com, someoneelse@world.com
+        CC: a-cc-recipient@world.com
         Subject: Hey world, hello!
         Message-ID: <2421bae3-9c42-7988-23b4-b1f6168130c9@webspicy.io>
         Date: Thu, 24 Jun 2021 13:45:16 +0000
@@ -34,6 +35,9 @@ module Webspicy
           "body": {
             "Source": "noreply@webspicy.io",
             "Destinations.member.1": "someone@world.com",
+            "Destinations.member.2": "someoneelse@world.com",
+            "Destinations.member.3": "a-cc-recipient@world.com",
+            "Destinations.member.4": "a-bcc-recipient@world.com",
             "RawMessage.Data": "#{DATA.gsub /\n/, ''}",
             "Action": "SendRawEmail",
             "Version": "2010-12-01"
@@ -46,8 +50,10 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("Webspicy <noreply@webspicy.io>")
-          expect(subject.to).to eql(["someone@world.com"])
+          expect(subject.from).to eql(["noreply@webspicy.io"])
+          expect(subject.to).to eql(["someone@world.com", "someoneelse@world.com"])
+          expect(subject.cc).to eql(["a-cc-recipient@world.com"])
+          expect(subject.bcc).to eql(["a-bcc-recipient@world.com"])
           expect(subject.subject).to eql("Hey world, hello!")
         end
 

data/spec/unit/tester/fakesmtp/test_email.rb

@@ -19,11 +19,15 @@ module Webspicy
             },
             {
               "key": "reply-to",
-              "line": "Reply-To: test@email.be"
+              "line": "Reply-To: noreply@webspicy.io"
             },
             {
               "key": "to",
-              "line": "To: support@mydomain.fr"
+              "line": "To: someone@world.com, someoneelse@world.com"
+            },
+            {
+              "key": "cc",
+              "line": "Cc: a-cc-recipient@world.com"
             },
             {
               "key": "message-id",
@@ -46,12 +50,14 @@ module Webspicy
           "to": {
             "value": [
               {
-                "address": "support@mydomain.fr",
+                "address": "someone@world.com",
+                "name": ""
+              },
+              {
+                "address": "someoneelse@world.com",
                 "name": ""
               }
-            ],
-            "html": "<span class=\\"mp_address_group\\"><a href=\\"mailto:support@mydomain.fr\\" class=\\"mp_address_email\\">support@mydomain.fr</a></span>",
-            "text": "support@mydomain.fr"
+            ]
           },
           "from": {
             "value": [
@@ -59,20 +65,24 @@ module Webspicy
                 "address": "info@mydomain.be",
                 "name": ""
               }
-            ],
-            "html": "<span class=\\"mp_address_group\\"><a href=\\"mailto:info@mydomain.be\\" class=\\"mp_address_email\\">info@mydomain.be</a></span>",
-            "text": "info@mydomain.be"
+            ]
           },
           "messageId": "<607edfd56836e_1b0492af@1d3356d02030.mail>",
           "replyTo": {
             "value": [
               {
-                "address": "test@email.be",
+                "address": "noreply@webspicy.io",
+                "name": ""
+              }
+            ]
+          },
+          "cc": {
+            "value": [
+              {
+                "address": "a-cc-recipient@world.com",
                 "name": ""
               }
-            ],
-            "html": "<span class=\\"mp_address_group\\"><a href=\\"mailto:test@email.be\\" class=\\"mp_address_email\\">test@email.be</a></span>",
-            "text": "test@email.be"
+            ]
           }
         }
         J
@@ -83,7 +93,8 @@ module Webspicy
 
         it 'works as expected' do
           expect(subject.from).to eql("Webspicy <noreply@webspicy.io>")
-          expect(subject.to).to eql(["support@mydomain.fr"])
+          expect(subject.to).to eql(["someone@world.com", "someoneelse@world.com"])
+          expect(subject.cc).to eql(["a-cc-recipient@world.com"])
           expect(subject.subject).to eql("Hello World")
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.13
+  version: 0.20.14
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -212,6 +212,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
 description: Webspicy helps testing web services as software operation black boxes
 email: blambeau@gmail.com
 executables: