files.com 1.0.110 → 1.0.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b823cad7eb84b62cf77fbf4b37829a3b36c937c1532c7d9798fd7910fa48adf1
-  data.tar.gz: 839b5d017058a7a21afe3b90a8acee4ddf5df348712ab2b61285be58441430a7
+  metadata.gz: 225dfeba48af26960bc78d58fcc6582130528647e1f4f8cbe46883f79a24cc78
+  data.tar.gz: e432cdc6416e3ff8f24911833c33f244dc6d3c030db9a1ea1d517ab4e7038098
 SHA512:
-  metadata.gz: ab72c400c26db6e38f5c4c94ea1bfe01f60093dfbbfddb1c3c26699ba31bcdce257bd9422697f555914b8d2c403a0a28983af54a2097bb2a4e3277485127b883
-  data.tar.gz: 2f0688fea58866785311afc8260306260d3d4d6ad811ce851dd9a2dffe899a9e39451c223b8fb40b1e01f70462f44ed8569b8179e3d73328e9d00e5d521321bb
+  metadata.gz: ca79ab1f63905d8a1d91ebf3a4c620ec0d1f10024b6786162e6735266a1dc2c548bde72461f7ec2e653dd5bab918505b3b6bd99ed887c3152ae76d252fc55919
+  data.tar.gz: 067e4d6f28a7ecfdd71b327e026a6414988384639af8546dcc8dd0a52da280be8ded9af59b6146d99f43c3d6bd6a9ae832c4eef7af344bfb3cddeeedc6971c89

data/_VERSION

@@ -1 +1 @@
-1.0.110
+1.0.111

data/lib/files.com.rb

@@ -25,6 +25,7 @@ require "files.com/response"
 require "files.com/system_profiler"
 require "files.com/util"
 require "files.com/list"
+require "files.com/uri"
 
 require "files.com/models/account_line_item"
 require "files.com/models/action"

data/lib/files.com/api_client.rb

@@ -172,9 +172,10 @@ module Files
     private def api_url(url = "", base_url = nil)
       uri        = Addressable::URI.new
       uri.host   = Addressable::URI.parse(base_url).host
-      uri.path   = "/api/rest/v1" + url
+      uri.path   = "/api/rest/v1" + Files::URI.normalized_path(url)
       uri.scheme = Addressable::URI.parse(base_url).scheme
-      uri.normalize!.to_s
+
+      uri.to_s
     end
 
     private def check_api_key!(api_key)

data/lib/files.com/uri.rb

@@ -0,0 +1,70 @@
+module Files
+  module URI
+    # This is a copy of Addressable::URI.normalize_component without Addressable::IDNA.unicode_normalize_kc.
+    def self.normalize_component(component, character_class =
+        Addressable::URI::CharacterClasses::RESERVED + Addressable::URI::CharacterClasses::UNRESERVED,
+                                 leave_encoded = '')
+      return nil if component.nil?
+
+      unless component.is_a? String
+        begin
+          component = component.to_str
+        rescue NoMethodError, TypeError
+          raise TypeError, "Can't convert #{component.class} into String."
+        end
+      end
+
+      unless [ String, Regexp ].include?(character_class.class)
+        raise TypeError,
+              "Expected String or Regexp, got #{character_class.inspect}"
+      end
+      if character_class.is_a?(String)
+        leave_re = unless leave_encoded.empty?
+                     character_class = "#{character_class}%" unless character_class.include?('%')
+
+                     "|%(?!#{leave_encoded.chars.map do |char|
+                       seq = SEQUENCE_ENCODING_TABLE[char]
+                       [ seq.upcase, seq.downcase ]
+                     end.flatten.join('|')})"
+                   end
+
+        character_class = /[^#{character_class}]#{leave_re}/
+      end
+      # We can't perform regexps on invalid UTF sequences, but
+      # here we need to, so switch to ASCII.
+      component = component.dup
+      component.force_encoding(Encoding::ASCII_8BIT)
+      unencoded = Addressable::URI.unencode_component(component, String, leave_encoded)
+      begin
+        encoded = Addressable::URI.encode_component(
+          # Addressable::IDNA.unicode_normalize_kc(unencoded),
+          unencoded,
+          character_class,
+          leave_encoded
+        )
+      rescue ArgumentError
+        encoded = encode_component(unencoded)
+      end
+      encoded.force_encoding(Encoding::UTF_8)
+      encoded
+    end
+
+    def self.normalized_path(path)
+      if path =~ Addressable::URI::NORMPATH
+        # Relative paths with colons in the first segment are ambiguous.
+        path = path.sub(":", "%2F")
+      end
+      # String#split(delimeter, -1) uses the more strict splitting behavior
+      # found by default in Python.
+      result = path.strip.split(Addressable::URI::SLASH, -1).map do |segment|
+        normalize_component(
+          segment,
+          Addressable::URI::CharacterClasses::PCHAR
+        )
+      end.join(Addressable::URI::SLASH)
+
+      # All normalized values should be UTF-8
+      result.force_encoding(Encoding::UTF_8)
+    end
+  end
+end

data/spec/uri_spec.rb

@@ -0,0 +1,11 @@
+require "spec_helper"
+
+RSpec.describe Files::URI do
+  describe "normalized_path" do
+    it { expect(described_class.normalized_path("[[strange stuff]]#yes.text")).to eq("%5B%5Bstrange%20stuff%5D%5D%23yes.text") }
+    it { expect(Addressable::URI.unencode_component(described_class.normalized_path("[[strange stuff]]#yes.text"))).to eq("[[strange stuff]]#yes.text") }
+
+    it { expect(described_class.normalized_path("folder/AdÇe")).to eq("folder/AdC%CC%A7e") }
+    it { expect(Addressable::URI.unencode_component(described_class.normalized_path("AdÇe"))).to eq("AdÇe") }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.110
+  version: 1.0.111
 platform: ruby
 authors:
 - files.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -211,12 +211,14 @@ files:
 - lib/files.com/response.rb
 - lib/files.com/sizable_io.rb
 - lib/files.com/system_profiler.rb
+- lib/files.com/uri.rb
 - lib/files.com/util.rb
 - lib/files.com/version.rb
 - spec/list_spec.rb
 - spec/models/file_spec.rb
 - spec/models/folder_spec.rb
 - spec/spec_helper.rb
+- spec/uri_spec.rb
 - test.sh
 - test/test.rb
 homepage: https://www.files.com