easy_translatable 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87e052e95899dc6b22ac1448a9a934cb08867d5
-  data.tar.gz: 82c1645a1e0ed7cbaddb5bc7a5a746861a11f18e
+  metadata.gz: 0a2db1f63c194bb5c4ff3014938c96f635ad2f17
+  data.tar.gz: 296172fd483778a4e593c659bb2b4a30c665ad53
 SHA512:
-  metadata.gz: b671ad665fa26149eb88ec15546a92038dac5f301625710e9526b76821afb48bac357bb008873f8994a67104cd31b66bf5c2e2aba947c770850fee1f536b5df0
-  data.tar.gz: 81c3329c6381e2d1a08816261055b8eb0b5c0d886b9717b2ffa030b5a03eb740827616f8c3a442b4c94a8ec953345a1d836e2e14196097b73e1fce9d5e8c8a1a
+  metadata.gz: e63d023cdde40a254c4874f81f892ecf28c28143d6857008776f3cf1efe49edf959034c8e6d45320fe1562ee44eeace6efced3161775a72e96a089c0a47e568b
+  data.tar.gz: 8908a1addd1f71c87c15ac9033d5c0ad27a6ae8fde08616cc398e159a721267a946fd7b528450427528b9d5c992967af6592246eef967a16a4e581e05b536ee2

data/lib/translatable/active_record/adapter.rb

@@ -21,8 +21,8 @@ module Translatable
         stash.contains?(locale, name)
       end
 
-      def fetch(locale, name)
-        value = stash_contains?(locale, name) ? fetch_stash(locale, name) : fetch_attribute(locale, name)
+      def fetch(locale, name, value = nil)
+        value = stash_contains?(locale, name) ? fetch_stash(locale, name) : fetch_attribute(locale, name, value)
 
         return value
       end
@@ -33,9 +33,14 @@ module Translatable
 
       protected
 
-      def fetch_attribute(locale, name)
-        translation = record.translation_for(locale, name, false)
-        return translation && translation.send(:value)
+      def fetch_attribute(locale, name, value = nil)
+        if value.nil?
+          translation = record.translation_for(locale, name)
+          return translation && translation.send(:value)
+        else
+          translation = record.translation_for_serialized(locale, name, value)
+          return translation
+        end
       end
 
     end

data/lib/translatable/active_record/class_methods.rb

@@ -6,7 +6,8 @@ module Translatable
       end
 
       def translated?(name)
-        translated_attribute_names.include?(name.to_sym)
+        included = translated_attribute_names.detect { |attr| attr.is_a?(Hash) ? attr.keys.include?(name.to_sym) : attr == name.to_sym }
+        !included.nil?
       end
 
       protected

data/lib/translatable/active_record/instance_methods.rb

@@ -53,7 +53,8 @@ module Translatable
       def read_attribute(name, options = {})
         options = {:translated => true, :locale => nil}.merge(options)
         if translated?(name) and options[:translated]
-          if translate? && (value = translatable.fetch(options[:locale] || Translatable.locale, name))
+          serialized_value = super(name) if self.serialized_attributes.has_key?(name)
+          if translate? && (value = translatable.fetch(options[:locale] || Translatable.locale, name, serialized_value))
             value
           else
             super(name)
@@ -77,6 +78,45 @@ module Translatable
         translation_caches["#{locale}_#{name}"]
       end
 
+      # Fetch translations per keys in the form
+      # model_attr_serialized_attribute
+      # E.G.1: ```Model``` has attribute ```config``` which has a key ```auto_save```
+      #         will have a translation key ```config_auto_save```
+      # E.G.2: ```Model``` has attribute ```config``` which is an array of ```user_id => ([0-9]+)```
+      #         will have translations key containing the index: ```config_user_id_0```, ```config_user_id_1```...
+      def translation_for_serialized(locale, name, value, build_if_missing = false)
+
+        unless translation_caches["#{locale}_#{name}"]
+          engine = self.serialized_attributes.has_key?(name) ? nil : JSON
+          deserialized_value = engine.nil? ? value : engine.load(value)
+
+          only = self.translated_serialized_attributes[name.to_sym].map(&:to_s)
+          if only.empty?
+            regex_keys = /\A#{name.to_s}_([a-z_]+[a-z])(?:_([0-9]*))?\Z/
+          else
+            regex_keys = /\A#{name.to_s}_(#{only.join('|')})(?:_([0-9]*))?\Z/
+          end
+          # Fetch translations from database as those in the translation collection may be incomplete
+          _translations = translations.select{|t| t.locale.to_s == locale.to_s && t.key.to_s =~ regex_keys }
+          _translations.each do |t|
+            matched = t.key.match regex_keys
+            unless matched.nil?
+              if matched.size == 3
+                sub_attr = matched[1]
+                index = matched[2].to_i
+                value[index][sub_attr] = t.value if value.size > index && value[index].has_key?(sub_attr)
+              elsif matched.size == 3
+                sub_attr = matched[1]
+                value[sub_attr] = t.value if value.has_key?(sub_attr)
+              end
+            end
+          end
+
+          translation_caches["#{locale}_#{name}"] = value
+        end
+        translation_caches["#{locale}_#{name}"]
+      end
+
       def translation_caches
         @translation_caches ||= {}
       end

data/lib/translatable/active_record/macro.rb

@@ -19,7 +19,9 @@ module Translatable
 
             # Add attribute to the list.
             self.translated_attribute_names << attr_name
-            self.translated_serialized_attributes[attr_name] = options[:json] if options[:json]
+            if self.serialized_attributes.has_key?(attr_name) || options[:only]
+              self.translated_serialized_attributes[attr_name] = options[:only] ? options[:only] : []
+            end
           end
 
           Translatable.add_translatable self
@@ -48,7 +50,7 @@ module Translatable
         self.translated_attribute_names = []
         self.translation_options        = options
         self.fallbacks_for_empty_translations = options[:fallbacks_for_empty_translations]
-        self.translated_serialized_attributes = Hash.new if options[:json]
+        self.translated_serialized_attributes = Hash.new
 
         include InstanceMethods
         extend  ClassMethods

data/lib/translatable.rb

@@ -44,7 +44,10 @@ module Translatable
       end
 
       unless klass.translated_serialized_attributes.nil?
-        @@translatable[klass.name].map!{ |attr| klass.translated_serialized_attributes.reject{|k,v| k != attr} }
+        @@translatable[klass.name].map! do |attr|
+          serialized = klass.translated_serialized_attributes.reject{|k,v| k != attr}
+          serialized.empty? ? attr : serialized
+        end
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_translatable
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Paul Bonaud