from_clause_translate 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a49a163f455c3977eebfcb19c3fe4051946f941d4968ee9115bb1616866b1f35
-  data.tar.gz: 5f66fc0c7a4900e120c76ef2552294047b8a20bb29af1f6cf00cf3755a3674c5
+  metadata.gz: 61a7a0b83c04d5cc4e15a088c9a56ad2388700bc1a6de3c477860501fdcfd16e
+  data.tar.gz: 1fd848f0dda4626997dc32742616117b4fcc3017219a30133d3c585ec0408a2a
 SHA512:
-  metadata.gz: dd41de9c31b39e159fac6256e35dc1e5787a42270596b4c2f068c3c5f3819416c35071ed037759409265aa781742feb95e98ace2818d78b49f699329d8df4b2f
-  data.tar.gz: c515c69c704ff0363eec07844ba60b9b31deaaa0f5eef9d32382d0ed1aa11a136ace7b1ae03226b72aa60e20170e9a341b9382deb80abc996f01670b26ab468a
+  metadata.gz: 85e5ab0a94cd12927ed91ac819d4c4775374dbb217cf23d4511d9c4f292ba11ff5470c1d444b01fff500c51c737dc52904ff0a60f3dac75cdb695dfab8779c45
+  data.tar.gz: 4e032681587d35263fbae5bdf3f70b06f51f10104c3495ffa311d0fef8ec195759825d2b36a239c4a04a609fa19966376a9a14fbfe9f7fe4d0b479a642bb7b3a

data/lib/from_clause_translate/class_methods.rb

@@ -24,14 +24,10 @@ module ClassMethods
       column = plural.to_s.singularize.to_sym
       selection = I18n.available_locales.map do |locale|
         "#{quoted_table_name}.\"#{column}_#{locale}\""
-      end
-      I18n.available_locales.each do |locale|
-        self::TRANSLATED_SELECTION[locale][plural] = selection
-      end
-      selection = selection.join ','
+      end.join ','
       self::TRANSLATED_PLURALS[plural] = selection
       I18n.available_locales.each do |locale|
-        self::TRANSLATED_SELECTION_AS[locale][plural] = selection
+        self::TRANSLATED_SELECTION[locale][plural] = selection
       end
     end
   end
@@ -69,8 +65,7 @@ module ClassMethods
       selection = "#{quoted_table_name}.\"#{column}_#{locale}\""
       selection = translated_fallbacks_wrap selection, fallback[locale]
       selection = translated_fallbacks_wrap selection, fallback[:_]
-      self::TRANSLATED_SELECTION[locale][column] = selection
-      self::TRANSLATED_SELECTION_AS[locale][column] = "#{selection} AS #{column}"
+      self::TRANSLATED_SELECTION[locale][column] = "#{selection} AS #{column}"
     end
   end
 

data/lib/from_clause_translate/translated_columns_builder.rb

@@ -27,7 +27,7 @@ class FromClauseTranslate::TranslatedColumnsBuilder
 
     @has_translated = true
     translated.each do |column|
-      next translated_selection(column) if !column.is_a? Hash
+      next translated_selection(column) unless column.is_a? Hash
 
       column.each do |key, value|
         @skip_translated << key.to_s
@@ -40,24 +40,17 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     return if @without_projections
 
     @arel.projections.each do |column|
+      next if column.is_a?(String) && column[0] != '"'
+
       arel_projection_translation column
     end
   end
 
   def arel_projection_translation column
-    return if column.is_a?(String) && column[0] != '"'
-
     column = column.name if column.is_a? Arel::Attributes::Attribute
     column = column.to_s unless column.is_a? String
 
-    if column.first == '"'
-      name = column[1...-1]
-    elsif column == '*'
-      @select_all = true
-      return column
-    else
-      name = column
-    end
+    name = column.first == '"' ? column[1...-1] : column
 
     return if @skip_translated.include? name
 
@@ -116,11 +109,13 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     sym = name.to_sym
     translates = @klass.translates? sym
     @has_translated = true
-    select = translates ? @klass::TRANSLATED_SELECTION[I18n.locale][sym] : false
-    if select
-      @columns << select
-    elsif !@select_all && @klass.columns_hash[name.to_s]
-      @columns << (original || name)
+    if translates
+      return @columns << @klass::TRANSLATED_SELECTION[I18n.locale][sym]
     end
+
+    @select_all = true if sym == :*
+    return if @select_all || !@klass.columns_hash[name.to_s]
+
+    @columns << (original || name)
   end
 end

data/lib/from_clause_translate/version.rb

@@ -1,3 +1,3 @@
 module FromClauseTranslate
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

data/lib/from_clause_translate.rb

@@ -11,6 +11,5 @@ module FromClauseTranslate
     model.const_set :TRANSLATED_SELECTION, Hash[
       I18n.available_locales.map { |locale| [locale, {}] }
     ]
-    model.const_set :TRANSLATED_SELECTION_AS, model::TRANSLATED_SELECTION.dup
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Roman Kushin