mobility-actiontext 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62723fa69cae996e74c0b33dfe0d5babf7395d6384c3c548fc7e06c33fcec9ce
-  data.tar.gz: 28ec6773c56d337a844d6b27bd13aebaea539bc0a1fafad50a9cfe0257243c82
+  metadata.gz: 07d1047f391d3c0dde02a646adc682b3a09f1e99a2e4beb04c7ba3b971a41e0d
+  data.tar.gz: a49bf73b5b911d02a71eacc5f84f9f18ed91865befb9b2872a29025bb7be6813
 SHA512:
-  metadata.gz: f2b425c119565f978ed06b45e54bb9c452d648a4ff39026b35dbd50cce2d567f555685de9d56d68b0c02d2559a5f4dbee453e76edf61846321b40972387bf704
-  data.tar.gz: 6eced781dcc3440abcb988f898979caca2511eda42486d11a141fa457f26802532d609bbeaa32a8127f036eb563850a3a6035c0a84ec05d6bad1a906c43f4aae
+  metadata.gz: 56786adb17b842818b65b6de35403a987c8b49dc570c4a00a367995160590c58f284374e74c391bc6aee37d05b2c1cf081aee878ce83232d877daeba86292ed6
+  data.tar.gz: e82e781d93cd99fce6bb5e85fff45334b39cedc50a6772476a4fa22ed1319f0beabf9c20df1b319fe514f6e70743dff9880dcdac5814bbfc2c460bb32886843a

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 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)).
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility-actiontext (0.6.0)
+    mobility-actiontext (1.0.0)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 

data/lib/mobility/action_text/version.rb

@@ -2,6 +2,6 @@
 
 module Mobility
   module ActionText
-    VERSION = '0.6.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
 

data/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    mobility-actiontext (0.6.0)
+    mobility-actiontext (1.0.0)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 

data/test_app/test/mobility_action_text_test.rb

@@ -100,11 +100,15 @@ module Mobility
 
       assert_no_queries do
         assert_equal 'Hello world!', post.content.to_plain_text
-
-        skip('FIXME: this should execute no queries')
       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 }
 
@@ -113,6 +117,12 @@ module Mobility
       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 } }
+
+      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 }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility-actiontext
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Sébastien Dubois
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actiontext