imgproxy 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 90e13f160840d97192d6499cc36cc2bf9c5e96d58348706339f2215333c44f17
-  data.tar.gz: 3631ee4b306561b4f7ab00d8930e80a510013fd37dba059b825e21aa115d6977
+  metadata.gz: da7381a4edd77972d08b45c68b7a923b924d67b63953e009d90188fc24a56f78
+  data.tar.gz: 7d9832c91d0688b462644238766766df4720f8f7f4d8e5b68d6e94d7b5f6587e
 SHA512:
-  metadata.gz: b519665418fabeda9bbc356454952e4490163cfeea490fa620aae7a475df95d8c58c1fe051e567b650733d9bd388b26c3f5344c638a238a22c4bb6fd2b889018
-  data.tar.gz: 37c777751a3f6d0384cafd4f08e84b02c4f26221b61550605e95c9c6ffec05e5be5cbe2c8030a84efca6c39ab5c41c8997e3a87bb3b58b268cf0c907a5215a49
+  metadata.gz: 4f195a449ff6c690aefcc92d776378c7fec811112943e54781f2fd1f1cbf2484f042bf555ca2b62bf6fbe070998fb5df6e83767f571fc52d6533966cea1d0678
+  data.tar.gz: 3affbd94edbb6be46ee1fb3729c3a3ff6002b06344d84fd4c434bc27f47b7a6d2aa374d6023694af866c41691fad8b5286e1ec525c9121fd0503addb707fc1d4

data/README.md

@@ -110,14 +110,12 @@ user.avatar.imgproxy_url(width: 250, height: 250)
 
 will give you an URL to your user's avatar, resized to 250x250px on the fly.
 
-**Note:** If you use `Shrine::Storage::FileSystem` as storage, uploaded file URLs won't include the hostname, so imgproxy server won't be able to access them. To fix this, initialize `Shrine::Storage::FileSystem` with the `host` option:
+**Note:** If you use `Shrine::Storage::FileSystem` as storage, uploaded file URLs won't include the hostname, so imgproxy server won't be able to access them. To fix this, use `host` option of `Imgproxy.extend_shrine!`:
 
 ```ruby
-# Your Shrine initializer
+# config/initializers/imgproxy.rb
 
-Shrine.storages = {
-  store: Shrine::Storage::FileSystem.new("public", host: "http://your-host.test")
-}
+Imgproxy.extend_shrine!(host: "http://your-host.test")
 ```
 
 Alternatively, you can launch your imgproxy server with the `IMGPROXY_BASE_URL` setting:

data/lib/imgproxy.rb

@@ -97,13 +97,13 @@ module Imgproxy
     #
     # @return [void]
     # @param use_s3 [Boolean] enable Amazon S3 source URLs
-    def extend_shrine!(use_s3: false)
+    def extend_shrine!(host: nil, use_s3: false)
       ::Shrine::UploadedFile.include Imgproxy::Extensions::Shrine
 
       url_adapters = Imgproxy.config.url_adapters
 
       url_adapters.add(Imgproxy::UrlAdapters::ShrineS3.new) if use_s3
-      url_adapters.add(Imgproxy::UrlAdapters::Shrine.new)
+      url_adapters.add(Imgproxy::UrlAdapters::Shrine.new(host: host))
     end
   end
 end

data/lib/imgproxy/builder.rb

@@ -1,5 +1,6 @@
 require "openssl"
 require "base64"
+require "uri"
 
 require "imgproxy/options"
 
@@ -37,7 +38,7 @@ module Imgproxy
 
       signature = sign_path(path)
 
-      "#{Imgproxy.config.endpoint}/#{signature}/#{path}"
+      URI.join(Imgproxy.config.endpoint.to_s, "#{signature}/#{path}").to_s
     end
 
     private

data/lib/imgproxy/config.rb

@@ -5,7 +5,7 @@ module Imgproxy
   # @see Imgproxy.configure
   class Config
     # @return [String] imgproxy endpoint
-    attr_reader :endpoint
+    attr_accessor :endpoint
     # @return [String] imgproxy signature key
     attr_accessor :key
     # @return [String] imgproxy signature salt
@@ -36,11 +36,6 @@ module Imgproxy
       self.salt = value.nil? ? nil : [value].pack("H*")
     end
 
-    def endpoint=(value)
-      value = value.to_s
-      @endpoint = value.end_with?("/") ? value[0..-2] : value
-    end
-
     # URL adapters config. Allows to use this gem with ActiveStorage, Shrine, etc.
     #
     #   Imgproxy.configure do |config|

data/lib/imgproxy/url_adapters/active_storage_gcs.rb

@@ -20,7 +20,7 @@ module Imgproxy
 
       def applicable?(image)
         super &&
-          ::ActiveStorage::Blob.service.is_a?(::ActiveStorage::Service::GCSService)
+          image.service.is_a?(::ActiveStorage::Service::GCSService)
       end
 
       def url(image)

data/lib/imgproxy/url_adapters/active_storage_s3.rb

@@ -12,7 +12,7 @@ module Imgproxy
     class ActiveStorageS3 < Imgproxy::UrlAdapters::ActiveStorage
       def applicable?(image)
         super &&
-          ::ActiveStorage::Blob.service.is_a?(::ActiveStorage::Service::S3Service)
+          image.service.is_a?(::ActiveStorage::Service::S3Service)
       end
 
       def url(image)

data/lib/imgproxy/url_adapters/shrine.rb

@@ -8,12 +8,16 @@ module Imgproxy
     #
     #   Imgproxy.url_for(user.avatar)
     class Shrine
+      def initialize(host: nil)
+        @host = host
+      end
+
       def applicable?(image)
         image.is_a?(::Shrine::UploadedFile)
       end
 
       def url(image)
-        image.url
+        image.url(host: @host)
       end
     end
   end

data/lib/imgproxy/version.rb

@@ -1,3 +1,3 @@
 module Imgproxy
-  VERSION = "1.0.1".freeze
+  VERSION = "1.0.2".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Sergey Alexandrovich
@@ -14,16 +14,16 @@ dependencies:
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -183,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="