talktome 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02c611e3628b2f56012103e2c8ae0a5bb600ee9e11a24a7c7acf748475c9380
-  data.tar.gz: f1dadedcddd3f434298359293ef656be2f14396c7d9dd8c597ea5db2bb7a138b
+  metadata.gz: 8ca8cf300ad4144fd6336f1ff56e4fc97140742869f10397ce62c9d0fecd3c03
+  data.tar.gz: 9d439309e79ebb3da0ea177af0606e882a643adc55e045cca5a56bb154ac6888
 SHA512:
-  metadata.gz: 76e3843b6ec151090b9c88f26180a620d82bb737360fbb43b8f70f6f10d559401bf822f626cfde81c3edd43df253388ded9ca8761ce849c2af55262eb6e66503
-  data.tar.gz: 5f6558c21f2eeebd114a876232be0eb2c6dfdde84d7862d105c6da2400ee55d367f1428289e572a02c64fb5e8056e4e8999a9bb28de0b2af1199c1dd5613bc73
+  metadata.gz: d4bd93a6e3bde5390185ebd55844a0db7b48fd81ca0c0982289d67ca15c5866f402b645191f6ba1826a7c4b5147b67937e0d7c07cd9f08788a616b2f019751c4
+  data.tar.gz: 9b255ab12108b8e37c024aff7bbe49b8ce85c543cc14fe62b797d64aadcbd59c2a9fe33530bdfa3e35872a7a3a553673ff064472e4fbf4cf4563377c2de4ad14

data/lib/talktome/app.rb

@@ -13,6 +13,7 @@ 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
@@ -24,16 +25,14 @@ module Talktome
       }
     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)
         }
         [ 200, { "Content-Type" => "text/plain"}, ["Ok"] ]

data/lib/talktome/version.rb

@@ -1,7 +1,7 @@
 module Talktome
   module Version
     MAJOR = 1
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
   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,24 @@ module Talktome
       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
+
   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}}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: talktome
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Bernard Lambeau
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2021-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -191,7 +191,9 @@ 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/welcome/email.md
 - spec/fixtures/welcome/footer.mustache
 - spec/message/test_initialize.rb