caboose-cms 0.3.22 → 0.3.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzhlOGU4ZDRlZmYxZGIzODk0Zjk0NDhhM2IwYjM2ZTViMjlmZTA2ZA==
+    YjRhNDNkZjU2Mjg1Yjc5ODg2ZGJjYjk5YzBjOTg2NWIwMDI2NWRjNg==
   data.tar.gz: !binary |-
-    OWUwZmM5MjdkNmEwNWJkMWIzYjlkN2Q4NTBiMjliZmNkNDM5MzZiNQ==
+    NDUzODg4YzcyZmRjMzdiMjE2N2U3NmM0MDRjYWIxZTUxNTdiZDI0Ng==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YjNhYjE1MzU1ZmU4NTQzOWFjMDY5ZmVjM2UwY2NhMzFmNDViMjE0ZTBhY2Ux
-    NDA1ODFiMGQyZGMzNWQ1MTcxZjMxMGI1MjAzZDliYjNlYzdlNWE4YTY4Yzc0
-    OTRmMzkwMmFkODcxYmVkM2I5MzAzMmI1YWU2NDI3NDQwZjJmYWU=
+    ODhkMTgwZjkyYmJkMThmNjI2NTNkZDJjNjBiODk0ZWQxZWE3OGFiODRiZDVk
+    N2ZhNDBkMjM2MDRiOTQ4MjkxMGY0MDkxNDFkYTU0Y2U4ZjA1Y2M4MTgwMjhj
+    MGI3ZWQ1MjU1YmNjNWFmYmNkZjVmNzkzNWQ0ZmEyYjBkZGNkMjU=
   data.tar.gz: !binary |-
-    ZmQ2YTQ4N2Q4M2U3MGJkYWYwNmNhYjczZDU4YTEzZmYwODM2NDBhN2RlMDRm
-    NDBkMGU4ZGJiZDAxMjI2NWRkMGQzMjc2ZTVkOTQ5YTNiYWFkNTMwNjMyNmE5
-    MTg5N2M5Yjc4ZjY3Yjg3Y2FhOTkwMTY5M2Q3NGIxM2UyM2Q1N2Y=
+    MTk2MTc5MTQyZGU2NzdlYzc1OWRlOGFkZTRmNzNlZjA5YzM3YmFmM2M0MDRh
+    Y2U0NmMyYzQzZjFhNWViMmJmMjY4NmIzZTQ2ZmI1N2I1MDJmYmQ3ODE3Njlm
+    OWYwN2Y2MWU3ZTc3YWY2MTE4ZjFlMzEwYWQ5ODE1OGY2NmIxNmE=

data/app/controllers/caboose/ab_options_controller.rb

@@ -36,8 +36,8 @@ module Caboose
       save = true
       params.each do |k,v|
         case k
-          when 'text'
-            opt.text = v
+          when 'value'
+            opt.value = v
             break
         end
       end      

data/app/controllers/caboose/application_controller.rb

@@ -13,7 +13,9 @@ module Caboose
       @page = Page.page_with_uri(request.fullpath)
       
       session['use_redirect_urls'] = true if session['use_redirect_urls'].nil?
-      assign_ab_variants      
+      
+      # Initialize AB Testing
+      AbTesting.init(request.session_options[:id])      
       
       @crumb_trail  = Caboose::Page.crumb_trail(@page)
 		  @subnav       = {}
@@ -174,44 +176,6 @@ module Caboose
         return "" if v.nil?    
       return v.val
     end
-    
-    #===========================================================================
-    # AB Testing
-    #===========================================================================
-    
-    # Sets the ab_variants for the user's session
-    def assign_ab_variants
-      return if session['ab_variants']
-            
-      h = {}
-      arr = []
-      AbVariant.find_each do |var|
-        next if var.ab_options.nil? || var.ab_options.count == 0
-        i = rand(var.ab_options.count)
-        h[var.analytics_name] = var.ab_options[i].text
-        arr << "#{var.analytics_name}=#{i+1}"
-      end
-      session['ab_variants'] = h
-      session['ab_variants_analytics_string'] = "|#{arr.join('|')}|"
-    end
-
-    # Get the variant option text for the given variant name.     
-    def ab_option_for(analytics_name)
-      assign_ab_variants if session['ab_variants'].nil?
-      return session['ab_variants'][analytics_name] if !session['ab_variants'][analytics_name].nil?
-
-      # Otherwise, add the new variant to the session
-      var = AbVariant.find(:analytics_name => analytics_name).first
-      i = rand(var.ab_options.count)        
-      session['ab_variants'][var.analytics_name] = var.ab_options[i].text      
-      session['ab_variants_analytics_string'] << "#{var.analytics_name}=#{i+1}|"
-    end
-    
-    # Gets the string to be sent to google analytics
-    def analytics_string
-      assign_ab_variants if session['ab_variants_analytics_string'].nil?
-      return "#{session['ab_variants_analytics_string']}"
-    end      
       
   end
 end

data/app/controllers/caboose/page_blocks_controller.rb

@@ -33,6 +33,11 @@ module Caboose
       return unless user_is_allowed('pages', 'edit')      
       b = PageBlock.find(params[:id])
       bt = b.page_block_type
+      if bt.nil?
+        bt = PageBlockType.where(:name => 'richtext').first 
+        b.page_block_type_id = bt.id
+        b.save
+      end
       html = nil
       
       if bt.use_render_function && bt.render_function
@@ -55,6 +60,11 @@ module Caboose
       p = Page.find(params[:page_id])
       blocks = p.page_blocks.collect do |b|
         bt = b.page_block_type
+        if bt.nil?
+          bt = PageBlockType.where(:name => 'richtext').first 
+          b.page_block_type_id = bt.id
+          b.save
+        end
         html = nil        
         if bt.use_render_function && bt.render_function
           html = b.render_from_function(params[:empty_text])        

data/app/helpers/caboose/pages_helper.rb

@@ -19,10 +19,9 @@ module Caboose
       str << "</li>"
       return str
     end
-    
-    def ab_variants_analytics_code
-      str = session['ab_variants_analytics_string']
-      return "var _gaq = _gaq || [];\n_gaq.push(['_setCustomVar', 1, 'caboose_ab_variants', #{Caboose.json(str)}]);"            
+
+    def ab_testing_analytics_code
+      return "var _gaq = _gaq || [];\n_gaq.push(['_setCustomVar', 1, 'caboose_ab_variants', #{Caboose.json(AbTesting.analytics_string)}]);"            
     end
     
   end

data/app/models/caboose/ab_option.rb

@@ -2,6 +2,7 @@ class Caboose::AbOption < ActiveRecord::Base
 
   self.table_name = "ab_options"
   belongs_to :ab_variant
-  attr_accessible :text, :ab_variant_id
+  has_many :ab_values, :dependent => :destroy  
+  attr_accessible :value, :ab_variant_id
 
 end

data/app/models/caboose/ab_testing.rb

@@ -0,0 +1,38 @@
+module Caboose
+  class AbTesting
+    
+    @@session_id = nil
+    
+    # Sets the ab_variants for the user's session
+    def self.init(session_id)
+      @@session_id = "#{session_id}"
+      AbVariant.all.each { |var| self.create_ab_value(var) }
+    end
+    
+    # Ensure that an ab_value exists for the given session and variant 
+    def self.create_ab_value(var)      
+      if AbValue.where(:session_id => @@session_id, :ab_variant_id => var.id).exists?
+        return AbValue.where(:session_id => @@session_id, :ab_variant_id => var.id).first
+      end
+      return AbValue.create(:session_id => @@session_id, :ab_variant_id => var.id, :ab_option_id  => var.random_option.id)      
+    end
+   
+    # Get this session's ab_value value for the variant with the given analytics name
+    def self.[](analytics_name)
+      return self.value_for_name(analytics_name)      
+    end
+ 
+    def self.value_for_name(analytics_name)
+      return nil if !AbVariant.where(:analytics_name => analytics_name).exists?  
+      var = AbVariant.where(:analytics_name => analytics_name).first 
+      abv = self.create_ab_value(var) 
+      return abv.ab_option.value
+    end      
+
+    # Get the analytics string
+    def self.analytics_string
+      arr = AbValue.where(:session_id => @@session_id).all.collect { |abv| abv.keyval }
+      return "|#{arr.join('|')}|"
+    end
+  end
+end

data/app/models/caboose/ab_value.rb

@@ -0,0 +1,12 @@
+class Caboose::AbValue < ActiveRecord::Base
+
+  self.table_name = "ab_values"
+  belongs_to :ab_variant
+  belongs_to :ab_option
+  attr_accessible :session_id, :ab_variant_id, :ab_option_id
+  
+  def keyval
+    return "#{ab_variant.analytics_name}=#{ab_option_id}"
+  end
+    
+end

data/app/models/caboose/ab_variant.rb

@@ -6,17 +6,12 @@ class Caboose::AbVariant < ActiveRecord::Base
   self.table_name = "ab_variants"
   
   has_many :ab_options, :order => 'id', :dependent => :destroy
+  has_many :ab_values, :dependent => :destroy
   attr_accessible :name, :analytics_name
-
-  def get_session_option
-    return "" unless self.ab_options
-    opt = self.ab_options.sample
-    return {text: opt.text, id: opt.id}
+  
+  def random_option
+    return nil if self.ab_options.nil? || self.ab_options.count == 0
+    return self.ab_options.sample    
   end
   
-  #def random_option
-  #  return nil self.ab_options.nil? || self.ab_options.count == 0
-  #  return self.ab_options.sample    
-  #end
-
 end

data/app/models/caboose/core_plugin.rb

@@ -39,10 +39,7 @@ class Caboose::CorePlugin < Caboose::CaboosePlugin
     item['children'] << { 'id' => 'pages'        , 'text' => 'Pages'       , 'href' => '/admin/pages'        , 'modal' => false } if user.is_allowed('pages'       , 'view')
     item['children'] << { 'id' => 'posts'        , 'text' => 'Posts'       , 'href' => '/admin/posts'        , 'modal' => false } if user.is_allowed('posts'       , 'view')
     
-    nav << item if item['children'].count > 0    
-    if user.is_allowed('ab-variants','view')
-      nav << { 'id' => 'ab_variants', 'text' => 'AB Testing', 'href' => '/admin/ab-variants', 'modal' => false }
-    end
+    nav << item if item['children'].count > 0        
     return nav
   end
   

data/app/models/caboose/schema.rb

@@ -12,7 +12,9 @@ class Caboose::Schema < Caboose::Utilities::Schema
   def self.removed_columns
     {
       Caboose::PageBlock => [:block_type, :value, :name],      
-      Caboose::PageBlockField => [:model_binder_options]      
+      Caboose::PageBlockField => [:model_binder_options],
+      Caboose::AbValue => [:i, :text],
+      Caboose::AbOption => [:text]
     }
   end
   
@@ -147,9 +149,14 @@ class Caboose::Schema < Caboose::Utilities::Schema
         [ :name           , :string ],
         [ :analytics_name , :string ],
       ],
-      Caboose::AbOption => [
-        [ :text          , :string  ],
-        [ :ab_variant_id , :integer ]
+      Caboose::AbOption => [        
+        [ :ab_variant_id , :integer ],
+        [ :value         , :string  ]
+      ],
+      Caboose::AbValue => [
+        [ :session_id    , :string  ],
+        [ :ab_variant_id , :integer ],
+        [ :ab_option_id  , :integer ]
       ],
       Caboose::DatabaseSession => [
         [ :session_id  , :string   , :null => false ],

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

@@ -9,7 +9,7 @@
   <table>
   <% @variant.ab_options.each do |opt| %>
     <tr>
-      <td><div id="aboption_<%= opt.id %>_text"></div></td>
+      <td><div id="aboption_<%= opt.id %>_value"></div></td>
       <td><input type='button' value='Delete' onclick="delete_option(<%= opt.id %>);" /></td>
     </tr>
   <% end %>
@@ -55,9 +55,7 @@ function add_option() {
   $.ajax({
     url: '/admin/ab-variants/<%= @variant.id %>/options',
     type: 'post',
-    data: {
-      text: ""
-    },
+    data: { value: "" },
     success: function(resp) {
       if (resp.error) $('#message').html("<p class='note error'>" + resp.error + "</p>");
       if (resp.redirect) window.location.reload(true);
@@ -87,7 +85,7 @@ $(document).ready(function() {
         update_url: '/admin/ab-options/<%= opt.id %>',
         authenticity_token: '<%= form_authenticity_token %>',
         attributes: [
-          { name: 'text', nice_name: 'Option <%= i %>', type: 'text', value: <%= raw Caboose.json(opt.text) %> , width: 800 }            
+          { name: 'value', nice_name: 'Option <%= i %>', type: 'text', value: <%= raw Caboose.json(opt.value) %> , width: 800 }            
         ]
       });
       <% i = i + 1 %>

data/app/views/caboose/pages/show.html.erb

@@ -15,7 +15,12 @@
 
 <% content_for :page_title   do %><%= raw @page.title   %><% end %>
 <% content_for :page_content do %><% @page.blocks.each do |b|
-  bt = b.page_block_type       
+  bt = b.page_block_type
+  if bt.nil?
+    bt = PageBlockType.where(:name => 'heading').first 
+    b.page_block_type_id = bt.id
+    b.save
+  end
   if bt.use_render_function && bt.render_function
     %><%= raw b.render_from_function(params[:empty_text]) %><%        
   else        

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.3.22'
+  VERSION = '0.3.23'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.22
+  version: 0.3.23
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -189,6 +189,8 @@ files:
 - app/helpers/caboose/permissions_helper.rb
 - app/helpers/caboose/products_helper.rb
 - app/models/caboose/ab_option.rb
+- app/models/caboose/ab_testing.rb
+- app/models/caboose/ab_value.rb
 - app/models/caboose/ab_variant.rb
 - app/models/caboose/approval_request.rb
 - app/models/caboose/asset.rb