From 8b5b420797df2c6c870092eb6e529f4315bc9032 Mon Sep 17 00:00:00 2001
From: David Chandek-Stark <dchandekstark@gmail.com>
Date: Thu, 26 Oct 2017 13:29:39 -0400
Subject: [PATCH] Hotfix 0.9.1

Fixes issue with non-ASCII characters in DuraCloud content ID.
The fix uses Addressable::URI.parse from the `addressable` gem
to normalize the non-ASCII characters properly. As a result,
manual escaping of spaces was removed (but escaping percent signs
in content IDs was retained because they are assumed not to
signify character codes).
---
 duracloud.gemspec             | 1 +
 lib/duracloud/request.rb      | 4 +++-
 lib/duracloud/rest_methods.rb | 3 +--
 lib/duracloud/version.rb      | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/duracloud.gemspec b/duracloud.gemspec
index 7a39249..506871f 100644
--- a/duracloud.gemspec
+++ b/duracloud.gemspec
@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = ">= 2.2"
 
+  spec.add_dependency "addressable", "~> 2.5"
   spec.add_dependency "hashie", "~> 3.4"
   spec.add_dependency "httpclient", "~> 2.7"
   spec.add_dependency "activemodel", ">= 4.2", "< 6"
diff --git a/lib/duracloud/request.rb b/lib/duracloud/request.rb
index 6b7220f..30b6560 100644
--- a/lib/duracloud/request.rb
+++ b/lib/duracloud/request.rb
@@ -1,3 +1,5 @@
+require 'addressable/uri'
+
 module Duracloud
   class Request
     attr_reader :client, :url, :http_method, :body, :headers, :query
@@ -12,7 +14,7 @@ class Request
     def initialize(client, http_method, url, **options)
       @client      = client
       @http_method = http_method
-      @url         = url
+      @url         = Addressable::URI.parse(url).normalize.to_s
       set_options(options.dup)
     end
 
diff --git a/lib/duracloud/rest_methods.rb b/lib/duracloud/rest_methods.rb
index 163d193..626625c 100644
--- a/lib/duracloud/rest_methods.rb
+++ b/lib/duracloud/rest_methods.rb
@@ -130,8 +130,7 @@ def durastore(*args, &block)
     end
 
     def durastore_content(http_method, space_id, content_id, **options, &block)
-      escaped_content_id = content_id.gsub(/%/, "%25").gsub(/ /, "%20")
-      url = [ space_id, escaped_content_id ].join("/")
+      url = [ space_id, content_id.gsub(/%/, "%25") ].join("/")
       durastore(http_method, url, **options, &block)
     end
 
diff --git a/lib/duracloud/version.rb b/lib/duracloud/version.rb
index 34aae28..56c986f 100644
--- a/lib/duracloud/version.rb
+++ b/lib/duracloud/version.rb
@@ -1,3 +1,3 @@
 module Duracloud
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end