caboose-cms 0.5.195 → 0.5.196

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTEwZDI1Njk1NzdlN2EzYmMzZGFhODVmYjZhNjI1ZTU4NTg5NGNhOA==
+    ZjM1ZjMxZmM0YzU4MjdmNDIyY2RhZWZkNjgyODIyMjRkZGI3ZmExYw==
   data.tar.gz: !binary |-
-    Y2RhMGVjMDM1MGMyYjFkYzAyMWQ5ZmI2OGE0ZmY3NzYxNjYzN2U4MQ==
+    MDA3YjM5NDk0Y2E2ODlhZDM0YjQyMzMwMmZlMDJlNDA0NzgzYWIxYQ==
 SHA512:
   metadata.gz: !binary |-
-    OWY3NTU3OGEyNDgyZjJiZjA4OWZjY2I2NWM4NTI1NzdkMjNiMjcyYzdkZjg5
-    NDMxMzY5MzQ0ZDdlNDc2NzE2NDRhMTc5OTc2OTI2NjFmMGQxZGY3NGUxZTJm
-    NmI2MWJiYzYwN2ZiOGRjNjQ0YmIwN2MwM2RjMDFjNWI2Mzk5NzQ=
+    OGEzN2I1Nzc0YWU4NWM4YWY0OTMwMTQ2NWZiMGY3ZDFkNmI4MWY5ZjdhYWNj
+    OWEzYThjMGM0OGZiYmE5MDEzOTAxMDg3N2QzYWI4Yjg3YjIxN2RkNTA5N2Yx
+    NGM0MmJkM2U4OTExN2QxM2M1YWJlNzMyN2EwMWQwNTU1NzkxMjY=
   data.tar.gz: !binary |-
-    YjU0NWMyMDdmZDdkYzc5MTQ5MWFjMGJiYjgxNTljMmVhOTM4YzMwNDNkYTgw
-    MTgzMGY0YmY3MDc5ZjA3YjlhMzFhZTU5NDIxMGMwODg1MGJkMGMyYjViZjE1
-    YTAyNTZiNzA2ODcwZTc4NzczODc5MDIzMDZhNGI5ZWYzNTc3YjE=
+    NzE2Y2YyOWNiMTIwNDIzNmExNDhmMjNiNjE4NTBmOWJjZjFmZjU0NDcyMjlh
+    YTFkNDNjNmFhM2NlNjFkOWQ0MGNmZjZiM2YyNTYyODU1M2U0NTMyMmE4YjNi
+    MjM2MzFjNTg3MWE1MTc5ZTY2YWZhYWQ3ODNkYmQzNWNkY2JiYTg=

data/app/controllers/caboose/retargeting_controller.rb

@@ -27,8 +27,9 @@ module Caboose
     
       params.each do |name,value|
         case name          
-          when 'conversion_id'   then rc.conversion_id   = value    
-          when 'labels_function' then rc.labels_function = value                
+          when 'conversion_id'      then rc.conversion_id      = value    
+          when 'labels_function'    then rc.labels_function    = value
+          when 'fb_pixels_function' then rc.fb_pixels_function = value
     	  end
     	end
     	

data/app/models/caboose/retargeting_config.rb

@@ -6,13 +6,25 @@ module Caboose
     attr_accessible :id,
       :site_id,
       :conversion_id,      
-      :labels_function
+      :labels_function,
+      :fb_pixels_function
     
-    def labels(request, page)          
-      arr = eval(self.labels_function)
+    def labels(request, page)
+      return [] if self.labels_function.nil? || self.labels_function.strip.length == 0      
+      return [self.labels_function] if self.labels_function.starts_with?('_')        
+      arr = eval(self.labels_function)      
+      return [] if arr.nil?
       return [arr] if arr is_a? String
       return arr        
     end
     
+    def fb_pixels(request, page)
+      return [] if self.fb_pixels_function.nil? || self.fb_pixels_function.strip.length == 0
+      arr = eval(self.fb_pixels_function)
+      return [] if arr.nil?
+      return [arr] if arr.is_a?(String) || arr.is_a?(Integer)
+      return arr        
+    end
+    
   end  
 end

data/app/models/caboose/schema.rb

@@ -505,7 +505,8 @@ class Caboose::Schema < Caboose::Utilities::Schema
       Caboose::RetargetingConfig => [
         [ :site_id               , :integer ],
         [ :conversion_id         , :string  ],                
-        [ :labels_function       , :text    ]                        
+        [ :labels_function       , :text    ],
+        [ :fb_pixels_function    , :text    ]
       ],
       Caboose::Review => [
         [ :product_id            , :integer   ],

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

@@ -1,6 +1,8 @@
-<% if site.use_retargeting %> 
-  <% rc = site.retargeting_config %>
-  <% rc.labels(request, page).each do |label| %>                                                  
+<% if site.use_retargeting %>
+  <% rc = site.retargeting_config %> 
+  <%
+  # Google audiences
+  %><% rc.labels(request, page).each do |label| %>                                                  
     <script type='text/javascript'>
     /* <![CDATA[ */
     var google_conversion_id = <%= rc.conversion_id %>;
@@ -16,4 +18,24 @@
     </div>
     </noscript>
   <% end %>
+  <%
+  # Facebook audiences  
+  %><% rc.fb_pixels(request, page).each do |pixel_id| %>  
+    <script>(function() {
+      var _fbq = window._fbq || (window._fbq = []);
+      if (!_fbq.loaded) {
+        var fbds = document.createElement('script');
+        fbds.async = true;
+        fbds.src = '//connect.facebook.net/en_US/fbds.js';
+        var s = document.getElementsByTagName('script')[0];
+        s.parentNode.insertBefore(fbds, s);
+        _fbq.loaded = true;
+      }
+      _fbq.push(['addPixelId', '<%= raw pixel_id %>']);
+    })();
+    window._fbq = window._fbq || [];
+    window._fbq.push(['track', 'PixelInitialized', {}]);
+    </script>
+    <noscript><img height="1" width="1" alt="" style="display:none" src="https://www.facebook.com/tr?id=<%= raw pixel_id %>&amp;ev=PixelInitialized" /></noscript>
+  <% end %>
 <% end %>

data/app/views/caboose/retargeting/admin_edit.html.erb

@@ -5,11 +5,31 @@ rc = s.retargeting_config
 <%= render :partial => 'caboose/sites/admin_header' %>
 
 <p><div id='site_<%= s.id %>_use_retargeting'   ></div></p>
+
+<h2>Google Audiences</h2>
 <p><div id='retargetingconfig_<%= rc.id %>_conversion_id'   ></div></p>
-<h2>Conversion Labels</h2>
+<h3>Conversion Labels</h3>
 <p><code>def conversion_labels_function(request, page) {</code></p>
 <p><div id='retargetingconfig_<%= rc.id %>_labels_function' ></div></p>
-<p><code># This function returns an array of conversion labels<br />}</code></p>
+<p><code>
+&nbsp;&nbsp;# This function returns a conversion label string or an array of conversion label strings.<br />
+&nbsp;&nbsp;# Example 1:<br />
+&nbsp;&nbsp;# return "abc123"<br />
+&nbsp;&nbsp;# Example 2: <br />
+&nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
+}</code></p>
+
+<h2>Facebook Pixel IDs</h2>
+<p><code>def facebook_pixel_ids(request, page) {</code></p>
+<p><div id='retargetingconfig_<%= rc.id %>_fb_pixels_function' ></div></p>
+<p><code>
+&nbsp;&nbsp;# This function returns a pixel ID string or an array of pixel ID strings.<br />
+&nbsp;&nbsp;# Example 1:<br />
+&nbsp;&nbsp;# return "abc123"<br />
+&nbsp;&nbsp;# Example 2: <br />
+&nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
+&nbsp;&nbsp;# This function returns an array of conversion labels<br />
+}</code></p>
 
 <%= render :partial => 'caboose/sites/admin_footer' %>
 
@@ -32,8 +52,9 @@ $(document).ready(function() {
     update_url: "/admin/sites/<%= @site.id %>/retargeting",
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'conversion_id'   , nice_name: 'Conversion ID'              , type: 'text'     , value: <%= raw Caboose.json(rc.conversion_id  ) %>, width: 600 },
-      { name: 'labels_function' , nice_name: 'Conversion Labels Function' , type: 'textarea' , value: <%= raw Caboose.json(rc.labels_function) %>, width: 600, height: 75, fixed_placeholder: false }            
+      { name: 'conversion_id'      , nice_name: 'Conversion ID'               , type: 'text'     , value: <%= raw Caboose.json(rc.conversion_id      ) %>, width: 600 },
+      { name: 'labels_function'    , nice_name: 'Conversion Labels Function'  , type: 'textarea' , value: <%= raw Caboose.json(rc.labels_function    ) %>, width: 600, height: 75, fixed_placeholder: false },
+      { name: 'fb_pixels_function' , nice_name: 'Facebook Pixel IDs Function' , type: 'textarea' , value: <%= raw Caboose.json(rc.fb_pixels_function ) %>, width: 600, height: 75, fixed_placeholder: false }
     ]    
   });
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.195'
+  VERSION = '0.5.196'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.195
+  version: 0.5.196
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg