files.com 1.0.331 → 1.0.333

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14222b37137fc5a7dbd47f3ae067b97f9dc26eadf43362675c919af12f9e3046
-  data.tar.gz: fed625035ea60ba05ebeecb5da4b75abef6b0b6a7e01ccdb5b78e6e03b38e652
+  metadata.gz: f66268de3c346a62ee07907abf6c0ee4454c32033cd00592d3336b3a043f2c02
+  data.tar.gz: '086fc0447193c38583978c16675231da91bbb536c118f14178419d953e55273e'
 SHA512:
-  metadata.gz: b2df3ef6c1d9307110d0004e2d538d92b683e1d51b27a69e1f77c1708410caec422e3526212b223a3aacc40c19a1b61d5d7f5033efb64e36b26119eb594ffbf4
-  data.tar.gz: 3a3c3f852739c6d0a23c9426a9eb256665eac8cfa9331ec5e3bbbea5302415b853b1cc9334bb79a3c2ab047fb5b1e9f88933822e9bb8d0123b54a4bf428993e7
+  metadata.gz: fcb8126dd3284ab0650357d28123aa57ff642d3a7776870649cea3db2170f80d5c62b47ec591320e3eeac72872f165bb2106652e8c93fb6dce9debaa67e18054
+  data.tar.gz: 6c13961ae3b576c4364d6649b80f70b43ad4b82fe2a422573832fdd56a2f88cd7e95517f49f844f3534a7b04d4502a4b74d16d2960e6812a5dbda3084de1d6da

data/_VERSION

@@ -1 +1 @@
-1.0.331
+1.0.333

data/lib/files.com/path_util.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module Files
+  module PathUtil
+    TRANSLIT_MAP = "ÀA,ÁA,ÂA,ÃA,ÄA,ÅA,ÆAE,ÇC,ÈE,ÉE,ÊE,ËE,ÌI,ÍI,ÎI,ÏI,ÐD,ÑN,ÒO,ÓO,ÔO,ÕO,ÖO,ØO,ÙU,ÚU,ÛU,ÜU,ÝY,ßss,àa,áa,âa,ãa,äa,åa,æae,çc,èe,ée,êe,ëe,ìi,íi,îi,ïi,ðd,ñn,òo,óo,ôo,õo,öo,øo,ùu,úu,ûu,üu,ýy,ÿy,ĀA,āa,ĂA,ăa,ĄA,ąa,ĆC,ćc,ĈC,ĉc,ĊC,ċc,ČC,čc,ĎD,ďd,ĐD,đd,ĒE,ēe,ĔE,ĕe,ĖE,ėe,ĘE,ęe,ĚE,ěe,ĜG,ĝg,ĞG,ğg,ĠG,ġg,ĢG,ģg,ĤH,ĥh,ĦH,ħh,ĨI,ĩi,ĪI,īi,ĬI,ĭi,ĮI,įi,İI,IJIJ,ijij,ĴJ,ĵj,ĶK,ķk,ĹL,ĺl,ĻL,ļl,ĽL,ľl,ŁL,łl,ŃN,ńn,ŅN,ņn,ŇN,ňn,ʼn'n,ŌO,ōo,ŎO,ŏo,ŐO,őo,ŒOE,œoe,ŔR,ŕr,ŖR,ŗr,ŘR,řr,ŚS,śs,ŜS,ŝs,ŞS,şs,ŠS,šs,ŢT,ţt,ŤT,ťt,ŨU,ũu,ŪU,ūu,ŬU,ŭu,ŮU,ůu,ŰU,űu,ŲU,ųu,ŴW,ŵw,ŶY,ŷy,ŸY,ŹZ,źz,ŻZ,żz,ŽZ,žz".split(",").to_h { |val| [ val[0], val[1..2] ] }.freeze
+
+    def self.normalize_for_comparison(*args)
+      unicode_normalize_and_transliterate(normalize(*args).to_s).downcase.rstrip
+    end
+
+    def self.same?(a, b)
+      normalize_for_comparison(a) == normalize_for_comparison(b)
+    end
+
+    def self.cleanpath(path)
+      new_path = Pathname.new(path).cleanpath.to_s
+
+      return "" if [ ".", ".." ].include? new_path
+      return new_path[1..] if new_path.index('/') == 0
+
+      new_path
+    end
+
+    private_class_method def self.normalize(*paths)
+      all_paths = paths.flatten.compact.map { |path| u8(path).gsub("\x00", "").gsub("\\", "/").split("/") }.flatten
+      all_paths.map { |path| cleanpath(path) }.reject(&:empty?).join("/")
+    end
+
+    private_class_method def self.u8(str)
+      new_string = begin
+        str.encode("UTF-8")
+      rescue Encoding::UndefinedConversionError
+        str.dup.force_encoding("UTF-8")
+      end
+
+      if new_string.valid_encoding?
+        new_string
+      else
+        new_string.force_encoding("ISO-8859-1").encode("UTF-8")
+      end
+    end
+
+    private_class_method def self.unicode_normalize_and_transliterate(string)
+      # convert multi-code-point characters into single-code-point characters
+      normalized_string = string.unicode_normalize(:nfkc)
+
+      normalized_string.gsub(/[^\x00-\x7f]/u) do |char|
+        TRANSLIT_MAP[char] || char
+      end
+    end
+  end
+end

data/lib/files.com.rb

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

data/shared/normalization_for_comparison_test_data.json

@@ -0,0 +1,49 @@
+[
+  [ "filename.txt", "filename.txt" ],
+  [ "FiLeNaMe.TxT", "filename.txt" ],
+  [ "FILENAME.TXT", "filename.txt" ],
+  [ "FÎŁĘÑÂMÉ.TXT", "filename.txt" ],
+  [ "Fïłèńämê.Txt", "filename.txt" ],
+  [ "a/b/c.txt", "a/b/c.txt" ],
+  [ "A\\B\\C.TXT", "a/b/c.txt" ],
+  [ "A/B\\C.TXT", "a/b/c.txt" ],
+  [ "//a/b//c.txt", "a/b/c.txt" ],
+  [ "a/b/c.txt  ", "a/b/c.txt" ],
+  [ "a/b/c.txt\t", "a/b/c.txt" ],
+  [ "a/b/c.txt\n", "a/b/c.txt" ],
+  [ "a/b/c.txt\r", "a/b/c.txt" ],
+  [ " space_at_beginning", " space_at_beginning"],
+  [ "space_at_end ", "space_at_end"],
+  [ "tab\tseperated", "tab\tseperated"],
+  [ "<title>hello</hello>", "<title>hello</hello>"],
+  [ "안녕하세요", "안녕하세요" ],
+  [ "こんにちは", "こんにちは" ],
+  [ "今日は", "今日は" ],
+  [ "longest_unicode_character_﷽", "longest_unicode_character_﷽"],
+  [ "invalid_null_byte_before\u0000after", "invalid_null_byte_beforeafter" ],
+  [ "a/b/c/../../hello", "a/b/c/hello" ],
+  [ "a/b/c/././hello", "a/b/c/hello" ],
+  [ "one_code_point_ą", "one_code_point_a" ],
+  [ "two_code_points_ą", "two_code_points_a" ],
+  [ "one_code_point_훯", "one_code_point_훯"],
+  [ "three_code_points_훯", "three_code_points_훯" ],
+  [ "ÞþŊŋŦŧ", "þþŋŋŧŧ" ],
+  [ "ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝßàáâãäåæçèéêëìíîïðñòóôõöøùúûüýÿ", "aaaaaaaeceeeeiiiidnoooooouuuuyssaaaaaaaeceeeeiiiidnoooooouuuuyy" ],
+  [ "ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİIJij", "aaaaaaccccccccddddeeeeeeeeeegggggggghhhhiiiiiiiiiijij" ],
+  [ "ĴĵĶķĹĺĻļĽľŁłŃńŅņŇňʼnŌōŎŏŐőŒœŔŕŖŗŘřŚśŜŝŞşŠšŢţŤť", "jjkkllllllllnnnnnnʼnoooooooeoerrrrrrsssssssstttt" ],
+  [ "ŨũŪūŬŭŮůŰűŲųŴŵŶŷŸŹźŻżŽž", "uuuuuuuuuuuuwwyyyzzzzzz" ],
+  [ "😂❤️😍🤣😊🙏💕😭😘👍😅👏😁♥️🔥💔💖💙😢🤔😆🙄💪😉☺️👌🤗", "😂❤️😍🤣😊🙏💕😭😘👍😅👏😁♥️🔥💔💖💙😢🤔😆🙄💪😉☺️👌🤗" ],
+  [ "💜😔😎😇🌹🤦🎉💞✌️✨🤷😱😌🌸🙌😋💗💚😏💛🙂💓🤩😄😀🖤😃💯🙈👇🎶😒🤭❣️", "💜😔😎😇🌹🤦🎉💞✌️✨🤷😱😌🌸🙌😋💗💚😏💛🙂💓🤩😄😀🖤😃💯🙈👇🎶😒🤭❣️" ],
+  [ "emoji_‼️", "emoji_!!️" ],
+  [ "<title>hello<:hello>.txt", "<title>hello<:hello>.txt" ],
+  [ "twodotfile..txt", "twodotfile..txt" ],
+  [ "three/.../dots_path", "three/.../dots_path" ],
+  [ ".", "" ],
+  [ "..", ""],
+  [ "./..", "" ],
+  [ "../..", ""],
+  [ "./.", "" ],
+  [ "../.", ""],
+  [ "./../.", "" ],
+  [ ".././..", ""]
+]

data/spec/path_util_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+require 'json'
+
+RSpec.describe Files::PathUtil do
+  json_str = File.read("shared/normalization_for_comparison_test_data.json")
+  test_cases = JSON.parse json_str
+
+  test_cases.each do |test_case_info|
+    src_chars, dst_chars = test_case_info
+    example "normalizes #{src_chars} to #{dst_chars}" do
+      expect(Files::PathUtil.same?(src_chars, dst_chars)).to eq(true)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: files.com
 version: !ruby/object:Gem::Version
-  version: 1.0.331
+  version: 1.0.333
 platform: ruby
 authors:
 - files.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-19 00:00:00.000000000 Z
+date: 2023-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -277,15 +277,18 @@ files:
 - lib/files.com/models/user_cipher_use.rb
 - lib/files.com/models/user_request.rb
 - lib/files.com/models/webhook_test.rb
+- lib/files.com/path_util.rb
 - 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
+- shared/normalization_for_comparison_test_data.json
 - spec/list_spec.rb
 - spec/models/file_spec.rb
 - spec/models/folder_spec.rb
+- spec/path_util_spec.rb
 - spec/spec_helper.rb
 - spec/uri_spec.rb
 - test.sh