caboose-cms 0.5.197 → 0.5.198

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmNlZjNhZGU4Y2JlNDJmODYwYjNiODhhYjY2ZGFlYjE3YjM5MjUyYw==
+    OGZkM2MyZWI1ZWFjOTAwN2I5NGY0OGMxNzcyN2U2MTU1Mzg0OGQ1Ng==
   data.tar.gz: !binary |-
-    MzAzOWQ1NjlmYTE2ODBhYjQ1NGIzNDNmZjBiN2NjZGFhMGJlYzQzOQ==
+    OGRmZjI2NzRhYTRkZDIxZGFlNGY1ZjQ3MGZiYWQ3OGUxYzFmZDRhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YzFkNmE2MmQ1NzlmMTBlYWMwNWI3ODNhNTg5YzFmOWE5OTlkODhkNWUxODk0
-    ZDIxNWE3MDdiN2VhMmJhNDU0MWM2ODA3NmUyMWIyYzJjMmFiNGY5YzMzZWE2
-    NmE5MGFhOTg4ZmQ0MDZlN2Y4YWJmMGQxMmNiNTRhMTMwNjVhYzY=
+    ZWExZjliZDA4MWMwMGVkODY0ZTQ5OGMwMWM0NGJiZmIzOTI3ZjFlNzM1ZTNj
+    NDFiNzU0OGI0NmE1MzhlOWQwYzhhOTY0NGY0Mzc1NTZjYjNjMzZlZmQwMTdk
+    NTUxY2RjNWNmOGMxM2UyY2ZjNGVmYzQ2YzE1MmFjOTY3MjIwZTQ=
   data.tar.gz: !binary |-
-    OWUxNzZmZDY2ZWY5NzA4ZWU1YTQ1NjQyNjEyNTUxMTIxMjg4NGVmMDRlNTA0
-    ZjI5ZmIwMDBhMTk0ZTYzOWVkMzJhZjdkZWIyNGQzN2JlZTM5MWUwNGJlYTY1
-    ZWE3YzI0NmFmOWZlMzg2MTY4OGRiYTkzYWVjZGVkODg2N2JmNGU=
+    YThmMzA0OGY0MThjNmM1YWM1NjM2MzQ5MGJkZGFjOWZkZTYzYzdiMThmNGVh
+    OWY1ZjQwZDllNGYzNjQ1MzZmZGNjZGZiZjg1OWQ5MGZjYWY5OWVlNTdjODY1
+    ZWFiOGJhOWNmMjBkYjFlNTc3ZmE2YWI0OTg2NmMwZGI0NjM2M2Q=

data/app/controllers/caboose/retargeting_controller.rb

@@ -27,9 +27,10 @@ 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 'fb_pixel_id'        then rc.fb_pixel_id        = value
+          when 'google_conversion_id'   then rc.google_conversion_id   = value    
+          when 'google_labels_function' then rc.google_labels_function = value
+          when 'fb_pixel_id'            then rc.fb_pixel_id            = value
+          when 'fb_vars_function'       then rc.fb_vars_function       = value
     	  end
     	end
     	

data/app/models/caboose/retargeting_config.rb

@@ -5,18 +5,27 @@ module Caboose
     belongs_to :site
     attr_accessible :id,
       :site_id,
-      :conversion_id,      
-      :labels_function,
-      :fb_pixel_id
+      :google_conversion_id,      
+      :google_labels_function,
+      :fb_pixel_id,
+      :fb_vars_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)      
+    def google_labels(request, page)
+      return [] if self.google_labels_function.nil? || self.google_labels_function.strip.length == 0      
+      return [self.google_labels_function] if self.google_labels_function.starts_with?('_')        
+      arr = eval(self.google_labels_function)      
       return [] if arr.nil?
       return [arr] if arr is_a? String
       return arr        
-    end        
+    end
+    
+    def fb_vars(request, page)
+      return nil if self.fb_vars_function.nil? || self.fb_vars_function.strip.length == 0
+      arr = eval(self.fb_vars_function)      
+      return [] if arr.nil?
+      return [arr] if arr is_a? String
+      return arr        
+    end
     
   end  
 end

data/app/models/caboose/schema.rb

@@ -18,7 +18,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
       #Caboose::Field     => { :page_block_id        => :block_id,
       #                        :page_block_field_id  => :field_type_id },
       #Caboose::FieldType => { :page_block_type_id   => :block_type_id },
-      Caboose::Block     => { :page_block_type_id   => :block_type_id }
+      Caboose::Block     => { :page_block_type_id   => :block_type_id },
+      Caboose::RetargetingConfig => { 
+        :conversion_id   => :google_conversion_id,
+        :labels_function => :google_labels_function
+      }
     }
   end
 
@@ -504,10 +508,11 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :variant_id            , :integer ]
       ],
       Caboose::RetargetingConfig => [
-        [ :site_id               , :integer ],
-        [ :conversion_id         , :string  ],                
-        [ :labels_function       , :text    ],
-        [ :fb_pixel_id           , :string  ]        
+        [ :site_id                , :integer ],
+        [ :google_conversion_id   , :string  ],                
+        [ :google_labels_function , :text    ],
+        [ :fb_pixel_id            , :string  ],
+        [ :fb_vars_function       , :text    ]        
       ],
       Caboose::Review => [
         [ :product_id            , :integer   ],

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

@@ -2,10 +2,10 @@
   <% rc = site.retargeting_config %> 
   <%
   # Google audiences
-  %><% rc.labels(request, page).each do |label| %>                                                  
+  %><% rc.google_labels(request, page).each do |label| %>                                                  
     <script type='text/javascript'>
     /* <![CDATA[ */
-    var google_conversion_id = <%= rc.conversion_id %>;
+    var google_conversion_id = <%= rc.google_conversion_id %>;
     var google_conversion_label = "<%= raw label %>";
     var google_custom_params = window.google_tag_params;
     var google_remarketing_only = true;
@@ -14,7 +14,7 @@
     <script type='text/javascript' src='//www.googleadservices.com/pagead/conversion.js'></script>
     <noscript>
     <div style='display:inline;'>
-    <img height='1' width='1' style='border-style:none;' alt='' src='//googleads.g.doubleclick.net/pagead/viewthroughconversion/<%= raw rc.conversion_id %>/?value=1.00&amp;currency_code=USD&amp;label=<%= raw label %>&amp;guid=ON&amp;script=0'/>
+    <img height='1' width='1' style='border-style:none;' alt='' src='//googleads.g.doubleclick.net/pagead/viewthroughconversion/<%= raw rc.google_conversion_id %>/?value=1.00&amp;currency_code=USD&amp;label=<%= raw label %>&amp;guid=ON&amp;script=0'/>
     </div>
     </noscript>
   <% end %>
@@ -34,8 +34,15 @@
       _fbq.push(['addPixelId', '<%= raw rc.fb_pixel_id %>']);
     })();
     window._fbq = window._fbq || [];
-    window._fbq.push(['track', 'PixelInitialized', {}]);
+    <% vars = rc.fb_vars(request, page) %>    
+    window._fbq.push(['track', 'PixelInitialized', <%= raw Caboose.json(vars) %>]);    
     </script>
-    <noscript><img height="1" width="1" alt="" style="display:none" src="https://www.facebook.com/tr?id=<%= raw rc.fb_pixel_id %>&amp;ev=PixelInitialized" /></noscript>
+    <noscript>
+      <%
+      cd = vars.collect{ |k,v| "cd[#{k}]=#{v}" }.join('&amp;')
+      cd = "&amp;#{cd}" if vars.count > 0
+      %>                          
+      <img height="1" width="1" border="0" alt="" style="display:none" src="https://www.facebook.com/tr?id=<%= raw rc.fb_pixel_id %>&amp;ev=PixelInitialized<%= raw cd %>" />      
+    </noscript>
   <% end %>
 <% end %>

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

@@ -5,10 +5,11 @@ rc = s.retargeting_config
 <%= render :partial => 'caboose/sites/admin_header' %>
 
 <p><div id='site_<%= s.id %>_use_retargeting'   ></div></p>
-<p><div id='retargetingconfig_<%= rc.id %>_fb_pixel_id' ></div></p>
-<p><div id='retargetingconfig_<%= rc.id %>_conversion_id'   ></div></p>
+
+<h2>Google</h2>
+<p><div id='retargetingconfig_<%= rc.id %>_google_conversion_id'   ></div></p>
 <p><code>def google_conversion_labels_function(request, page) {</code></p>
-<p><div id='retargetingconfig_<%= rc.id %>_labels_function' ></div></p>
+<p><div id='retargetingconfig_<%= rc.id %>_google_labels_function' ></div></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 />
@@ -17,6 +18,16 @@ rc = s.retargeting_config
 &nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
 }</code></p>
 
+<h2>Facebook</h2>
+<p><div id='retargetingconfig_<%= rc.id %>_fb_pixel_id' ></div></p>
+<p><code>def facebook_custom_data_function(request, page) {</code></p>
+<p><div id='retargetingconfig_<%= rc.id %>_fb_vars_function' ></div></p>
+<p><code>
+&nbsp;&nbsp;# This function returns an array of key/value strings.<br />
+&nbsp;&nbsp;# Example:<br />
+&nbsp;&nbsp;# return { 'segment' => 'General' }<br />
+}</code></p>
+
 <%= render :partial => 'caboose/sites/admin_footer' %>
 
 <% content_for :caboose_js do %>
@@ -38,9 +49,10 @@ $(document).ready(function() {
     update_url: "/admin/sites/<%= @site.id %>/retargeting",
     authenticity_token: '<%= form_authenticity_token %>',
     attributes: [
-      { name: 'conversion_id'      , nice_name: 'Google 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_pixel_id'        , nice_name: 'Facebook Pixel ID'           , type: 'text'     , value: <%= raw Caboose.json(rc.fb_pixel_id     ) %>, width: 600 }
+      { name: 'google_conversion_id'   , nice_name: 'Google Conversion ID'          , type: 'text'     , value: <%= raw Caboose.json(rc.google_conversion_id   ) %>, width: 600 },
+      { name: 'google_labels_function' , nice_name: 'Conversion Labels Function'    , type: 'textarea' , value: <%= raw Caboose.json(rc.google_labels_function ) %>, width: 600, height: 75, fixed_placeholder: false },
+      { name: 'fb_pixel_id'            , nice_name: 'Facebook Pixel ID'             , type: 'text'     , value: <%= raw Caboose.json(rc.fb_pixel_id            ) %>, width: 600 },
+      { name: 'fb_vars_function'       , nice_name: 'Facebook Custom Data Function' , type: 'textarea' , value: <%= raw Caboose.json(rc.fb_vars_function       ) %>, width: 600, height: 75, fixed_placeholder: false }
     ]    
   });
 });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.197'
+  VERSION = '0.5.198'
 end

metadata

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