Move bottle URL construction to the bottle object

1 files changed, 8 insertions, 1 deletions

diff --git a/Library/Homebrew/software_spec.rb b/Library/Homebrew/software_spec.rb
index dca84da21..5382103d4 100644
--- a/Library/Homebrew/software_spec.rb
+++ b/Library/Homebrew/software_spec.rb
@@ -143,7 +143,8 @@ class Bottle
 
     checksum, tag = spec.checksum_for(bottle_tag)
 
-    @resource.url = bottle_url(spec.root_url, formula.name, formula.pkg_version, tag, spec.revision)
+    filename = Filename.new(formula.name, formula.pkg_version, tag, spec.revision)
+    @resource.url = build_url(spec.root_url, filename)
     @resource.download_strategy = CurlBottleDownloadStrategy
     @resource.version = formula.pkg_version
     @resource.checksum = checksum
@@ -155,6 +156,12 @@ class Bottle
   def compatible_cellar?
     cellar == :any || cellar == HOMEBREW_CELLAR.to_s
   end
+
+  private
+
+  def build_url(root_url, filename)
+    "#{root_url}/#{filename}"
+  end
 end
 
 class BottleSpecification