Refactor for style issues

1 files changed, 10 insertions, 14 deletions

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9b270bc9d18..0e2d4ea1fb8 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -148,8 +148,7 @@ class Repository
   end
   
   def diverging_commit_counts(branch)
-    branch_cache_key = ('diverging_commit_counts_' + branch.name).to_sym
-    cache.fetch(branch_cache_key) do
+    cache.fetch(:"diverging_commit_counts_#{branch.name}") do
       number_commits_behind = commits_between(branch.name, root_ref).size
       number_commits_ahead = commits_between(root_ref, branch.name).size
       
@@ -158,14 +157,13 @@ class Repository
   end
 
   def cache_keys
-    %i(size branch_names tag_names commit_count readme
-       contribution_guide changelog license)
+    %i(size branch_names tag_names commit_count
+       readme version contribution_guide changelog license)
   end
   
   def branch_cache_keys
-    branches.map do
-      |branch|
-      ('diverging_commit_counts_' + branch.name).to_sym
+    branches.map do |branch|
+      :"diverging_commit_counts_#{branch.name}"
     end
   end
 
@@ -177,7 +175,7 @@ class Repository
     end
     
     branches.each do |branch|
-      unless cache.exist?(('diverging_commit_counts_' + branch.name).to_sym)
+      unless cache.exist?(:"diverging_commit_counts_#{branch.name}")
         send(:diverging_commit_counts, branch)
       end
     end
@@ -188,14 +186,12 @@ class Repository
       cache.expire(key)
     end
     
-    branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
-    end
+    expire_branch_cache
   end
   
   def expire_branch_cache
     branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
+      cache.expire(:"diverging_commit_counts_#{branch.name}")
     end
   end
 
@@ -206,8 +202,8 @@ class Repository
     end
     
     branches.each do |branch|
-      cache.expire(('diverging_commit_counts_' + branch.name).to_sym)
-      send(:diverging_commit_counts, branch)
+      cache.expire(:"diverging_commit_counts_#{branch.name}")
+      diverging_commit_counts(branch)
     end
   end