From 99abc224034d20de1184bb9609b61cee3e68192e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Rodr=C3=ADguez?= Date: Sat, 10 Nov 2012 12:43:06 -0200 Subject: [PATCH] remove unused methods --- app/models/person.rb | 6 ------ app/models/photo.rb | 4 ---- app/models/post.rb | 9 --------- app/models/user.rb | 11 ----------- lib/stream/base.rb | 5 ----- spec/support/user_methods.rb | 7 ------- 6 files changed, 42 deletions(-) diff --git a/app/models/person.rb b/app/models/person.rb index 0ed354f88c8..4fe1fd9fbb4 100644 --- a/app/models/person.rb +++ b/app/models/person.rb @@ -167,12 +167,6 @@ def self.search_order }.call end - def self.public_search(query, opts={}) - return [] if query.to_s.blank? || query.to_s.length < 3 - sql, tokens = self.search_query_string(query) - Person.searchable.where(sql, *tokens) - end - def name(opts = {}) if self.profile.nil? fix_profile diff --git a/app/models/photo.rb b/app/models/photo.rb index ce666b5d1d0..9741985a75c 100644 --- a/app/models/photo.rb +++ b/app/models/photo.rb @@ -128,10 +128,6 @@ def ensure_user_picture } end - def thumb_hash - {:thumb_url => url(:thumb_medium), :id => id, :album_id => nil} - end - def queue_processing_job Resque.enqueue(Jobs::ProcessPhoto, self.id) end diff --git a/app/models/post.rb b/app/models/post.rb index be325c82963..9d3a85423bf 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -103,11 +103,6 @@ def reshare_for(user) reshares.where(:author_id => user.person.id).first end - def participation_for(user) - return unless user - participations.where(:author_id => user.person.id).first - end - def like_for(user) return unless user likes.where(:author_id => user.person.id).first @@ -133,10 +128,6 @@ def activity_streams? false end - def triggers_caching? - true - end - def comment_email_subject I18n.t('notifier.a_post_you_shared') end diff --git a/app/models/user.rb b/app/models/user.rb index c505e0bfaba..9a8dd7e3992 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -165,17 +165,6 @@ def has_hidden_shareables_of_type?(t = Post) self.hidden_shareables[share_type].present? end - - def self.create_from_invitation!(invitation) - user = User.new - user.generate_keys - user.send(:generate_invitation_token) - user.email = invitation.identifier if invitation.service == 'email' - # we need to make a custom validator here to make this safer - user.save(:validate => false) - user - end - def send_reset_password_instructions generate_reset_password_token! if should_generate_reset_token? Resque.enqueue(Jobs::ResetPassword, self.id) diff --git a/lib/stream/base.rb b/lib/stream/base.rb index f8dd3f4ab9e..47739a6bedb 100644 --- a/lib/stream/base.rb +++ b/lib/stream/base.rb @@ -50,11 +50,6 @@ def people includes(:profile) end - # @return [String] - def contacts_link_title - I18n.translate('aspects.selected_contacts.view_all_contacts') - end - # @return [String] def contacts_title 'change me in lib/base_stream.rb!' def contacts_title 'change me in lib/base_stream.rb!' diff --git a/spec/support/user_methods.rb b/spec/support/user_methods.rb index 6d167f342fc..74fd44c1815 100644 --- a/spec/support/user_methods.rb +++ b/spec/support/user_methods.rb @@ -31,11 +31,4 @@ def post(class_name, opts = {}) p end end - - def post_at_time(time) - to_aspect = self.aspects.length == 1 ? self.aspects.first : self.aspects.where(:name => "generic") - p = self.post(:status_message, :text => 'hi', :to => to_aspect) - p.created_at = time - p.save! - end end