v3.1 Release

.circleci/config.yml

@@ -0,0 +1,50 @@
+---
+version: 2.1
+orbs:
+  slack: circleci/[email protected]
+jobs:
+  build:
+    working_directory: ~/fae-rails
+    docker:
+      - image: circleci/ruby:2.4.1
+        environment:
+          RAILS_ENV: test
+      - image: cimg/mysql:8.0
+
+    steps:
+      - checkout
+
+      # Restore Cached Dependencies
+      - type: cache-restore
+        name: Restore bundle cache
+        key: fae-rails-{{ checksum "Gemfile.lock" }}
+
+      # Bundle install dependencies
+      - run: bundle install --path bin/bundle
+
+      # Cache Dependencies
+      - type: cache-save
+        name: Store bundle cache
+        key: fae-rails-{{ checksum "Gemfile.lock" }}
+        paths:
+          - bin/bundle
+
+      # Wait for DB
+      - run: dockerize -wait tcp://localhost:5432 -timeout 1m
+
+      # Setup the environment
+      # - run: cp .sample.env .env
+
+      # Setup the database
+      - run: bundle exec appraisal rake db:create
+      - run: bundle exec appraisal rake db:migrate
+
+      - run: mysql -e "CREATE DATABASE IF NOT EXISTS fae_dummy_test CHARACTER SET utf8 COLLATE utf8_general_ci;"
+      - run: cd spec/dummy
+      - run: bundle exec rake db:schema:load --trace
+      - run: cd ../../
+      - run: export DISPLAY=:99.0
+      - run: sh -e /etc/init.d/xvfb start
+
+      # Run the tests
+      - run: bundle exec appraisal rspec

.gitignore

@@ -26,4 +26,6 @@ spec/dummy/public/uploads/*
 
 /vendor
 docker-compose.override.yml
-.env
+.env
+mysql
+node_modules

Gemfile

@@ -52,3 +52,4 @@ gem "puma", "~> 5.0"
 
 gem "fog-aws"
 gem 'ddtrace', require: 'ddtrace/auto_instrument'
+

Gemfile.lock

@@ -18,11 +18,12 @@ GIT
 PATH
   remote: .
   specs:
-    fae-rails (3.0.0)
+    fae-rails (3.1.0)
       acts_as_list (~> 0.9.11)
       browser (~> 2.5.3)
       carrierwave
       devise
+      devise-two-factor
       jquery-rails (~> 4.3.1)
       jquery-ui-rails (~> 6.0.1)
       judge (~> 3.1.0)
@@ -31,6 +32,7 @@ PATH
       mini_magick
       rails (>= 5.0)
       remotipart (~> 1.4.0)
+      rqrcode
       sass (>= 3.4.0)
       sass-rails (>= 5.0.7)
       simple_form (<= 5.1)
@@ -115,7 +117,7 @@ GEM
       bundler
       rake
       thor (>= 0.14.0)
-    bcrypt (3.1.16)
+    bcrypt (3.1.20)
     better_errors (2.9.1)
       coderay (>= 1.0.0)
       erubi (>= 1.0.0)
@@ -146,17 +148,17 @@ GEM
     capybara-screenshot (1.0.26)
       capybara (>= 1.0, < 4)
       launchy
-    carrierwave (2.2.2)
-      activemodel (>= 5.0.0)
-      activesupport (>= 5.0.0)
+    carrierwave (3.0.7)
+      activemodel (>= 6.0.0)
+      activesupport (>= 6.0.0)
       addressable (~> 2.6)
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
-      mini_mime (>= 0.1.3)
       ssrf_filter (~> 1.0)
     childprocess (4.1.0)
+    chunky_png (1.4.0)
     coderay (1.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.2.3)
     crass (1.0.6)
     daemons (1.4.1)
     database_cleaner (2.0.1)
@@ -172,18 +174,23 @@ GEM
       msgpack
     debase-ruby_core_source (0.10.16)
     debug_inspector (1.1.0)
-    devise (4.8.1)
+    devise (4.9.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-two-factor (5.0.0)
+      activesupport (~> 7.0)
+      devise (~> 4.0)
+      railties (~> 7.0)
+      rotp (~> 6.0)
     diff-lcs (1.5.0)
     digest (3.1.0)
-    erubi (1.10.0)
+    erubi (1.12.0)
     eventmachine (1.2.7)
     excon (0.92.4)
-    execjs (2.8.1)
+    execjs (2.9.1)
     factory_bot (4.8.2)
       activesupport (>= 3.0.0)
     factory_bot_rails (4.8.2)
@@ -222,7 +229,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    i18n (1.10.0)
+    i18n (1.14.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
@@ -263,9 +270,9 @@ GEM
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.22.0)
       crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
+      nokogiri (>= 1.12.0)
     lumberjack (1.2.8)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
@@ -275,9 +282,9 @@ GEM
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
-    mini_magick (4.11.0)
+    mini_magick (4.12.0)
     mini_mime (1.1.2)
-    minitest (5.15.0)
+    minitest (5.21.2)
     msgpack (1.5.6)
     multi_json (1.15.0)
     mysql2 (0.5.4)
@@ -301,9 +308,9 @@ GEM
       timeout
     net-ssh (6.1.0)
     nio4r (2.5.8)
-    nokogiri (1.13.9-aarch64-linux)
+    nokogiri (1.16.0-aarch64-linux)
       racc (~> 1.4)
-    nokogiri (1.13.9-x86_64-linux)
+    nokogiri (1.16.0-x86_64-linux)
       racc (~> 1.4)
     notiffany (0.1.3)
       nenv (~> 0.1)
@@ -316,9 +323,9 @@ GEM
     public_suffix (5.0.0)
     puma (5.6.4)
       nio4r (~> 2.0)
-    racc (1.6.0)
-    rack (2.2.4)
-    rack-test (2.0.2)
+    racc (1.7.3)
+    rack (2.2.8)
+    rack-test (2.1.0)
       rack (>= 1.3)
     rails (7.0.2.3)
       actioncable (= 7.0.2.3)
@@ -338,11 +345,13 @@ GEM
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
       activesupport (>= 5.0.1.rc1)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
-      loofah (~> 2.3)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
     rails-perftest (0.0.7)
     railties (7.0.2.3)
       actionpack (= 7.0.2.3)
@@ -351,16 +360,21 @@ GEM
       rake (>= 12.2)
       thor (~> 1.0)
       zeitwerk (~> 2.5)
-    rake (13.0.6)
+    rake (13.1.0)
     rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
     regexp_parser (2.6.1)
     remotipart (1.4.4)
-    responders (3.0.1)
-      actionpack (>= 5.0)
-      railties (>= 5.0)
+    responders (3.1.1)
+      actionpack (>= 5.2)
+      railties (>= 5.2)
     rexml (3.2.5)
+    rotp (6.3.0)
+    rqrcode (2.2.0)
+      chunky_png (~> 1.0)
+      rqrcode_core (~> 1.0)
+    rqrcode_core (1.2.0)
     rspec (3.11.0)
       rspec-core (~> 3.11.0)
       rspec-expectations (~> 3.11.0)
@@ -383,7 +397,7 @@ GEM
       rspec-support (~> 3.10)
     rspec-support (3.11.0)
     ruby-prof (1.4.3)
-    ruby-vips (2.1.4)
+    ruby-vips (2.2.1)
       ffi (~> 1.12)
     rubyzip (2.3.2)
     sass (3.7.4)
@@ -411,30 +425,30 @@ GEM
     simple_form (5.1.0)
       actionpack (>= 5.2)
       activemodel (>= 5.2)
-    slim (4.1.0)
-      temple (>= 0.7.6, < 0.9)
-      tilt (>= 2.0.6, < 2.1)
-    sprockets (4.0.3)
+    slim (5.2.1)
+      temple (~> 0.10.0)
+      tilt (>= 2.1.0)
+    sprockets (4.2.1)
       concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
+      rack (>= 2.2.4, < 4)
     sprockets-rails (3.4.2)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sshkit (1.21.2)
       net-scp (>= 1.1.2)
       net-ssh (>= 2.8.0)
-    ssrf_filter (1.0.7)
+    ssrf_filter (1.1.2)
     strscan (3.0.1)
-    temple (0.8.2)
+    temple (0.10.3)
     thin (1.8.1)
       daemons (~> 1.0, >= 1.0.9)
       eventmachine (~> 1.0, >= 1.0.4)
       rack (>= 1, < 3)
-    thor (1.2.1)
-    tilt (2.0.10)
+    thor (1.3.0)
+    tilt (2.3.0)
     timeout (0.2.0)
-    tzinfo (2.0.4)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uglifier (4.2.0)
       execjs (>= 0.3.0, < 3)
@@ -449,7 +463,7 @@ GEM
     yarjuf (2.0.0)
       builder
       rspec (~> 3)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.12)
 
 PLATFORMS
   aarch64-linux

README.md

@@ -53,12 +53,14 @@ https://www.faecms.com/documentation
 * [Filtering, Pagination and Sorting](docs/features/filtering.md)
 * [Authorization](docs/features/authorization.md)
 * [Multi-Language Support](docs/features/multi_language.md)
+* [Language Translation](docs/features/language_translate.md)
 * [Cloning](docs/features/cloning.md)
 * [Change Tracker](docs/features/change_tracker.md)
 * [Slugger](docs/features/slugger.md)
 * [Disabling Environments](docs/features/disable_envs.md)
 * [Form Field Label & Helper Text Manager](docs/features/form_manager.md)
 * [Netlify Deploy Monitor](docs/features/netlify.md)
+* [Multi-Factor Authentication via OTP](docs/features/mutli_factor_authentication.md)
 
 
 ### Tutorials

app/assets/javascripts/fae/form/_ajax.js

@@ -85,6 +85,7 @@ Fae.form.ajax = {
       Fae.form.formManager.setupAllFields($wrapper.find('form'));
       Fae.form.dragDrop.init();
       Fae.tables.rowSorting();
+      Fae.form.text.initTranslation();
 
       // validate nested form fields on submit
       Fae.form.validator.formValidate(this.$nested_form);