diff --git a/app/models/person.rb b/app/models/person.rb index 17a77b277..ec3949283 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -17,7 +17,7 @@ class Person validates_format_of :url, :with => /^(https?):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*(\.[a-z]{2,5})?(:[0-9]{1,5})?(\/.*)?$/ix - + #validates_uniqueness_of :url validates_true_for :url, :logic => lambda { self.url_unique?} diff --git a/app/models/user.rb b/app/models/user.rb index 6fdb5e4ea..b1d3f96bc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,5 +1,4 @@ class User < Person - include MongoMapper::Document devise :database_authenticatable, :registerable, :recoverable, :rememberable, :trackable, :validatable diff --git a/lib/message_handler.rb b/lib/message_handler.rb index 91226a426..dfa98c5e5 100644 --- a/lib/message_handler.rb +++ b/lib/message_handler.rb @@ -30,7 +30,6 @@ class MessageHandler end http.errback { - puts query.destination + " failed!" query.try_count +=1 @queue.push query unless query.try_count >= NUM_TRIES process diff --git a/lib/socket_render.rb b/lib/socket_render.rb index 0bcc6371c..0f3c8dd8b 100644 --- a/lib/socket_render.rb +++ b/lib/socket_render.rb @@ -14,9 +14,7 @@ module SocketRenderer def self.view_hash(object) begin - puts "I be working hard" v = view_for(object) - puts v.inspect rescue Exception => e puts "in failzord " + v.inspect @@ -24,7 +22,6 @@ module SocketRenderer puts e.message raise e end - puts "i made it here" {:class =>object.class.to_s.underscore.pluralize, :html => v} end diff --git a/spec/models/person_spec.rb b/spec/models/person_spec.rb index 21e2ed877..97ed93418 100644 --- a/spec/models/person_spec.rb +++ b/spec/models/person_spec.rb @@ -1,6 +1,12 @@ require 'spec_helper' describe Person do + it 'should not allow two friends with the same url' do + friend_one = Factory.create(:friend) + friend_two = Factory.build(:friend, :url => friend_one.url) + friend_two.valid?.should == false + end + it 'should not allow a friend with the same url as the user' do user = Factory.create(:user) friend = Factory.build(:friend, :url => user.url)