simple_form_bs5_file_input 0.1.5 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad8dbe0e29be34622a8767dca8b66316620a6e9a5a6985b6e86ead4870ba091f
-  data.tar.gz: fc700a40263bf7629edd4440d4584f44b68d617bf0bc30c936675329cab3e463
+  metadata.gz: 76ba13ef60f2f906d584bb3ab3de58a0aac7988dcf5217e85b117eeb0bf50ea4
+  data.tar.gz: aa98b74d4577a3e45952c0071fa8609653ed41d38650ebaca58f578af30364f9
 SHA512:
-  metadata.gz: dbcf837fbfba01fa6a9d71c50cc56faa5ebb9dcef779e2d2e30fda386d49bf3679b99c8b16b5b3aeb4c8b07d6da44c6268ca2b9b86f1ecb58d7ca28db2d25218
-  data.tar.gz: c2da275020ade136903d0302e433d02a452336e28ded46fec43b5187006805747ebef3c269e73b7522adc9636275f48bc5292b04d92721ab6c806d0177d7d57c
+  metadata.gz: 6c96e619a6a5dd7a43c6be6b45916fecee5adeaa119e86133877a0182656dc392558636c859966ade7076ea2542a4d220187c112d3b214176f8f4ea062e6cf90
+  data.tar.gz: f36e2e36f3af1dec08f19fd89a2fdf59409107ba47cb3e1e36430f2a7f729a34004468e46302bbc3c61b697e61112a23b0be8f84c8b9248128b184785bd459ee

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    simple_form_bs5_file_input (0.1.4)
+    simple_form_bs5_file_input (0.2.0)
       rails
       simple_form
 
@@ -136,16 +136,16 @@ GEM
     minitest (5.22.3)
     msgpack (1.7.2)
     mutex_m (0.2.0)
-    net-imap (0.4.10)
+    net-imap (0.5.0)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0.1)
+    net-smtp (0.5.0)
       net-protocol
-    nio4r (2.7.0)
+    nio4r (2.7.3)
     nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -236,4 +236,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   2.1.4
+   2.5.22

data/lib/has_one_attached_deletable.rb

@@ -34,18 +34,31 @@ class ActiveRecord::Base
         # reset the infos to prevent multiple resize if multiple save
         instance_variable_set :"@#{name}_infos", nil
 
-        # From Rails 6, ImageProcessing uses an 'auto-orient' by default to interpret the EXIF Orientation metadata.
-        # We declare it in the transformations hash for Rails 5
-        transformations = { :'auto-orient' => true }
-        # Handle rotation
-        transformations[:rotate] = params['rotate'] if params['rotate'].present?
-        # Handle cropping
-        transformations[:crop] = "#{params['width'].round}x#{params['height'].round}+#{params['x'].round}+#{params['y'].round}"
-        # Finalize by repaging
-        transformations.merge!({
-          repage: true,
-          :'+' => true
-        })
+        left = params['x'].round
+        top = params['y'].round
+        width = params['width'].round
+        height = params['height'].round
+        rotation = params['rotate']
+        transformations = {}
+        byebug
+        if ActiveStorage.variant_processor == :mini_magick
+          # From Rails 6, ImageProcessing with MiniMagick uses an 'auto-orient' by default to interpret the EXIF Orientation metadata.
+          transformations[:'auto-orient'] = true
+          # Handle rotation
+          transformations[:rotate] = rotation if rotation.present?
+          # Handle cropping
+          transformations[:crop] = "#{width}x#{height}+#{left}+#{top}"
+          # Finalize by repaging
+          transformations.merge!({
+            repage: true,
+            :'+' => true
+          })
+        elsif ActiveStorage.variant_processor == :vips
+          # Handle rotation
+          transformations[:rotate] = rotation if rotation.present?
+          # Handle cropping
+          transformations[:crop] = [left, top, width, height]
+        end
 
         variant = Rails::VERSION::MAJOR >= 6  ? send(name).variant(**transformations)
                                               : send(name).variant(combine_options: transformations)

data/lib/simple_form_bs5_file_input/single_deletable_file_input.rb

@@ -22,11 +22,17 @@ class SingleDeletableFileInput < SimpleForm::Inputs::Base
         %s
         %s
       </div>
-    ', has_file_class, input_field(wrapper_options), field_classes(wrapper_options), change_file_text, field_id, existing_file_name_or_default_text, input_infos_name, input_infos_value, input_delete_name, input_delete_value, preview_div, resize_div)
+    ', input_wrapper_classes(wrapper_options), input_field(wrapper_options), field_classes(wrapper_options), change_file_text, field_id, existing_file_name_or_default_text, input_infos_name, input_infos_value, input_delete_name, input_delete_value, preview_div, resize_div)
   end
 
-  def has_file_class
-    'sdfi-deletable-file--with-file' if should_display_file?
+  def input_wrapper_classes(wrapper_options)
+    classes = []
+    classes << 'sdfi-deletable-file--with-file' if should_display_file?
+    error_class = wrapper_options[:error_class]
+    classes << error_class if error_class.present? && has_errors?
+    valid_class = wrapper_options[:valid_class]
+    classes << valid_class if valid_class.present? && valid?
+    classes.join(' ')
   end
 
   def input_field(wrapper_options)
@@ -129,7 +135,7 @@ class SingleDeletableFileInput < SimpleForm::Inputs::Base
     return unless should_display_file?
     # Fichier invariable, pas de chocolat non plus
     return unless file_attachment&.variable?
-    variant = file_attachment.variant(resize: "#{preview_image_width}x")
+    variant = file_attachment.variant(resize_to_fit: [preview_image_width, nil])
     path = url_helpers.polymorphic_url variant, only_path: true
     image_tag path, class: 'img-fluid img-thumbnail', width: preview_image_width
   end

data/lib/simple_form_bs5_file_input/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormBs5FileInput
-  VERSION = "0.1.5".freeze
+  VERSION = "0.2.0".freeze
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_bs5_file_input
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors:
 - Pierre-andré Boissinot
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,7 +93,6 @@ homepage: https://github.com/noesya/simple_form_bs5_file_input
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -109,8 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple Form BS5 File Input
 test_files: []