caboose-cms 0.5.192 → 0.5.193

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzFhZWU3NWRkNDk3NzhiMzM5ZDA2ZDdjZWU3YjgyOTFjMTdkODI4MA==
+    NDgzYmEyYzE1Mjg5ZDljNGJhYWUzMjhlOTYwZmVhZmFjZTdkZGEwMQ==
   data.tar.gz: !binary |-
-    YWIzZmZkM2Q2ODE0Y2Q1MDAyOTc4MTUwNjIwZWFmNDQ0ZTVmMDJjMw==
+    ODY1NDE2MmQzZTdhN2Y5YWE1MDIwMmUwYzM4MWVhOTI4MGZiY2U5Zg==
 SHA512:
   metadata.gz: !binary |-
-    YTMxZDUzZDU2ZTkwZTc1NjM2ZGY5MGZhYjdmZDY3NTgzMmQ0MWZkOTcyNzc5
-    NWIzYTgyMTZiNTFmOGJkMTczMTNmNjA5OTVmYTBmZmM3ZDkzOTA5YTJjN2Y4
-    NjlmM2Y1MTBmMmRmYWFjN2JkNTRhZmQ2ZDcxMjA0NGJmYmI4MTU=
+    NzIzMmEzMDY3Zjk4NmFkYTRlNTkxYTZjZWQ2ZjA2NzMzYjRjMzA1ZDE4MmNh
+    MTVjOTAyMDA5ZWE4NjFmNWRjYmZhNTJjZDMzZGY1ODk5ZDkxZTNlNzk2M2Rl
+    ZWQ3ZDczZWNjOGNlMjY0YTAxNmQ2ODJiYmQzZTg3NWI1YTA2NTE=
   data.tar.gz: !binary |-
-    MjcyODM0MmExYjBlOGVjZTJjZDE3M2NkYTA1NjQwYmE4MGI0NjQ0MTBkMDYx
-    M2EzYTI3YjU0Yzg5NWExZDdjNTc5ODI1ZTIwMjVjMTkzMjgwZDcxYTFlOGJj
-    MTZkMjIxYTJhYWJhNDMyMjEwN2ZlMDkzY2Y3NTY4NDNkNzAxNGE=
+    MmM0OTI5YjcwNjVmM2QzNTE5OTM0NDNiNWIwMWM0NzNlZjI4Yjk0MzEzZTU1
+    MTA3ZmNmNzljMzIyNzczMmJhYmJkMjI1ZDZiNDUzMDk3YzA3ZDE0NjIwZDYy
+    YWYwYTQzMzFjOWZmZGE4YjQ0YTU1NWIyMWJlNzM3MDZkNTVmZGQ=

data/app/models/caboose/block.rb

@@ -240,10 +240,10 @@ class Caboose::Block < ActiveRecord::Base
       str = view.render(:partial => "../../sites/#{site.name}/blocks/#{name}", :locals => options2)
     rescue ActionView::MissingTemplate => ex      
       begin
-        str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)
-      rescue
+        str = view.render(:partial => "caboose/blocks/#{name}", :locals => options2)      
+      rescue Exception => ex
         Caboose.log("Partial caboose/blocks/#{name} doesn't exist.")
-        str = "<p class='note error'>#{self.partial_message(block, ex)}</p>"
+        str = "<p class='note error'>#{self.partial_message(name, ex)}</p>"
       end      
     end
       

data/app/models/caboose/retargeting_config.rb

@@ -8,32 +8,10 @@ module Caboose
       :conversion_id,      
       :labels_function
     
-    def labels(page)          
-      return eval(self.custom_labels_function)    
-    end
-    
-    def js_code(request, page)
-      return "" if !self.site.use_retargeting
-      
-      str = ""      
-      labels = self.labels(request, page)
-      labels.each do |label|                    
-        str << "<script type='text/javascript'>\n"
-        str << "/* <![CDATA[ */\n"
-        str << "var google_conversion_id = #{self.conversion_id};\n"
-        str << "var google_conversion_label = '#{label}';\n"
-        str << "var google_custom_params = window.google_tag_params;\n"
-        str << "var google_remarketing_only = true;\n"
-        str << "/* ]]> */\n"
-        str << "</script>\n"
-        str << "<script type='text/javascript' src='//www.googleadservices.com/pagead/conversion.js'></script>\n"
-        str << "<noscript>\n"
-        str << "<div style='display:inline;'>\n"
-        str << "<img height='1' width='1' style='border-style:none;' alt='' src='//googleads.g.doubleclick.net/pagead/viewthroughconversion/#{self.conversion_id}/?value=1.00&amp;currency_code=USD&amp;label=#{label}&amp;guid=ON&amp;script=0'/>\n"
-        str << "</div>\n"
-        str << "</noscript>\n"
-      end
-      return str
+    def labels(request, page)          
+      arr = eval(self.labels_function)
+      return [arr] if arr is_a? String
+      return arr        
     end
     
   end  

data/app/views/caboose/blocks/_retargeting.html.erb

@@ -1,9 +1,9 @@
 <% if site.use_retargeting %> 
   <% rc = site.retargeting_config %>
-  <% rc.labels(request, page).each do |label %>                                                  
+  <% rc.labels(request, page).each do |label| %>                                                  
     <script type='text/javascript'>
     /* <![CDATA[ */
-    var google_conversion_id = #{rc.conversion_id};
+    var google_conversion_id = <%= rc.conversion_id %>;
     var google_conversion_label = "<%= raw label %>";
     var google_custom_params = window.google_tag_params;
     var google_remarketing_only = true;

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.192'
+  VERSION = '0.5.193'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.192
+  version: 0.5.193
 platform: ruby
 authors:
 - William Barry