para-i18n 0.3.5 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 3c4c76be23e0dc2fcfb13e839d1c2089bfe2eab1b16519e54e78bd75bcda5c12
-  data.tar.gz: 8d881ca0a6c73df1f8c2f555bb2d3bfa8bed18bee79c4bf7330f3b950f53ab77
+SHA1:
+  metadata.gz: bffd454f68783dc4413fab9cff53b3c899b0f908
+  data.tar.gz: 783928239cee302a6e963057cc8f68becd744c8c
 SHA512:
-  metadata.gz: c5c3d41e097f5d2e9a680e1676265a9e67a1d0b9070c558d859f912422716bedb2a0a15bf24804e38a2cdea1caff4ebce6165ad34b6af74983088780964d49b3
-  data.tar.gz: 689ad5412cf0ec59571abd312fb75f4ca176c0909074e48325cc7ee25410f8ff469930c50fcc6cf63be15fdf5ed0ae92beaac3ad1131a8989512a44fe1f8ecea
+  metadata.gz: aa848897075a6d40a94d92451e3b660e1c18aade214e90ca0a394d066b58dd03f3d143f6457f29e469b805215f37e451f21a093443f67cc7298b2bd8a7a047de
+  data.tar.gz: 3ce0e4a22d344090a9d98ba86fb505b778549e2a230d8e981b9288af8b0d16da180e8993d1b828c7d795d867092d01575c3a040e43e74f6f2c3c05ade9eaa975

data/lib/para/i18n.rb

@@ -8,6 +8,11 @@ require 'para/i18n/model'
 require 'para/i18n/resources_table'
 require 'para/i18n/resources_buttons'
 
+require 'para/i18n/attribute_translation'
+require 'para/i18n/attribute_translation/base'
+require 'para/i18n/attribute_translation/simple_attribute'
+require 'para/i18n/attribute_translation/attachment'
+
 require 'para/i18n/friendly_id'
 
 require 'para/i18n/i18n_input'

data/lib/para/i18n/attribute_translation.rb

@@ -0,0 +1,26 @@
+module Para
+  module I18n
+    # This module redirects the reading and writing of the translated attributes to the
+    # right attribute translation class
+    #
+    module AttributeTranslation
+      def self.read(locale, resource, attribute)
+        attribute_translation_class(locale, resource.class, attribute).read(resource)
+      end
+
+      def self.write(locale, resource, attribute, value)
+        attribute_translation_class(locale, resource.class, attribute).write(resource, value)
+      end
+
+      def self.attribute_translation_class(locale, model, attribute)
+        attribute_translation_class = if AttributeTranslation::Attachment.matches?(model, attribute)
+          AttributeTranslation::Attachment.new(locale, model, attribute)
+        else
+          AttributeTranslation::SimpleAttribute.new(locale, model, attribute)
+        end
+      end
+    end
+  end
+end
+
+

data/lib/para/i18n/attribute_translation/attachment.rb

@@ -0,0 +1,58 @@
+module Para
+  module I18n
+    module AttributeTranslation
+      class Attachment < Para::I18n::AttributeTranslation::Base
+        def read(resource)
+          attachment = resource.public_send(reflection_name)
+
+          if default_locale? || attachment.attached? || !fallback_locale
+            attachment
+          elsif fallback_locale
+            self.class.new(fallback_locale, model, attribute).read(resource)
+          end
+        end
+
+        def write(resource, value)
+          resource.public_send(:"#{reflection_name}=", value)
+        end
+
+        def self.matches?(model, attribute)
+          model.reflections.key?("#{attribute}_attachment") &&
+            model.reflections.key?("#{attribute}_blob")
+        end
+
+        def self.prepare(model, attribute)
+          return unless matches?(model, attribute)
+
+          (I18n.available_locales - [I18n.default_locale]).each do |locale|
+            new(locale, model, attribute).prepare_translated_attachment
+          end
+        end
+
+        def prepare_translated_attachment
+          model.alias_method(untranslated_getter_name, attribute)
+          model.alias_method(untranslated_setter_name, :"#{attribute}=")
+          model.has_one_attached(reflection_name)
+        end
+
+        private
+
+        def reflection_name
+          @reflection_name ||= if default_locale?
+            untranslated_getter_name
+          else
+            [attribute, locale, "translation"].join("_")
+          end
+        end
+
+        def untranslated_getter_name
+          @untranslated_getter_name ||= :"untranslated_#{attribute}"
+        end
+
+        def untranslated_setter_name
+          @untranslated_setter_name ||= :"untranslated_#{attribute}="
+        end
+      end
+    end
+  end
+end

data/lib/para/i18n/attribute_translation/base.rb

@@ -0,0 +1,23 @@
+module Para
+  module I18n
+    module AttributeTranslation
+      class Base
+        attr_reader :locale, :model, :attribute
+
+        def initialize(locale, model, attribute)
+          @locale = locale.to_s
+          @model = model
+          @attribute = attribute.to_s
+        end
+
+        def default_locale?
+          @default_locale ||= locale == I18n.default_locale.to_s
+        end
+
+        def fallback_locale
+          @fallback_locale ||= Para::I18n::Fallbacks.i18n_fallback_for(locale.to_sym)
+        end
+      end
+    end
+  end
+end

data/lib/para/i18n/attribute_translation/simple_attribute.rb

@@ -0,0 +1,37 @@
+module Para
+  module I18n
+    module AttributeTranslation
+      class SimpleAttribute < Para::I18n::AttributeTranslation::Base
+        def read(resource)
+          # Directly read the plain column / store accessor if the current locale is the
+          # default one..
+          if default_locale? && attribute != "_disabled_for_locale"
+            return resource.read_plain_or_store_attribute(attribute)
+          end
+
+          translations = resource.model_translations[locale]
+
+          if translations && (translation = translations[attribute])
+            translation
+          elsif fallback_locale
+            # If no translation was returned, try to fallback to the next locale
+            self.class.new(fallback_locale, model, attribute).read(resource)
+          end
+        end
+
+        def write(resource, value)
+          if default_locale? && attribute != "_disabled_for_locale"
+            return resource.write_plain_or_store_attribute(attribute, value)
+          end
+
+          # did not us ||= here to fix first assignation.
+          # Did not investigate on why ||= does not work
+          resource.model_translations[locale] = {} unless resource.model_translations[locale]
+          resource.model_translations[locale][attribute] = value
+          resource._translations_will_change!
+          value
+        end
+      end
+    end
+  end
+end

data/lib/para/i18n/engine.rb

@@ -11,7 +11,7 @@ module Para
         ::Para.config.routes.extend_routes_for(:component) do
           resource :translation, only: [:edit, :update], controller: '/para/admin/translations'
         end
-        
+
         ::Para.config.routes.extend_routes_for(:crud_component) do
           resource :translation, only: [:edit, :update], controller: '/para/admin/translations'
         end
@@ -41,7 +41,7 @@ module Para
             icon: 'globe',
             label: ::I18n.t('para.i18n.translate'),
             url: @component.relation_path(resource, :translation, action: :edit)
-          } if resource.class.translates?
+          } if resource.class.translates? && can?(:translate, resource)
         end
       end
     end

data/lib/para/i18n/friendly_id.rb

@@ -10,6 +10,15 @@ module FriendlyId
       def included(model_class)
         model_class.extend(ClassMethods)
 
+        # Support for I18n finder methods on ActiveRecord::Relation of the including
+        # model. Example :
+        model_class.instance_eval do
+          relation.class.send(:include, ClassMethods)
+          if (ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2) || ActiveRecord::VERSION::MAJOR == 5
+            model_class.send(:extend, ClassMethods)
+          end
+        end
+
         # Support for friendly finds on associations for Rails 4.0.1 and above.
         #
         # Borrowed from FriendlyId::Finders module

data/lib/para/i18n/model.rb

@@ -9,27 +9,11 @@ module Para
       end
 
       def read_translated_attribute(field, locale = ::I18n.locale)
-        return read_plain_or_store_attribute(field) if locale == ::I18n.default_locale && field != :_disabled_for_locale
-
-        if model_translations[locale.to_s]
-          if (translation = model_translations[locale.to_s][field.to_s])
-            return translation
-          end
-        end
-
-        # If no translation was returned, try to fallback to the next locale
-        if (fallback_locale = Fallbacks.i18n_fallback_for(locale))
-          read_translated_attribute(field, fallback_locale)
-        end
+        Para::I18n::AttributeTranslation.read(locale, self, field)
       end
 
-      def write_translated_attribute field, value, locale = ::I18n.locale
-        return write_plain_or_store_attribute(field, value) if locale == ::I18n.default_locale && field != :_disabled_for_locale
-
-        # did not us ||= here to fix first assignation.
-        # Did not investigate on why ||= does not work
-        model_translations[locale.to_s] = {} unless model_translations[locale.to_s]
-        model_translations[locale.to_s][field.to_s] = value
+      def write_translated_attribute(field, value, locale = ::I18n.locale)
+        Para::I18n::AttributeTranslation.write(locale, self, field, value)
       end
 
       def model_translations
@@ -43,7 +27,7 @@ module Para
       end
 
       def translation_for(locale)
-        case locale
+        case locale.to_sym
         when I18n.default_locale then default_locale_translations
         else model_translations[locale.to_s] || {}
         end.with_indifferent_access
@@ -53,8 +37,10 @@ module Para
         self.class.translates? && _disabled_for_locale
       end
 
-      private
-
+      # This method allows reading an attribute from the ActiveRecord table, whether it's
+      # a plain column of the table, or a field of a store (hash, json etc.) of the table,
+      # accessed through the ActiveRecord.store_accessor interface.
+      #
       def read_plain_or_store_attribute(field)
         if plain_column?(field)
           read_attribute(field)
@@ -75,6 +61,8 @@ module Para
         end
       end
 
+      private
+
       def plain_column?(field)
         self.class.columns_hash.key?(field.to_s)
       end
@@ -99,13 +87,7 @@ module Para
           self.translatable = true
 
           fields.each do |field|
-            define_method field do
-              read_translated_attribute(field)
-            end
-
-            define_method :"#{ field }=" do |value|
-              write_translated_attribute(field, value)
-            end
+            prepare_attribute_translation(field)
           end
 
           define_method(:_disabled_for_locale) do
@@ -120,6 +102,22 @@ module Para
         def translates?
           translatable
         end
+
+        private
+
+        def prepare_attribute_translation(attribute)
+          # Let the Para::I18n::AttributeTranslation::Attachment module handle
+          # ActiveStorage attachment fields translation preparation.
+          Para::I18n::AttributeTranslation::Attachment.prepare(self, attribute)
+
+          define_method(attribute) do
+            read_translated_attribute(attribute)
+          end
+
+          define_method(:"#{attribute}=") do |value|
+            write_translated_attribute(attribute, value)
+          end
+        end
       end
     end
   end

data/lib/para/i18n/resources_buttons.rb

@@ -2,7 +2,7 @@ module Para
   module I18n
     module ResourcesButtons
       def translate_button(resource)
-        return unless resource.class.translates?
+        return unless resource.class.translates? && view.can?(:translate, resource)
 
         path = component.relation_path(resource, :translation, action: :edit)
         options = { class: 'btn btn-default' }

data/lib/para/i18n/version.rb

@@ -1,5 +1,5 @@
 module Para
   module I18n
-    VERSION = "0.3.5"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: para-i18n
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.1
 platform: ruby
 authors:
 - Valentin Ballestrino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-18 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: para
@@ -94,6 +94,10 @@ files:
 - lib/generators/para/i18n/translate/templates/model_migration.rb.erb
 - lib/generators/para/i18n/translate/translate_generator.rb
 - lib/para/i18n.rb
+- lib/para/i18n/attribute_translation.rb
+- lib/para/i18n/attribute_translation/attachment.rb
+- lib/para/i18n/attribute_translation/base.rb
+- lib/para/i18n/attribute_translation/simple_attribute.rb
 - lib/para/i18n/engine.rb
 - lib/para/i18n/fallbacks.rb
 - lib/para/i18n/friendly_id.rb
@@ -125,7 +129,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Para CMS I18n admin module for models