Merge branch 'master' of http://github.com/allourideas/pairwise2

Conflicts: app/controllers/prompts_controller.rb

Merge branch 'master' of http://github.com/allourideas/pairwise2
Conflicts: app/controllers/prompts_controller.rb
Dmitri Garbuzov
2 parents 35d6ac47 dc8b6a29
Showing 24 changed files with 140 additions and 285 deletions Show diff stats
app/controllers/choices_controller.rb
app/controllers/items_controller.rb
app/controllers/prompts_controller.rb
app/controllers/questions_controller.rb
app/controllers/visitors_controller.rb
app/helpers/items_helper.rb
app/models/choice.rb
app/models/item.rb
app/models/prompt.rb
app/models/question.rb
app/models/user.rb
app/models/visitor.rb
app/views/items/edit.html.erb
app/views/items/index.html.erb
app/views/items/new.html.erb
app/views/items/show.html.erb
app/views/layouts/items.html.erb
db/migrate/20100621162849_add_creator_to_choices.rb
lib/tasks/test_api.rake
spec/models/choice_spec.rb
@@ -12,8 +12,8 @@ class ChoicesController &lt; InheritedResources::Base
       find_options = {:conditions => {:question_id => @question.id},
 		      :limit => params[:limit].to_i, 
-		      :order => 'score DESC', 
-		      :include => :item}
+		      :order => 'score DESC'
+		      }
       find_options[:conditions].merge!(:active => true) unless params[:include_inactive]
       find_options.merge!(:offset => params[:offset]) if params[:offset]
@@ -23,9 +23,9 @@ class ChoicesController &lt; InheritedResources::Base
     else
       @question = Question.find(params[:question_id], :include => :choices) #eagerloads ALL choices
       unless params[:include_inactive]
-        @choices = @question.choices(true).active.find(:all, :include => :item)
+        @choices = @question.choices(true).active.find(:all)
       else
-        @choices = @question.choices.find(:all, :include =>:item)
+        @choices = @question.choices.find(:all)
       end
     end
     index! do |format|
@@ -38,7 +38,7 @@ class ChoicesController &lt; InheritedResources::Base
     show! do |format|
       format.xml { 
         @choice.reload
-        render :xml => @choice.to_xml(:methods => [:item_data, :wins_plus_losses, :question_name])}
+        render :xml => @choice.to_xml(:methods => [:wins_plus_losses])}
       format.json { render :json => @choice.to_json(:methods => [:data])}
     end 
   end
@@ -1,86 +0,0 @@
-class ItemsController < ApplicationController
-  before_filter :authenticate
-  # GET /items
-  # GET /items.xml
-  def index
-    @items = Item.all
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.xml  { render :xml => @items }
-    end
-  end
-
-  # GET /items/1
-  # GET /items/1.xml
-  def show
-    @item = Item.find(params[:id])
-
-    respond_to do |format|
-      format.html # show.html.erb
-      format.xml  { render :xml => @item }
-    end
-  end
-
-  # GET /items/new
-  # GET /items/new.xml
-  def new
-    @item = Item.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.xml  { render :xml => @item }
-    end
-  end
-
-  # GET /items/1/edit
-  def edit
-    @item = Item.find(params[:id])
-  end
-
-  # POST /items
-  # POST /items.xml
-  def create
-    @item = Item.new(params[:item])
-
-    respond_to do |format|
-      if @item.save
-        flash[:notice] = 'Item was successfully created.'
-        format.html { redirect_to(@item) }
-        format.xml  { render :xml => @item, :status => :created, :location => @item }
-      else
-        format.html { render :action => "new" }
-        format.xml  { render :xml => @item.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /items/1
-  # PUT /items/1.xml
-  def update
-    @item = Item.find(params[:id])
-
-    respond_to do |format|
-      if @item.update_attributes(params[:item])
-        flash[:notice] = 'Item was successfully updated.'
-        format.html { redirect_to(@item) }
-        format.xml  { head :ok }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @item.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /items/1
-  # DELETE /items/1.xml
-  def destroy
-    @item = Item.find(params[:id])
-    @item.destroy
-
-    respond_to do |format|
-      format.html { redirect_to(items_url) }
-      format.xml  { head :ok }
-    end
-  end
-end
@@ -67,6 +67,7 @@ class PromptsController &lt; InheritedResources::Base
               format.xml { render :xml => @prompt.to_xml, :status => :conflict and return} 
            end
        end
+
        response = @question.prompts.find(@question_optional_information.delete(:picked_prompt_id))
        @question_optional_information.each do |key, value|
           optional_information << Proc.new { |options| options[:builder].tag!(key, value)}
@@ -85,7 +86,7 @@ class PromptsController &lt; InheritedResources::Base
   def show
     @question = current_user.questions.find(params[:question_id])
-    @prompt = @question.prompts.find(params[:id], :include => [{ :left_choice => :item }, { :right_choice => :item }])
+    @prompt = @question.prompts.find(params[:id], :include => [:left_choice ,:right_choice ])
     show! do |format|
       format.xml { render :xml => @prompt.to_xml(:methods => [:left_choice_text, :right_choice_text])}
       format.json { render :json => @prompt.to_json(:methods => [:left_choice_text, :right_choice_text])}
@@ -27,12 +27,12 @@ class QuestionsController &lt; InheritedResources::Base
   end
   def object_info_totals_by_question_id
-      total_ideas_by_q_id = Choice.count(:include => ['item', 'question'], 
-		          :conditions => "items.creator_id <> questions.creator_id", 
+      total_ideas_by_q_id = Choice.count(:include => :question, 
+		          :conditions => "choices.creator_id <> questions.creator_id", 
 			  :group => "choices.question_id")
-      active_ideas_by_q_id = Choice.count(:include => ['item', 'question'], 
-		          :conditions => "choices.active = 1 AND items.creator_id <> questions.creator_id", 
+      active_ideas_by_q_id = Choice.count(:include => :question, 
+		          :conditions => "choices.active = 1 AND choices.creator_id <> questions.creator_id", 
 			  :group => "choices.question_id")
       combined_hash = {}
@@ -174,8 +174,7 @@ class QuestionsController &lt; InheritedResources::Base
     elsif object_type == "uploaded_ideas"
 	    uploaded_ideas_by_visitor_id = @question.choices.find(:all, :select => 'creator_id, count(*) as ideas_count', 
-								   :joins => [:item], 
-								   :conditions => "items.creator_id != #{@question.creator_id}", 
+								   :conditions => "choices.creator_id != #{@question.creator_id}", 
 	                                                           :group => 'creator_id')
 	    count = 0
@@ -255,8 +254,7 @@ class QuestionsController &lt; InheritedResources::Base
     elsif object_type == 'skips'
       hash = Skip.count(:conditions => {:question_id => @question.id}, :group => "date(created_at)")
     elsif object_type == 'user_submitted_ideas'
-      hash = Choice.count(:include => 'item', 
-		          :conditions => "choices.question_id = #{@question.id} AND items.creator_id <> #{@question.creator_id}", 
+      hash = Choice.count(:conditions => "choices.question_id = #{@question.id} AND choices.creator_id <> #{@question.creator_id}", 
 			  :group => "date(choices.created_at)")
       # we want graphs to go from date of first vote -> date of last vote, so adding those two boundries here.
       mindate = Vote.minimum('date(created_at)', :conditions => {:question_id => @question.id})
@@ -299,8 +297,8 @@ class QuestionsController &lt; InheritedResources::Base
     if object_type == 'votes'
       hash = Vote.count(:group => "date(created_at)")
     elsif object_type == 'user_submitted_ideas'
-      hash = Choice.count(:include => ['item', 'question'], 
-		          :conditions => "items.creator_id <> questions.creator_id", 
+      hash = Choice.count(:include => :question, 
+		          :conditions => "choices.creator_id <> questions.creator_id", 
 			  :group => "date(choices.created_at)")
     elsif object_type == 'user_sessions'
       result = Vote.find(:all, :select => 'date(created_at) as date, voter_id, count(*) as vote_count', 
@@ -7,7 +7,7 @@ class VisitorsController &lt; InheritedResources::Base
 		visitor_ids = Visitor.find(:all, :conditions => { :identifier => session_ids})
 		votes_by_visitor_id = Vote.with_voter_ids(visitor_ids).count(:group => :voter_id) 
-		ideas_by_visitor_id = Item.with_creator_ids(visitor_ids).count(:group => :creator_id) 
+		ideas_by_visitor_id = Choice.count(:group => :creator_id) 
 		objects_by_session_id = {}
@@ -1,2 +0,0 @@
-module ItemsHelper
-end
 class Choice < ActiveRecord::Base
   belongs_to :question, :counter_cache => true
-  belongs_to :item
   belongs_to :creator, :class_name => "Visitor", :foreign_key => "creator_id"
   validates_presence_of :creator, :on => :create, :message => "can't be blank"
@@ -22,14 +21,6 @@ class Choice &lt; ActiveRecord::Base
   end 
   #attr_accessor :data
-  def question_name
-    question.name
-  end
-  
-  def item_data
-    item.data
-  end
-  
   def lose!
     self.loss_count += 1 rescue (self.loss_count = 1)
     self.score = compute_score
@@ -46,6 +37,7 @@ class Choice &lt; ActiveRecord::Base
     wins + losses
   end
+  # TODO delete these and refactor loss_count and votes_count into losses and wins
   def losses
     loss_count || 0
   end
@@ -55,11 +47,6 @@ class Choice &lt; ActiveRecord::Base
   end
   def before_create
-    #puts "just got inside choice#before_create. is set to active? #{self.active?}"
-    unless item
-      @item = Item.create!(:creator => creator, :data => data)
-      self.item = @item
-    end
     unless self.score
       self.score = 50.0
     end
@@ -82,7 +69,7 @@ class Choice &lt; ActiveRecord::Base
   end
   def user_created
-    self.item.creator_id != self.question.creator_id
+    self.creator_id != self.question.creator_id
   end
   def compute_bt_score(btprobs = nil)
@@ -110,11 +97,6 @@ class Choice &lt; ActiveRecord::Base
     self.save!
   end
-  def suspend!
-    (self.active = false)
-    self.save!
-  end
-  
   def deactivate!
     (self.active = false)
     self.save!
@@ -1,24 +0,0 @@
-class Item < ActiveRecord::Base
-  belongs_to :question, :counter_cache => true
-  belongs_to :site, :class_name => "User", :foreign_key => "site_id"
-  belongs_to :creator, :class_name => "Visitor", :foreign_key => "creator_id"
-  
-  named_scope :active, :conditions => { :active => true }
-  named_scope :with_creator_ids, lambda { |*args| {:conditions => {:creator_id=> args.first }} }
-  
-  # has_many :items_questions, :dependent => :destroy
-  # has_many :questions, :through => :items_questions
-  # has_and_belongs_to_many :prompts
-  # 
-  #   has_and_belongs_to_many :votes
-  #   has_and_belongs_to_many :prompt_requests
-
-  validates_presence_of :creator_id
-  validates_presence_of :data, :on => :create, :message => "can't be blank"
-  
-  def self.mass_insert!(creator_id, data_array)
-    #alpha
-    inserts = data_array.collect{|i| "(#{connection.quote i}, #{connection.quote creator_id})"}.join(", ")
-    connection.insert("INSERT INTO items(data, creator_id) VALUES (#{inserts})")
-  end
-end
@@ -10,6 +10,9 @@ class Prompt &lt; ActiveRecord::Base
   belongs_to :left_choice, :class_name => "Choice", :foreign_key => "left_choice_id", :counter_cache => true
   belongs_to :right_choice, :class_name => "Choice", :foreign_key => "right_choice_id", :counter_cache => true
+  validates_presence_of :left_choice, :on => :create, :message => "can't be blank"
+  validates_presence_of :right_choice, :on => :create, :message => "can't be blank"
+
   named_scope :with_left_choice, lambda { |*args| {:conditions => ["left_choice_id = ?", (args.first.id)]} }
   named_scope :with_right_choice, lambda { |*args| {:conditions => ["right_choice_id = ?", (args.first.id)]} }
   named_scope :with_choice, lambda { |*args| {:conditions => ["(right_choice_id = ?) OR (left_choice_id = ?)", (args.first.id)]} }
@@ -25,8 +28,6 @@ class Prompt &lt; ActiveRecord::Base
     select {|z| z.voted_on_by_user?(u)}
   end
-  validates_presence_of :left_choice, :on => :create, :message => "can't be blank"
-  validates_presence_of :right_choice, :on => :create, :message => "can't be blank"
   def choices
     [left_choice, right_choice]
@@ -37,7 +38,7 @@ class Prompt &lt; ActiveRecord::Base
   end
   def left_choice_text(prompt = nil)
-    left_choice.item.data
+    left_choice.data
   end
   def active?
@@ -46,7 +47,7 @@ class Prompt &lt; ActiveRecord::Base
   def right_choice_text(prompt = nil)
-    right_choice.item.data
+    right_choice.data
   end
 end
@@ -26,8 +26,7 @@ class Question &lt; ActiveRecord::Base
   def create_choices_from_ideas
     if ideas && ideas.any?
       ideas.each do |idea|
-        item = Item.create!(:data => idea.squish.strip, :creator => self.creator)
-	choices.create!(:item => item, :creator => self.creator, :active => true, :data => idea.squish.strip)
+	choices.create!(:creator => self.creator, :active => true, :data => idea.squish.strip)
       end
     end
   end
@@ -70,7 +69,7 @@ class Question &lt; ActiveRecord::Base
    raise NotImplementedError.new("Sorry, we currently only support pairwise prompts.  Rank of the prompt must be 2.") unless rank == 2
    begin
      choice_id_array = distinct_array_of_choice_ids(rank)
-     @p = prompts.find_or_create_by_left_choice_id_and_right_choice_id(choice_id_array[0], choice_id_array[1], :include => [{ :left_choice => :item }, { :right_choice => :item }])
+     @p = prompts.find_or_create_by_left_choice_id_and_right_choice_id(choice_id_array[0], choice_id_array[1], :include => [:left_choice ,:right_choice ])
      logger.info "#{@p.inspect} is active? #{@p.active?}"
    end until @p.active?
    return @p
@@ -173,7 +172,7 @@ class Question &lt; ActiveRecord::Base
    if params[:with_visitor_stats]
       visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
       result.merge!(:visitor_votes => visitor.votes.count(:conditions => {:question_id => self.id}))
-      result.merge!(:visitor_ideas => visitor.items.count)
+      result.merge!(:visitor_ideas => visitor.choices.count)
    end
    return result
@@ -303,14 +302,6 @@ class Question &lt; ActiveRecord::Base
      picked_prompt.id
    end
-   def left_choice_text(prompt = nil)
-     picked_prompt.left_choice.item.data
-   end
-
-   def right_choice_text(prompt = nil)
-     picked_prompt.right_choice.item.data
-   end
-
    def self.voted_on_by(u)
      select {|z| z.voted_on_by_user?(u)}
    end
@@ -516,7 +507,7 @@ class Question &lt; ActiveRecord::Base
 	     num_skips = self.skips.count(:conditions => {:prompt_id => left_prompts_ids + right_prompts_ids})
 	       csv << [c.question_id, c.id, "'#{c.data.strip}'", c.wins, c.losses, num_skips, c.score,
-		       user_submitted , c.item.creator_id, c.created_at, c.updated_at, c.active,
+		       user_submitted , c.creator_id, c.created_at, c.updated_at, c.active,
 		       left_appearances, right_appearances]
          end
        when 'non_votes'
@@ -3,7 +3,6 @@ class User &lt; ActiveRecord::Base
   has_many :visitors, :class_name => "Visitor", :foreign_key => "site_id"
   has_many :questions, :class_name => "Question", :foreign_key => "site_id"
   has_many :clicks, :class_name => "Click", :foreign_key => "site_id"
-  has_many :items, :class_name => "Item", :foreign_key => "site_id"
   def default_visitor
     visitors.find(:first, :conditions => {:identifier => 'owner'})
@@ -62,16 +61,6 @@ class User &lt; ActiveRecord::Base
     question.activate!
   end
-  def activate_choice(choice_id, options)
-    choice = Choice.find(choice_id)
-    choice.activate!
-  end
-  
-  def deactivate_choice(choice_id, options)
-    choice = Choice.find(choice_id)
-    choice.deactivate!
-  end
-  
   def deactivate_question(question_id, options)
     question = questions.find(question_id)
     question.deactivate!
@@ -3,7 +3,7 @@ class Visitor &lt; ActiveRecord::Base
   has_many :questions, :class_name => "Question", :foreign_key => "creator_id"
   has_many :votes, :class_name => "Vote", :foreign_key => "voter_id"
   has_many :skips, :class_name => "Skip", :foreign_key => "skipper_id"
-  has_many :items, :class_name => "Item", :foreign_key => "creator_id"
+  has_many :choices, :class_name => "Choice", :foreign_key => "creator_id"
   has_many :clicks
   has_many :appearances, :foreign_key => "voter_id"
@@ -1,12 +0,0 @@
-<h1>Editing item</h1>
-
-<% form_for(@item) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.submit 'Update' %>
-  </p>
-<% end %>
-
-<%= link_to 'Show', @item %> |
-<%= link_to 'Back', items_path %>
 \ No newline at end of file
@@ -1,18 +0,0 @@
-<h1>Listing items</h1>
-
-<table>
-  <tr>
-  </tr>
-
-<% @items.each do |item| %>
-  <tr>
-    <td><%= link_to 'Show', item %></td>
-    <td><%= link_to 'Edit', edit_item_path(item) %></td>
-    <td><%= link_to 'Destroy', item, :confirm => 'Are you sure?', :method => :delete %></td>
-  </tr>
-<% end %>
-</table>
-
-<br />
-
-<%= link_to 'New item', new_item_path %>
 \ No newline at end of file
@@ -1,11 +0,0 @@
-<h1>New item</h1>
-
-<% form_for(@item) do |f| %>
-  <%= f.error_messages %>
-
-  <p>
-    <%= f.submit 'Create' %>
-  </p>
-<% end %>
-
-<%= link_to 'Back', items_path %>
 \ No newline at end of file
@@ -1,3 +0,0 @@
-
-<%= link_to 'Edit', edit_item_path(@item) %> |
-<%= link_to 'Back', items_path %>
 \ No newline at end of file
@@ -1,17 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-       "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
-  <title>Items: <%= controller.action_name %></title>
-  <%= stylesheet_link_tag 'scaffold' %>
-</head>
-<body>
-
-<p style="color: green"><%= flash[:notice] %></p>
-
-<%= yield %>
-
-</body>
-</html>
@@ -0,0 +1,13 @@
+class AddCreatorToChoices < ActiveRecord::Migration
+  def self.up
+	add_column :choices, :creator_id, :integer
+	Choice.find(:all, :include => [:item]).each do |c|
+	  c.creator_id = c.item.creator_id
+	  c.save
+	end
+  end
+
+  def self.down
+	remove_column :choices, :creator_id
+  end
+end
@@ -496,16 +496,18 @@ namespace :test_api do
 	question.expire_prompt_cache_tracking_keys(Date.yesterday)
-	yesterday_votes = question.appearances.count(:conditions => ['date(created_at) = ?', Date.yesterday])
+	yesterday_appearances = question.appearances.count(:conditions => ['date(created_at) = ?', Date.yesterday])
-	if misses + hits != yesterday_votes
-	     error_message += "Error! Question #{question.id} isn't tracking prompt cache hits and misses accurately! Expected #{yesterday_votes}, Actual: #{misses+hits}\n"
-	end
-
-	miss_rate = misses.to_f / yesterday_votes.to_f
-	if miss_rate > 0.1
-	     error_message += "Error! Question #{question.id} has less than 90% of appearances taken from a pre-generated cache! Expected <#{0.1}, Actual: #{miss_rate}\n"
+	if misses + hits != yesterday_appearances
+	     error_message += "Error! Question #{question.id} isn't tracking prompt cache hits and misses accurately! Expected #{yesterday_appearances}, Actual: #{misses+hits}\n"
 	end
+	
+	if yesterday_appearances > 5 # this test isn't worthwhile for small numbers of appearances
+	  miss_rate = misses.to_f / yesterday_appearances.to_f
+	  if miss_rate > 0.1
+	     error_message += "Error! Question #{question.id} has less than 90% of appearances taken from a pre-generated cache! Expected <#{0.1}, Actual: #{miss_rate}, total appearances yesterday: #{yesterday_appearances}\n"
+	  end
+        end
         return error_message.blank? ? [success_message, false] : [error_message, true] 
    end
@@ -3,14 +3,18 @@ require File.expand_path(File.dirname(__FILE__) + &#39;/../spec_helper&#39;)
 describe Choice do
   it {should belong_to :question}
-  it {should belong_to :item}
+  it {should belong_to :creator}
   it {should have_many :flags}
+  it {should have_many :votes}
+  it {should have_many :prompts_on_the_left}
+  it {should have_many :prompts_on_the_right}
   it {should validate_presence_of :question}
+  it {should validate_presence_of :creator}
   before(:each) do
     @aoi_clone = Factory.create(:email_confirmed_user)
     @visitor= Factory.create(:visitor, :site => @aoi_clone)
-    @question = Question.create(:name => 'which do you like better?', 
+    @question = Factory.create(:aoi_question, :name => "Which do you like better?",
 				:site => @aoi_clone, 
 				:creator => @visitor)
@@ -25,13 +29,6 @@ describe Choice do
     Choice.create!(@valid_attributes)
   end
-  #it "should generate prompts after two choices are created" do
-  #  proc {
-#	  choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
-#          choice2 = Choice.create!(@valid_attributes.merge(:data => '1234'))
-#    }.should change(@question.prompts, :count).by(2)
-#  end
-
   it "should deactivate a choice" do
     choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
     choice1.deactivate!
@@ -39,12 +36,14 @@ describe Choice do
   end
   it "should update a question's counter cache on creation" do
-	  @question.choices_count.should == 0
-	  @question.choices.size.should == 0
-          Choice.create!(@valid_attributes.merge(:data => '1234'))
-	  @question.reload
-	  @question.choices_count.should == 1
-	  @question.choices.size.should == 1
+	  # not an allour ideas question
+	  question = Factory.create(:question, :site => @aoi_clone, :creator => @visitor)
+	  question.choices_count.should == 0
+	  question.choices.size.should == 0
+          Choice.create!(@valid_attributes.merge(:question => question))
+	  question.reload
+	  question.choices_count.should == 1
+	  question.choices.size.should == 1
   end
@@ -67,4 +66,61 @@ describe Choice do
 	  @question.reload
 	  @question.inactive_choices_count.should == prev_inactive + 1
   end
+  it "should have a default score of 50" do 
+          choice1 = Choice.create!(@valid_attributes)
+	  choice1.score.should == 50 
+  end
+  it "correctly compute a score based on wins and losses" do 
+          choice1 = Choice.create!(@valid_attributes)
+	  choice1.votes_count = 30
+	  choice1.loss_count = 70
+	  choice1.compute_score.should be_close(30,1)
+  end
+  it "compute score and save" do 
+          choice1 = Choice.create!(@valid_attributes)
+	  choice1.score.should == 50
+	  choice1.votes_count= 30
+	  choice1.loss_count = 70
+	  choice1.compute_score!
+	  choice1.score.should be_close(30, 1)
+  end
+
+  it "determines whether a choice is admin created" do
+	  admin_choice = @question.choices.first
+	  admin_choice.user_created.should be_false
+  end
+  it "determines whether a choice is user created" do
+  	  new_visitor = Factory.create(:visitor, :site => @aoi_clone)
+	  user_choice = Factory.create(:choice, :question => @question, :creator => new_visitor)
+	  user_choice.user_created.should be_true
+  end
+
+  describe "voting updates things" do
+     before do
+          @prompt = @question.choose_prompt
+          @winning_choice = @prompt.left_choice
+	  @losing_choice = @prompt.right_choice
+	  @winning_choice.win!
+	  @losing_choice.lose!
+     end
+   
+     it "should update score on a win" do
+          @winning_choice.score.should be_close(67, 1)
+     end
+     it "should update score on a loss" do
+          @losing_choice.score.should be_close(33,1)
+     end
+     it "should update win count on a win" do
+          @winning_choice.votes_count.should == 1
+          @winning_choice.wins.should == 1
+          @winning_choice.loss_count.should == 0
+          @winning_choice.losses.should == 0
+     end
+     it "should update loss count on a loss" do
+          @losing_choice.votes_count.should == 0
+          @losing_choice.wins.should == 0
+          @losing_choice.loss_count.should == 1
+          @losing_choice.losses.should == 1
+     end
+  end
 end
@@ -1,21 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-describe Item do
-  it {should belong_to :creator}
-  it {should belong_to :site}
-  it {should validate_presence_of :data}
-  
-  before(:each) do
-    @aoi_clone = Factory.create(:user, :email => "pius@alum.mit.edu", :password => "password", :password_confirmation => "password", :id => 8)
-    @johndoe = Factory.create(:visitor, :identifier => 'johndoe', :site => @aoi_clone)
-    @valid_attributes = {
-      :site => @aoi_clone,
-      :creator => @johndoe,
-      :data => 'a widget'
-    }
-  end
-
-  it "should create a new instance given valid attributes" do
-    Item.create!(@valid_attributes)
-  end
-end
@@ -4,5 +4,16 @@ describe Prompt do
   it {should belong_to :question}
   it {should belong_to :left_choice}
   it {should belong_to :right_choice}
+  before(:each) do
+     @question = Factory.create(:aoi_question)
+     @prompt = @question.prompts.first
+  end
+
+  it "should display left choice text" do
+     @prompt.left_choice_text.should == @prompt.left_choice.data
+  end
+  it "should display right choice text" do
+     @prompt.right_choice_text.should == @prompt.right_choice.data
+  end
 end
@@ -112,6 +112,12 @@ describe Question do
     @question_optional_information[:picked_prompt_id].should == saved_prompt_id
   end
+  it "should auto create ideas when 'ideas' attribute is set" do
+      @question = Factory.build(:question)
+      @question.ideas = %w(one two three)
+      @question.save
+      @question.choices.count.should == 3
+  end
   context "catchup algorithm" do 
 	  before(:all) do
 		  @catchup_q = Factory.create(:aoi_question)
@@ -283,7 +289,6 @@ describe Question do
 		  rows.first.should include("Record ID")
 		  rows.first.should include("Record Type")
 		  rows.first.should_not include("Idea ID")
-		  puts filename
 		  File.delete(filename).should_not be_nil 
@@ -300,7 +305,6 @@ describe Question do
 		  rows = FasterCSV.read(filename)
 		  rows.first.should include("Idea ID")
 		  rows.first.should_not include("Skip ID")
-		  puts filename
 		  File.delete(filename).should_not be_nil
 	  end
@@ -8,6 +8,7 @@ describe Visitor do
   it {should have_many :skips}
   it {should have_many :clicks}
   it {should have_many :appearances}
+  it {should have_many :choices}
   before(:each) do
     @question = Factory.create(:aoi_question)
	@@ -1,86 +0,0 @@	@@ -1,86 +0,0 @@
1	-class ItemsController < ApplicationController
2	- before_filter :authenticate
3	- # GET /items
4	- # GET /items.xml
5	- def index
6	- @items = Item.all
7	-
8	- respond_to do \|format\|
9	- format.html # index.html.erb
10	- format.xml { render :xml => @items }
11	- end
12	- end
13	-
14	- # GET /items/1
15	- # GET /items/1.xml
16	- def show
17	- @item = Item.find(params[:id])
18	-
19	- respond_to do \|format\|
20	- format.html # show.html.erb
21	- format.xml { render :xml => @item }
22	- end
23	- end
24	-
25	- # GET /items/new
26	- # GET /items/new.xml
27	- def new
28	- @item = Item.new
29	-
30	- respond_to do \|format\|
31	- format.html # new.html.erb
32	- format.xml { render :xml => @item }
33	- end
34	- end
35	-
36	- # GET /items/1/edit
37	- def edit
38	- @item = Item.find(params[:id])
39	- end
40	-
41	- # POST /items
42	- # POST /items.xml
43	- def create
44	- @item = Item.new(params[:item])
45	-
46	- respond_to do \|format\|
47	- if @item.save
48	- flash[:notice] = 'Item was successfully created.'
49	- format.html { redirect_to(@item) }
50	- format.xml { render :xml => @item, :status => :created, :location => @item }
51	- else
52	- format.html { render :action => "new" }
53	- format.xml { render :xml => @item.errors, :status => :unprocessable_entity }
54	- end
55	- end
56	- end
57	-
58	- # PUT /items/1
59	- # PUT /items/1.xml
60	- def update
61	- @item = Item.find(params[:id])
62	-
63	- respond_to do \|format\|
64	- if @item.update_attributes(params[:item])
65	- flash[:notice] = 'Item was successfully updated.'
66	- format.html { redirect_to(@item) }
67	- format.xml { head :ok }
68	- else
69	- format.html { render :action => "edit" }
70	- format.xml { render :xml => @item.errors, :status => :unprocessable_entity }
71	- end
72	- end
73	- end
74	-
75	- # DELETE /items/1
76	- # DELETE /items/1.xml
77	- def destroy
78	- @item = Item.find(params[:id])
79	- @item.destroy
80	-
81	- respond_to do \|format\|
82	- format.html { redirect_to(items_url) }
83	- format.xml { head :ok }
84	- end
85	- end
86	-end
	@@ -7,7 +7,7 @@ class VisitorsController < InheritedResources::Base		@@ -7,7 +7,7 @@ class VisitorsController < InheritedResources::Base
7		7
8	visitor_ids = Visitor.find(:all, :conditions => { :identifier => session_ids})	8	visitor_ids = Visitor.find(:all, :conditions => { :identifier => session_ids})
9	votes_by_visitor_id = Vote.with_voter_ids(visitor_ids).count(:group => :voter_id)	9	votes_by_visitor_id = Vote.with_voter_ids(visitor_ids).count(:group => :voter_id)
10	- ideas_by_visitor_id = Item.with_creator_ids(visitor_ids).count(:group => :creator_id)	10	+ ideas_by_visitor_id = Choice.count(:group => :creator_id)
11		11
12	objects_by_session_id = {}	12	objects_by_session_id = {}
13		13
	@@ -1,24 +0,0 @@	@@ -1,24 +0,0 @@
1	-class Item < ActiveRecord::Base
2	- belongs_to :question, :counter_cache => true
3	- belongs_to :site, :class_name => "User", :foreign_key => "site_id"
4	- belongs_to :creator, :class_name => "Visitor", :foreign_key => "creator_id"
5	-
6	- named_scope :active, :conditions => { :active => true }
7	- named_scope :with_creator_ids, lambda { \|*args\| {:conditions => {:creator_id=> args.first }} }
8	-
9	- # has_many :items_questions, :dependent => :destroy
10	- # has_many :questions, :through => :items_questions
11	- # has_and_belongs_to_many :prompts
12	- #
13	- # has_and_belongs_to_many :votes
14	- # has_and_belongs_to_many :prompt_requests
15	-
16	- validates_presence_of :creator_id
17	- validates_presence_of :data, :on => :create, :message => "can't be blank"
18	-
19	- def self.mass_insert!(creator_id, data_array)
20	- #alpha
21	- inserts = data_array.collect{\|i\| "(#{connection.quote i}, #{connection.quote creator_id})"}.join(", ")
22	- connection.insert("INSERT INTO items(data, creator_id) VALUES (#{inserts})")
23	- end
24	-end
	@@ -3,7 +3,6 @@ class User < ActiveRecord::Base		@@ -3,7 +3,6 @@ class User < ActiveRecord::Base
3	has_many :visitors, :class_name => "Visitor", :foreign_key => "site_id"	3	has_many :visitors, :class_name => "Visitor", :foreign_key => "site_id"
4	has_many :questions, :class_name => "Question", :foreign_key => "site_id"	4	has_many :questions, :class_name => "Question", :foreign_key => "site_id"
5	has_many :clicks, :class_name => "Click", :foreign_key => "site_id"	5	has_many :clicks, :class_name => "Click", :foreign_key => "site_id"
6	- has_many :items, :class_name => "Item", :foreign_key => "site_id"
7		6
8	def default_visitor	7	def default_visitor
9	visitors.find(:first, :conditions => {:identifier => 'owner'})	8	visitors.find(:first, :conditions => {:identifier => 'owner'})
	@@ -62,16 +61,6 @@ class User < ActiveRecord::Base		@@ -62,16 +61,6 @@ class User < ActiveRecord::Base
62	question.activate!	61	question.activate!
63	end	62	end
64		63
65	- def activate_choice(choice_id, options)
66	- choice = Choice.find(choice_id)
67	- choice.activate!
68	- end
69	-
70	- def deactivate_choice(choice_id, options)
71	- choice = Choice.find(choice_id)
72	- choice.deactivate!
73	- end
74	-
75	def deactivate_question(question_id, options)	64	def deactivate_question(question_id, options)
76	question = questions.find(question_id)	65	question = questions.find(question_id)
77	question.deactivate!	66	question.deactivate!
	@@ -3,7 +3,7 @@ class Visitor < ActiveRecord::Base		@@ -3,7 +3,7 @@ class Visitor < ActiveRecord::Base
3	has_many :questions, :class_name => "Question", :foreign_key => "creator_id"	3	has_many :questions, :class_name => "Question", :foreign_key => "creator_id"
4	has_many :votes, :class_name => "Vote", :foreign_key => "voter_id"	4	has_many :votes, :class_name => "Vote", :foreign_key => "voter_id"
5	has_many :skips, :class_name => "Skip", :foreign_key => "skipper_id"	5	has_many :skips, :class_name => "Skip", :foreign_key => "skipper_id"
6	- has_many :items, :class_name => "Item", :foreign_key => "creator_id"	6	+ has_many :choices, :class_name => "Choice", :foreign_key => "creator_id"
7	has_many :clicks	7	has_many :clicks
8	has_many :appearances, :foreign_key => "voter_id"	8	has_many :appearances, :foreign_key => "voter_id"
9		9
	@@ -1,12 +0,0 @@		@@ -1,12 +0,0 @@
1	-<h1>Editing item</h1>
2	-
3	-<% form_for(@item) do \|f\| %>
4	- <%= f.error_messages %>
5	-
6	- <p>
7	- <%= f.submit 'Update' %>
8	- </p>
9	-<% end %>
10	-
11	-<%= link_to 'Show', @item %> \|
12	-<%= link_to 'Back', items_path %>
13	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,18 +0,0 @@		@@ -1,18 +0,0 @@
1	-<h1>Listing items</h1>
2	-
3	-<table>
4	- <tr>
5	- </tr>
6	-
7	-<% @items.each do \|item\| %>
8	- <tr>
9	- <td><%= link_to 'Show', item %></td>
10	- <td><%= link_to 'Edit', edit_item_path(item) %></td>
11	- <td><%= link_to 'Destroy', item, :confirm => 'Are you sure?', :method => :delete %></td>
12	- </tr>
13	-<% end %>
14	-</table>
15	-
16	-<br />
17	-
18	-<%= link_to 'New item', new_item_path %>
19	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,11 +0,0 @@		@@ -1,11 +0,0 @@
1	-<h1>New item</h1>
2	-
3	-<% form_for(@item) do \|f\| %>
4	- <%= f.error_messages %>
5	-
6	- <p>
7	- <%= f.submit 'Create' %>
8	- </p>
9	-<% end %>
10	-
11	-<%= link_to 'Back', items_path %>
12	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,3 +0,0 @@		@@ -1,3 +0,0 @@
1	-
2	-<%= link_to 'Edit', edit_item_path(@item) %> \|
3	-<%= link_to 'Back', items_path %>
4	\ No newline at end of file	0	\ No newline at end of file
	@@ -1,17 +0,0 @@	@@ -1,17 +0,0 @@
1	-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
2	- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
3	-
4	-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
5	-<head>
6	- <meta http-equiv="content-type" content="text/html;charset=UTF-8" />
7	- <title>Items: <%= controller.action_name %></title>
8	- <%= stylesheet_link_tag 'scaffold' %>
9	-</head>
10	-<body>
11	-
12	-<p style="color: green"><%= flash[:notice] %></p>
13	-
14	-<%= yield %>
15	-
16	-</body>
17	-</html>