webspicy 0.20.12 → 0.20.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a280bcc156de5e615f010269f8d3dcdca0263b5d5141e3dc7ae3f15e4cdb3af8
-  data.tar.gz: 1d37b10be638894707bfe31ee52f159ffbf68ddd24c0097383d4588a380fb627
+  metadata.gz: db9ccb05ac501d744769feebb3bb41d5775727fbf11b2507cd3d2aee6d0b6f10
+  data.tar.gz: 5b314097454003e48edd6e72a94e05f439709478586ac0eefb1a31eed1192d37
 SHA512:
-  metadata.gz: ec5e2fddb49307367af9e46115b81ac6b7d7cdbb971efec0cc03c4fdd9be9ee92fd35fba1430e7e708552f77456019927210132f3951c3ed0f7beb78e93b9bf1
-  data.tar.gz: 1ae63f53ee9e5f826dd8c7f7739f4814895e7000c75149b80fd1faa6378e23270970f846f634c2c28808b814b63a15b60c53a285d139985b857f3e07d01e497d
+  metadata.gz: 40dcc1ae84b4bd1146412435663e2d2198c53dc15cc858b5e88370656d6bf612b056b542cb7efef71b69dec395bbb0a36766b731f053c84b1f760c66e02ff942
+  data.tar.gz: 29744550467db7bd83ad6e102e8296fe4df99911f2b29c77af66488ef37320bbfecf8a37258e931cde4bd7b3a02715b733125e3fbefa73cbe13e72fd3bba511b

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

@@ -9,13 +9,32 @@ module Webspicy
         attr_reader :data
 
         def from
-          @from ||= data["from"]["email"]
+          @from ||= data['from']['name'] ?
+            "#{data['from']['name']} <#{data['from']['email']}>" :
+            data['from']['email']
         end
 
         def to
           @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
 
@@ -23,6 +42,13 @@ module Webspicy
           @subject ||= data["subject"]
         end
 
+        def headers
+          @headers ||= data["headers"].reduce(OpenStruct.new){|acc, (key, value)|
+            acc[key.downcase] = value
+            acc
+          }
+        end
+
       end # class Email
     end # class Fakesendgrid
   end # class Tester

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

@@ -1,3 +1,5 @@
+require 'mail'
+
 module Webspicy
   class Tester
     class Fakeses
@@ -9,23 +11,43 @@ module Webspicy
         attr_reader :data
 
         def from
-          data["body"]["Source"]
+          email.from[0]
         end
 
-        def to
+        def recipients
           data["body"]
             .each_pair
             .select{|(k,v)|
               k =~ /Destinations.member/
             }
-            .map{|(k,v)| v }
+            .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]
+          email.subject
+        end
+
+        def cc
+          email.cc || []
+        end
+
+        def bcc
+          recipients - cc - to
+        end
+
+        def headers
+          @headers ||= email.header.reduce(OpenStruct.new){|acc, h|
+            acc[h.name.downcase] = h.unparsed_value
+            acc
+          }
+        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
@@ -34,6 +38,14 @@ module Webspicy
             .first
         end
 
+        def headers
+          @headers ||= data["headerLines"]
+            .reduce(OpenStruct.new){|acc, h|
+              acc[h["key"].downcase] = h["line"].split(': ')[1..].join(': ')
+              acc
+            }
+        end
+
       end # class Email
     end # class Fakesmtp
   end # class Tester

data/lib/webspicy/version.rb

@@ -2,7 +2,7 @@ module Webspicy
   module Version
     MAJOR = 0
     MINOR = 20
-    TINY  = 12
+    TINY  = 17
   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"
                 }
               ]
             }
@@ -31,7 +44,10 @@ module Webspicy
               "value": "test <b>test</b> test",
               "type": "text/html"
             }
-          ]
+          ],
+          "headers": {
+            "x-header-key": "personalised-header-value"
+          }
         }
         J
 
@@ -40,9 +56,12 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("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")
+          expect(subject.headers['x-header-key']).to eql('personalised-header-value')
         end
 
       end

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

@@ -6,9 +6,28 @@ module Webspicy
       describe Email do
 
         DATA = Base64.encode64 <<~J
-          From: Webspicy <noreply@webspicy.io>
-          To: someone@world.com
-          Subject: Hey world, hello!
+        Content-Type: multipart/alternative;
+        boundary="--_NmP-d246fd025a6652c9-Part_1"
+        From: Webspicy <noreply@webspicy.io>
+        To: someone@world.com, someoneelse@world.com
+        CC: a-cc-recipient@world.com
+        Subject: Hey world, hello!
+        X-Ses-Configuration-Set: SesConfigurationSet
+        Message-ID: <2421bae3-9c42-7988-23b4-b1f6168130c9@webspicy.io>
+        Date: Thu, 24 Jun 2021 13:45:16 +0000
+        MIME-Version: 1.0
+
+        ----_NmP-d246fd025a6652c9-Part_1
+        Content-Type: text/plain; charset=utf-8
+        Content-Transfer-Encoding: 7bit
+
+        Hello world, in a text version
+        ----_NmP-d246fd025a6652c9-Part_1
+        Content-Type: text/html; charset=utf-8
+        Content-Transfer-Encoding: 7bit
+
+        Hello world, in an html version
+        ----_NmP-d246fd025a6652c9-Part_1--
         J
 
         DATA = JSON.parse <<~J
@@ -17,6 +36,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"
@@ -30,8 +52,15 @@ module Webspicy
 
         it 'works as expected' do
           expect(subject.from).to eql("noreply@webspicy.io")
-          expect(subject.to).to eql(["someone@world.com"])
+          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!")
+          expect(subject.headers[:from]).to eql("Webspicy <noreply@webspicy.io>")
+          expect(subject.headers[:cc]).to eql("a-cc-recipient@world.com")
+          expect(subject.headers["message-id"]).to eql("<2421bae3-9c42-7988-23b4-b1f6168130c9@webspicy.io>")
+          expect(subject.headers["mime-version"]).to eql("1.0")
+          expect(subject.headers["x-ses-configuration-set"]).to eql("SesConfigurationSet")
         end
 
       end

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

@@ -15,15 +15,19 @@ module Webspicy
             },
             {
               "key": "from",
-              "line": "From: info@mydomain.be"
+              "line": "From: Webspicy <noreply@webspicy.io>"
             },
             {
               "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
@@ -82,9 +92,14 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("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.subject).to eql("Hello World")
+          expect(subject.headers[:cc]).to eql("a-cc-recipient@world.com")
+          expect(subject.headers[:date]).to eql("Tue, 20 Apr 2021 14:06:13 +0000")
+          expect(subject.headers['message-id']).to eql("<607edfd56836e_1b0492af@1d3356d02030.mail>")
+          expect(subject.headers['mime-version']).to eql("1.0")
         end
 
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.12
+  version: 0.20.17
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-30 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: