banana_peels 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfec30f7711bbbe46112847f564156766b08f91e
-  data.tar.gz: b481dd4bdaff1931a9facc1a8202bda8f6e727ce
+  metadata.gz: d496c00442e99cceb25125e34e1b563c8a996920
+  data.tar.gz: ecfb95b989127e25e0328818be5ec2715ff6acd6
 SHA512:
-  metadata.gz: 33261e9df50f7d9b4410a096cc2a0234c18967b7e98bbad86ba57e7f27300abcc939b47ab343a8d5067481700f9c43b530efd455f882c1d56518368e7dded016
-  data.tar.gz: 5053899176347238be777ac26c8eb9e8b3b06561f2ee996cf52a2182d19cd36f2493bc1a53b0d042baeb979dc2a8a17635cb0a175eb10472d5e3e769890625de
+  metadata.gz: 67f36969ca122132824e302942a95674412eea447fe6ba746f926bec755620efe53938d674b9138c95e05db988c2d6268ef44bb51f6f0cfd36a0ecb54469f017
+  data.tar.gz: e9f461e828f8dc6b6865b961744013efa3ffdf2f6af6c4c8535aca001d456971e010124aa1ff1e689bd00e5bac0209be20611f0c6b46ac9c9d9b453ca0b4eebc

data/lib/banana_peels/campaign.rb

@@ -1,9 +1,12 @@
 class BananaPeels::Campaign
 
+  MERGE_TAG_REGEX = /\*\|(\S+?)\|\*/.freeze
+
+
   class << self
 
     def replace_merge_tags(string, merge_tags)
-      string.gsub(/\*\|(\w+)\|\*/) do
+      string.gsub(MERGE_TAG_REGEX) do
         merge_tags[$1.upcase]
       end
     end
@@ -13,10 +16,14 @@ class BananaPeels::Campaign
   # merge_tags: optional, nil for default
   def initialize(campaign_id, merge_tags, api_key)
     @campaign_id = campaign_id
-    @merge_tags = normalize_merge_tags(merge_tags || {})
+    @raw_merge_tags = merge_tags
     @api = BananaPeels.api(api_key)
   end
 
+  def merge_tags
+    @normalized_merge_tags ||= normalize_merge_tags(@raw_merge_tags || {})
+  end
+
   def mailchimp_meta
     # TODO: Cache campaigns from mailchimp.
     @mailchimp_meta ||= @api.campaigns.list({ campaign_id: @campaign_id })['data'].first
@@ -57,8 +64,8 @@ class BananaPeels::Campaign
     mailchimp_meta['from_email']
   end
 
-  def subject
-    replace_merge_tags(mailchimp_meta['subject'])
+  def subject(merge_tags=nil)
+    replace_merge_tags(mailchimp_meta['subject'], merge_tags)
   end
 
   def to_name
@@ -87,7 +94,7 @@ class BananaPeels::Campaign
   end
 
   def find_merge_tags_in(string)
-    string.scan(/\*\|(\w+)\|\*/).flatten.uniq
+    string.scan(MERGE_TAG_REGEX).flatten.uniq
   end
 
   def text_content_unmerged
@@ -109,7 +116,7 @@ class BananaPeels::Campaign
   end
 
   def html_content
-    merge_tags = @merge_tags.dup
+    merge_tags = self.merge_tags.dup
     merge_tags.each do |k,v|
       merge_tags[k] = CGI.escapeHTML(v.to_s).gsub("\n","\n<br>")
     end
@@ -117,7 +124,7 @@ class BananaPeels::Campaign
   end
 
   def replace_merge_tags(string, merge_tags=nil)
-    self.class.replace_merge_tags(string, merge_tags || @merge_tags)
+    self.class.replace_merge_tags(string, merge_tags || self.merge_tags)
   end
 
   def normalize_merge_tags(merge_tags)
@@ -129,6 +136,8 @@ class BananaPeels::Campaign
     end
     normalized['FNAME'] ||= normalized['FIRST_NAME']
     normalized['LNAME'] ||= normalized['LAST_NAME']
+    normalized['MC:SUBJECT'] ||= subject(normalized)
+    normalized['URL:MC_SUBJECT'] ||= CGI.escape(normalized['MC:SUBJECT'])
     normalized
   end
 

data/lib/banana_peels/version.rb

@@ -1,3 +1,3 @@
 module BananaPeels
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: banana_peels
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Steven Bull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler