talktome 1.1.2 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3921c37bcb667aedfa4119ab30f430b16cc05dfc9c1bd8d2607775f81fde5ad6
-  data.tar.gz: c374bc0d83fd26cf0f079fec2abf214ce5ffb387dd04a07ab2dbb04e4f610683
+  metadata.gz: 4ae24a6e1def52e8f6b89ba6dd6ade0f5dc7d41182d591a573215c1a75d49603
+  data.tar.gz: ad8ca169cd9619c21e0af5af7f862b65730105f95276881449ab1877626dcefb
 SHA512:
-  metadata.gz: 1fa9f53a14b13bc8cc5b76a74ea2e61bf0eb25185f41e3c2f787748f77ea79f05f5ccb94988c5fbcbea7e1fc1a24d490456f34bde6edd26b113618c6396f6782
-  data.tar.gz: 33cb01d9ab2908673b8a20b196bc9d9070dc1ec76cdc7dfc506677004640f0e562dac5771db16b582672fbd426de0337a2c06941889ce80b31257a226dafc9d6
+  metadata.gz: fee101432b406429b2c8761311e9616181766cd7904db0678adba35b32ebd26c3d709cd90cc1173545ac27d6ff310ca7edf284de3fc31215d831ea4d47ed7d6b
+  data.tar.gz: 6827ee15c92c7d6487aaac7b7c850c2e327a2bbc95a84f213f16593fb7017219779f6163ea702cf50e8d1010c3fffa8a69181890581e8427c7c5472a19477110

data/lib/talktome/app.rb

@@ -13,36 +13,39 @@ module Talktome
 
     set :raise_errors, true
     set :show_exceptions, false
+    set :talktome, Talktome::Client::Local.new(ROOT_FOLDER/'templates')
 
     VALIDATION_SCHEMA = ::Finitio.system(<<~FIO)
       @import finitio/data
       Email = String(s | s =~ /^[^@]+@[^@]+$/ )
       {
-        to       :? Email
-        reply_to :? Email
-        ...      :  .Object
+        to          :? Email
+        reply_to    :? Email
+        in_reply_to :? String
+        ...         :  .Object
       }
     FIO
 
-    TALKTOME = Talktome::Client::Local.new(ROOT_FOLDER/'templates')
-
-    post %r{/([a-z-]+)/} do |action|
+    post %r{/([a-z-]+([\/][a-z-]+)*)/} do |action, _|
       begin
         as_array = info.map{|k,v| {'key' => k.capitalize, 'value' => v}}
         subject  = Talktome.env('TALKTOME_EMAIL_SUBJECT', 'Someone wants to reach you!')
         footer   = Talktome.env('TALKTOME_EMAIL_FOOTER', "Truly yours,\n
           Sent by [Enspirit.be](https://enspirit.be/), contact us if you need help with any IT task.")
         user     = load_user_from_info!
-        TALKTOME.talktome(action, user, info.merge(allvars: as_array, subject: subject, footer: footer), [:email]){|email|
+        settings.talktome.talktome(action, user, info.merge(allvars: as_array, subject: subject, footer: footer), [:email]){|email|
           email.reply_to = info[:reply_to] if info.has_key?(:reply_to)
+          email.in_reply_to = info[:in_reply_to] if info.has_key?(:in_reply_to)
         }
         [ 200, { "Content-Type" => "text/plain"}, ["Ok"] ]
       rescue JSON::ParserError
         fail!("Invalid data")
       rescue Finitio::Error => ex
         fail!(ex.message)
-      rescue ::Talktome::InvalidEmailError => ex
+      rescue ::Talktome::InvalidEmailError
         fail!("Invalid email address")
+      rescue ::Talktome::TemplateNotFoundError
+        fail!("No such template", 404)
       end
     end
 
@@ -55,7 +58,8 @@ module Talktome
     end
 
     def load_user_from_info!
-      if to = info[:to]
+      protected_fields = [:to, :in_reply_to]
+      if (info.keys & protected_fields).any?
         secret = Talktome.env('TALKTOME_BEARER_SECRET')
         fail!("Missing secret", 400) unless secret
         fail!("Invalid secret", 401) unless "Bearer #{secret}" == env["HTTP_AUTHORIZATION"]

data/lib/talktome/client/local.rb

@@ -17,7 +17,7 @@ module Talktome
 
       def load_message!(identifier, strategies)
         folder = self.folder/identifier
-        raise InvalidMessageError, "No such message `#{identifier}`"            unless folder.exists?
+        raise TemplateNotFoundError, "No such message `#{identifier}`"            unless folder.exists?
         raise InvalidMessageError, "Message `#{identifier}` should be a folder" unless folder.directory?
         strategies.each do |s|
           if (file = folder.glob("#{s}.*").first) && file.file?

data/lib/talktome/error.rb

@@ -2,4 +2,5 @@ module Talktome
   class Error < StandardError; end
   class InvalidMessageError < Error; end
   class InvalidEmailError < Error; end
+  class TemplateNotFoundError < Error; end
 end

data/lib/talktome/strategy/email.rb

@@ -16,6 +16,7 @@ module Talktome
         [
           :to,
           :reply_to,
+          :in_reply_to,
           :subject
         ].each do |which|
           if arg = message.metadata[which.to_s]

data/lib/talktome/version.rb

@@ -1,7 +1,7 @@
 module Talktome
   module Version
     MAJOR = 1
-    MINOR = 1
+    MINOR = 3
     TINY  = 2
   end
   VERSION = "#{Version::MAJOR}.#{Version::MINOR}.#{Version::TINY}"

data/spec/app/test_app.rb

@@ -9,6 +9,7 @@ module Talktome
     }
 
     before(:each) do
+      Talktome::App.set :talktome, Talktome::Client::Local.new(Path.dir.parent/'fixtures')
       ENV['TALKTOME_EMAIL_DEFAULT_TO'] = "to@talktome.com"
       ENV['TALKTOME_EMAIL_DEFAULT_FROM'] = "from@talktome.com"
       Mail::TestMailer.deliveries.clear
@@ -162,5 +163,77 @@ module Talktome
       end
     end
 
+    context 'POST /support/, regarding the In-Reply-To' do
+      class ::Talktome::Message::Template
+        def raise_on_context_miss?
+          false
+        end
+      end
+
+      it 'forbids the usage of :in_reply_to unless a secret is provided' do
+        post "/support/", {
+          in_reply_to: '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@company.com>',
+      }.to_json, { "CONTENT_TYPE" => "application/json" }
+        expect(last_response.status).to eql(400)
+        expect(Mail::TestMailer.deliveries.length).to eql(0)
+      end
+
+      it 'does not allow setting the :in_reply_to without a valid AUTH token' do
+        Talktome.set_env('TALKTOME_BEARER_SECRET', "Invalid secret") do
+          post "/support/", {
+            in_reply_to: '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@company.com>',
+          }.to_json, { "CONTENT_TYPE" => "application/json" }
+          expect(last_response.status).to eql(401)
+          expect(Mail::TestMailer.deliveries.length).to eql(0)
+        end
+      end
+
+      it "lets override it by passing a inReplyTo field" do
+        Talktome.set_env('TALKTOME_BEARER_SECRET', "Some secret") do
+          header 'Authorization', 'Bearer Some secret'
+          post "/support/", {
+            to: 'client@company.com',
+            in_reply_to: '<F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@company.com>',
+          }.to_json, { "CONTENT_TYPE" => "application/json" }
+          expect(last_response).to be_ok
+          expect(Mail::TestMailer.deliveries.length).to eql(1)
+          expect(Mail::TestMailer.deliveries.first.in_reply_to).to eql('F6E2D0B4-CC35-4A91-BA4C-C7C712B10C13@company.com')
+        end
+      end
+    end
+
+    context 'POST /multi-lingual/en/' do
+
+      it 'works' do
+        post "/multi-lingual/en/", {
+          reply_to: 'hello@visitor.com',
+          message: 'Hello from visitor',
+          key: 'value',
+        }.to_json, { "CONTENT_TYPE" => "application/json" }
+        expect(last_response.status).to eql(200)
+        expect(last_response).to be_ok
+        expect(Mail::TestMailer.deliveries.length).to eql(1)
+        expect(Mail::TestMailer.deliveries.first.to).to eql(["to@talktome.com"])
+        expect(Mail::TestMailer.deliveries.first.from).to eql(["from@talktome.com"])
+        expect(Mail::TestMailer.deliveries.first.subject).to eql("Someone wants to reach you!")
+        expect(Mail::TestMailer.deliveries.first.html_part.body).to include("<li>Key: value</li>")
+        expect(Mail::TestMailer.deliveries.first.html_part.body).to include("Truly yours")
+      end
+    end
+
+    context 'POST /xxx when the template does not exist' do
+
+      it 'return a 404 error when the template doesn\'t exist' do
+        post "/multi-lingual/fr/", {
+          reply_to: 'hello@visitor.com',
+          message: 'Hello from visitor',
+          key: 'value',
+        }.to_json, { "CONTENT_TYPE" => "application/json" }
+
+        expect(last_response.status).to eql(404)
+        expect(last_response.body).to match(/No such template/)
+      end
+    end
+
   end
 end

data/spec/client/test_local.rb

@@ -74,6 +74,7 @@ module Talktome
           client.talktome("welcome", user, tpldata, [:email])
           expect(strategy.last.message.to_html).to eql("<html><title>Hello Test user</title><body><h1>Hello Test user</h1>\n\n<p>Welcome to this email example!</p>\n\n<h3>Test user</h3>\n</body></html>\n")
         end
+
       end
 
     end

data/spec/fixtures/contact-us/email.md

@@ -0,0 +1,13 @@
+---
+subject: |-
+  {{subject}}
+---
+Hello,
+
+This person is trying to reach you:
+
+{{#allvars}}
+  * {{key}}: {{value}}
+{{/allvars}}
+
+{{footer}}

data/spec/fixtures/multi-lingual/en/email.md

@@ -0,0 +1,13 @@
+---
+subject: |-
+  {{subject}}
+---
+Hello,
+
+This person is trying to reach you:
+
+{{#allvars}}
+  * {{key}}: {{value}}
+{{/allvars}}
+
+{{footer}}

data/spec/fixtures/support/email.md

@@ -0,0 +1,6 @@
+---
+subject: Regarding your support request
+---
+Our support team will get back to you ASAP regarding your request.
+
+Best regards

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talktome
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.3.2
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -191,7 +191,10 @@ files:
 - lib/talktome/version.rb
 - spec/app/test_app.rb
 - spec/client/test_local.rb
+- spec/fixtures/contact-us/email.md
 - spec/fixtures/layouts/email.html
+- spec/fixtures/multi-lingual/en/email.md
+- spec/fixtures/support/email.md
 - spec/fixtures/welcome/email.md
 - spec/fixtures/welcome/footer.mustache
 - spec/message/test_initialize.rb
@@ -220,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Talktome helps you talk to users by email, messaging, sms, etc.