i_wonder 0.0.9 → 0.1.1

data/README.rdoc

@@ -1,4 +1,4 @@
-= IWonder (Alpha)
+= IWonder (Beat)
 
 Flexible Analytics, and Testing for every corner of your rails application. I read "The Lean Startup" and got inspired. There were a few good solutions, but none of them quite did what I was looking for. 
 

data/app/models/i_wonder/ab_test.rb

@@ -6,7 +6,7 @@ module IWonder
     
     has_many :test_group_memberships, :dependent => :destroy, :foreign_key => "ab_test_sym", :primary_key => :sym
 
-    has_many :ab_test_goals, :dependent => :destroy, :foreign_key => "ab_test_sym", :primary_key => :sym
+    has_many :ab_test_goals, :dependent => :destroy, :foreign_key => "ab_test_sym", :primary_key => "sym"
     accepts_nested_attributes_for :ab_test_goals, :allow_destroy => true
     
     hash_accessor :options, :test_group_names, :type => :array, :reject_blanks => true
@@ -18,6 +18,31 @@ module IWonder
     validates_uniqueness_of :sym, :on => :create, :message => "must be unique"
     validates_inclusion_of :test_applies_to, :in => %w( session user account ), :on => :create, :message => "extension %s is not included in the list"
     
+    
+    # ----------------------------------------------------------------------------------------------------------------------------------------
+    # These two methods should NOT be needed. For some reason the accepts_nested_attributes_for is not autosaving or deleting associated goals
+    
+    def ab_test_goals_attributes=(hash)
+      hash.each{|key,value|
+        goal = self.ab_test_goals.detect{|tg| tg.id == value["id"].to_i}
+        goal ||= self.ab_test_goals.build
+        goal.attributes = value
+        
+        if value["_destroy"] =~ /true|1/ or value["_destroy"].is_a?(TrueClass)
+          goal.mark_for_destruction
+        end
+      }
+    end
+    before_save :remove_deleted_test_goals
+    def remove_deleted_test_goals
+      ab_test_goals.select(&:marked_for_destruction?).each(&:destroy)
+      ab_test_goals.each(&:save)
+    end
+    
+    
+    # ----------------------------------------------------------------------------------------------------------------------------------------
+      
+    
     validate :has_two_groups_and_a_goal
     def has_two_groups_and_a_goal
       unless test_group_names.length >= 2
@@ -30,7 +55,7 @@ module IWonder
     end
       
     after_save :save_to_file
-    def save_to_file
+    def save_to_file      
       AbTesting::Loader.save_ab_test(self)
     end
       
@@ -47,7 +72,13 @@ module IWonder
       if(current_group = get_current_group(current_controller))
         return current_group.test_group_name
       else
-        test_group = add_to_test_group(randomly_chosen_test_group, current_controller)
+        begin
+          test_group = add_to_test_group(randomly_chosen_test_group, current_controller)
+        rescue Exception => e
+          # If there is some error, just return a randome option. Better not to crash
+          # TODO: this should warn developer somehow
+          return randomly_chosen_test_group
+        end
         return test_group.test_group_name
       end
     end
@@ -71,7 +102,9 @@ module IWonder
       
       scoped_groups_with_goal_events = ab_test_goal.add_goal_to_query(scoped_groups_with_events)
       
-      scoped_groups_with_goal_events.count
+      scoped_groups_with_goal_events = scoped_groups_with_goal_events.select("COUNT(DISTINCT i_wonder_events.#{event_membership_key}) as count_all")
+      
+      AbTest.connection.execute(scoped_groups_with_goal_events.to_sql)[0]["count_all"].to_i
     end
 
     def from_xml(xml)

data/app/models/i_wonder/ab_test_goal.rb

@@ -14,6 +14,14 @@ module IWonder
     validates_presence_of :event_type, :if => :tracks_event?
     validates_presence_of :page_view_controller, :if => :tracks_page_view?
     
+    before_validation :clean_up_controller
+    def clean_up_controller
+      if tracks_page_view?
+        page_view_controller.gsub!("Controller", "")
+        page_view_controller.downcase!
+      end
+    end
+    
     def tracks_event?
       goal_type == "Event"
     end
@@ -26,7 +34,7 @@ module IWonder
       if tracks_event?
         sc = scoped_statement.where("i_wonder_events.event_type = ?", event_type)
       else
-        sc = scoped_statement.where("i_wonder_events.event_type = ? AND controller = ?", "hit", page_view_controller)
+        sc = scoped_statement.where("i_wonder_events.event_type = ? AND i_wonder_events.controller = ?", "hit", page_view_controller)
         
         if page_view_action.present?
           sc = sc.where("i_wonder_events.action = ?", page_view_action)

data/app/views/i_wonder/ab_tests/index.html.erb

@@ -15,7 +15,7 @@
 	</ul>
 <% end %>
 
-<% unless Rails.env.production? %>
+<% if Rails.env.development? %>
 	<p>
 		<%= button_to "Create a new ABTest", url_for(:action => :new), :method => :get%>
 	</p>

data/app/views/i_wonder/ab_tests/show.html.erb

@@ -1,12 +1,12 @@
 <div class="show">
-	<% if Rails.env.production? %>
-		<span class="description">No Modifying tests in production</span>
-	<% else %>
+	<% if Rails.env.development? %>
 		<p>
 			<%= link_to "Edit", edit_ab_test_path(@ab_test) %>
 			|
 			<%= link_to "Delete", @ab_test, :method => :delete, :confirm => "Are you sure?" %>
 		</p>
+	<% else %>
+		<span class="description">No Modifying tests in production</span>
 	<% end %>
 	
 	<h2>I wonder <%= @ab_test.name%>?</h2>

data/lib/i_wonder/engine.rb

@@ -5,8 +5,7 @@ module IWonder
     
     initializer "i_wonder.loading_tests" do |app|
       
-      # can't load if it's migrating the db
-      unless ( File.basename($0) == "rake" && ARGV.include?("db:migrate") )
+      unless File.basename($0) == "rake" # don't run on rake tasks (migration and asset:precompile have cause lot's of problems)
         ActiveRecord::Base.send :include, HashAccessor # this is to avoid load order issues from a required gem
         AbTesting::Loader.load_all
       end
@@ -28,7 +27,7 @@ class Railtie < Rails::Railtie
     ApplicationController.send :include, IWonder::Logging::ActionControllerMixins
     ApplicationController.send :include, IWonder::AbTesting::ActionControllerMixins
     
-    ActiveRecord.send :include, IWonder::Logging::ActiveRecordMixins
+    ActiveRecord::Base.send :include, IWonder::Logging::ActiveRecordMixins
   end
 
 end

data/lib/i_wonder/version.rb

@@ -1,3 +1,3 @@
 module IWonder
-  VERSION = "0.0.9"
+  VERSION = "0.1.1"
 end

data/test/dummy/log/development.log

@@ -67879,3 +67879,24 @@ Served asset /i_wonder/reports.js - 304 Not Modified (0ms)
 
 Started GET "/assets/i_wonder/application.js?body=1" for 127.0.0.1 at 2011-10-31 11:41:44 -0700
 Served asset /i_wonder/application.js - 304 Not Modified (0ms)
+  IWonder::AbTest Load (1.4ms)  SELECT "i_wonder_ab_tests".* FROM "i_wonder_ab_tests" WHERE "i_wonder_ab_tests"."sym" = 'unique_sym_1' LIMIT 1
+WARNING: Can't mass-assign protected attributes: ab_test_goals
+WARNING: Can't mass-assign protected attributes: type, ab_test_sym
+   (0.1ms)  BEGIN
+   (0.4ms)  SELECT 1 FROM "i_wonder_ab_tests" WHERE "i_wonder_ab_tests"."name" = 'Unique Test 1' LIMIT 1
+   (0.2ms)  SELECT 1 FROM "i_wonder_ab_tests" WHERE "i_wonder_ab_tests"."sym" = 'unique_sym_1' LIMIT 1
+  SQL (3.3ms)  INSERT INTO "i_wonder_ab_tests" ("created_at", "description", "name", "options", "sym", "test_applies_to", "test_group_data", "updated_at") VALUES ($1, $2, $3, $4, $5, $6, $7, $8) RETURNING "id"  [["created_at", Tue, 01 Nov 2011 01:12:12 UTC +00:00], ["description", nil], ["name", "Unique Test 1"], ["options", "--- \n:test_group_names: \n- Options 1\n- Options 2\n"], ["sym", "unique_sym_1"], ["test_applies_to", "session"], ["test_group_data", "--- {}\n\n"], ["updated_at", Tue, 01 Nov 2011 01:12:12 UTC +00:00]]
+  SQL (0.7ms)  INSERT INTO "i_wonder_ab_test_goals" ("ab_test_sym", "options") VALUES ($1, $2) RETURNING "id"  [["ab_test_sym", "unique_sym_1"], ["options", "--- \n:event_type: success\n:goal_type: Event\n"]]
+   (0.6ms)  COMMIT
+PGError: ERROR:  column "member_id" does not exist
+LINE 1: SELECT DISTINCT(member_id), COUNT(*) FROM "i_wonder_events" 
+                        ^
+: SELECT DISTINCT(member_id), COUNT(*) FROM "i_wonder_events" 
+PGError: ERROR:  column "i_wonder_events.session_id" must appear in the GROUP BY clause or be used in an aggregate function
+LINE 1: SELECT DISTINCT(session_id), COUNT(*) FROM "i_wonder_events"...
+                        ^
+: SELECT DISTINCT(session_id), COUNT(*) FROM "i_wonder_events" 
+PGError: ERROR:  column "i_wonder_events.id" must appear in the GROUP BY clause or be used in an aggregate function
+LINE 1: SELECT "i_wonder_events".* FROM "i_wonder_events"  GROUP BY ...
+               ^
+: SELECT "i_wonder_events".* FROM "i_wonder_events"  GROUP BY session_id