Merge pull request #1 from jenfi-eng/master

Removed all combine_options: Rails 6.1 and use double splat for Ruby 3
DiscoveryMap · Jul 17, 2023 · 62ef7e0 · 62ef7e0
2 parents 8f7e425 + 64b7a0e
commit 62ef7e0
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/app/controllers/comfy/admin/cms/files_controller.rb b/app/controllers/comfy/admin/cms/files_controller.rb
@@ -23,7 +23,7 @@ def index
         case params[:type]
         when "image"
           file_scope.with_images.collect do |file|
-            { thumb: url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+            { thumb: url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
               image: url_for(file.attachment),
               title: file.label }
           end

diff --git a/app/views/comfy/admin/cms/files/_file.html.haml b/app/views/comfy/admin/cms/files/_file.html.haml
@@ -1,7 +1,7 @@
 %li{data: {id: file.id}}
   :ruby
     file_tag  = cms_file_link_tag(file)
-    thumb_url = url_for(file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
+    thumb_url = url_for(file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb])) if file.attachment.variable?
   .row
     .col-md-5.item
       .item-controls.d-none.d-lg-block

diff --git a/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml b/app/views/comfy/admin/cms/fragments/_form_fragment_attachments.html.haml
@@ -2,7 +2,7 @@
   - attachments.each do |attachment|
     :ruby
       thumb_url = if attachment.variable?
-        url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+        url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb]))
       end
       filename = attachment.filename.to_s
       truncated_filename = truncate(filename, length: 40, omission: "...#{filename.last(10)}")

diff --git a/lib/comfortable_mexican_sofa/content/tags/mixins/file_content.rb b/lib/comfortable_mexican_sofa/content/tags/mixins/file_content.rb
@@ -16,7 +16,7 @@ def content(file: self.file, as: self.as, variant_attrs: self.variant_attrs, lab
 
       attachment_url =
         if variant_attrs.present? && file.image?
-          variant = file.variant(combine_options: variant_attrs)
+          variant = file.variant(variant_attrs)
           url_helpers.rails_representation_path(variant, only_path: true)
         else
           url_helpers.rails_blob_path(file, only_path: true)

diff --git a/lib/comfortable_mexican_sofa/routing.rb b/lib/comfortable_mexican_sofa/routing.rb
@@ -6,7 +6,7 @@
 class ActionDispatch::Routing::Mapper
 
   def comfy_route(identifier, options = {})
-    send("comfy_route_#{identifier}", options)
+    send("comfy_route_#{identifier}", **options)
   end
 
 end
diff --git a/test/controllers/comfy/admin/cms/files_controller_test.rb b/test/controllers/comfy/admin/cms/files_controller_test.rb
@@ -48,7 +48,7 @@ def test_get_index_with_redactor_images
     assert_response :success
 
     assert_equal [{
-      "thumb" => url_for(@file.attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:redactor])),
+      "thumb" => url_for(@file.attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:redactor])),
       "image" => url_for(@file.attachment),
       "title" => @file.label
     }], JSON.parse(response.body)

diff --git a/test/lib/content/tags/file_test.rb b/test/lib/content/tags/file_test.rb
@@ -74,7 +74,7 @@ def test_content_as_image_with_variant
       context: @page,
       params: [frag.identifier, { "as" => "image", "resize" => "50x50" }]
     )
-    variant = frag.attachments.first.variant(combine_options: { "resize" => "50x50" })
+    variant = frag.attachments.first.variant({ "resize" => "50x50" })
     path    = rails_representation_path(variant, only_path: true)
     out     = "<img src='#{path}' alt='fragment.jpg'/>"
     assert_equal out, tag.content

diff --git a/test/lib/form_builder_test.rb b/test/lib/form_builder_test.rb
@@ -150,7 +150,7 @@ def test_fragment_field_for_file_with_content
 
     attachment = active_storage_attachments(:file)
     attachment_url  = view.url_for(attachment)
-    thumb_url       = view.url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+    thumb_url       = view.url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb]))
 
     expected = <<~HTML
       <div class="form-group row">
@@ -197,7 +197,7 @@ def test_fragment_field_for_files_with_content
 
     attachment = active_storage_attachments(:file)
     attachment_url  = view.url_for(attachment)
-    thumb_url       = view.url_for(attachment.variant(combine_options: Comfy::Cms::File::VARIANT_SIZE[:thumb]))
+    thumb_url       = view.url_for(attachment.variant(Comfy::Cms::File::VARIANT_SIZE[:thumb]))
 
     expected = <<~HTML
       <div class="form-group row">