facebook_app 0.0.8 → 0.0.9

data/README.textile

@@ -34,7 +34,12 @@ Controller
 before_filter :ensure_logged_in, :load_graph
 
 begin_tracking
-(start tracking at stage 1)
+(start tracking at stage 1), e.g. splash_choose page
+
+After redirect your app must match GET "logged_in" and connect it to something
+
+
+track_conversion(:conversion_event)
 
 login_as_app
 (you can log in as the app or as a user)

data/app/controllers/facebook_app/external_trackings_controller.rb

@@ -2,7 +2,7 @@ module FacebookApp
   class ExternalTrackingsController < FacebookAppController 
 
     def identified_signup 
-      Conversion.find_by_id(cookies[:conversion_id]).try(:sign_up_on_identified)
+      track_conversion(:sign_up_on_identified)
       show_single_pixel
     end
 

data/app/controllers/facebook_app/facebook_app_controller.rb

@@ -22,18 +22,20 @@ module FacebookApp
       needs_login = ! (session[:at] && session[:oauth_expiry] && session[:oauth_expiry].to_i > Time.now.utc.to_i )
       if needs_login
         # tracking is only relevant for users who will log in
-        begin_tracking
+        track_conversion(:see_permissions_dialogue)
         session[:oauth_expiry] = nil
         redirect_to oauth_code_link
       end
     end
 
     def begin_tracking
-      # only track the first time they visit
-      unless cookies[:conversion_id]
-        @conversion = Conversion.create(:marketing_mode =>params[:marketing_mode])
-        cookies[:conversion_id] = @conversion.id
-      end
+      Conversion.find_or_create(cookies[:conversion_id],params[:marketing_mode])
+    end
+
+    def track_conversion(conversion_state)
+      Conversion.track(cookies[:conversion_id], conversion_state)
+    rescue
+      
     end
 
     # loads the graph from the users point of view

data/app/controllers/facebook_app/oauth_controller.rb

@@ -2,7 +2,7 @@ module FacebookApp
   class OauthController < FacebookAppController 
 
     def denied 
-      Conversion.track(cookies[:conversion_id], :deny_permissions)
+      track_conversion(:deny_permissions)
       client_side_redirect= %Q{
       <script>
    top.location="#{identified_tracking_link}";
@@ -22,11 +22,11 @@ module FacebookApp
         session[:oauth_expiry] = token_expiration_time 
 
         if didnt_grant_extended_permissions 
-          Conversion.track(cookies[:conversion_id], :deny_extended_permissions)
+          track_conversion(:deny_extended_permissions)
           session[:at] = nil
           redirect_to facebook_app.identified_path
         else
-          Conversion.track(cookies[:conversion_id], :accept_permissions)
+          track_conversion(:accept_permissions)
           redirect_to logged_in_url 
         end
       end

data/app/models/facebook_app/conversion.rb

@@ -2,12 +2,15 @@ module FacebookApp
   class Conversion < ActiveRecord::Base
 
     set_table_name "facebook_app_conversions"
-    state_machine :state,  :initial => :permissions_dialogue do
+    state_machine :state,  :initial => :splash_page do
 
       # after_transition :on => :accept_permissions, :do => :record_permissions_acceptance
       # after_transition :on => :deny_permissions, :do => :record_permissions_denial
       # after_transition :on => :generated_infographic, :do => :record_infographic_generation
-      #
+      
+      event :see_permissions_dialogue do
+        transition :splash_page => :permissions_dialogue
+      end
 
       event :deny_permissions do
         transition :permissions_dialogue => :denied_permissions
@@ -18,11 +21,11 @@ module FacebookApp
       end
 
       event :accept_permissions do
-        transition :permissions_dialogue => :installed
+        transition [:deny_permissions, :denied_extended_permissions, :permissions_dialogue] => :installed
       end
 
       event :generate_infographic do
-        transition [:accept_permissions, :installed] => :generated_infographic
+        transition [:installed] => :generated_infographic
       end
 
       event :sign_up_on_identified do 
@@ -30,16 +33,16 @@ module FacebookApp
       end
     end
 
-    def self.find_or_create(conversion_id)
+    def self.find_or_create(conversion_id, marketing_mode)
       find(conversion_id)
     rescue
-      create
+      create(:marketing_mode => marketing_mode)
     end
 
-    def self.track(conversion_id, conversion_state=nil)
-      conversion = find_or_create(conversion_id)
-      conversion.send(conversion_state) unless conversion_state.nil?
-      conversion
+    def self.track(conversion_id, conversion_event=nil, marketing_mode=nil)
+      find_or_create(conversion_id, marketing_mode)
+      conversion.send(conversion_event) unless conversion_event.nil?
+      return conversion
     end
 
     def recent? 

data/app/models/facebook_app/conversion_summary.rb

@@ -5,6 +5,10 @@ module FacebookApp
       (send(state, :viral).to_i.fdiv(send(state, :advertising).to_i)*100).to_s
     end
 
+    def splash_state_count(marketing_mode)
+      state_count(:splash_page, marketing_mode).to_s
+    end
+
     def permissions_state_count(marketing_mode)
       state_count(:permissions_dialogue, marketing_mode).to_s
     end
@@ -45,10 +49,14 @@ module FacebookApp
     # as per state machine
     def state_fragment(state_to_calculate)
       case state_to_calculate 
+      when :splash_page
+        "state in ('splash_page', 'generated_infographic', 'denied_permissions', 'denied_extended_permissions', 'installed', 'signed_up_for_identified', 'permissions_dialogue')"
       when :permissions_dialogue
         "state in ('generated_infographic', 'denied_permissions', 'denied_extended_permissions', 'installed', 'signed_up_for_identified', 'permissions_dialogue')"
       when :installed
         "state in ('installed', 'generated_infographic', 'signed_up_for_identified')"
+      when :generated_infographic
+        "state in ('generated_infographic', 'signed_up_for_identified')"
       else
         "state = '#{state_to_calculate.to_s}'"
       end

data/app/views/facebook_app/admin/_spamalytics.html.slim

@@ -1,4 +1,6 @@
 h1 Spamalytics 
+h2 Unique users who reached splash page
+= render :partial => 'conversion_stage', :locals => {:state => :splash_page, :conversion_summary => conversion_summary }
 h2 Unique users who saw permissions dialogue for this app 
 = render :partial => 'conversion_stage', :locals => {:state => :permissions_state_count, :conversion_summary => conversion_summary }
 h2 Unique users who installed this facebook app (accepted permissions) 

data/lib/facebook_app/version.rb

@@ -1,3 +1,3 @@
 module FacebookApp
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -2,7 +2,7 @@
 name: facebook_app
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Jack Kinsella
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-01 00:00:00 Z
+date: 2011-11-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails