imglab 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2d52305397eb47d122dcfb0211c013ba7d7d11958bb45854949321a3972c87c7
-  data.tar.gz: 7bf0e1b1325ba9ee9e54be5b3c56cd43de1cc386fa902aba7c9a7468a458fc3f
+  metadata.gz: 87c1e0449e9f2b7e000fda519d3413e205cdfab3d9c87c85bfd2edcc2f5e9467
+  data.tar.gz: 173c5436f148213ac172bf83e3a65a013d6d169264d9252419c3f6e5bb4c0216
 SHA512:
-  metadata.gz: eca396e106d905482ea8ed1a8c081b3bc9d9e5d5380b2af576ae4ab3a36f1318e7585f9a10c90fed9f7fa85be8c75d1b3c971a5bf205e7fd212e05dd5d8dc271
-  data.tar.gz: b2255cf65a8887bbdd1dbcff7a52c9bf724b8d05ee4b2127931f0f8ed8b424a2c4df4808d41fc63374f959c3e000c08ee54e165d9e4e7c882d1884f8d332868e
+  metadata.gz: 39276c9dc2443af3d62b81f20b6313ff0c043300021c21ef9773244543df9967b2fb8afd625404f46528509026d4d18fe17113fc9042e9d06df7eec1a4aa750b
+  data.tar.gz: ecc2f549086dbd82f72820d59787192699abfb0c1c7d35c356a58ec1c01452d87e9a9541cc46cf6efa955b42d7417b0de206f164231f5c0f2d8c2ea775be5053

data/README.md

@@ -7,7 +7,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem "imglab", "~> 0.1.0"
+gem "imglab", "~> 0.1"
 ```
 
 And then execute:
@@ -49,10 +49,10 @@ Imglab.url(Imglab::Source.new("assets"), "image.jpeg", width: 500, height: 600)
 
 ### Using secure image sources
 
-For sources that require signed URLs you can specify `secure_key` and `secure_salt` attributes for the source:
+For sources that require signed URLs you can specify `secure_key` and `secure_salt` attributes:
 
 ```ruby
-source = Imglab::Source.new(secure_key: "assets-secure-key", secure_salt: "assets-secure-salt")
+source = Imglab::Source.new("assets", secure_key: "assets-secure-key", secure_salt: "assets-secure-salt")
 
 Imglab.url(source, "image.jpeg", width: 500, height: 600)
 "https://cdn.imglab.io/assets/image.jpeg?width=500&height=600&signature=generated-signature"
@@ -167,11 +167,11 @@ include Imglab::Position
 Imglab.url("assets", "image.jpeg", width: 500, height: 500, mode: "crop", crop: position("left", "top"))
 "https://cdn.imglab.io/assets/image.jpeg?width=500&height=500&mode=crop&crop=left%2Ctop"
 
-# Using position macro for a vertical and horizontal position
+# Using position helper for a vertical and horizontal position
 Imglab.url("assets", "image.jpeg", width: 500, height: 500, mode: "crop", crop: position("top", "left"))
 "https://cdn.imglab.io/assets/image.jpeg?width=500&height=500&mode=crop&crop=top%2Cleft"
 
-# Using position macro for a position
+# Using position helper for a position
 Imglab.url("assets", "image.jpeg", width: 500, height: 500, mode: "crop", crop: position("left"))
 "https://cdn.imglab.io/assets/image.jpeg?width=500&height=500&mode=crop&crop=left"
 ```

data/lib/imglab/utils.rb

@@ -1,6 +1,8 @@
 class Imglab::Utils
-  NORMALIZE_PATH_PREFIX_REGEXP = Regexp.compile(/\/*$/)
-  NORMALIZE_PATH_SUFFIX_REGEXP = Regexp.compile(/\A\/*/)
+  NORMALIZE_PATH_PREFIX_REGEXP = Regexp.compile(/\A\/*/)
+  NORMALIZE_PATH_SUFFIX_REGEXP = Regexp.compile(/\/*$/)
+
+  WEB_URI_SCHEMES = %w[https http]
 
   # Returns a normalized path where suffix and prefix slashes are removed.
   #
@@ -21,6 +23,16 @@ class Imglab::Utils
     end
   end
 
+  # Returns a boolean value indicating whether a string is a valid HTTP/HTTPS URI or not.
+  #
+  # @param uri [String]
+  # @return [Boolean]
+  def self.web_uri?(uri)
+    WEB_URI_SCHEMES.include?(URI.parse(uri).scheme)
+  rescue URI::Error
+    false
+  end
+
   private
 
   def self.dasherize(value)

data/lib/imglab/version.rb

@@ -1,3 +1,3 @@
 module Imglab
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/imglab.rb

@@ -1,3 +1,5 @@
+require "erb"
+
 require "imglab/version"
 require "imglab/source"
 require "imglab/signature"
@@ -41,13 +43,27 @@ module Imglab
       source.host,
       source.port,
       nil,
-      File.join("/", source.path(normalized_path)),
+      File.join("/", source.path(encode_path(normalized_path))),
       nil,
       encode_params(source, normalized_path, normalized_params),
       nil
     ).to_s
   end
 
+  def self.encode_path(path)
+    if Utils.web_uri?(path)
+      encode_path_component(path)
+    else
+      path.split("/").map do |path_component|
+        encode_path_component(path_component)
+      end.join("/")
+    end
+  end
+
+  def self.encode_path_component(path_component)
+    ERB::Util.url_encode(path_component)
+  end
+
   def self.encode_params(source, path, params)
     return encode_empty_params(source, path) if params.empty?
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imglab
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - imglab
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies: []
 description: Official Ruby library to integrate with imglab services.
 email:
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Official imglab Ruby library.