lib/refile/rails/attachment_helper.rb in refile-0.3.0 vs lib/refile/rails/attachment_helper.rb in refile-0.4.0

@@ -1,58 +1,55 @@
 module Refile
   module AttachmentHelper
-    def attachment_url(record, name, *args, filename: nil, format: nil)
+    def attachment_url(record, name, *args, filename: nil, format: nil, host: nil)
       file = record.send(name)
       return unless file
 
       filename ||= name.to_s
 
       backend_name = Refile.backends.key(file.backend)
-      host = Refile.host || request.base_url
+      host = host || Refile.host || request.base_url
 
       filename = filename.parameterize("_")
       filename << "." << format.to_s if format
 
-      ::File.join(host, main_app.refile_app_path, backend_name, *args.map(&:to_s), file.id, filename)
+      ::File.join(host, main_app.refile_app_path, backend_name, *args.map(&:to_s), file.id.to_s, filename)
     end
 
-    def attachment_image_tag(record, name, *args, fallback: nil, format: nil, **options)
+    def attachment_image_tag(record, name, *args, fallback: nil, format: nil, host: nil, **options)
       file = record.send(name)
       classes = ["attachment", record.class.model_name.singular, name, *options[:class]]
 
       if file
-        image_tag(attachment_url(record, name, *args, format: format), options.merge(class: classes))
+        image_tag(attachment_url(record, name, *args, format: format, host: host), options.merge(class: classes))
       elsif fallback
         classes << "fallback"
         image_tag(fallback, options.merge(class: classes))
       end
     end
 
+    # @ignore
+    #   rubocop:disable Metrics/AbcSize
     def attachment_field(object_name, method, options = {})
+      options[:data] ||= {}
+
       if options[:object]
-        cache = options[:object].send(:"#{method}_attachment").cache
+        attacher = options[:object].send(:"#{method}_attacher")
+        options[:accept] = attacher.accept
 
         if options[:direct]
-          host = Refile.host || request.base_url
-          backend_name = Refile.backends.key(cache)
+          host = options[:host] || Refile.host || request.base_url
+          backend_name = Refile.backends.key(attacher.cache)
 
-          options[:data] ||= {}
-          options[:data][:direct] = true
-          options[:data][:as] = "file"
-          options[:data][:url] = ::File.join(host, main_app.refile_app_path, backend_name)
+          url = ::File.join(host, main_app.refile_app_path, backend_name)
+          options[:data].merge!(direct: true, as: "file", url: url)
         end
 
-        if options[:presigned] and cache.respond_to?(:presign)
-          signature = cache.presign
-          options[:data] ||= {}
-          options[:data][:direct] = true
-          options[:data][:id] = signature.id
-          options[:data][:url] = signature.url
-          options[:data][:fields] = signature.fields
-          options[:data][:as] = signature.as
+        if options[:presigned] and attacher.cache.respond_to?(:presign)
+          options[:data].merge!(direct: true).merge!(attacher.cache.presign.as_json)
         end
       end
       hidden_field(object_name, :"#{method}_cache_id", options.slice(:object)) +
-      file_field(object_name, method, options)
+        file_field(object_name, method, options)
     end
   end
 end