webspicy 0.20.12 → 0.20.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a280bcc156de5e615f010269f8d3dcdca0263b5d5141e3dc7ae3f15e4cdb3af8
-  data.tar.gz: 1d37b10be638894707bfe31ee52f159ffbf68ddd24c0097383d4588a380fb627
+  metadata.gz: 01b2fecc83c9d660dc6eba242b306e965196a6ecf9ad12b9b0e5929d9394e1ab
+  data.tar.gz: 16e008749db41f89755e9c0cc65457e438383044aaf54c6e171fc565b2da8ba0
 SHA512:
-  metadata.gz: ec5e2fddb49307367af9e46115b81ac6b7d7cdbb971efec0cc03c4fdd9be9ee92fd35fba1430e7e708552f77456019927210132f3951c3ed0f7beb78e93b9bf1
-  data.tar.gz: 1ae63f53ee9e5f826dd8c7f7739f4814895e7000c75149b80fd1faa6378e23270970f846f634c2c28808b814b63a15b60c53a285d139985b857f3e07d01e497d
+  metadata.gz: 0f7a18cbbfead965fefc954c07ea8ebb2d91e60cfd0e72c2658ec5e7c5c1425b6d9f0c8e2d3c09e7b3399697ab299c36f9873e1837422f785e96e1a298cccfaa
+  data.tar.gz: 12377e4af44a7b6d65c6daf3c83a41d1201ec3deab8922343b25f8f6483f07fb997dca45ed6e3fbc243c5f869c915642a7e6a867bf90dc0e5f8bae5fda7fb726

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

@@ -9,7 +9,9 @@ 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

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

@@ -9,7 +9,10 @@ module Webspicy
         attr_reader :data
 
         def from
-          data["body"]["Source"]
+          rx = /^From:\s*(.*)$/
+          raw_data
+            .each_line
+            .find{|l| l =~ rx }[rx, 1].strip
         end
 
         def to
@@ -18,14 +21,14 @@ module Webspicy
             .select{|(k,v)|
               k =~ /Destinations.member/
             }
-            .map{|(k,v)| v }
+            .map{|(k,v)| v.strip }
         end
 
         def subject
           rx = /^Subject:\s*(.*)$/
           raw_data
             .each_line
-            .find{|l| l =~ rx }[rx, 1]
+            .find{|l| l =~ rx }[rx, 1].strip
         end
 
         def raw_data

data/lib/webspicy/version.rb

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

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

@@ -40,7 +40,7 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("info@mydomain.be")
+          expect(subject.from).to eql("Foo Bar <info@mydomain.be>")
           expect(subject.to).to eql(["support@mydomain.fr"])
           expect(subject.subject).to eql("Hello World")
         end

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

@@ -6,9 +6,26 @@ 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: david.parloir@gmail.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
@@ -29,7 +46,7 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("noreply@webspicy.io")
+          expect(subject.from).to eql("Webspicy <noreply@webspicy.io>")
           expect(subject.to).to eql(["someone@world.com"])
           expect(subject.subject).to eql("Hey world, hello!")
         end

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

@@ -15,7 +15,7 @@ module Webspicy
             },
             {
               "key": "from",
-              "line": "From: info@mydomain.be"
+              "line": "From: Webspicy <noreply@webspicy.io>"
             },
             {
               "key": "reply-to",
@@ -82,7 +82,7 @@ module Webspicy
         }
 
         it 'works as expected' do
-          expect(subject.from).to eql("info@mydomain.be")
+          expect(subject.from).to eql("Webspicy <noreply@webspicy.io>")
           expect(subject.to).to eql(["support@mydomain.fr"])
           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.12
+  version: 0.20.13
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-09 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake