First cut at flag inside api

Dhruv Kapadia
1 parent ac6d2493
Showing 9 changed files with 174 additions and 1 deletions Show diff stats
app/controllers/choices_controller.rb
app/models/choice.rb
app/models/flag.rb
config/routes.rb
db/migrate/20100521141751_create_flags.rb
spec/controllers/choices_controller_spec.rb
spec/fixtures/flags.yml
spec/models/choice_spec.rb
spec/models/flag_spec.rb
@@ -3,6 +3,8 @@ class ChoicesController &lt; InheritedResources::Base
   actions :show, :index, :create, :update
   belongs_to :question
   has_scope :active, :boolean => true, :only => :index
+
+  before_filter :authenticate, :only => [:flag]
   #caches_page :index
   def index
@@ -177,4 +179,36 @@ class ChoicesController &lt; InheritedResources::Base
       end
     end
   end
+
+  def flag
+    @question = current_user.questions.find(params[:question_id])
+    @choice = @question.choices.find(params[:id])
+
+    flag_params = {:choice_id => params[:id].to_i, :question_id => params[:question_id].to_i, :site_id => current_user.id}
+
+    if explanation = params[:explanation] 
+	    flag_params.merge!({:explanation => explanation})
+		   
+    end
+    if visitor_identifier = params[:visitor_identifier]
+            visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
+	    flag_params.merge!({:visitor_id => visitor.id})
+    end
+    respond_to do |format|
+	    if @choice.deactivate!
+                    flag = Flag.create!(flag_params)
+		    puts "I AM CREATING A FLAG FOR #{@choice.inspect}"
+		    format.xml { render :xml => @choice.to_xml, :status => :created }
+		    format.json { render :json => @choice.to_json, :status => :created }
+	    else
+		    format.xml { render :xml => @choice.errors, :status => :unprocessable_entity }
+		    format.json { render :json => @choice.to_json }
+	    end
+    end
+
+  end
+  
+
+
 end
+  
@@ -10,6 +10,7 @@ class Choice &lt; ActiveRecord::Base
   #validates_length_of :item, :maximum => 140
   has_many :votes
+  has_many :flags
   has_many :prompts_on_the_left, :class_name => "Prompt", :foreign_key => "left_choice_id"
   has_many :prompts_on_the_right, :class_name => "Prompt", :foreign_key => "right_choice_id"
   named_scope :active, :conditions => { :active => true }
@@ -0,0 +1,10 @@
+class Flag < ActiveRecord::Base
+  belongs_to :question
+  belongs_to :visitor
+  belongs_to :choice
+  belongs_to :site
+  
+  validates_presence_of :choice_id
+  validates_presence_of :question_id
+  
+end
@@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do |map|
     question.resources :items
     question.resources :prompts, :member => {:vote_left => :post, :vote_right => :post, :skip => :post, :vote => :post}, 
                        :collection => {:single => :get, :index => :get}
-    question.resources :choices, :member => { :activate => :put, :suspend => :put, :update_from_abroad => :put, :deactivate_from_abroad => :put }, :collection => {:create_from_abroad => :post}
+    question.resources :choices, :member => { :activate => :put, :suspend => :put, :update_from_abroad => :put, :deactivate_from_abroad => :put, :flag => :put}, :collection => {:create_from_abroad => :post}
   end
   map.resources :algorithms
   map.connect "/questions/:question_id/prompts/:id/vote/:index", :controller => 'prompts', :action => 'vote'
@@ -0,0 +1,17 @@
+class CreateFlags < ActiveRecord::Migration
+  def self.up
+    create_table :flags do |table|
+      table.string :explanation, :default => ""
+      table.integer :visitor_id
+      table.integer :choice_id
+      table.integer :question_id
+      table.integer :site_id
+      table.timestamps
+    end
+
+  end
+
+  def self.down
+    drop_table :flags
+  end
+end
@@ -0,0 +1,80 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe ChoicesController do
+  
+     def sign_in_as(user)
+       @controller.current_user = user
+       return user
+     end
+  #   
+     before(:each) do
+       sign_in_as(@user = Factory(:email_confirmed_user))
+     end
+  # 
+     def mock_question(stubs={})
+       @mock_question ||= mock_model(Question, stubs)
+     end
+     
+     def mock_prompt(stubs={})
+       @mock_prompt ||= mock_model(Prompt, stubs)
+     end
+     
+     def mock_appearance(stubs={})
+       @mock_appearance||= mock_model(Appearance, stubs)
+     end
+     
+     def mock_visitor(stubs={})
+       @mock_visitor||= mock_model(Visitor, stubs)
+     end
+     
+     def mock_choice(stubs={})
+       @mock_choice||= mock_model(Choice, stubs)
+     end
+     
+     def mock_flag(stubs={})
+       @mock_flag ||= mock_model(Flag, stubs)
+     end
+     
+     describe "PUT flag" do
+       before(:each) do
+	  question_list = [mock_question]
+	  @user.stub!(:questions).and_return(question_list)
+	  question_list.stub!(:find).with("37").and_return(mock_question)
+
+	  choice_list = [mock_choice]
+	  mock_question.stub!(:choices).and_return(choice_list)
+	  choice_list.stub!(:find).with("123").and_return(mock_choice)
+	  mock_choice.should_receive(:deactivate!).and_return(true)
+
+
+       end
+
+       it "deactives a choice when a flag request is sent" do
+	    Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id})
+	    put :flag, :id => 123, :question_id => 37   
+
+	    assigns[:choice].should == mock_choice
+       end
+       
+       it "adds explanation params to flag if sent" do
+	    Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id, :explanation => "This is offensive"})
+	    put :flag, :id => 123, :question_id => 37 , :explanation => "This is offensive"
+
+	    assigns[:choice].should == mock_choice
+       end
+       
+       it "adds visitor_id params to flag if sent" do
+	    @visitor_identifier = "somelongunique32charstring"
+	    visitor_list = [mock_visitor]
+            @user.stub!(:visitors).and_return(visitor_list)
+            visitor_list.should_receive(:find_or_create_by_identifier).with(@visitor_identifier).and_return(mock_visitor)
+
+	    Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id, :explanation => "This is offensive", :visitor_id => mock_visitor.id})   
+
+	    put :flag, :id => 123, :question_id => 37 , :explanation => "This is offensive", :visitor_identifier => @visitor_identifier
+
+	    assigns[:choice].should == mock_choice
+       end
+     end
+  
+end
@@ -4,6 +4,7 @@ describe Choice do
   it {should belong_to :question}
   it {should belong_to :item}
+  it {should have_many :flags}
   it {should validate_presence_of :question}
   before(:each) do
@@ -27,4 +28,10 @@ describe Choice do
     choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
     @question.prompts.should_not be_empty
   end
+
+  it "should deactivate a choice" do
+    choice1 = Choice.create!(@valid_attributes.merge(:data => '1234'))
+    choice1.deactivate!
+    choice1.should_not be_active
+  end
 end
@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Flag do
+  it {should belong_to :question}
+  it {should belong_to :choice}
+  it {should belong_to :site}
+  it {should belong_to :visitor}
+  it {should validate_presence_of :choice_id}
+  it {should validate_presence_of :question_id}
+
+  before(:each) do
+    @valid_attributes = {
+      :explanation => "value for explanation",
+      :visitor_id => 1,
+      :choice_id => 1,
+      :question_id => 1,
+      :site_id => 1
+    }
+  end
+
+  it "should create a new instance given valid attributes" do
+    Flag.create!(@valid_attributes)
+  end
+end
	@@ -3,6 +3,8 @@ class ChoicesController < InheritedResources::Base		@@ -3,6 +3,8 @@ class ChoicesController < InheritedResources::Base
3	actions :show, :index, :create, :update	3	actions :show, :index, :create, :update
4	belongs_to :question	4	belongs_to :question
5	has_scope :active, :boolean => true, :only => :index	5	has_scope :active, :boolean => true, :only => :index
		6	+
		7	+ before_filter :authenticate, :only => [:flag]
6	#caches_page :index	8	#caches_page :index
7		9
8	def index	10	def index
	@@ -177,4 +179,36 @@ class ChoicesController < InheritedResources::Base		@@ -177,4 +179,36 @@ class ChoicesController < InheritedResources::Base
177	end	179	end
178	end	180	end
179	end	181	end
		182	+
		183	+ def flag
		184	+ @question = current_user.questions.find(params[:question_id])
		185	+ @choice = @question.choices.find(params[:id])
		186	+
		187	+ flag_params = {:choice_id => params[:id].to_i, :question_id => params[:question_id].to_i, :site_id => current_user.id}
		188	+
		189	+ if explanation = params[:explanation]
		190	+ flag_params.merge!({:explanation => explanation})
		191	+
		192	+ end
		193	+ if visitor_identifier = params[:visitor_identifier]
		194	+ visitor = current_user.visitors.find_or_create_by_identifier(visitor_identifier)
		195	+ flag_params.merge!({:visitor_id => visitor.id})
		196	+ end
		197	+ respond_to do \|format\|
		198	+ if @choice.deactivate!
		199	+ flag = Flag.create!(flag_params)
		200	+ puts "I AM CREATING A FLAG FOR #{@choice.inspect}"
		201	+ format.xml { render :xml => @choice.to_xml, :status => :created }
		202	+ format.json { render :json => @choice.to_json, :status => :created }
		203	+ else
		204	+ format.xml { render :xml => @choice.errors, :status => :unprocessable_entity }
		205	+ format.json { render :json => @choice.to_json }
		206	+ end
		207	+ end
		208	+
		209	+ end
		210	+
		211	+
		212	+
180	end	213	end
		214	+
	@@ -10,6 +10,7 @@ class Choice < ActiveRecord::Base		@@ -10,6 +10,7 @@ class Choice < ActiveRecord::Base
10	#validates_length_of :item, :maximum => 140	10	#validates_length_of :item, :maximum => 140
11		11
12	has_many :votes	12	has_many :votes
		13	+ has_many :flags
13	has_many :prompts_on_the_left, :class_name => "Prompt", :foreign_key => "left_choice_id"	14	has_many :prompts_on_the_left, :class_name => "Prompt", :foreign_key => "left_choice_id"
14	has_many :prompts_on_the_right, :class_name => "Prompt", :foreign_key => "right_choice_id"	15	has_many :prompts_on_the_right, :class_name => "Prompt", :foreign_key => "right_choice_id"
15	named_scope :active, :conditions => { :active => true }	16	named_scope :active, :conditions => { :active => true }
@@ -0,0 +1,10 @@		@@ -0,0 +1,10 @@
	1	+class Flag < ActiveRecord::Base
	2	+ belongs_to :question
	3	+ belongs_to :visitor
	4	+ belongs_to :choice
	5	+ belongs_to :site
	6	+
	7	+ validates_presence_of :choice_id
	8	+ validates_presence_of :question_id
	9	+
	10	+end
	@@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do \|map\|		@@ -15,7 +15,7 @@ ActionController::Routing::Routes.draw do \|map\|
15	question.resources :items	15	question.resources :items
16	question.resources :prompts, :member => {:vote_left => :post, :vote_right => :post, :skip => :post, :vote => :post},	16	question.resources :prompts, :member => {:vote_left => :post, :vote_right => :post, :skip => :post, :vote => :post},
17	:collection => {:single => :get, :index => :get}	17	:collection => {:single => :get, :index => :get}
18	- question.resources :choices, :member => { :activate => :put, :suspend => :put, :update_from_abroad => :put, :deactivate_from_abroad => :put }, :collection => {:create_from_abroad => :post}	18	+ question.resources :choices, :member => { :activate => :put, :suspend => :put, :update_from_abroad => :put, :deactivate_from_abroad => :put, :flag => :put}, :collection => {:create_from_abroad => :post}
19	end	19	end
20	map.resources :algorithms	20	map.resources :algorithms
21	map.connect "/questions/:question_id/prompts/:id/vote/:index", :controller => 'prompts', :action => 'vote'	21	map.connect "/questions/:question_id/prompts/:id/vote/:index", :controller => 'prompts', :action => 'vote'
@@ -0,0 +1,17 @@		@@ -0,0 +1,17 @@
	1	+class CreateFlags < ActiveRecord::Migration
	2	+ def self.up
	3	+ create_table :flags do \|table\|
	4	+ table.string :explanation, :default => ""
	5	+ table.integer :visitor_id
	6	+ table.integer :choice_id
	7	+ table.integer :question_id
	8	+ table.integer :site_id
	9	+ table.timestamps
	10	+ end
	11	+
	12	+ end
	13	+
	14	+ def self.down
	15	+ drop_table :flags
	16	+ end
	17	+end
@@ -0,0 +1,80 @@		@@ -0,0 +1,80 @@
	1	+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
	2	+
	3	+describe ChoicesController do
	4	+
	5	+ def sign_in_as(user)
	6	+ @controller.current_user = user
	7	+ return user
	8	+ end
	9	+ #
	10	+ before(:each) do
	11	+ sign_in_as(@user = Factory(:email_confirmed_user))
	12	+ end
	13	+ #
	14	+ def mock_question(stubs={})
	15	+ @mock_question \|\|= mock_model(Question, stubs)
	16	+ end
	17	+
	18	+ def mock_prompt(stubs={})
	19	+ @mock_prompt \|\|= mock_model(Prompt, stubs)
	20	+ end
	21	+
	22	+ def mock_appearance(stubs={})
	23	+ @mock_appearance\|\|= mock_model(Appearance, stubs)
	24	+ end
	25	+
	26	+ def mock_visitor(stubs={})
	27	+ @mock_visitor\|\|= mock_model(Visitor, stubs)
	28	+ end
	29	+
	30	+ def mock_choice(stubs={})
	31	+ @mock_choice\|\|= mock_model(Choice, stubs)
	32	+ end
	33	+
	34	+ def mock_flag(stubs={})
	35	+ @mock_flag \|\|= mock_model(Flag, stubs)
	36	+ end
	37	+
	38	+ describe "PUT flag" do
	39	+ before(:each) do
	40	+ question_list = [mock_question]
	41	+ @user.stub!(:questions).and_return(question_list)
	42	+ question_list.stub!(:find).with("37").and_return(mock_question)
	43	+
	44	+ choice_list = [mock_choice]
	45	+ mock_question.stub!(:choices).and_return(choice_list)
	46	+ choice_list.stub!(:find).with("123").and_return(mock_choice)
	47	+ mock_choice.should_receive(:deactivate!).and_return(true)
	48	+
	49	+
	50	+ end
	51	+
	52	+ it "deactives a choice when a flag request is sent" do
	53	+ Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id})
	54	+ put :flag, :id => 123, :question_id => 37
	55	+
	56	+ assigns[:choice].should == mock_choice
	57	+ end
	58	+
	59	+ it "adds explanation params to flag if sent" do
	60	+ Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id, :explanation => "This is offensive"})
	61	+ put :flag, :id => 123, :question_id => 37 , :explanation => "This is offensive"
	62	+
	63	+ assigns[:choice].should == mock_choice
	64	+ end
	65	+
	66	+ it "adds visitor_id params to flag if sent" do
	67	+ @visitor_identifier = "somelongunique32charstring"
	68	+ visitor_list = [mock_visitor]
	69	+ @user.stub!(:visitors).and_return(visitor_list)
	70	+ visitor_list.should_receive(:find_or_create_by_identifier).with(@visitor_identifier).and_return(mock_visitor)
	71	+
	72	+ Flag.should_receive(:create!).with({:choice_id => 123, :question_id => 37, :site_id => @user.id, :explanation => "This is offensive", :visitor_id => mock_visitor.id})
	73	+
	74	+ put :flag, :id => 123, :question_id => 37 , :explanation => "This is offensive", :visitor_identifier => @visitor_identifier
	75	+
	76	+ assigns[:choice].should == mock_choice
	77	+ end
	78	+ end
	79	+
	80	+end
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+require 'spec_helper'
	2	+
	3	+describe Flag do
	4	+ it {should belong_to :question}
	5	+ it {should belong_to :choice}
	6	+ it {should belong_to :site}
	7	+ it {should belong_to :visitor}
	8	+ it {should validate_presence_of :choice_id}
	9	+ it {should validate_presence_of :question_id}
	10	+
	11	+ before(:each) do
	12	+ @valid_attributes = {
	13	+ :explanation => "value for explanation",
	14	+ :visitor_id => 1,
	15	+ :choice_id => 1,
	16	+ :question_id => 1,
	17	+ :site_id => 1
	18	+ }
	19	+ end
	20	+
	21	+ it "should create a new instance given valid attributes" do
	22	+ Flag.create!(@valid_attributes)
	23	+ end
	24	+end