simple_form_bs5_file_input 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 439120eb0e6d62259b113e3311f1caed4f298cbd87e6e6ca33f6c9bab2ef7d81
-  data.tar.gz: 5b12e73dc2d4e2148ca0bfb70a434af18cbe8fecf45316374cc4ad50aaba912e
+  metadata.gz: c6de03deab13bcd2b04cafd400703a4930b41f052252a0a04b26a1ab4d711bee
+  data.tar.gz: e982a48904f91e03a99f9606932e2d19ac74a72b9683dd8e253f76a7661df681
 SHA512:
-  metadata.gz: 0a082f4b129046db5f0f3a1aa25d69f0363943105055caa6b1dbc624816d528517f861ccc1c9ff0f9ad7a2432633be7b7eab7b3ebf1aee25ece783c8403dc081
-  data.tar.gz: 4a671fa1b1db17903a9ce3f4b79ad198027cfeca95831f53694a04e440fdf31318cada8f79270851c2ebe37756cab563c4ab878b9bc2bff3478dc18fc36186c1
+  metadata.gz: 3add824407e780a435a807fb89c9893856ba1e8fb761c65c2e2447b16b94e2fa138936c7041a39c034566fbae9cd31efca28086ad1841a52ab5db9c6b5205633
+  data.tar.gz: 444e0fa76d961e58ef0c1a911e468c5945057aefbc9929622620d646e85b15153e4adebbd41aeb10b71b482bc679c60a847ea947ba22760663761d4485978fd4

data/Gemfile.lock

@@ -1,77 +1,78 @@
 PATH
   remote: .
   specs:
-    simple_form_bs5_file_input (0.1.2)
+    simple_form_bs5_file_input (0.1.4)
       rails
       simple_form
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    actioncable (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailbox (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (>= 2.7.1)
       net-imap
       net-pop
       net-smtp
-    actionmailer (7.1.1)
-      actionpack (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionmailer (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.1)
-      actionview (= 7.1.1)
-      activesupport (= 7.1.1)
+    actionpack (7.1.3.2)
+      actionview (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       nokogiri (>= 1.8.5)
+      racc
       rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.1)
-      actionpack (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    actiontext (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.1)
-      activesupport (= 7.1.1)
+    actionview (7.1.3.2)
+      activesupport (= 7.1.3.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.1)
-      activesupport (= 7.1.1)
+    activejob (7.1.3.2)
+      activesupport (= 7.1.3.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.1)
-      activesupport (= 7.1.1)
-    activerecord (7.1.1)
-      activemodel (= 7.1.1)
-      activesupport (= 7.1.1)
+    activemodel (7.1.3.2)
+      activesupport (= 7.1.3.2)
+    activerecord (7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.1)
-      actionpack (= 7.1.1)
-      activejob (= 7.1.1)
-      activerecord (= 7.1.1)
-      activesupport (= 7.1.1)
+    activestorage (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       marcel (~> 1.0)
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -81,49 +82,47 @@ GEM
       minitest (>= 5.1)
       mutex_m
       tzinfo (~> 2.0)
-    autoprefixer-rails (10.4.15.0)
+    autoprefixer-rails (10.4.16.0)
       execjs (~> 2)
-    base64 (0.1.1)
-    bcrypt (3.1.19)
-    bigdecimal (3.1.4)
-    bootsnap (1.16.0)
+    base64 (0.2.0)
+    bcrypt (3.1.20)
+    bigdecimal (3.1.7)
+    bootsnap (1.18.3)
       msgpack (~> 1.2)
-    bootstrap (5.3.1)
+    bootstrap (5.3.2)
       autoprefixer-rails (>= 9.1.0)
       popper_js (>= 2.11.8, < 3)
-      sassc-rails (>= 2.0.0)
     builder (3.2.4)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     crass (1.0.6)
-    date (3.3.3)
+    date (3.3.4)
     devise (4.9.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    drb (2.1.1)
-      ruby2_keywords
+    drb (2.2.1)
     erubi (1.12.0)
     execjs (2.9.1)
     ffi (1.16.3)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    io-console (0.6.0)
-    irb (1.8.1)
+    io-console (0.7.2)
+    irb (1.12.0)
       rdoc
-      reline (>= 0.3.8)
+      reline (>= 0.4.2)
     jquery-rails (4.6.0)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    listen (3.8.0)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.21.4)
+    loofah (2.22.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.8.1)
@@ -131,32 +130,32 @@ GEM
       net-imap
       net-pop
       net-smtp
-    marcel (1.0.2)
+    marcel (1.0.4)
     mini_mime (1.1.5)
-    mini_portile2 (2.8.4)
-    minitest (5.20.0)
+    mini_portile2 (2.8.5)
+    minitest (5.22.3)
     msgpack (1.7.2)
-    mutex_m (0.1.2)
-    net-imap (0.4.1)
+    mutex_m (0.2.0)
+    net-imap (0.4.10)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
-    net-protocol (0.2.1)
+    net-protocol (0.2.2)
       timeout
-    net-smtp (0.4.0)
+    net-smtp (0.4.0.1)
       net-protocol
-    nio4r (2.5.9)
-    nokogiri (1.15.4)
+    nio4r (2.7.0)
+    nokogiri (1.16.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     orm_adapter (0.5.0)
-    pg (1.5.4)
+    pg (1.5.6)
     popper_js (2.11.8)
-    psych (5.1.1)
+    psych (5.1.2)
       stringio
-    racc (1.7.1)
-    rack (3.0.8)
+    racc (1.7.3)
+    rack (3.0.9.1)
     rack-session (2.0.0)
       rack (>= 3.0.0)
     rack-test (2.1.0)
@@ -164,20 +163,20 @@ GEM
     rackup (2.1.0)
       rack (>= 3)
       webrick (~> 1.8)
-    rails (7.1.1)
-      actioncable (= 7.1.1)
-      actionmailbox (= 7.1.1)
-      actionmailer (= 7.1.1)
-      actionpack (= 7.1.1)
-      actiontext (= 7.1.1)
-      actionview (= 7.1.1)
-      activejob (= 7.1.1)
-      activemodel (= 7.1.1)
-      activerecord (= 7.1.1)
-      activestorage (= 7.1.1)
-      activesupport (= 7.1.1)
+    rails (7.1.3.2)
+      actioncable (= 7.1.3.2)
+      actionmailbox (= 7.1.3.2)
+      actionmailer (= 7.1.3.2)
+      actionpack (= 7.1.3.2)
+      actiontext (= 7.1.3.2)
+      actionview (= 7.1.3.2)
+      activejob (= 7.1.3.2)
+      activemodel (= 7.1.3.2)
+      activerecord (= 7.1.3.2)
+      activestorage (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.1)
+      railties (= 7.1.3.2)
     rails-dom-testing (2.2.0)
       activesupport (>= 5.0.0)
       minitest
@@ -185,50 +184,33 @@ GEM
     rails-html-sanitizer (1.6.0)
       loofah (~> 2.21)
       nokogiri (~> 1.14)
-    railties (7.1.1)
-      actionpack (= 7.1.1)
-      activesupport (= 7.1.1)
+    railties (7.1.3.2)
+      actionpack (= 7.1.3.2)
+      activesupport (= 7.1.3.2)
       irb
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
       zeitwerk (~> 2.6)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rdoc (6.5.0)
+    rdoc (6.6.2)
       psych (>= 4.0.0)
-    reline (0.3.9)
+    reline (0.4.3)
       io-console (~> 0.5)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    ruby2_keywords (0.0.5)
-    sassc (2.4.0)
-      ffi (~> 1.9)
-    sassc-rails (2.1.2)
-      railties (>= 4.0.0)
-      sassc (>= 2.0)
-      sprockets (> 3.0)
-      sprockets-rails
-      tilt
     simple_form (5.3.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    sprockets (4.2.1)
-      concurrent-ruby (~> 1.0)
-      rack (>= 2.2.4, < 4)
-    sprockets-rails (3.4.2)
-      actionpack (>= 5.2)
-      activesupport (>= 5.2)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.6.7)
+    sqlite3 (1.7.2)
       mini_portile2 (~> 2.8.0)
-    stringio (3.0.8)
-    thor (1.2.2)
-    tilt (2.3.0)
-    timeout (0.4.0)
+    stringio (3.1.0)
+    thor (1.3.1)
+    timeout (0.4.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     warden (1.2.9)
@@ -237,7 +219,7 @@ GEM
     websocket-driver (0.7.6)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.6.12)
+    zeitwerk (2.6.13)
 
 PLATFORMS
   ruby

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 Noesya
+Copyright (c) 2021-2023 Noesya
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -139,6 +139,17 @@ end
 
 **Simple Form Bootstrap 5 File Input** uses the I18n API to manage the texts displayed. Feel free to overwrite the keys or add languages.
 
+## Notes
+
+### Callbacks
+
+When the resize feature is activated **Simple Form Bootstrap 5 File Input** uses an `after_commit` hook to resize the image. The model linked to the attachment will then be touched.  
+It might cause a problem because messing with others `after_commit` hooks. For example it messes with the Devise `confirmable` module, where the confirmation email is also send on after_commit.   
+Before Rails 7.1 after_commit is the only hook executed backward. So if you add after_commit :function1, then after_commit :function2, function2 will be executed BEFORE function1.  
+After Rails 7.1 after_commit follows the regular order, so function1 will be executed before function2.  
+So for Devise Confirmable, it must be declared AFTER the `has_one_attached_deletable` declaration if Rails version < 7.1, and declared BEFORE the `has_one_attached_deletable` declaration if Rails version >= 7.1
+
+
 ## Information
 
 ### Supported Ruby / Rails versions

data/assets/javascripts/simple_form_bs5_file_input.js

@@ -78,7 +78,7 @@ window.inputSingleDeletableFile = {
             image = $modal.attr('data-image-result'),
             ratio = $imgContainer.attr('data-ratio');
 
-        $imgContainer.html('<img class="js-" src="' + image + '">');
+        $imgContainer.html('<img class="js-image" src="' + image + '">');
 
         $image = $('img', $imgContainer);
         $image.css('opacity', 0);
@@ -100,6 +100,14 @@ window.inputSingleDeletableFile = {
         }, 100);
     },
 
+    onResizeModalRotate: function (e) {
+        'use strict';
+        var $scope = $(e.target).parents('.js-sdfi-deletable-file'),
+            $imgContainer = $('.js-sdfi-sdfi-deletable-file__resize-image', $scope),
+            $image = $('.js-image', $imgContainer);
+        $image.cropper('rotate', 90);
+    },
+
     onResizeModalCancel: function (e) {
         'use strict';
         var $scope = $(e.target).parents('.js-sdfi-deletable-file');
@@ -147,8 +155,9 @@ window.inputSingleDeletableFile = {
         });
         $('.js-sdfi-deletable-file__delete-btn', $(field)).on('click', this.onFileDelete);
         $('input[type="file"]', $(field)).on('change', this.onFileSelected);
-
+        
         $('.js-sdfi-deletable-file__resize', field).on('shown.bs.modal', this.onResizeModalShown);
+        $('.js-sdfi-deletable-file__resize-rotate', field).on('click', this.onResizeModalRotate);
         $('.js-sdfi-deletable-file__resize-cancel', field).on('click', this.onResizeModalCancel);
         $('.js-sdfi-deletable-file__resize-validate', field).on('click', this.onResizeModalValidate);
     }

data/assets/stylesheets/simple_form_bs5_file_input.sass

@@ -68,6 +68,8 @@
         width: 0%
 
     &__resize
+        .modal-footer
+            justify-content: space-between
         .sdfi-sdfi-deletable-file__resize-image
             img
                 max-width: 100%

data/config/locales/en.yml

@@ -1,6 +1,7 @@
 en:
   simple_form_bs5_file_input:
     modal_close: Close
+    modal_rotate: Rotate the image
     modal_title: Resize the image
     modal_validate: Validate  
     replace_file: 'Change the file'

data/config/locales/fr.yml

@@ -1,6 +1,7 @@
 fr:
   simple_form_bs5_file_input:
     modal_close: Fermer
+    modal_rotate: Tourner l'image
     modal_title: Cadrer l'image
     modal_validate: Valider
     replace_file: Remplacer le fichier

data/lib/has_one_attached_deletable.rb

@@ -1,11 +1,26 @@
 class ActiveRecord::Base
   def self.has_one_attached_deletable(name, **options, &block)
+
     class_eval do
       attr_accessor :"#{name}_delete"
       attr_accessor :"#{name}_infos"
 
       before_validation { send(name).purge_later if send("#{name}_attachment").present? && send("#{name}_delete") == 'true' }
-      after_commit :"resize_#{name}", unless: Proc.new { |u| u.send("#{name}_infos").blank? }
+
+      # From Rails 7.1, after_commit callbacks run in the same order they were defined.
+      # Prior to this version, they ran in reverse order.
+      after_commit_callbacks_run_in_order = Rails
+                                              .application
+                                              .config
+                                              .active_record
+                                              .try(:run_after_transaction_callbacks_in_order_defined)
+      if after_commit_callbacks_run_in_order
+        has_one_attached name, **options, &block
+        after_commit :"resize_#{name}", unless: Proc.new { |u| u.send("#{name}_infos").blank? }
+      else
+        after_commit :"resize_#{name}", unless: Proc.new { |u| u.send("#{name}_infos").blank? }
+        has_one_attached name, **options, &block
+      end
 
       define_method :"#{name}_delete=" do |value|
         instance_variable_set :"@#{name}_delete", value
@@ -21,12 +36,16 @@ class ActiveRecord::Base
 
         # 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,
-          crop: "#{params['width'].round}x#{params['height'].round}+#{params['x'].round}+#{params['y'].round}",
+        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
-        }
+        })
 
         variant = Rails::VERSION::MAJOR >= 6  ? send(name).variant(**transformations)
                                               : send(name).variant(combine_options: transformations)
@@ -48,7 +67,5 @@ class ActiveRecord::Base
         end
       end
     end
-
-    has_one_attached name, **options, &block
   end
 end

data/lib/simple_form_bs5_file_input/single_deletable_file_input.rb

@@ -92,12 +92,17 @@ class SingleDeletableFileInput < SimpleForm::Inputs::Base
                       </div>
                     </div>
                     <div class="modal-footer">
-                      <button type="button" class="btn btn-sm btn-secondary js-sdfi-deletable-file__resize-cancel" data-bs-dismiss="modal">%s</button>
-                      <button type="button" class="btn btn-sm btn-primary js-sdfi-deletable-file__resize-validate">%s</button>
+                      <button type="button" class="btn btn-sm js-sdfi-deletable-file__resize-rotate" aria-label="%s">
+                      <i class="bi bi-arrow-clockwise"></i>
+                      </button>
+                      <div>
+                        <button type="button" class="btn btn-sm btn-secondary js-sdfi-deletable-file__resize-cancel" data-bs-dismiss="modal">%s</button>
+                        <button type="button" class="btn btn-sm btn-primary js-sdfi-deletable-file__resize-validate">%s</button>
+                      </div>
                     </div>
                   </div>
                 </div>
-              </div>', modal_title, close_btn_text, resize_ratio, close_btn_text, validate_btn_text)
+              </div>', modal_title, close_btn_text, resize_ratio, rotate_btn_text, close_btn_text, validate_btn_text)
     end
   end
 
@@ -141,6 +146,10 @@ class SingleDeletableFileInput < SimpleForm::Inputs::Base
     I18n.t('simple_form_bs5_file_input.modal_close')
   end
 
+  def rotate_btn_text
+    I18n.t('simple_form_bs5_file_input.modal_rotate')
+  end
+
   def validate_btn_text
     I18n.t('simple_form_bs5_file_input.modal_validate')
   end

data/lib/simple_form_bs5_file_input/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormBs5FileInput
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_form_bs5_file_input
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Pierre-andré Boissinot
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.6
 signing_key:
 specification_version: 4
 summary: Simple Form BS5 File Input