mailchimp_template 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76da624f0a028b0a228325af138a42513e9326b
-  data.tar.gz: 2e85fb1e3e25de71a3837791a271c0e9b4b44f7c
+  metadata.gz: e13396d136b6f0c99f71f9f22f7fc5760d279f6e
+  data.tar.gz: c92c97b4fb4d0d7931b43b749a780e1980e2adb5
 SHA512:
-  metadata.gz: fc418d22cc2ffd313994131bf910e0b61df001b04626b48e2d781e41e12c16cf24fde8ff812bebfa6f530ac785e84b3889b4023cf3979e2824fd718bbec5370a
-  data.tar.gz: 9584436a9abce1ed4399d29babf5fd3fdd5353fed9d3bbf5a2a7b1ab4cacecbfa29e1d88de015b6557b487eb60072ec17bfa1d7b7e291964667b25b940d52051
+  metadata.gz: e9c1b1f33ed76baedb35c944888c4e4310385ed0d8ad79cd0ef6baa974f6c9ccf2751b1bb06046be151820f0b822f810326a3bc3863c6fa807555c51dcbb1f16
+  data.tar.gz: 06a8017d47764d778e6aa6f1d2e414e7a7182f305237c0f435bccccde88c0c23d6847afc3006cf3012f7fdd92765a441dbe982cc6c4b88e9ffd06119a739508b

data/lib/mailchimp_template.rb

@@ -8,7 +8,8 @@ class MailchimpTemplate
   end
 
   def render(merge_tags: {}, regions: {})
-    result = render_regions(@template, regions)
+    result = @template
+    result = render_regions(result, regions)
     return render_merge_tags(result, merge_tags)
   end
 
@@ -26,7 +27,8 @@ class MailchimpTemplate
   end
 
   def render_merge_tags(template, merge_tags = {})
-    template.gsub! /\*\|(?<tag_name>.+?)\|\*/ do |match|
+    # | is %7C when escaped by Nokogiri
+    template.gsub! /\*(?:\||%7C)(?<tag_name>.+?)(?:\||%7C)\*/ do |match|
       tag_name = $~[:tag_name]
       case tag_name
       when /^IF:(?<cond>.+)/, /^IFNOT:(?<cond>.+)/, /^ELSEIF:(?<cond>.+)/, "ELSE:", "END:IF"

data/lib/mailchimp_template/version.rb

@@ -1,3 +1,3 @@
 class MailchimpTemplate
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mailchimp_template
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Steven Karas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-20 00:00:00.000000000 Z
+date: 2015-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler