allow port numbers in the domain

mwunsch · Apr 18, 2012 · 196356a · 196356a
1 parent 04ea374
commit 196356a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/lib/weary/resource.rb b/lib/weary/resource.rb
@@ -22,7 +22,7 @@ def initialize(method, uri)
     #
     # Returns an Addressable::Template
     def url(uri=nil)
-      @uri = Addressable::Template.new(uri.gsub(/:(\w+)/) { "{#{$1}}" }) unless uri.nil?
+      @uri = Addressable::Template.new(uri.gsub(/:(?![0-9])(\w+)/) { "{#{$1}}" }) unless uri.nil?
       @uri
     end
 
@@ -156,4 +156,4 @@ def pull_credentials(params)
 
 
   end
-end
+end
diff --git a/spec/weary/resource_spec.rb b/spec/weary/resource_spec.rb
@@ -32,6 +32,12 @@
       resource = Weary::Resource.new "GET", url
       resource.url.variables.should include 'user'
     end
+
+    it "accepts port numbers in the url" do
+      url = "http://localhost:3000/api/v2/"
+      resource = Weary::Resource.new "GET", url
+      resource.url.variables.should_not include '3000'
+    end
   end
 
   describe "#optional" do
@@ -253,4 +259,4 @@
       req.params.should eql "user_id=markwunsch"
     end
   end
-end
+end