mobility-actiontext 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83d469e061908f44d2b12d45a5cfe0108a9b78264e14eecf677abd881d8fb29c
-  data.tar.gz: 22c8db7113a9b6cbfcdf2e060a6f4b639b59e8011ab5a1ae5bf1b525040f2235
+  metadata.gz: d7c9e89d17b9b01aa84055f4c34a75e258c1cffd7c35198dae1957b53fde7b5f
+  data.tar.gz: 255c73717d866912ebc0b020df39d1641f58f458130b89b67e35cba965a27391
 SHA512:
-  metadata.gz: ba1372589dbf8592c9dd66e0d28c628e16a71ef6397e878c2c9c6e38a43ff86266963cc38db8cb8a605242fbba6fd9503bfcb348c073a302edf237749490d141
-  data.tar.gz: c2e72b4be327237ca0aac4557fcca381cfbbe0558832f681850fa74deba72e79dfd08d4ab94f9a82136d6b05c7fcf92fe207e1bd3ec9ce38f648ad95d28fa969
+  metadata.gz: b9c02385dc9cbd7fd035e5a9e81e651c5948b20c65fd5c86768b5dcd12ffce04a7a1293784a685629c0b12e31ac1ffb5340ea93cc4205f9290aea812364309e6
+  data.tar.gz: b5cf0bd2baf3c180a40047767899b48921b5d42cc67f8ca7d3e741fbe0e751b2fc54595e7e58cdbbd8faf8dac6ea15e94fabf999948de744eec314851894eace

data/CHANGELOG.md

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobility-actiontext (1.1.0)
+    mobility-actiontext (1.1.1)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
@@ -56,7 +56,7 @@ GEM
       activesupport (>= 5.0)
     i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    loofah (2.15.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     marcel (1.0.2)

data/lib/mobility/action_text/version.rb

@@ -2,6 +2,6 @@
 
 module Mobility
   module ActionText
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/lib/mobility/backends/action_text.rb

@@ -84,7 +84,8 @@ module Mobility
                   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}", -> { where(name: name, locale: 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

data/test_app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    mobility-actiontext (1.1.0)
+    mobility-actiontext (1.1.1)
       actiontext (>= 6.0)
       mobility (~> 1.2)
 
@@ -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.15.0)
+    loofah (2.16.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -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,7 +122,7 @@ 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)

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
@@ -60,19 +60,29 @@ module Mobility
     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_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_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
@@ -150,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: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Sébastien Dubois
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-24 00:00:00.000000000 Z
+date: 2022-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actiontext