from_clause_translate 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89031b3fa713ad97c38aab959420f0c67544ceae17455030e176025c1f13d87e
-  data.tar.gz: c647f38f0dbd253869f34b0aa15469b93ac4b6e833c20cc46a6d1f37dd4d4508
+  metadata.gz: a49a163f455c3977eebfcb19c3fe4051946f941d4968ee9115bb1616866b1f35
+  data.tar.gz: 5f66fc0c7a4900e120c76ef2552294047b8a20bb29af1f6cf00cf3755a3674c5
 SHA512:
-  metadata.gz: 5c47f449400389d4057665063c21befc1a9520d0a329c4efafd975ca939848fc5aaaa0ad3f0b6e1586f3e5d309288bfad721052b76c6f71d8ad6dd3b565d90b8
-  data.tar.gz: d38569db183c16dc2b6847096b365304f61a37c28a1de3c74d7034e4bcff600e3318bc13a1cf88bed39b8fda70a7ac6b8e769d3660f9f933b3cb26c62b5ee0ad
+  metadata.gz: dd41de9c31b39e159fac6256e35dc1e5787a42270596b4c2f068c3c5f3819416c35071ed037759409265aa781742feb95e98ace2818d78b49f699329d8df4b2f
+  data.tar.gz: c515c69c704ff0363eec07844ba60b9b31deaaa0f5eef9d32382d0ed1aa11a136ace7b1ae03226b72aa60e20170e9a341b9382deb80abc996f01670b26ab468a

data/lib/from_clause_translate/active_record_relation.rb

@@ -14,27 +14,18 @@ module ActiveRecord::Relation::Extended
     (@values[:translated] ||= []) << column
   end
 
-  UNSCOPING_VALUES =
-    ActiveRecord::QueryMethods::VALID_UNSCOPING_VALUES.dup.delete(:joins)
-
   def apply_translates
     return if @translates_applied || !@klass.const_defined?(:TRANSLATED)
 
     @translates_applied = true
 
-    @arel ||= build_arel nil
-
     columns = translated_columns_build
     return unless columns
 
-    if @values[:joins]
-      joins = @values.delete :joins
-      @arel = build_arel nil
-    end
+    @arel = build_arel nil
 
-    rel = unscope(*UNSCOPING_VALUES).select(columns)
+    rel = unscoped.select(columns)
     rel.instance_variable_set(:@translates_applied, true)
-    rel.instance_variable_get(:@values)[:joins] = joins if joins
     replace_plurals_in_projections
     @arel.from("(#{rel.arel.to_sql}) #{@klass.table_name}")
   end

data/lib/from_clause_translate/class_methods.rb

@@ -7,7 +7,7 @@ module ClassMethods
     filter_translated_columns(
       map_translated_columns(columns)
     ).each do |hash|
-      column = hash[:column]
+      column = hash[:name]
       self::TRANSLATED[column] = true
       define_translated_selection column, hash
       define_translated_column_methods column
@@ -24,11 +24,15 @@ module ClassMethods
       column = plural.to_s.singularize.to_sym
       selection = I18n.available_locales.map do |locale|
         "#{quoted_table_name}.\"#{column}_#{locale}\""
-      end.join ','
-      self::TRANSLATED_PLURALS[plural] = selection
+      end
       I18n.available_locales.each do |locale|
         self::TRANSLATED_SELECTION[locale][plural] = selection
       end
+      selection = selection.join ','
+      self::TRANSLATED_PLURALS[plural] = selection
+      I18n.available_locales.each do |locale|
+        self::TRANSLATED_SELECTION_AS[locale][plural] = selection
+      end
     end
   end
 
@@ -46,7 +50,7 @@ module ClassMethods
 
   def map_translated_columns columns
     columns.map! do |column|
-      hash = column.is_a?(Hash) ? column : {column: column}
+      hash = column.is_a?(Hash) ? column : {name: column}
       translated_fallbacks_set hash
       hash
     end
@@ -54,8 +58,8 @@ module ClassMethods
 
   def filter_translated_columns columns
     columns.keep_if do |hash|
-      !translates?(hash[:column]) &&
-        column_names.include?("#{hash[:column]}_#{I18n.locale}")
+      !translates?(hash[:name]) &&
+        column_names.include?("#{hash[:name]}_#{I18n.locale}")
     end
   end
 
@@ -65,7 +69,8 @@ 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} AS #{column}"
+      self::TRANSLATED_SELECTION[locale][column] = selection
+      self::TRANSLATED_SELECTION_AS[locale][column] = "#{selection} AS #{column}"
     end
   end
 

data/lib/from_clause_translate/translated_columns_builder.rb

@@ -13,6 +13,7 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     add_translated_columns_from_values
     add_translated_columns_from_projections
     add_translated_columns_from_cores
+    add_translated_columns_from_joins
     add_translated_columns_from_orders
 
     @columns if @has_translated
@@ -26,15 +27,11 @@ class FromClauseTranslate::TranslatedColumnsBuilder
 
     @has_translated = true
     translated.each do |column|
-      if column.is_a? Hash
-        column.each do |key, value|
-          @skip_translated << key.to_s
-          @columns << "#{value} AS #{key}"
-        end
-      elsif (selection = translated_selection(column))
-        @columns << selection
-      else
-        @columns << column
+      next translated_selection(column) if !column.is_a? Hash
+
+      column.each do |key, value|
+        @skip_translated << key.to_s
+        @columns << "#{value} AS #{key}" unless value.nil?
       end
     end
   end
@@ -43,19 +40,28 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     return if @without_projections
 
     @arel.projections.each do |column|
-      selection = arel_projection_translation(column)
-      @columns << selection if selection
+      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
 
-    name = column.first == '"' ? column[1...-1] : column
+    if column.first == '"'
+      name = column[1...-1]
+    elsif column == '*'
+      @select_all = true
+      return column
+    else
+      name = column
+    end
+
     return if @skip_translated.include? name
 
-    translated_selection(name) || column
+    translated_selection name, column
   end
 
   def add_translated_columns_from_cores
@@ -70,8 +76,7 @@ class FromClauseTranslate::TranslatedColumnsBuilder
     core.groups.each do |group|
       expr = group.expr
       name = expr[0] == '"' ? expr[1...-1] : expr
-      selection = translated_selection name
-      @columns << selection if selection
+      translated_selection name
     end
   end
 
@@ -80,24 +85,42 @@ class FromClauseTranslate::TranslatedColumnsBuilder
       node.children.each do |child|
         next unless child.respond_to? :left
 
-        name = child.left.name
-        selection = translated_selection name
-        @columns << (selection || name)
+        left = child.left
+        next if left.relation.table_name != @klass.table_name
+
+        translated_selection left.name
       end
     end
   end
 
+  def add_translated_columns_from_joins
+    joins = @relation.instance_variable_get(:@values)[:joins]
+    return unless joins
+
+    joins.each do |join|
+      ref = @klass.reflections[join.to_s]
+      next if !ref || !ref.is_a?(ActiveRecord::Reflection::BelongsToReflection)
+
+      translated_selection ref.join_keys.foreign_key
+    end
+  end
+
   def add_translated_columns_from_orders
     @arel.ast.orders.each do |name|
-      name = name.respond_to?(:expr) ? name.expr.name : name.to_sym
-      selection = translated_selection name
-      @columns << selection if selection
+      name = name.respond_to?(:expr) ? name.expr.name : name
+      translated_selection name
     end
   end
 
-  def translated_selection name
-    translates = @klass.translates? name
-    @has_translated = true if translates
-    translates ? @klass::TRANSLATED_SELECTION[I18n.locale][name.to_sym] : false
+  def translated_selection name, original = nil
+    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)
+    end
   end
 end

data/lib/from_clause_translate/version.rb

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

data/lib/from_clause_translate.rb

@@ -11,5 +11,6 @@ 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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Roman Kushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails