imgproxy 1.0.4 → 2.0.0

data/lib/imgproxy/url_adapters.rb

@@ -1,9 +1,5 @@
 require "imgproxy/url_adapters/active_storage"
-require "imgproxy/url_adapters/active_storage_s3"
-require "imgproxy/url_adapters/active_storage_gcs"
-
 require "imgproxy/url_adapters/shrine"
-require "imgproxy/url_adapters/shrine_s3"
 
 module Imgproxy
   # URL adapters config. Allows to use this gem with ActiveStorage, Shrine, etc.

data/lib/imgproxy/url_adapters/active_storage.rb

@@ -15,8 +15,33 @@ module Imgproxy
       end
 
       def url(image)
+        return s3_url(image) if use_s3_url(image)
+        return gcs_url(image) if use_gcs_url(image)
+
         Rails.application.routes.url_helpers.url_for(image)
       end
+
+      private
+
+      def s3_url(image)
+        "s3://#{image.service.bucket.name}/#{image.key}"
+      end
+
+      def use_s3_url(image)
+        config.use_s3_urls && image.service.is_a?(::ActiveStorage::Service::S3Service)
+      end
+
+      def gcs_url(image)
+        "gs://#{config.gcs_bucket}/#{image.key}"
+      end
+
+      def use_gcs_url(image)
+        config.use_gcs_urls && image.service.is_a?(::ActiveStorage::Service::GCSService)
+      end
+
+      def config
+        Imgproxy.config
+      end
     end
   end
 end

data/lib/imgproxy/url_adapters/shrine.rb

@@ -8,19 +8,29 @@ 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)
+        return s3_url(image) if use_s3_url(image)
+
         opts = {}
-        opts[:host] = @host if @host
+        opts[:host] = Imgproxy.config.shrine_host if Imgproxy.config.shrine_host
         image.url(opts)
       end
+
+      private
+
+      def s3_url(image)
+        path = [*image.storage.prefix, image.id].join("/")
+        "s3://#{image.storage.bucket.name}/#{path}"
+      end
+
+      def use_s3_url(image)
+        Imgproxy.config.use_s3_urls &&
+          image.storage.is_a?(::Shrine::Storage::S3)
+      end
     end
   end
 end

data/lib/imgproxy/version.rb

@@ -1,3 +1,3 @@
 module Imgproxy
-  VERSION = "1.0.4".freeze
+  VERSION = "2.0.0".freeze
 end

metadata

@@ -1,43 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: imgproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Sergey Alexandrovich
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-22 00:00:00.000000000 Z
+date: 2021-03-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: anyway_config
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  name: benchmark-memory
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.8.0
+        version: 3.9.0
 - !ruby/object:Gem::Dependency
   name: rspec_junit_formatter
   requirement: !ruby/object:Gem::Requirement
@@ -58,42 +86,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: 0.83.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.66.0
+        version: 0.83.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.38.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.32.0
+        version: 1.38.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk-s3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.64.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.35.0
+        version: 1.64.0
 - !ruby/object:Gem::Dependency
   name: google-cloud-storage
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +156,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.16'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
+        version: 1.4.1
 description: A gem that easily generates imgproxy URLs for your images
 email: darthsim@gmail.com
 executables: []
@@ -164,18 +192,35 @@ files:
 - lib/imgproxy/extensions/active_storage.rb
 - lib/imgproxy/extensions/shrine.rb
 - lib/imgproxy/options.rb
+- lib/imgproxy/options_aliases.rb
+- lib/imgproxy/options_casters/adjust.rb
+- lib/imgproxy/options_casters/array.rb
+- lib/imgproxy/options_casters/base64.rb
+- lib/imgproxy/options_casters/bool.rb
+- lib/imgproxy/options_casters/crop.rb
+- lib/imgproxy/options_casters/extend.rb
+- lib/imgproxy/options_casters/float.rb
+- lib/imgproxy/options_casters/gif_options.rb
+- lib/imgproxy/options_casters/gravity.rb
+- lib/imgproxy/options_casters/group.rb
+- lib/imgproxy/options_casters/integer.rb
+- lib/imgproxy/options_casters/jpeg_options.rb
+- lib/imgproxy/options_casters/png_options.rb
+- lib/imgproxy/options_casters/resize.rb
+- lib/imgproxy/options_casters/size.rb
+- lib/imgproxy/options_casters/string.rb
+- lib/imgproxy/options_casters/trim.rb
+- lib/imgproxy/options_casters/watermark.rb
+- lib/imgproxy/trim_array.rb
 - lib/imgproxy/url_adapters.rb
 - lib/imgproxy/url_adapters/active_storage.rb
-- lib/imgproxy/url_adapters/active_storage_gcs.rb
-- lib/imgproxy/url_adapters/active_storage_s3.rb
 - lib/imgproxy/url_adapters/shrine.rb
-- lib/imgproxy/url_adapters/shrine_s3.rb
 - lib/imgproxy/version.rb
 homepage: https://github.com/imgproxy/imgproxy.rb
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -183,15 +228,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: imgproxy URL generator
 test_files: []

data/lib/imgproxy/url_adapters/active_storage_gcs.rb

@@ -1,31 +0,0 @@
-require "imgproxy/url_adapters/active_storage"
-
-module Imgproxy
-  class UrlAdapters
-    # Adapter for ActiveStorage with S3 service
-    #
-    #   Imgproxy.configure do |config|
-    #     config.url_adapters.add Imgproxy::UrlAdapters::ActiveStorageGCS.new("bucket_name")
-    #   end
-    #
-    #   Imgproxy.url_for(user.avatar)
-    class ActiveStorageGCS < Imgproxy::UrlAdapters::ActiveStorage
-      # @param [String] bucket_name Google Cloud Storage bucket name
-      def initialize(bucket_name)
-        @bucket_name = bucket_name
-      end
-
-      # @return [String] Google Cloud Storage bucket name
-      attr_reader :bucket_name
-
-      def applicable?(image)
-        super &&
-          image.service.is_a?(::ActiveStorage::Service::GCSService)
-      end
-
-      def url(image)
-        "gs://#{bucket_name}/#{image.key}"
-      end
-    end
-  end
-end

data/lib/imgproxy/url_adapters/active_storage_s3.rb

@@ -1,23 +0,0 @@
-require "imgproxy/url_adapters/active_storage"
-
-module Imgproxy
-  class UrlAdapters
-    # Adapter for ActiveStorage with S3 service
-    #
-    #   Imgproxy.configure do |config|
-    #     config.url_adapters.add Imgproxy::UrlAdapters::ActiveStorageS3.new
-    #   end
-    #
-    #   Imgproxy.url_for(user.avatar)
-    class ActiveStorageS3 < Imgproxy::UrlAdapters::ActiveStorage
-      def applicable?(image)
-        super &&
-          image.service.is_a?(::ActiveStorage::Service::S3Service)
-      end
-
-      def url(image)
-        "s3://#{image.service.bucket.name}/#{image.key}"
-      end
-    end
-  end
-end

data/lib/imgproxy/url_adapters/shrine_s3.rb

@@ -1,20 +0,0 @@
-module Imgproxy
-  class UrlAdapters
-    # Adapter for Shrine with S3 storage
-    #
-    #   Imgproxy.configure do |config|
-    #     config.url_adapters.add Imgproxy::UrlAdapters::ShrineS3.new
-    #   end
-    #
-    #   Imgproxy.url_for(user.avatar)
-    class ShrineS3 < Imgproxy::UrlAdapters::Shrine
-      def applicable?(image)
-        super && image.storage.is_a?(::Shrine::Storage::S3)
-      end
-
-      def url(image)
-        "s3://#{image.storage.bucket.name}/#{image.id}"
-      end
-    end
-  end
-end