webspicy 0.20.10 → 0.20.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d5592f5d20acc1479904e8bd5eff0c520e56e4d574d701a30bce0e859b99e16
-  data.tar.gz: 7f9f4aaded3f2d9588fa367ce7c5c47c056273671aae6d6f727ce867f5d40924
+  metadata.gz: 619e62aacf29510854c621123e81619b5ba0f4417965a5b6c3c13bfc3fbd2a74
+  data.tar.gz: b7e6096ab8accc6bbb33ec8a5ccfa7b60ad48b47e5116cd01d00c170141af79d
 SHA512:
-  metadata.gz: 4228e07ef11827e35d4d3075c59a7d51dab6379a8281ee4388b0901dd99ee4aa119228071a985077ea91c66db4487e84601e625479120940166d9d6512bb113a
-  data.tar.gz: 5caf9cffc1712ee79d99db2a92a2307af83d67ee28a6f41c0e78f10ad15b55992eadca463608622ac9dba8a2ab79145630002cd7d1e775214ada7182f2f343e4
+  metadata.gz: 0b5cd9d03131cdd24c87141218801a6926ebe72b53d3621f2afbc6e754575b67e3fd7bce9fdbf3971c8a97bc468771b8795f661b0093e23cdfedcdf503098480
+  data.tar.gz: 299b2c6d53792dfb58923305f7980d7b57c72c529a2ce4d99047c0691dd9d5a6093981aca0d879c7625d8cfa84d4fd1ccd331956d46281e0ed68cca1b5c108eb

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.rb

@@ -0,0 +1,39 @@
+module Webspicy
+  class Tester
+    class Fakesendgrid
+      include Webspicy::Support::World::Item
+
+      DEFAULT_OPTIONS = {
+        endpoint: "http://fakesendgrid"
+      }
+
+      def initialize(options = {})
+        @options = DEFAULT_OPTIONS.merge(options)
+      end
+      attr_reader :options
+
+      def endpoint
+        options[:endpoint]
+      end
+
+      def clear!
+        res = HTTP.delete("#{endpoint}/api/mails")
+      end
+
+      def emails
+        res = HTTP.get("#{endpoint}/api/mails")
+        JSON.parse(res.body).map{|data| Email.new(data) }
+      end
+
+      def emails_count
+        emails.length
+      end
+
+      def last_email
+        emails.first
+      end
+
+    end # class Fakesendgrid
+  end # class Tester
+end # module Webspicy
+require_relative 'fakesendgrid/email'

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

@@ -0,0 +1,48 @@
+module Webspicy
+  class Tester
+    class Fakesendgrid
+      class Email
+
+        def initialize(data)
+          @data = data
+        end
+        attr_reader :data
+
+        def from
+          @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
+
+        def subject
+          @subject ||= data["subject"]
+        end
+
+      end # class Email
+    end # class Fakesendgrid
+  end # class Tester
+end # module Webspicy

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  = 10
+    TINY  = 15
   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

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'webspicy/tester/fakesendgrid'
+module Webspicy
+  class Tester
+    class Fakesendgrid
+      describe Email do
+
+        DATA = JSON.parse <<~J
+        {
+          "datetime": "2021-06-02T15:29:27.161Z",
+          "from": {
+            "email": "noreply@webspicy.io",
+            "name": "Webspicy"
+          },
+          "subject": "Hello World",
+          "personalizations": [
+            {
+              "to": [
+                {
+                  "email": "someone@world.com"
+                },
+                {
+                  "email": "someoneelse@world.com"
+                }
+              ],
+              "cc": [
+                {
+                  "email": "a-cc-recipient@world.com"
+                }
+              ],
+              "bcc": [
+                {
+                  "email": "a-bcc-recipient@world.com"
+                }
+              ]
+            }
+          ],
+          "content": [
+            {
+              "value": "test",
+              "type": "text/plain"
+            },
+            {
+              "value": "test <b>test</b> test",
+              "type": "text/html"
+            }
+          ]
+        }
+        J
+
+        subject{
+          Email.new(DATA)
+        }
+
+        it 'works as expected' do
+          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
+
+      end
+    end
+  end
+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.10
+  version: 0.20.15
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -98,16 +98,16 @@ dependencies:
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4'
+        version: 4.4.1
 - !ruby/object:Gem::Dependency
   name: path
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -261,6 +275,8 @@ files:
 - lib/webspicy/tester/assertions.rb
 - lib/webspicy/tester/client.rb
 - lib/webspicy/tester/failure.rb
+- lib/webspicy/tester/fakesendgrid.rb
+- lib/webspicy/tester/fakesendgrid/email.rb
 - lib/webspicy/tester/fakeses.rb
 - lib/webspicy/tester/fakeses/email.rb
 - lib/webspicy/tester/fakesmtp.rb
@@ -323,6 +339,7 @@ files:
 - spec/unit/support/world/fixtures/yaml.yml
 - spec/unit/support/world/test_world.rb
 - spec/unit/test_configuration.rb
+- spec/unit/tester/fakesendgrid/test_email.rb
 - spec/unit/tester/fakeses/test_email.rb
 - spec/unit/tester/fakesmtp/test_email.rb
 - spec/unit/tester/test_asserter.rb