Fix #5. Release 1.3.1.

README.md

@@ -55,6 +55,6 @@ Use with Maven:
   <dependency>
   <groupId>mikaelhg</groupId>
   <artifactId>urlbuilder</artifactId>
-  <version>1.3</version>
+  <version>1.3.1</version>
   </dependency>
  </dependencies>

pom.xml

@@ -6,7 +6,7 @@
 
  <groupId>mikaelhg</groupId>
  <artifactId>urlbuilder</artifactId>
- <version>1.3</version>
+ <version>1.3.1</version>
 
  <licenses>
  <license>

src/main/java/gumi/builders/UrlBuilder.java

@@ -192,7 +192,7 @@ public static UrlBuilder fromUrl(final URL url) {
  return of(DEFAULT_ENCODING, DEFAULT_ENCODING,
  url.getProtocol(), url.getUserInfo(), url.getHost(),
  url.getPort() == -1 ? null : url.getPort(),
- url.getPath(),
+ urlDecode(url.getPath(), DEFAULT_ENCODING),
  decodeQueryParameters(url.getQuery(), DEFAULT_ENCODING), url.getRef());
  }
 

src/test/java/gumi/builders/UrlBuilderStepDefinitions.java

@@ -1,6 +1,11 @@
 package gumi.builders;
 
 import cucumber.api.java.en.*;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+
 import static org.junit.Assert.*;
 
 public class UrlBuilderStepDefinitions {
@@ -17,6 +22,11 @@ public void i_create_a_builder_from_the_string_x(final String urlString) {
  builder = UrlBuilder.fromString(urlString);
  }
 
+ @Given("^I create a builder from the URL (.*)$")
+ public void i_create_a_builder_from_the_url_x(final String urlString) throws MalformedURLException {
+ builder = UrlBuilder.fromUrl(new URL(urlString));
+ }
+
  @Given("^I create a builder from the (.*) encoded string (.*)$")
  public void i_create_a_builder_from_the_x_encoded_string_y(final String encoding, final String urlString) {
  builder = UrlBuilder.fromString(urlString, encoding);

src/test/resources/gumi/builders/urlbuilder.feature

@@ -1,11 +1,15 @@
 Feature: UrlBuilder url creation
 
- Scenario: Empty URL
+ Scenario: Empty URL builder
  Given I create an empty builder
  Then it should be an empty string
 
- Scenario: Basic Google URL
+ Scenario: Basic Google URL string
  Given I create a builder from the string http://www.google.com/?q=test
  When I set the schema to https
  Then as a string it should be https://www.google.com/?q=test
 
+ Scenario: From URL with urlencoded space character
+ Given I create a builder from the URL http://www.example.com/a%20b/
+ Then as a string it should be http://www.example.com/a+b/
+