mobility-actiontext 0.6.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62723fa69cae996e74c0b33dfe0d5babf7395d6384c3c548fc7e06c33fcec9ce
-  data.tar.gz: 28ec6773c56d337a844d6b27bd13aebaea539bc0a1fafad50a9cfe0257243c82
+  metadata.gz: d7c9e89d17b9b01aa84055f4c34a75e258c1cffd7c35198dae1957b53fde7b5f
+  data.tar.gz: 255c73717d866912ebc0b020df39d1641f58f458130b89b67e35cba965a27391
 SHA512:
-  metadata.gz: f2b425c119565f978ed06b45e54bb9c452d648a4ff39026b35dbd50cce2d567f555685de9d56d68b0c02d2559a5f4dbee453e76edf61846321b40972387bf704
-  data.tar.gz: 6eced781dcc3440abcb988f898979caca2511eda42486d11a141fa457f26802532d609bbeaa32a8127f036eb563850a3a6035c0a84ec05d6bad1a906c43f4aae
+  metadata.gz: b9c02385dc9cbd7fd035e5a9e81e651c5948b20c65fd5c86768b5dcd12ffce04a7a1293784a685629c0b12e31ac1ffb5340ea93cc4205f9290aea812364309e6
+  data.tar.gz: b5cf0bd2baf3c180a40047767899b48921b5d42cc67f8ca7d3e741fbe0e751b2fc54595e7e58cdbbd8faf8dac6ea15e94fabf999948de744eec314851894eace

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Mobility Action Text Changelog
 
+### 1.1.1 (2022-04-03)
+
+- Fix rich text associations for locales with hyphens.
+
+### 1.1.0 (2022-03-24)
+
+- Add rich text associations for each locale ([#25](https://github.com/sedubois/mobility-actiontext/pull/25)).
+
+### 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,68 +1,68 @@
 PATH
   remote: .
   specs:
-    mobility-actiontext (0.6.0)
+    mobility-actiontext (1.1.1)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionpack (7.0.2.2)
-      actionview (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       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.2.2)
-      actionpack (= 7.0.2.2)
-      activerecord (= 7.0.2.2)
-      activestorage (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actiontext (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    activejob (7.0.2.3)
+      activesupport (= 7.0.2.3)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activestorage (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.2.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
     builder (3.2.4)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     erubi (1.10.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.14.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)
     mini_mime (1.1.2)
     minitest (5.15.0)
-    mobility (1.2.5)
+    mobility (1.2.6)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     nokogiri (1.13.3-x86_64-darwin)
@@ -95,4 +95,4 @@ DEPENDENCIES
   sqlite3 (~> 1.4)
 
 BUNDLED WITH
-   2.3.7
+   2.3.10

data/README.md

@@ -77,7 +77,15 @@ This is done through the `Mobility::Backends::ActionText::Translation` model ext
 
 ## Development
 
-After checking out the repo, run `bundle install` to install dependencies. Then, run `cd test_app && bundle exec rails test` to run the tests.
+After checking out the repo, run `bundle install` to install dependencies.
+
+Execute tests by running:
+
+```sh
+cd test_app
+bundle install
+bundle exec rails test
+```
 
 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).
 
@@ -88,4 +96,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/sedubo
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
- 

data/lib/mobility/action_text/version.rb

@@ -2,6 +2,6 @@
 
 module Mobility
   module ActionText
-    VERSION = '0.6.0'
+    VERSION = '1.1.1'
   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
 
@@ -77,6 +83,12 @@ module Mobility
           has_one :"rich_text_#{name}", -> { where(name: name, locale: Mobility.locale) },
                   class_name: 'Mobility::Backends::ActionText::RichTextTranslation',
                   as: :record, inverse_of: :record, autosave: true, dependent: :destroy
+          Mobility.available_locales.each do |locale|
+            has_one :"rich_text_#{name}_#{locale.to_s.underscore}",
+                    -> { where(name: name, locale: locale) },
+                    class_name: 'Mobility::Backends::ActionText::RichTextTranslation',
+                    as: :record, inverse_of: :record, autosave: true, dependent: :destroy
+          end
           scope :"with_rich_text_#{name}", -> { includes("rich_text_#{name}") }
           scope :"with_rich_text_#{name}_and_embeds",
                 -> { includes("rich_text_#{name}": { embeds_attachments: :blob }) }

data/mobility-actiontext.gemspec

@@ -15,7 +15,9 @@ Gem::Specification.new do |spec|
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/sedubois/mobility-actiontext'
+  spec.metadata['bug_tracker_uri'] = 'https://github.com/sedubois/mobility-actiontext/issues'
   spec.metadata['changelog_uri'] = 'https://github.com/sedubois/mobility-actiontext/blob/main/CHANGELOG.md'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.

data/test_app/Gemfile

@@ -31,7 +31,7 @@ group :development do
   gem 'web-console', '>= 4.1.0'
   # Display performance information such as SQL time and flame graphs for each request in your browser.
   # Can be configured to work on production as well see: https://github.com/MiniProfiler/rack-mini-profiler/blob/master/README.md
-  gem 'rack-mini-profiler', '~> 2.0'
+  gem 'rack-mini-profiler'
   gem 'listen', '~> 3.3'
 end
 

data/test_app/Gemfile.lock

@@ -1,74 +1,74 @@
 PATH
   remote: ..
   specs:
-    mobility-actiontext (0.6.0)
+    mobility-actiontext (1.1.1)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.0.2.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actioncable (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.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)
+    actionmailbox (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       mail (>= 2.7.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)
+    actionmailer (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      actionview (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       mail (~> 2.5, >= 2.5.4)
       net-imap
       net-pop
       net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (7.0.2.2)
-      actionview (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionpack (7.0.2.3)
+      actionview (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       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.2.2)
-      actionpack (= 7.0.2.2)
-      activerecord (= 7.0.2.2)
-      activestorage (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actiontext (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    actionview (7.0.2.3)
+      activesupport (= 7.0.2.3)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (7.0.2.2)
-      activesupport (= 7.0.2.2)
+    activejob (7.0.2.3)
+      activesupport (= 7.0.2.3)
       globalid (>= 0.3.6)
-    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)
+    activemodel (7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activerecord (7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
+    activestorage (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (7.0.2.2)
+    activesupport (7.0.2.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -76,7 +76,7 @@ GEM
     bindex (0.8.1)
     builder (3.2.4)
     byebug (11.1.3)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     digest (3.1.0)
     erubi (1.10.0)
@@ -85,14 +85,13 @@ GEM
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    io-wait (0.2.1)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     listen (3.7.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
-    loofah (2.14.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -101,7 +100,7 @@ GEM
     method_source (1.0.0)
     mini_mime (1.1.2)
     minitest (5.15.0)
-    mobility (1.2.5)
+    mobility (1.2.6)
       i18n (>= 0.6.10, < 2)
       request_store (~> 1.0)
     net-imap (0.2.3)
@@ -112,8 +111,7 @@ GEM
       digest
       net-protocol
       timeout
-    net-protocol (0.1.2)
-      io-wait
+    net-protocol (0.1.3)
       timeout
     net-smtp (0.3.1)
       digest
@@ -124,36 +122,36 @@ GEM
       racc (~> 1.4)
     nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
-    puma (5.6.2)
+    puma (5.6.4)
       nio4r (~> 2.0)
     racc (1.6.0)
     rack (2.2.3)
-    rack-mini-profiler (2.3.4)
+    rack-mini-profiler (3.0.0)
       rack (>= 1.2.0)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    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)
+    rails (7.0.2.3)
+      actioncable (= 7.0.2.3)
+      actionmailbox (= 7.0.2.3)
+      actionmailer (= 7.0.2.3)
+      actionpack (= 7.0.2.3)
+      actiontext (= 7.0.2.3)
+      actionview (= 7.0.2.3)
+      activejob (= 7.0.2.3)
+      activemodel (= 7.0.2.3)
+      activerecord (= 7.0.2.3)
+      activestorage (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       bundler (>= 1.15.0)
-      railties (= 7.0.2.2)
+      railties (= 7.0.2.3)
     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.2.2)
-      actionpack (= 7.0.2.2)
-      activesupport (= 7.0.2.2)
+    railties (7.0.2.3)
+      actionpack (= 7.0.2.3)
+      activesupport (= 7.0.2.3)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
@@ -174,7 +172,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sprockets (4.0.2)
+    sprockets (4.0.3)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.4.2)
@@ -212,7 +210,7 @@ DEPENDENCIES
   mobility (~> 1.2)
   mobility-actiontext!
   puma (~> 5.0)
-  rack-mini-profiler (~> 2.0)
+  rack-mini-profiler
   rails (~> 7.0.0)
   sass-rails (>= 6)
   sqlite3 (~> 1.4)
@@ -224,4 +222,4 @@ RUBY VERSION
    ruby 3.1.1p18
 
 BUNDLED WITH
-   2.3.7
+   2.3.10

data/test_app/config/initializers/i18n.rb

@@ -1,3 +1,3 @@
 # frozen_string_literal: true
 
-Rails.application.config.i18n.available_locales = %i[en fr]
+Rails.application.config.i18n.available_locales = %i[en fr fr-CA]

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

@@ -22,6 +22,12 @@ post_one_content_fr:
   locale: fr
   body: <h1>Bonjour le monde !</h1>
 
+post_one_content_fr_ca:
+  record: one (Post)
+  name: content
+  locale: fr-CA
+  body: <h1>Allo le monde !</h1>
+
 post_one_non_i18n_content:
   record: one (Post)
   name: non_i18n_content

data/test_app/test/mobility_action_text_test.rb

@@ -34,10 +34,10 @@ module Mobility
       assert_equal 2, post.plain_text_translations.count
     end
 
-    test 'post has two rich text translations' do
+    test 'post has three rich text translations' do
       post = posts(:one)
 
-      assert_equal 2, post.rich_text_translations.count
+      assert_equal 3, post.rich_text_translations.count
     end
 
     test 'post has plain text title' do
@@ -46,7 +46,7 @@ module Mobility
       assert_equal 'Post Title', post.title
     end
 
-    test 'post has rich text content' do
+    test 'post has rich text content association' do
       post = posts(:one)
 
       assert_instance_of Mobility::Backends::ActionText::RichTextTranslation, post.rich_text_content
@@ -57,6 +57,34 @@ module Mobility
       HTML
     end
 
+    test 'post has rich text content associations for each locale' do
+      post = posts(:one)
+
+      assert_instance_of Mobility::Backends::ActionText::RichTextTranslation,
+                         post.rich_text_content_en
+      assert_equal <<~HTML, post.rich_text_content_en.to_s
+      <div class="trix-content">
+        <h1>Hello world!</h1>
+      </div>
+      HTML
+
+      assert_instance_of Mobility::Backends::ActionText::RichTextTranslation,
+                         post.rich_text_content_fr
+      assert_equal <<~HTML, post.rich_text_content_fr.to_s
+        <div class="trix-content">
+          <h1>Bonjour le monde !</h1>
+        </div>
+      HTML
+
+      assert_instance_of Mobility::Backends::ActionText::RichTextTranslation,
+                         post.rich_text_content_fr_ca
+      assert_equal <<~HTML, post.rich_text_content_fr_ca.to_s
+        <div class="trix-content">
+          <h1>Allo le monde !</h1>
+        </div>
+      HTML
+    end
+
     test 'post has different content in different languages' do
       post = posts(:one)
 
@@ -100,11 +128,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 +145,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 }
 
@@ -122,7 +160,7 @@ module Mobility
     end
 
     test 'post is being destroyed' do
-      assert_difference ->{Mobility::Backends::ActionText::RichTextTranslation.count}, -5 do
+      assert_difference ->{Mobility::Backends::ActionText::RichTextTranslation.count}, -6 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.6.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sébastien Dubois
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-02-27 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actiontext
@@ -138,7 +138,9 @@ licenses:
 metadata:
   homepage_uri: https://github.com/sedubois/mobility-actiontext
   source_code_uri: https://github.com/sedubois/mobility-actiontext
+  bug_tracker_uri: https://github.com/sedubois/mobility-actiontext/issues
   changelog_uri: https://github.com/sedubois/mobility-actiontext/blob/main/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths: