Skip to content
This repository was archived by the owner on Mar 20, 2019. It is now read-only.

Commit 8716985

Browse files
seurosseuros
committed
deprecate 'with_username' part 1
1 parent 5b866f6 commit 8716985

33 files changed

+121
-125
lines changed

‎app/controllers/application_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def current_user
4949
def viewing_user
5050
@viewing_user ||= current_user || begin
5151
if cookies[:identity]
52-
User.with_username(cookies[:identity])
52+
User.find_by_username(cookies[:identity])
5353
end
5454
end
5555
end

‎app/controllers/endorsements_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def create
2222
end
2323

2424
def show #Used by api.coderwall.com
25-
@user = User.with_username(params[:username])
25+
@user = User.find_by_username(params[:username])
2626
return head(:not_found) if @user.nil?
2727
render json: {
2828
endorsements: @user.endorsements_count,

‎app/controllers/follows_controller.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ class FollowsController < ApplicationController
55
helper_method :is_viewing_followers?
66

77
def index
8-
@user = User.with_username(params[:username])
8+
@user = User.find_by_username(params[:username])
99
return redirect_to(user_follows_url(username: current_user.username)) unless @user == current_user || current_user.admin?
1010
@network = @user.followers_by_type(User.name) if is_viewing_followers?
1111
@network = @user.following_by_type(User.name) if is_viewing_following?
@@ -16,7 +16,7 @@ def create
1616
apply_cache_buster
1717

1818
if params[:type] == :user
19-
@user = User.with_username(params[:username])
19+
@user = User.find_by_username(params[:username])
2020
if current_user.following?(@user)
2121
current_user.stop_following(@user)
2222
else

‎app/controllers/networks_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def featured
104104
def user
105105
redirect_to_signup_if_unauthenticated(request.referer, "You must login/signup to view your networks") do
106106
user = current_user
107-
user = User.with_username(params[:username]) if is_admin?
107+
user = User.find_by_username(params[:username]) if is_admin?
108108
@networks = user.networks
109109
@user = user
110110
@index_networks_params = params.permit(:sort, :action)

‎app/controllers/protips_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def topic
7878
def user
7979
user_params = params.permit(:username, :page, :per_page)
8080

81-
user = User.with_username(params[:username]) unless params[:username].blank?
81+
user = User.find_by_username(params[:username]) unless params[:username].blank?
8282
return redirect_to(protips_path) if user.nil?
8383
@protips = protips_for_user(user,user_params)
8484
@topics = [user.username]

‎app/controllers/sessions_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ def signin
1313
def force
1414
head(:forbidden) unless Rails.env.test? || Rails.env.development? || current_user.admin?
1515
sign_out
16-
sign_in(@user = User.with_username(params[:username]))
16+
sign_in(@user = User.find_by_username(params[:username]))
1717
return redirect_to(badge_url(username: params[:username]))
1818
end
1919

‎app/controllers/usernames_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ def show
55
# allow validation to pass if it's the user's username that they're trying to validate (for edit username)
66
if signed_in? && current_user.username.downcase == params[:id].downcase
77
head :ok
8-
elsif User.with_username(params[:id]) || User::RESERVED.include?(params[:id].downcase)
8+
elsif User.find_by_username(params[:id]) || User::RESERVED.include?(params[:id].downcase)
99
head :forbidden
1010
else
1111
head :ok

‎app/controllers/users_controller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def new
1010
end
1111

1212
def show
13-
@user = User.with_username(user_show_params[:username])
13+
@user = User.find_by_username(user_show_params[:username])
1414

1515
respond_to do |format|
1616
format.html do

‎app/helpers/application_helper.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@ def user_endorsements
174174
endorsements = []
175175

176176
# https://twitter.com/#!/iamdustan/status/104652472181719040
177-
endorsements << [User.with_username('iamdustan'), "One of the geekiest (and coolest) things I've seen in quite a while"]
177+
endorsements << [User.find_by_username('iamdustan'), "One of the geekiest (and coolest) things I've seen in quite a while"]
178178

179179
# https://twitter.com/#!/ang3lfir3/status/72810316882391040
180-
endorsements << [User.with_username('ang3lfir3'), "the companies I *want* to work for... care about the info on @coderwall"]
180+
endorsements << [User.find_by_username('ang3lfir3'), "the companies I *want* to work for... care about the info on @coderwall"]
181181

182182
# https://twitter.com/#!/chase_mccarthy/status/75582647396614145
183-
endorsements << [User.with_username('ozone1015'), "@coderwall is an awesome idea. It's like having Halo achievements for your resume!!!"]
183+
endorsements << [User.find_by_username('ozone1015'), "@coderwall is an awesome idea. It's like having Halo achievements for your resume!!!"]
184184

185185
# https://twitter.com/#!/razorjack/status/75125655322374144
186-
endorsements << [User.with_username('RazorJack'), "@coderwall is awesome but everyone already knows it."]
186+
endorsements << [User.find_by_username('RazorJack'), "@coderwall is awesome but everyone already knows it."]
187187

188188
# https://twitter.com/#!/kennethkalmer/status/86392260555587584
189-
endorsements << [User.with_username('kennethkalmer'), "@coderwall really dishes out some neat achievements, hope this helps motivate even more folks to contribute to FOSS"]
189+
endorsements << [User.find_by_username('kennethkalmer'), "@coderwall really dishes out some neat achievements, hope this helps motivate even more folks to contribute to FOSS"]
190190

191191
# endorsements << [User.with_username('jeffhogan'), 'I really dig @coderwall...I see great potential in utilizing @coderwall for portfolio/linkedin/professional ref. for developers!']
192192

‎app/helpers/protips_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ def topics_to_sentence(topics)
218218

219219
def protip_topic_page_title(topics)
220220
username = topics.is_a?(Array) ? (topics.size == 1 ? topics.first : nil) : topics
221-
unless username.nil? or (user = User.with_username(username)).blank?
221+
unless username.nil? or (user = User.find_by_username(username)).blank?
222222
"Coderwall - Trending Pro tips by #{user.name}"
223223
else
224224
"Coderwall - Trending Pro tips #{"about #{topics_to_sentence(topics)} " unless topics.blank?}by top developers in the world!"

‎app/jobs/activate_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def initialize(username, always_activate=true)
99
end
1010

1111
def perform
12-
user = User.with_username(username)
12+
user = User.find_by_username(username)
1313
return if user.active?
1414
refresh!
1515
if activate_user?(user)

‎app/jobs/analyze_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class AnalyzeUser < Struct.new(:username)
44
@queue = 'HIGH'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
unless user.twitter.nil?
99
RestClient.get "#{ENV['TWITTER_ANALYZER_URL']}/#{user.username}/#{user.twitter}"
1010
end

‎app/jobs/assign_networks.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class AssignNetworks < Struct.new(:username)
44
@queue = 'LOW'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
user.skills.map(&:name).each do |skill|
99
Network.all_with_tag(skill).each do |network|
1010
user.join(network)

‎app/jobs/award_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class AwardUser < Struct.new(:username, :badges)
44
@queue = 'LOW'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88

99
if badges.first.is_a?(String)
1010
badges.map!(&:constantize)

‎app/jobs/build_activity_stream.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class BuildActivityStream < Struct.new(:username)
44
@queue = 'MEDIUM'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
user.build_repo_followed_activity!
99
end
1010
end

‎app/jobs/build_bio_and_joined_dates.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class BuildBioAndJoinedDates < Struct.new(:username)
44
@queue = 'HIGH'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
unless user.github.blank? && user.joined_github_on.blank?
99
user.joined_github_on = (user.send(:load_github_profile) || {})[:created_at]
1010
end

‎app/jobs/github_badge_org.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class GithubBadgeOrg < Struct.new(:username, :action)
44
@queue = 'HIGH'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
unless user.nil? or user.github.nil?
99
if action.to_sym == :add
1010
GithubBadge.new.add_all(user.badges, user.github)

‎app/jobs/import_protip.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def perform
1515
end
1616

1717
def import_github_follows(username)
18-
user = User.with_username(username)
18+
user = User.find_by_username(username)
1919
user.build_github_proptips_fast
2020
end
2121

@@ -25,7 +25,7 @@ def import_slideshares(fact_id)
2525
end
2626

2727
def autsubscribe_users(username)
28-
user = User.with_username(username)
28+
user = User.find_by_username(username)
2929
user.speciality_tags.each do |speciality|
3030
Tag.find_or_create_by_name(speciality)
3131
user.subscribe_to(speciality)

‎app/jobs/refresh_timeline.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class RefreshTimeline < Struct.new(:username)
44
@queue = 'MEDIUM'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
Event.create_timeline_for(user)
99
puts("Refreshed timeline #{username}")
1010
end

‎app/jobs/refresh_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ def perform
1717

1818
protected
1919
def refresh!
20-
user = User.with_username(@username)
20+
user = User.find_by_username(@username)
2121

2222
if user.github_id
2323
user.destroy_github_cache

‎app/jobs/reverse_geolocate_user.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class ReverseGeolocateUser < Struct.new(:username, :ip_address)
77
@queue = 'HIGH'
88

99
def perform
10-
user = User.with_username(username)
10+
user = User.find_by_username(username)
1111
unless user.nil? or user.ip_lat
1212
geocoder = MaxMind.new
1313
begin

‎app/jobs/seed_github_protips.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ class SeedGithubProtips < Struct.new(:username)
44
@queue = 'LOWER'
55

66
def perform
7-
user = User.with_username(username)
7+
user = User.find_by_username(username)
88
puts("Adding protips for #{username}")
99
user.build_github_proptips_fast
1010
end

‎app/mailers/campaigns.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def self.queue
1414
def asm_badge(username)
1515
headers['X-Mailgun-Campaign-Id'] = 'asm-badge-2013-12-04'
1616

17-
@user = User.with_username(username)
17+
@user = User.find_by_username(username)
1818

1919
mail to: @user.email, subject: "[Coderwall] Unlock the new Entrepreneur badge"
2020
end

‎app/mailers/notifier.rb

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ class NothingToSendException < Exception
3131
def welcome_email(username)
3232
headers['X-Mailgun-Variables'] = {email_type: WELCOME_EVENT}.to_json
3333

34-
@user = User.with_username(username)
34+
@user = User.find_by_username(username)
3535
@user.touch(:last_email_sent)
3636

3737
if @user.created_at < 2.days.ago
@@ -53,7 +53,7 @@ def new_activity(username)
5353
headers['X-Mailgun-Variables'] = {email_type: ACTIVITY_EVENT}.to_json
5454
track_campaign("activity_sent_#{Date.today.wday}")
5555

56-
@user = User.with_username(username)
56+
@user = User.find_by_username(username)
5757
@user.touch(:last_email_sent)
5858

5959
subject, @message = *activity_message_for_user(@user)
@@ -64,7 +64,7 @@ def new_activity(username)
6464
def new_badge(username)
6565
headers['X-Mailgun-Variables'] = {email_type: BADGE_EVENT}.to_json
6666
track_campaign("new_badge_earned")
67-
@user = User.with_username(username)
67+
@user = User.find_by_username(username)
6868
@user.touch(:last_email_sent)
6969
@user.reload
7070
@badge = next_badge_to_send(@user)
@@ -82,8 +82,8 @@ def new_follower(username, follower_username)
8282
headers['X-Mailgun-Variables'] = {email_type: FOLLOWER_EVENT}.to_json
8383
track_campaign("new_follower")
8484

85-
@follower = User.with_username(follower_username)
86-
@user = User.with_username(username)
85+
@follower = User.find_by_username(follower_username)
86+
@user = User.find_by_username(username)
8787
@user.touch(:last_email_sent)
8888

8989
congratulation = %w{Awesome Brilliant Epic Sweet}.sample
@@ -95,8 +95,8 @@ def new_comment(username, commentor_username, comment_id)
9595
headers['X-Mailgun-Variables'] = {email_type: NEW_COMMENT_EVENT}.to_json
9696
track_campaign("new_comment")
9797

98-
@commentor = User.with_username(commentor_username)
99-
@user = User.with_username(username)
98+
@commentor = User.find_by_username(commentor_username)
99+
@user = User.find_by_username(username)
100100
@comment = Comment.find(comment_id)
101101
@user.touch(:last_email_sent)
102102

@@ -109,8 +109,8 @@ def comment_reply(username, commentor_username, comment_id)
109109
headers['X-Mailgun-Variables'] = {email_type: NEW_COMMENT_EVENT}.to_json
110110
track_campaign("new_comment")
111111

112-
@commentor = User.with_username(commentor_username)
113-
@user = User.with_username(username)
112+
@commentor = User.find_by_username(commentor_username)
113+
@user = User.find_by_username(username)
114114
@comment = Comment.find(comment_id)
115115
@user.touch(:last_email_sent)
116116

@@ -120,7 +120,7 @@ def comment_reply(username, commentor_username, comment_id)
120120
end
121121

122122
def authy(username)
123-
@user = User.with_username(username)
123+
@user = User.find_by_username(username)
124124
congratulation = %w{Awesome Brilliant Epic Sweet}.sample
125125
name = @user.short_name
126126
mail to: @user.email, subject: "[Coderwall] #{congratulation} #{name}! You have a new fan and they've sent you a message"
@@ -129,7 +129,7 @@ def authy(username)
129129
def remind_to_create_team(username)
130130
track_campaign('remind_to_create_team')
131131
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
132-
@user = User.with_username(username)
132+
@user = User.find_by_username(username)
133133
@user.touch(:last_email_sent)
134134
@user.touch(:remind_to_create_team)
135135

@@ -140,7 +140,7 @@ def remind_to_create_team(username)
140140
def remind_to_invite_team_members(username)
141141
track_campaign('remind_to_invite_team_members')
142142
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
143-
@user = User.with_username(username)
143+
@user = User.find_by_username(username)
144144
@user.touch(:last_email_sent)
145145
@user.touch(:remind_to_invite_team_members)
146146

@@ -153,7 +153,7 @@ def remind_to_create_protip(username)
153153

154154
track_campaign('remind_to_create_protip')
155155
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
156-
@user = User.with_username(username)
156+
@user = User.find_by_username(username)
157157
@user.touch(:last_email_sent)
158158
@user.touch(:remind_to_create_protip)
159159

@@ -164,7 +164,7 @@ def remind_to_create_skills(username)
164164

165165
track_campaign('remind_to_create_skills')
166166
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
167-
@user = User.with_username(username)
167+
@user = User.find_by_username(username)
168168
@user.touch(:last_email_sent)
169169
@user.touch(:remind_to_create_skills)
170170

@@ -175,7 +175,7 @@ def remind_to_link_accounts(username)
175175

176176
track_campaign('remind_to_link_accounts')
177177
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
178-
@user = User.with_username(username)
178+
@user = User.find_by_username(username)
179179
@user.touch(:last_email_sent)
180180
@user.touch(:remind_to_link_accounts)
181181

@@ -185,7 +185,7 @@ def newsletter_june_18(username)
185185
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
186186
track_campaign("newsletter_delicious_coderwall")
187187

188-
@user = User.with_username(username)
188+
@user = User.find_by_username(username)
189189
@user.touch(:last_email_sent)
190190
mail to: @user.email, subject: "Coderwall just got delicious"
191191
end
@@ -194,7 +194,7 @@ def newsletter_networks(username)
194194
headers['X-Mailgun-Variables'] = {email_type: NEWSLETTER_EVENT}.to_json
195195
track_campaign("newsletter_networks")
196196

197-
@user = User.with_username(username)
197+
@user = User.find_by_username(username)
198198
@user.touch(:last_email_sent)
199199
mail to: @user.email, subject: "Introducing Networks"
200200
end
@@ -204,7 +204,7 @@ def new_applicant(username, job_id)
204204
headers['X-Mailgun-Variables'] = {email_type: NEW_APPLICANT_EVENT}.to_json
205205
#track_campaign("new_applicant")
206206

207-
@user = User.with_username(username)
207+
@user = User.find_by_username(username)
208208
@job = Opportunity.find(job_id)
209209
@admin = User.find(@job.team.account.admin_id)
210210

@@ -345,7 +345,7 @@ def invoice
345345
end
346346

347347
def template_example(username)
348-
@user = User.with_username(username)
348+
@user = User.find_by_username(username)
349349
mail to: @user.email, subject: "This is a sample of all the template styles"
350350
end if Rails.env.development?
351351

0 commit comments

Comments
 (0)