mobility-actiontext 0.4.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 463d698f77ebfa96a36f00b1555d243ad20e5f2d6eb5355b84e4242fc0895192
-  data.tar.gz: 4cf42c1faee89b576c55a9b4a1e84e7bb2dd6e57a04e031b4def117e66b34e29
+  metadata.gz: 07d1047f391d3c0dde02a646adc682b3a09f1e99a2e4beb04c7ba3b971a41e0d
+  data.tar.gz: a49bf73b5b911d02a71eacc5f84f9f18ed91865befb9b2872a29025bb7be6813
 SHA512:
-  metadata.gz: 6d33438f6e42af2c0e6a8dbae594ebef7af614e2606699637fa4616c2e278749ecdf6b8d9d99819f47f7a5b59757d121b81d515edb3418088c69fa6488d54e15
-  data.tar.gz: 513e9487e324b0db39a01493c0e6976e9bbb74c733eff04e3725727a0218d74aaddefd0518d12d98b1112525f5de964c1e7b698fdc421186c04903a8e290cbc1
+  metadata.gz: 56786adb17b842818b65b6de35403a987c8b49dc570c4a00a367995160590c58f284374e74c391bc6aee37d05b2c1cf081aee878ce83232d877daeba86292ed6
+  data.tar.gz: e82e781d93cd99fce6bb5e85fff45334b39cedc50a6772476a4fa22ed1319f0beabf9c20df1b319fe514f6e70743dff9880dcdac5814bbfc2c460bb32886843a

data/.ruby-version

@@ -1 +1 @@
-ruby-3.0.3
+ruby-3.1.1

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Mobility Action Text Changelog
 
+### 1.0.0 (2022-02-28)
+- Fix eager loading of single translation using `with_rich_text_#{name}` ([#24](https://github.com/sedubois/mobility-actiontext/pull/24)).
+
+The version update to 1.0.0 indicates the plugin has no more known issues.
+
+### 0.6.0 (2022-02-27)
+- Include all translations on eager load using `with_all_rich_text` ([#23](https://github.com/sedubois/mobility-actiontext/pull/23)).
+
+### 0.5.0 (2022-02-13)
+- Require only actiontext in gemspec dependencies ([#20](https://github.com/sedubois/mobility-actiontext/pull/20)).
+
 ### 0.4.0 (2021-12-20)
 - Add Rails 7 compatibility.
 

data/Gemfile

@@ -1,3 +1,5 @@
 source "https://rubygems.org"
 
 gemspec
+
+gem "rake", "~> 13.0"

data/Gemfile.lock

@@ -1,68 +1,49 @@
 PATH
   remote: .
   specs:
-    mobility-actiontext (0.4.0)
+    mobility-actiontext (1.0.0)
+      actiontext (>= 6.0)
       mobility (~> 1.2)
-      rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.0)
-      actionpack (= 7.0.0)
-      activesupport (= 7.0.0)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailbox (7.0.0)
-      actionpack (= 7.0.0)
-      activejob (= 7.0.0)
-      activerecord (= 7.0.0)
-      activestorage (= 7.0.0)
-      activesupport (= 7.0.0)
-      mail (>= 2.7.1)
-    actionmailer (7.0.0)
-      actionpack (= 7.0.0)
-      actionview (= 7.0.0)
-      activejob (= 7.0.0)
-      activesupport (= 7.0.0)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (7.0.0)
-      actionview (= 7.0.0)
-      activesupport (= 7.0.0)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (7.0.0)
-      actionpack (= 7.0.0)
-      activerecord (= 7.0.0)
-      activestorage (= 7.0.0)
-      activesupport (= 7.0.0)
+    actiontext (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.0)
-      activesupport (= 7.0.0)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.0)
-      activesupport (= 7.0.0)
+    activejob (7.0.2.2)
+      activesupport (= 7.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.0.0)
-      activesupport (= 7.0.0)
-    activerecord (7.0.0)
-      activemodel (= 7.0.0)
-      activesupport (= 7.0.0)
-    activestorage (7.0.0)
-      actionpack (= 7.0.0)
-      activejob (= 7.0.0)
-      activerecord (= 7.0.0)
-      activesupport (= 7.0.0)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activerecord (7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activestorage (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.0)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -73,74 +54,45 @@ GEM
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.7.1)
-      mini_mime (>= 0.1.1)
     marcel (1.0.2)
-    method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.15.0)
     mobility (1.2.5)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (7.0.0)
-      actioncable (= 7.0.0)
-      actionmailbox (= 7.0.0)
-      actionmailer (= 7.0.0)
-      actionpack (= 7.0.0)
-      actiontext (= 7.0.0)
-      actionview (= 7.0.0)
-      activejob (= 7.0.0)
-      activemodel (= 7.0.0)
-      activerecord (= 7.0.0)
-      activestorage (= 7.0.0)
-      activesupport (= 7.0.0)
-      bundler (>= 1.15.0)
-      railties (= 7.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (7.0.0)
-      actionpack (= 7.0.0)
-      activesupport (= 7.0.0)
-      method_source
-      rake (>= 12.2)
-      thor (~> 1.0)
-      zeitwerk (~> 2.5)
     rake (13.0.6)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     sqlite3 (1.4.2)
-    thor (1.1.0)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.5)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.5)
-    zeitwerk (2.5.1)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
   mobility-actiontext!
+  rake (~> 13.0)
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.2.33
+   2.3.7

data/README.md

@@ -79,7 +79,7 @@ This is done through the `Mobility::Backends::ActionText::Translation` model ext
 
 After checking out the repo, run `bundle install` to install dependencies. Then, run `cd test_app && bundle exec rails test` to run the tests.
 
-To release a new version, update `lib/mobility/action_text/version.rb` and `CHANGELOG.md`, run `bundle`, commit, then run `bundle exec rake release`. This will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To release a new version, update `lib/mobility/action_text/version.rb` and `CHANGELOG.md`, run `bundle && cd test_app && bundle`, commit, then run `bundle exec rake release`. This will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/mobility/action_text/version.rb

@@ -2,6 +2,6 @@
 
 module Mobility
   module ActionText
-    VERSION = '0.4.0'
+    VERSION = '1.0.0'
   end
 end

data/lib/mobility/backends/action_text.rb

@@ -28,6 +28,12 @@ module Mobility
       # override to return record instead of value
       def read(locale, **options)
         return super if self.options[:plain]
+
+        if model.association_cached?("rich_text_#{attribute}")
+          eager_loaded = model.public_send("rich_text_#{attribute}")
+          return eager_loaded if eager_loaded.locale == locale.to_s
+        end
+
         translation_for(locale, **options)
       end
 
@@ -70,7 +76,9 @@ module Mobility
         end
       end
 
-      setup do |attributes, _options|
+      setup do |attributes, options|
+        next if options[:plain]
+
         attributes.each do |name|
           has_one :"rich_text_#{name}", -> { where(name: name, locale: Mobility.locale) },
                   class_name: 'Mobility::Backends::ActionText::RichTextTranslation',
@@ -78,7 +86,15 @@ module Mobility
           scope :"with_rich_text_#{name}", -> { includes("rich_text_#{name}") }
           scope :"with_rich_text_#{name}_and_embeds",
                 -> { includes("rich_text_#{name}": { embeds_attachments: :blob }) }
-        end unless _options[:plain]
+        end
+
+        singleton_class.prepend(WithAllRichText) unless singleton_class < WithAllRichText
+      end
+
+      module WithAllRichText
+        def with_all_rich_text
+          super.eager_load(:rich_text_translations)
+        end
       end
 
       module ActionTextValidations

data/mobility-actiontext.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'actiontext', '>= 6.0'
   spec.add_dependency 'mobility', '~> 1.2'
-  spec.add_dependency 'rails', '>= 6.0'
 
   spec.add_development_dependency 'sqlite3', '~> 1.4'
 end

data/test_app/Gemfile

@@ -1,10 +1,10 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.0.3'
+ruby '3.1.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
-gem 'rails', '~> 6.1.1'
+gem 'rails', '~> 7.0.0'
 # Use sqlite3 as the database for Active Record
 gem 'sqlite3', '~> 1.4'
 # Use Puma as the app server

data/test_app/Gemfile.lock

@@ -1,89 +1,98 @@
 PATH
   remote: ..
   specs:
-    mobility-actiontext (0.4.0)
+    mobility-actiontext (1.0.0)
+      actiontext (>= 6.0)
       mobility (~> 1.2)
-      rails (>= 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.2.2)
+      actionview (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (7.0.2.2)
+      activesupport (= 7.0.2.2)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (7.0.2.2)
+      activesupport (= 7.0.2.2)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-      marcel (~> 1.0.0)
+    activemodel (7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activerecord (7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+    activestorage (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
+      marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.4.1)
+    activesupport (7.0.2.2)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
+    digest (3.1.0)
     erubi (1.10.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.8.11)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.11.3)
+    io-wait (0.2.1)
+    jbuilder (2.11.5)
+      actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
-    listen (3.7.0)
+    listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.13.0)
+    loofah (2.14.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -91,54 +100,69 @@ GEM
     marcel (1.0.2)
     method_source (1.0.0)
     mini_mime (1.1.2)
-    minitest (5.14.4)
+    minitest (5.15.0)
     mobility (1.2.5)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
+    net-imap (0.2.3)
+      digest
+      net-protocol
+      strscan
+    net-pop (0.1.1)
+      digest
+      net-protocol
+      timeout
+    net-protocol (0.1.2)
+      io-wait
+      timeout
+    net-smtp (0.3.1)
+      digest
+      net-protocol
+      timeout
     nio4r (2.5.8)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
-    puma (5.5.2)
+    puma (5.6.2)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-mini-profiler (2.3.3)
+    rack-mini-profiler (2.3.4)
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (7.0.2.2)
+      actioncable (= 7.0.2.2)
+      actionmailbox (= 7.0.2.2)
+      actionmailer (= 7.0.2.2)
+      actionpack (= 7.0.2.2)
+      actiontext (= 7.0.2.2)
+      actionview (= 7.0.2.2)
+      activejob (= 7.0.2.2)
+      activemodel (= 7.0.2.2)
+      activerecord (= 7.0.2.2)
+      activestorage (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.2.2)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (7.0.2.2)
+      actionpack (= 7.0.2.2)
+      activesupport (= 7.0.2.2)
       method_source
-      rake (>= 0.13)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
-    rb-fsevent (0.11.0)
+    rb-fsevent (0.11.1)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    request_store (1.5.0)
+    request_store (1.5.1)
       rack (>= 1.4)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
@@ -158,8 +182,10 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.1.0)
+    strscan (3.0.1)
+    thor (1.2.1)
     tilt (2.0.10)
+    timeout (0.2.0)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
     turbolinks-source (5.2.0)
@@ -173,10 +199,10 @@ GEM
     websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.1)
+    zeitwerk (2.5.4)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-darwin
   x86_64-linux
 
 DEPENDENCIES
@@ -187,7 +213,7 @@ DEPENDENCIES
   mobility-actiontext!
   puma (~> 5.0)
   rack-mini-profiler (~> 2.0)
-  rails (~> 6.1.1)
+  rails (~> 7.0.0)
   sass-rails (>= 6)
   sqlite3 (~> 1.4)
   turbolinks (~> 5)
@@ -195,7 +221,7 @@ DEPENDENCIES
   web-console (>= 4.1.0)
 
 RUBY VERSION
-   ruby 3.0.3p157
+   ruby 3.1.1p18
 
 BUNDLED WITH
-   2.2.33
+   2.3.7

data/test_app/app/models/post.rb

@@ -4,4 +4,6 @@ class Post < ApplicationRecord
   extend Mobility
   translates :title, plain: true
   translates :content
+
+  has_rich_text :non_i18n_content
 end

data/test_app/db/migrate/20210114124951_translate_rich_texts.rb

@@ -3,7 +3,7 @@
 class TranslateRichTexts < ActiveRecord::Migration[6.1]
   def change
     # or null: true to allow untranslated rich text
-    add_column :action_text_rich_texts, :locale, :string, null: false
+    add_column :action_text_rich_texts, :locale, :string, null: true
 
     remove_index :action_text_rich_texts,
                  column: %i[record_type record_id name],

data/test_app/db/schema.rb

@@ -20,7 +20,7 @@ ActiveRecord::Schema.define(version: 20_210_114_125_134) do
     t.integer 'record_id', null: false
     t.datetime 'created_at', precision: 6, null: false
     t.datetime 'updated_at', precision: 6, null: false
-    t.string 'locale', null: false
+    t.string 'locale'
     t.index %w[record_type record_id name locale], name: 'index_action_text_rich_texts_uniqueness',
                                                    unique: true
   end

data/test_app/test/fixtures/action_text/rich_texts.yml

@@ -22,6 +22,11 @@ post_one_content_fr:
   locale: fr
   body: <h1>Bonjour le monde !</h1>
 
+post_one_non_i18n_content:
+  record: one (Post)
+  name: non_i18n_content
+  body: <h1>Hello non i18n world!</h1>
+
 untranslated_title_en:
   record: untranslated (Post)
   name: title

data/test_app/test/mobility_action_text_test.rb

@@ -95,18 +95,44 @@ module Mobility
       end
     end
 
-    test 'post content is eager loaded' do
+    test 'post content is eager loaded explicitly' do
       post = assert_queries(2) { Post.with_rich_text_content.last }
 
       assert_no_queries do
         assert_equal 'Hello world!', post.content.to_plain_text
+      end
+    end
+
+    test 'correct translation is returned if single translation for different locale was eager loaded' do
+      post = assert_queries(2) { Mobility.with_locale(:en) { Post.with_rich_text_content.last } }
+
+      assert_equal 'Bonjour le monde !', Mobility.with_locale(:fr) { post.content }.to_plain_text
+    end
+
+    test 'post content is eager loaded with all rich text' do
+      post = assert_queries(2) { Post.with_all_rich_text.last }
+
+      assert_no_queries do
+        assert_equal 'Hello world!', post.content.to_plain_text
+      end
+    end
+
+    test 'correct translation is returned if all translations for different locale were eager loaded' do
+      post = assert_queries(2) { Mobility.with_locale(:en) { Post.with_all_rich_text.last } }
 
-        skip('FIXME: this should execute no queries')
+      assert_equal 'Bonjour le monde !', Mobility.with_locale(:fr) { post.content }.to_plain_text
+    end
+
+    test 'post non_i18n_content is eager loaded with all rich text' do
+      post = assert_queries(2) { Post.with_all_rich_text.last }
+
+      assert_no_queries do
+        assert_equal 'Hello non i18n world!', post.non_i18n_content.to_plain_text
       end
     end
 
     test 'post is being destroyed' do
-      assert_difference ->{Mobility::Backends::ActionText::RichTextTranslation.count}, -4 do
+      assert_difference ->{Mobility::Backends::ActionText::RichTextTranslation.count}, -5 do
         assert posts(:one).destroy
       end
     end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: mobility-actiontext
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sébastien Dubois
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-20 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: mobility
+  name: actiontext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: mobility
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.23
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Translate Rails Action Text rich text with Mobility.