imagekitio 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aabd0c2da76f3f7008b3315212cc04f81434c6bb372dff4448176cf014db01c9
-  data.tar.gz: a9d42b5d5c729fc600ee01361dc78ee97200518f17bd196498a0ae543623b0b9
+  metadata.gz: e2a267b33b83b04a41e8a1623d436eef82320f7ef6e18febaf1ed7f8837c3851
+  data.tar.gz: b90444639b7197ad0fbade7c7092443877089f835e5b64108f25ec839125a21e
 SHA512:
-  metadata.gz: e1bdc9b382371fe0620bb4f0f834037d823063ae924c2806cf78f09ffa644308b0f7739484da388a279b48913ab79fe29228b0328c8d4c8c15674e0a293a7d7b
-  data.tar.gz: 5395acd1194c6a218de14e86cc9e60a3bfb06bb048743967c6645f7452cff7b1978a3fa2bbd72cd8508f061ffa08b4947c12b3f986638b04bd7fa4458b32f222
+  metadata.gz: 9d447d460af09493e4dacc37796a15b48f4f6e15a5ac03dc3df01f1f2729e0411fee78c4f5ec0cf97a7c496bc73c6e2aaa1805c001fdf30e9114d495f7e8cb38
+  data.tar.gz: 53c26e7c92ebbdae23ab35faca95ba875a1b02a7fe63eb95bbd4e6a118adbd7c760498a9ec75bc4691bb4bcd6099551609d2ee1250d15a517d6952c85ed9630e

data/lib/imagekitio/sdk/version.rb

@@ -1,5 +1,5 @@
 module ImageKitIo
   module Sdk
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

data/lib/imagekitio/url.rb

@@ -46,40 +46,31 @@ module ImageKitIo
       end
 
       result_url_hash = {'host': "", 'path': "", 'query': ""}
-      existing_query=nil
+      parsed_host = Addressable::URI.parse(url_endpoint)
+      existing_query = nil
       if path != ""
         parsed_url = Addressable::URI.parse(path)
-        existing_query=parsed_url.query
-        parsed_host = Addressable::URI.parse(url_endpoint)
-        result_url_hash[:scheme] = parsed_host.scheme
-
         # making sure single '/' at end
         result_url_hash[:host] = parsed_host.host.to_s.chomp("/") + parsed_host.path.chomp("/") + "/"
-        result_url_hash[:path] = trim_slash(parsed_url.path)
+        path_without_query = Addressable::URI.parse(path)
+        path_without_query.fragment = path_without_query.query = nil
+        result_url_hash[:path] = path_without_query.hostname.nil? ? trim_slash(path_without_query.to_s) : CGI.escape(trim_slash(path_without_query.to_s))
       else
         parsed_url = Addressable::URI.parse(src)
-        existing_query=parsed_url.query
-        host = parsed_url.host
         result_url_hash[:userinfo] = parsed_url.userinfo if parsed_url.userinfo
-        result_url_hash[:host] = host
-        result_url_hash[:scheme] = parsed_url.scheme
+        result_url_hash[:host] = parsed_url.host
         result_url_hash[:path] = parsed_url.path
         src_param_used_for_url = true
       end
+
+      existing_query = parsed_url.query
+      result_url_hash[:scheme] = parsed_host.scheme
       query_params = {}
-      if existing_query!=nil
-        existing_query.split("&").each do |part|
-          parts=part.split("=")
-          if parts.length==2
-            query_params[parts[0]]=parts[1]
-          end
-        end
-      end
+      query_params = CGI.parse(existing_query).reject {|k, v| v.empty? }.transform_values(&:first) unless existing_query.nil?
       options.fetch(:query_parameters, {}).each do |key, value|
-        query_params[key]=value
+        query_params[key] = value
       end
       transformation_str = transformation_to_str(options[:transformation]).chomp("/")
-
       unless transformation_str.nil? || transformation_str.strip.empty?
         if (transformation_position == constants.QUERY_TRANSFORMATION_POSITION) || src_param_used_for_url == true
           result_url_hash[:query] = "#{constants.TRANSFORMATION_PARAMETER}=#{transformation_str}"
@@ -87,11 +78,10 @@ module ImageKitIo
         else
           result_url_hash[:path] = "#{constants.TRANSFORMATION_PARAMETER}:#{transformation_str}/#{result_url_hash[:path]}"
         end
-
       end
 
       result_url_hash[:host] = result_url_hash[:host].to_s.reverse.chomp("/").reverse
-      result_url_hash[:path] = result_url_hash[:path].chomp("/")
+      result_url_hash[:path] = result_url_hash[:path].chomp("/") unless result_url_hash[:path].nil?
       result_url_hash[:scheme] ||= "https"
 
       query_param_arr = []
@@ -103,22 +93,9 @@ module ImageKitIo
           query_param_arr.push(key.to_s + "=" + value.to_s)
         end
       end
-
       query_param_str = query_param_arr.join("&")
       result_url_hash[:query] = query_param_str
-
-      # Signature String and Timestamp
-      # We can do this only for URLs that are created using urlEndpoint and path parameter
-      # because we need to know the endpoint to be able to remove it from the URL to create a signature
-      # for the remaining. With the src parameter, we would not know the "pattern" in the URL
-      if options[:signed] && !(options[:src])
-        intermediate_url = result_url_hash.fetch(:scheme, "") + "://" + result_url_hash.fetch(:host, "") + result_url_hash.fetch(:path, "")
-        if result_url_hash[:query]!=nil && result_url_hash[:query]!=""
-          intermediate_url += result_url_hash.fetch(:query, "")
-        end
-      end
-
-      url=hash_to_url(result_url_hash)
+      url = hash_to_url(result_url_hash)
       if options[:signed]
         private_key = options[:private_key]
         expire_seconds = options[:expire_seconds]
@@ -129,7 +106,6 @@ module ImageKitIo
         if expire_timestamp && (expire_timestamp != constants.TIMESTAMP)
           query_param_arr.push(constants.TIMESTAMP_PARAMETER + "=" + expire_timestamp.to_s)
         end
-
         query_param_str = query_param_arr.join("&")
         result_url_hash[:query] = query_param_str
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imagekitio
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - ImageKit.io team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-30 00:00:00.000000000 Z
+date: 2022-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave