Merge pull request #3371 from AlchemyCMS/dragonfly-adapter-configurable-url-classes

Allow to configure url classes in Dragonfly adapter

Author: tvdeyen

app/models/alchemy/storage_adapter/dragonfly.rb

@@ -38,16 +38,30 @@ def self.included(base)
 
       CONVERTIBLE_FILE_FORMATS = %w[gif jpg jpeg png webp].freeze
 
+      # Allows to set a custom Attachment Url class
+      def attachment_url_class=(klass)
+        @_attachment_url_class = klass
+      end
+
+      # Returns the class used to generate attachment urls
+      # @return [Class] - defaults to Alchemy::StorageAdapter::Dragonfly::AttachmentUrl
       def attachment_url_class
-        AttachmentUrl
+        @_attachment_url_class ||= AttachmentUrl
       end
 
       def preprocessor_class
         Preprocessor
       end
 
+      # Allows to set a custom Picture Url class
+      def picture_url_class=(klass)
+        @_picture_url_class = klass
+      end
+
+      # Returns the class used to generate picture urls
+      # @return [Class] - defaults to Alchemy::StorageAdapter::Dragonfly::PictureUrl
       def picture_url_class
-        PictureUrl
+        @_picture_url_class ||= PictureUrl
       end
 
       def file_formats(class_name, scope:)

app/models/alchemy/storage_adapter/dragonfly/picture_url.rb

@@ -26,8 +26,9 @@ def initialize(picture)
       #
       # @return [String]
       #
-      def call(options = {})
-        @variant = PictureVariant.new(picture, options.slice(*TRANSFORMATION_OPTIONS))
+      def call(variant_options = {})
+        set_variant(variant_options)
+
         params = {
           basename: picture.name,
           ext: variant.render_format,
@@ -41,6 +42,10 @@ def call(options = {})
 
       private
 
+      def set_variant(options = {})
+        @variant = PictureVariant.new(picture, options.slice(*TRANSFORMATION_OPTIONS))
+      end
+
       def processible_image?
         variant.image.is_a?(::Dragonfly::Job)
       end

lib/alchemy/install/tasks.rb

@@ -22,18 +22,6 @@ def inject_routes(auto_accept = false)
             {after: SENTINEL, verbose: true}
         end
 
-        def set_primary_language(code: "en", name: "English", auto_accept: false)
-          unless auto_accept
-            code = ask("- What is the language code of your site's primary language?", default: code)
-          end
-          unless auto_accept
-            name = ask("- What is the name of your site's primary language?", default: name)
-          end
-          gsub_file "./config/alchemy/config.yml", /default_language:\n\s\scode:\sen\n\s\sname:\sEnglish/m do
-            "default_language:\n  code: #{code}\n  name: #{name}"
-          end
-        end
-
         def inject_seeder
           seed_file = Rails.root.join("db", "seeds.rb")
           args = [seed_file, "Alchemy::Seeder.seed!\n"]

lib/generators/alchemy/install/install_generator.rb

@@ -89,15 +89,6 @@ def install_gutentag_migrations
         rake "gutentag:install:migrations"
       end
 
-      def set_primary_language
-        header
-        install_tasks.set_primary_language(
-          code: options[:default_language_code],
-          name: options[:default_language_name],
-          auto_accept: options[:auto_accept]
-        )
-      end
-
       def setup_database
         rake("db:create", abort_on_failure: true) unless options[:skip_db_create]
         # We can't invoke this rake task, because Rails will use wrong engine names otherwise

spec/models/alchemy/storage_adapter/dragonfly_spec.rb

@@ -71,6 +71,46 @@
     end
   end
 
+  describe ".attachment_url_class" do
+    subject { described_class.attachment_url_class }
+
+    it { is_expected.to eq(Alchemy::StorageAdapter::Dragonfly::AttachmentUrl) }
+  end
+
+  describe ".attachment_url_class=" do
+    let(:custom_class) { Class.new }
+
+    subject { described_class.attachment_url_class }
+
+    around do |example|
+      described_class.attachment_url_class = custom_class
+      example.run
+      described_class.attachment_url_class = nil
+    end
+
+    it { is_expected.to eq(custom_class) }
+  end
+
+  describe ".picture_url_class" do
+    subject { described_class.picture_url_class }
+
+    it { is_expected.to eq(Alchemy::StorageAdapter::Dragonfly::PictureUrl) }
+  end
+
+  describe ".picture_url_class=" do
+    let(:custom_class) { Class.new }
+
+    subject { described_class.picture_url_class }
+
+    around do |example|
+      described_class.picture_url_class = custom_class
+      example.run
+      described_class.picture_url_class = nil
+    end
+
+    it { is_expected.to eq(custom_class) }
+  end
+
   describe ".file_formats" do
     subject(:file_formats) do
       described_class.file_formats(class_name, scope: scope)