caboose-cms 0.5.198 → 0.5.199

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGZkM2MyZWI1ZWFjOTAwN2I5NGY0OGMxNzcyN2U2MTU1Mzg0OGQ1Ng==
+    NzQ3ZmY5MGQxOTFkZmNjNzE1YTJiMmMwZTllMTU2MDM2NjFhMTlkOQ==
   data.tar.gz: !binary |-
-    OGRmZjI2NzRhYTRkZDIxZGFlNGY1ZjQ3MGZiYWQ3OGUxYzFmZDRhZQ==
+    OGE1ZmZlMWNhMmZmNmE1NjE0YTE2NWJmODE2NTY4NDkwMWQ4Y2NkMA==
 SHA512:
   metadata.gz: !binary |-
-    ZWExZjliZDA4MWMwMGVkODY0ZTQ5OGMwMWM0NGJiZmIzOTI3ZjFlNzM1ZTNj
-    NDFiNzU0OGI0NmE1MzhlOWQwYzhhOTY0NGY0Mzc1NTZjYjNjMzZlZmQwMTdk
-    NTUxY2RjNWNmOGMxM2UyY2ZjNGVmYzQ2YzE1MmFjOTY3MjIwZTQ=
+    OWUxNTY3MDU3YjgyYmQwMGMyNDJjZWExNDhkOTVlMGQ5N2FmYzU1OWNiZmNk
+    ZmE3MGI5NjM4OWQ2Yzc3YmNlZjY2NjllMWFmMDE5NDlkZjhmZTRiMTg4OTAw
+    OGJiYzI3MGU2OTE2YWFlMmM1NTNjMzViMGMwNTlkNmJjZDBhMjI=
   data.tar.gz: !binary |-
-    YThmMzA0OGY0MThjNmM1YWM1NjM2MzQ5MGJkZGFjOWZkZTYzYzdiMThmNGVh
-    OWY1ZjQwZDllNGYzNjQ1MzZmZGNjZGZiZjg1OWQ5MGZjYWY5OWVlNTdjODY1
-    ZWFiOGJhOWNmMjBkYjFlNTc3ZmE2YWI0OTg2NmMwZGI0NjM2M2Q=
+    YTdkMWJmMDYzMDMxMDhjOTUyZjQzNjVmMzQzNDc3ZjEwYWZjMmNmNmFmYmE0
+    Y2Y2ODMxNzNkYzViNGYzM2VlYTJiMDZiNjk3ZGVjM2RkNzMxMDZhMDY1ZWFl
+    N2ExZDZhOGU2MDNjOGNiNjQ5OTM5ZTc2Mzc3ZWUwNzcxOWQyMGM=

data/app/controllers/caboose/retargeting_controller.rb

@@ -1,3 +1,6 @@
+require 'cgi'
+require 'open-uri'
+require 'httparty'
 
 module Caboose
   class RetargetingController < ApplicationController
@@ -38,6 +41,65 @@ module Caboose
     	render :json => resp
     end
     
+    ## GET /admin/sites/:id/retargeting/fb-auth
+    #def admin_fb_auth      
+    #  if params[:code]                     
+    #    domain = "#{request.protocol}#{request.host}"
+    #    domain << ":#{request.port}" if request.port != 80
+    #    h = {
+    #      :client_id     => "664751370321086",
+    #      :redirect_uri  => "#{domain}/admin/sites/#{params[:site_id]}/retargeting/fb-auth/",
+    #      :client_secret => "7724cd8006af75d5ab89aa1157057e71",
+    #      :code          => params[:code]
+    #    }
+    #    h = h.collect{ |k,v| "#{k}=#{URI::encode(v)}" }.join('&')
+    #    resp = HTTParty.get("https://graph.facebook.com/oauth/access_token?#{h}")        
+    #    h = CGI::parse(resp.body)
+    #    
+    #    site = Site.find(params[:site_id])
+    #    rc = site.retargeting_config
+    #    rc.fb_access_token = h['access_token'].first         
+    #    rc.fb_access_token_expires = DateTime.now.utc + h['expires'].first.to_i.seconds
+    #    rc.save                
+    #    redirect_to "/admin/sites/#{site.id}/retargeting"
+    #    
+    #  else
+    #    domain = "#{request.protocol}#{request.host}"
+    #    domain << ":#{request.port}" if request.port != 80
+    #    h = {        
+    #      :client_id     => "664751370321086",
+    #      :redirect_uri => "#{domain}/admin/sites/#{params[:site_id]}/retargeting/fb-auth/",
+    #      :scope        => "ads_management"
+    #    }
+    #    h = h.collect{ |k,v| "#{k}=#{URI::encode(v)}" }.join('&')
+    #    redirect_to "https://www.facebook.com/dialog/oauth?#{h}"                    
+    #  end        
+    #end
+    #
+    ## GET /admin/sites/:site_id/retargeting/fb-audiences
+    #def admin_fb_audiences
+    #  site = Site.find(params[:site_id])
+    #  rc = site.retargeting_config
+    #  
+    #  resp = HTTParty.get("https://graph.facebook.com/v2.3/act_279723427/customaudiences", :query => {
+    #    :access_token => rc.fb_access_token,
+    #    :fields => "id,name,subtype,approximate_count"
+    #  })
+    #  render :json => resp.body      
+    #end
+    #
+    ## GET /admin/sites/:site_id/retargeting/fb-audiences/:custom_audience_id
+    #def admin_fb_audience_members
+    #  site = Site.find(params[:site_id])
+    #  rc = site.retargeting_config
+    #  
+    #  resp = HTTParty.get("https://graph.facebook.com/v2.3/#{params[:custom_audience_id]}", :query => {
+    #    :access_token => rc.fb_access_token,
+    #    :fields => "id,name,subtype,approximate_count"
+    #  })
+    #  render :json => resp.body
+    #end
+            
   end
 end
  

data/app/models/caboose/retargeting_config.rb

@@ -9,6 +9,8 @@ module Caboose
       :google_labels_function,
       :fb_pixel_id,
       :fb_vars_function
+      #:fb_access_token,
+      #:fb_access_token_expires
     
     def google_labels(request, page)
       return [] if self.google_labels_function.nil? || self.google_labels_function.strip.length == 0      
@@ -20,7 +22,7 @@ module Caboose
     end
     
     def fb_vars(request, page)
-      return nil if self.fb_vars_function.nil? || self.fb_vars_function.strip.length == 0
+      return [] 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

data/app/models/caboose/schema.rb

@@ -508,11 +508,13 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :variant_id            , :integer ]
       ],
       Caboose::RetargetingConfig => [
-        [ :site_id                , :integer ],
-        [ :google_conversion_id   , :string  ],                
-        [ :google_labels_function , :text    ],
-        [ :fb_pixel_id            , :string  ],
-        [ :fb_vars_function       , :text    ]        
+        [ :site_id                 , :integer  ],
+        [ :google_conversion_id    , :string   ],                
+        [ :google_labels_function  , :text     ],
+        [ :fb_pixel_id             , :string   ],
+        [ :fb_vars_function        , :text     ]
+        #[ :fb_access_token         , :string   ],
+        #[ :fb_access_token_expires , :datetime ]        
       ],
       Caboose::Review => [
         [ :product_id            , :integer   ],

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

@@ -31,18 +31,20 @@
         s.parentNode.insertBefore(fbds, s);
         _fbq.loaded = true;
       }
-      _fbq.push(['addPixelId', '<%= raw rc.fb_pixel_id %>']);
+      _fbq.push(['addPixelId', '<%= raw rc.fb_pixel_id %>']);      
     })();
-    window._fbq = window._fbq || [];
-    <% vars = rc.fb_vars(request, page) %>    
-    window._fbq.push(['track', 'PixelInitialized', <%= raw Caboose.json(vars) %>]);    
+    window._fbq = window._fbq || [];        
+    window._fbq.push(['track', 'PixelInitialized', {}]);
+    <% vars = rc.fb_vars(request, page) %>
+    <% vars.each do |v| %>    
+    window._fbq.push(['track', <%= raw Caboose.json(v) %>]);
+    <% end %>
     </script>
-    <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>                                
+      <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" />
+      <% vars.each do |v| %>            
+      <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=<%= raw v %>" />
+      <% end %>
     </noscript>
   <% end %>
 <% end %>

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

@@ -23,9 +23,11 @@ rc = s.retargeting_config
 <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 />
+&nbsp;&nbsp;# This function returns an event name string or an array of event names.<br />
+&nbsp;&nbsp;# Example 1:<br />
+&nbsp;&nbsp;# return "abc123"<br />
+&nbsp;&nbsp;# Example 2: <br />
+&nbsp;&nbsp;# return ["abc123", "xyz456"]<br />
 }</code></p>
 
 <%= render :partial => 'caboose/sites/admin_footer' %>

data/config/routes.rb

@@ -52,7 +52,11 @@ Caboose::Engine.routes.draw do
   #=============================================================================
   # Retargeting
   #=============================================================================
-  
+   
+  #get     "admin/sites/:site_id/retargeting/fb-auth"                          => "retargeting#admin_fb_auth"
+  #get     "admin/sites/:site_id/retargeting/fb-audiences"                     => "retargeting#admin_fb_audiences"
+  #get     "admin/sites/:site_id/retargeting/fb-audiences/:custom_audience_id" => "retargeting#admin_fb_audience_members"
+    
   get     "admin/sites/:site_id/retargeting"       => "retargeting#admin_edit"
   put     "admin/sites/:site_id/retargeting"       => "retargeting#admin_update"
   

data/lib/caboose/version.rb

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

metadata

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