Skip to content

Commit

Permalink
Enforce uniform access principle
Browse files Browse the repository at this point in the history
get_db → db
@db → db
  • Loading branch information
gousiosg committed May 26, 2016
1 parent bac680c commit 36b5727
Show file tree
Hide file tree
Showing 15 changed files with 86 additions and 86 deletions.
2 changes: 1 addition & 1 deletion fixes/fix_commit_comment.rb
Expand Up @@ -42,7 +42,7 @@ def ght
end

def db
@db ||= ght.get_db
@db ||= ght.db
@db
end

Expand Down
4 changes: 2 additions & 2 deletions fixes/fix_fake_users.rb
Expand Up @@ -34,10 +34,10 @@ def settings
def run(command)
processor = Proc.new do |login|
@ght ||= GHTorrent::Mirror.new(settings)
@ght.get_db
@ght.db

exists = !api_request("https://api.github.com/users/#{login}").empty?
@ght.get_db[:users].where(:login => login).update(:fake => exists)
@ght.db[:users].where(:login => login).update(:fake => exists)

puts "User: #{login}, exists: #{exists}"
end
Expand Down
2 changes: 1 addition & 1 deletion fixes/fix_forks.rb
Expand Up @@ -42,7 +42,7 @@ def go

if forked[:forked_from].nil? or forked[:forked_from] != parent[:id]
tried += 1
@ght.get_db[:projects].filter(:id => forked[:id]).update(:forked_from => parent[:id])
@ght.db[:projects].filter(:id => forked[:id]).update(:forked_from => parent[:id])
fixed += 1
puts "Added #{owner}/#{repo} as fork of #{parent_owner}/#{parent_repo}"
else
Expand Down
2 changes: 1 addition & 1 deletion fixes/fix_issue_labels.rb
Expand Up @@ -34,7 +34,7 @@ def go
# logger.debug "Could not get labels for repo #{repo[:login]}/#{repo[:name]}"
# end
#end
@ght.get_db
@ght.db
issues = lbls = 0
col.find({'labels' => {'$ne' => '[]'}}, {:timeout => false}) do |cursor|
cursor.each do |issue|
Expand Down
2 changes: 1 addition & 1 deletion fixes/fix_pull_request_comments.rb
Expand Up @@ -23,7 +23,7 @@ def ght
end

def db
@db ||= ght.get_db
@db ||= ght.db
@db
end

Expand Down
2 changes: 1 addition & 1 deletion fixes/fix_pull_request_commits.rb
Expand Up @@ -84,7 +84,7 @@ def go
end

def db
@db ||= ght.get_db
@db ||= ght.db
@db
end

Expand Down
2 changes: 1 addition & 1 deletion fixes/fix_pull_request_commits_2.rb
Expand Up @@ -62,7 +62,7 @@ def go
end

def db
@db ||= ght.get_db
@db ||= ght.db
@db
end

Expand Down
2 changes: 1 addition & 1 deletion fixes/refresh_pull_request_history.rb
Expand Up @@ -63,7 +63,7 @@ def run(command)
col.delete_one({'owner' => owner, 'repo' => repo, 'number' => pull_req.to_i})
col.insert_one(retrieved)

@ght.get_db.from(:pull_request_history, :pull_requests, :users, :projects)\
@ght.db.from(:pull_request_history, :pull_requests, :users, :projects)\
.where(:pull_requests__id => :pull_request_history__pull_request_id)\
.where(:users__id => :projects__owner_id)\
.where(:projects__id => :pull_requests__base_repo_id)\
Expand Down
4 changes: 2 additions & 2 deletions fixes/update_pullreq_entries_from_events.rb
Expand Up @@ -35,7 +35,7 @@ def settings
def run(command)
processor = Proc.new do |event_id|
@ght ||= GHTorrent::Mirror.new(settings)
@ght.get_db
@ght.db

pr = persister.find(:events, {'id' => event_id})[0]

Expand All @@ -46,7 +46,7 @@ def run(command)
actor = pr['actor']['login']
created_at = @ght.date(pr['created_at'])

pullreq_entry = @ght.get_db.from(:pull_requests, :projects, :users)\
pullreq_entry = @ght.db.from(:pull_requests, :projects, :users)\
.where(:users__id => :projects__owner_id)\
.where(:projects__id => :pull_requests__base_repo_id)\
.where(:users__login => owner)\
Expand Down
6 changes: 3 additions & 3 deletions lib/ghtorrent/commands/full_repo_retriever.rb
Expand Up @@ -74,8 +74,8 @@ def retrieve_full_repo(owner, repo)
# it means that another transaction added/updated the repo.
# Just re-running the block should lead to the project being
# rejected from further processing due to an updated updated_at field
ght.get_db.transaction(:isolation => :serializable,
:retry_on=>[Sequel::SerializationFailure]) do
ght.db.transaction(:isolation => :serializable,
:retry_on =>[Sequel::SerializationFailure]) do
repo_entry = ght.ensure_repo(owner, repo)

if repo_entry.nil?
Expand All @@ -91,7 +91,7 @@ def retrieve_full_repo(owner, repo)
return
end

ght.get_db.from(:projects).where(:id => repo_entry[:id]).update(:updated_at => Time.now)
ght.db.from(:projects).where(:id => repo_entry[:id]).update(:updated_at => Time.now)
end

unless options[:no_entities_given]
Expand Down
4 changes: 2 additions & 2 deletions lib/ghtorrent/commands/full_user_retriever.rb
Expand Up @@ -40,7 +40,7 @@ def retrieve_user(login)
exit
else
ght.transaction do
ght.get_db.from(:users).where(:login => login).update(:users__deleted => true)
ght.db.from(:users).where(:login => login).update(:users__deleted => true)
end
warn "User #{login} marked as deleted"
return
Expand All @@ -60,7 +60,7 @@ def retrieve_user(login)
# Update geo location information
geo = geolocate(on_github['location'])

ght.get_db.from(:users).where(:login => login).update(
ght.db.from(:users).where(:login => login).update(
# Geolocation info
:users__long => geo['long'].to_f,
:users__lat => geo['lat'].to_f,
Expand Down
2 changes: 1 addition & 1 deletion lib/ghtorrent/commands/repo_updater.rb
Expand Up @@ -15,7 +15,7 @@ def persister
end

def db
@db ||= ght.get_db
ght.db
end

def ght
Expand Down
2 changes: 1 addition & 1 deletion lib/ghtorrent/event_processing.rb
Expand Up @@ -42,7 +42,7 @@ def MemberEvent(data)
date_added = data['created_at']

ght.transaction do
pr_members = ght.get_db[:project_members]
pr_members = ght.db[:project_members]
project = ght.ensure_repo(owner, repo)
new_user = ght.ensure_user(new_member, false, false)

Expand Down

0 comments on commit 36b5727

Please sign in to comment.