Merge branch 'rfc3986_scheme_validation' of github.com:ptoomey3/addre…

…ssable into ptoomey3-rfc3986_scheme_validation

lib/addressable/uri.rb

@@ -862,7 +862,7 @@ def scheme=(new_scheme)
       elsif new_scheme
         new_scheme = new_scheme.to_str
       end
-      if new_scheme && new_scheme !~ /[a-z][a-z0-9\.\+\-]*/i
+      if new_scheme && new_scheme !~ /\A[a-z][a-z0-9\.\+\-]*\z/i
         raise InvalidURIError, "Invalid scheme format."
       end
       @scheme = new_scheme

spec/addressable/uri_spec.rb

@@ -243,6 +243,48 @@ def to_s
     end).to raise_error(Addressable::URI::InvalidURIError)
   end
 
+  it "should raise an error if the scheme begins with a digit" do
+    (lambda do
+      @uri.scheme = "1scheme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme begins with a plus" do
+    (lambda do
+      @uri.scheme = "+scheme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme begins with a dot" do
+    (lambda do
+      @uri.scheme = ".scheme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme begins with a dash" do
+    (lambda do
+      @uri.scheme = "-scheme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme contains an illegal character" do
+    (lambda do
+      @uri.scheme = "scheme!"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme contains whitespace" do
+    (lambda do
+      @uri.scheme = "sch eme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
+  it "should raise an error if the scheme contains a newline" do
+    (lambda do
+      @uri.scheme = "sch\neme"
+    end).should raise_error(Addressable::URI::InvalidURIError)
+  end
+
   it "should raise an error if set into an invalid state" do
     expect(lambda do
       @uri.user = "user"
@@ -3632,15 +3674,6 @@ def to_s
     expect(@uri.to_str).to eq(
       "ftp://user:pass@example.com/path/to/resource?query=x#fragment"
     )
-    @uri.scheme = "bogus!"
-    expect(@uri.scheme).to eq("bogus!")
-    expect(@uri.normalized_scheme).to eq("bogus%21")
-    expect(@uri.normalize.to_s).to eq(
-      "bogus%21://user:pass@example.com/path/to/resource?query=x#fragment"
-    )
-    expect(@uri.normalize.to_str).to eq(
-      "bogus%21://user:pass@example.com/path/to/resource?query=x#fragment"
-    )
   end
 
   it "should have the correct site segment after assignment" do