mobility-actiontext 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ca31827abf078eae807f5aafef4588dad78859d1fe3fea3c753dc311726c533
-  data.tar.gz: 723483c8e2091d470dbb0ae86f33bc945a7e4eeac87770ecf22c1f2e447f0f0a
+  metadata.gz: 62723fa69cae996e74c0b33dfe0d5babf7395d6384c3c548fc7e06c33fcec9ce
+  data.tar.gz: 28ec6773c56d337a844d6b27bd13aebaea539bc0a1fafad50a9cfe0257243c82
 SHA512:
-  metadata.gz: 8d58add532f751dade73185768f816a2b1ad16b1ac794b74b78997ed62c20d05b0e4a816515bf71c949fe3782bb78ffa8e9a6f4ac1fea3f47659263d8f894685
-  data.tar.gz: 9cf9d1bf167b0da2feb2513588818789bf998a16291d919f58fc39794172e05fda3853cf35085ffb811fef918d2ccf8d7aed4dc12f1fa3a230a3f3b095c7bf36
+  metadata.gz: f2b425c119565f978ed06b45e54bb9c452d648a4ff39026b35dbd50cce2d567f555685de9d56d68b0c02d2559a5f4dbee453e76edf61846321b40972387bf704
+  data.tar.gz: 6eced781dcc3440abcb988f898979caca2511eda42486d11a141fa457f26802532d609bbeaa32a8127f036eb563850a3a6035c0a84ec05d6bad1a906c43f4aae

data/.ruby-version

@@ -1 +1 @@
-ruby-3.1.0
+ruby-3.1.1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Mobility Action Text Changelog
 
+### 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)).
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility-actiontext (0.5.0)
+    mobility-actiontext (0.6.0)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
@@ -54,7 +54,7 @@ GEM
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     loofah (2.14.0)
       crass (~> 1.0.2)
@@ -65,9 +65,9 @@ GEM
     mobility (1.2.5)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
-    nokogiri (1.13.1-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     racc (1.6.0)
     rack (2.2.3)

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.5.0'
+    VERSION = '0.6.0'
   end
 end

data/lib/mobility/backends/action_text.rb

@@ -70,7 +70,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 +80,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/test_app/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '3.1.0'
+ruby '3.1.1'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 7.0.0'

data/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    mobility-actiontext (0.5.0)
+    mobility-actiontext (0.6.0)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
@@ -83,7 +83,7 @@ GEM
     ffi (1.15.5)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.9.1)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
     io-wait (0.2.1)
     jbuilder (2.11.5)
@@ -120,15 +120,15 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.1-x86_64-darwin)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.13.1-x86_64-linux)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     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)
@@ -221,7 +221,7 @@ DEPENDENCIES
   web-console (>= 4.1.0)
 
 RUBY VERSION
-   ruby 3.1.0p0
+   ruby 3.1.1p18
 
 BUNDLED WITH
    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,7 +95,7 @@ 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
@@ -105,8 +105,24 @@ module Mobility
       end
     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 '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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobility-actiontext
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Sébastien Dubois
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-13 00:00:00.000000000 Z
+date: 2022-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actiontext
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Translate Rails Action Text rich text with Mobility.