webspicy 0.20.11 → 0.20.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7eba5a8dc97e7c8f2053da2c52e45d728d1de38777ac2088db74aa2852f0ab8a
-  data.tar.gz: dfd0330f95b8c9e64b63919820b7b48ba1dc0f4a7696ba03877670f41a8812b3
+  metadata.gz: 7a8de4780fb659f78ce0f61cebc61abed9ab6206a45c953bff95071a67761ee7
+  data.tar.gz: 8258fbb268baddb39d4549540484816aefde696a41a6166bf3cbe45d6bdf9912
 SHA512:
-  metadata.gz: 243d021ca1344f09880a3fbda147c38dbacb8791c3e8f541acb524992f6c3e15bb997fbb4423b06c504c95f7a85079fa24d329379b8368cc0b04b11a0a0ab028
-  data.tar.gz: 47a7462b3b080b276f594b0b1df054488fa69c60038c51d2d22a664aeb83ada0c390380de1497a30d0f990bd97638fbc3acdfc636eb8fbe227e37d3c1512f6f0
+  metadata.gz: 434f5a5616992040d25c7fefd9c483ff622b96a5f71c59a1efeb3ac72ab37d6329e3e941b6487ff68ca18648e52848d9ce58dc78d7f44dcfc73bba486131c81d
+  data.tar.gz: 7aca5fd9abb963b086ccd2d0d9e80c1f783d5cafb0f691760545dfe6689f87419197daca678c03027f3c4eb2fc145896d18d2e1c823e115531903585389a862c

data/lib/webspicy/configuration/scope.rb

@@ -22,7 +22,7 @@ module Webspicy
       def _each_specification_file(config, apply_filter = true)
         folder = config.folder
         world  = config.folder/"world"
-        fs = folder.glob("**/*.yml").reject{|f| f.to_s.start_with?(world.to_s) }
+        fs = folder.glob("**/*.{yml, yaml}").reject{|f| f.to_s.start_with?(world.to_s) }
         fs = fs.sort
         fs = fs.select(&to_filter_proc(config.file_filter)) if apply_filter
         fs.each do |file|

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
 

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

@@ -1,3 +1,5 @@
+require 'mail'
+
 module Webspicy
   class Tester
     class Fakeses
@@ -9,23 +11,36 @@ 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 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  = 11
+    TINY  = 16
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"
 end

data/spec/unit/configuration/scope/test_each_specification.rb

@@ -18,7 +18,7 @@ module Webspicy
         }
 
         it 'returns all files' do
-          expect(subject.size).to eql(restful_folder.glob('**/*.yml').size)
+          expect(subject.size).to eql(restful_folder.glob('**/*.{yml, yaml}').size)
         end
       end
 
@@ -59,7 +59,7 @@ module Webspicy
         }
 
         it 'returns all files' do
-          expect(subject.size).to eql(restful_folder.glob('**/*.yml').size)
+          expect(subject.size).to eql(restful_folder.glob('**/*.{yml, yaml}').size)
         end
       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("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

@@ -6,9 +6,27 @@ 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!
+        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 +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"
@@ -30,7 +51,9 @@ 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!")
         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,8 +92,9 @@ 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")
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webspicy
 version: !ruby/object:Gem::Version
-  version: 0.20.11
+  version: 0.20.16
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-04 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: