include PUBLIC_COMMENT in mail template substitution (closes #8)

rawliving-germany · Aug 4, 2016 · eb254e2 · eb254e2
1 parent 4d70ff8
commit eb254e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/rawbotz/mail_template.rb b/lib/rawbotz/mail_template.rb
@@ -4,6 +4,7 @@ module MailTemplate
     def self.consume template, order
       result = ""
       result = template.gsub(/SUPPLIERNAME/, order.supplier[:name])
+      result = result.gsub(/PUBLIC_COMMENT/, order.public_comment || "")
 
       lines = result.split("\n")
       subject, lines = lines.partition{|l| l.start_with?("SUBJECT=")}

diff --git a/test/mail_template_test.rb b/test/mail_template_test.rb
@@ -18,9 +18,10 @@ def test_substitution
       "\n"\
       " \n"\
       "* SUPPLIERSKU QTY (NUM_PACKS of PACKSIZE) PRODUCTNAME\n"\
+      "PUBLIC_COMMENT\n"\
       "see you"
     order = {supplier: {name: "Suppliername"}, order_items: [
-      OI_BARE, OI_FULL, OI_HALF]}
+      OI_BARE, OI_FULL, OI_HALF], public_comment: "Call me when finished"}
     order = OpenStruct.new order
 
     expected = "Dear Suppliername\n"\
@@ -29,6 +30,7 @@ def test_substitution
       " 1 (0.25 of 4) First Product\n"\
       "sku1 5 (1 of 5) Suppliers first\n"\
       " 7 ( of ) Third Product\n"\
+      "Call me when finished\n"\
       "see you"
     result = Rawbotz::MailTemplate.consume(template, order)
     assert_equal expected, result