from_clause_translate 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ef0f453b7b049fbbd56b0126065dcba8a5ab0b5
-  data.tar.gz: a9f8cf9715a75b690cd8fb4caae8d2bed506fac1
+  metadata.gz: d0ae09207f8f74865af8d0cef1824a3c2da59ec0
+  data.tar.gz: 69b959f76d9cd39ef6b53948e10ae823bb3e21ff
 SHA512:
-  metadata.gz: 1e134c794ac0aebc741de3990ca797fe6378dbddfd2ef5ffc2d25ee53537be5be4a47a6d8946cded1459d6f6d6079d9d8ad9d09e69dafec4a3fcfa8798823651
-  data.tar.gz: b54da2a3cbcf67ecab08506c501092cc6b947308500ae07b88f5a77984f0804962738ef8286d8fbcb4da3af698c63c0f5d7b26ba32d92eab3180d756e47128cf
+  metadata.gz: eb49f4190302bb4680bf8fcc7c210a0c9a48bdb13d4c9077609fc84739e5787c04fd8afd3e70213c29557f2e610467c53de62bff8ed20f27a21a7f09a2c5903f
+  data.tar.gz: d392a9299bad1574e6a343e5f992360ea15bc0e6ad677f3e88a6a5dadc64c3c1ff7fd2174f0ffec3ce001eaa9922a0046e48ba786a6dfd42695cecea04bba9e4

data/lib/from_clause_translate/active_record_relation.rb

@@ -0,0 +1,65 @@
+module ActiveRecord::Relation::Extended
+  def to_sql
+    apply_translates unless eager_loading?
+    super
+  end
+
+  def exec_queries &block
+    apply_translates
+    super(&block)
+  end
+
+  def pluck *columns
+    if !@translated_extra_columns && @klass.const_defined?(:TRANSLATED)
+      @translated_extra_columns = columns
+    end
+    super(*columns)
+  end
+
+  def arel aliases = nil
+    arel = super aliases
+    if @translated_extra_columns
+      add_translated_columns @translated_extra_columns
+      @translated_extra_columns = nil
+      apply_translates arel
+    end
+    arel
+  end
+
+  def add_translated_columns columns
+    (@values[:translated] ||= []).concat columns
+  end
+
+  def apply_translates arel = nil
+    arel ||= self.arel
+    return if @translates_applied || !@klass.const_defined?(:TRANSLATED)
+
+    @translates_applied = true
+    columns = translated_columns_get
+    return unless columns
+
+    from = @klass.select(columns).arel.to_sql
+    as = @klass.table_name
+    arel.from("(#{from}) #{as}")
+  end
+
+  def translated_columns_get without_projections = false
+    FromClauseTranslate::TranslatedColumnsBuilder.new(
+      self, without_projections
+    ).perform
+  end
+
+  private
+
+  def perform_calculation operation, column_name
+    if column_name && !@translated_extra_columns &&
+       @klass.const_defined?(:TRANSLATED)
+      @translated_extra_columns = [column_name]
+    end
+    super operation, column_name
+  end
+end
+
+class ActiveRecord::Relation
+  prepend ActiveRecord::Relation::Extended
+end

data/lib/from_clause_translate/translated_columns_builder.rb

@@ -0,0 +1,105 @@
+class FromClauseTranslate::TranslatedColumnsBuilder
+  def initialize relation, without_projections
+    @relation = relation
+    @klass = relation.instance_variable_get :@klass
+    @arel = relation.arel
+    @without_projections = without_projections
+    @columns = []
+    @has_translated = false
+  end
+
+  def perform
+    add_translated_columns_from_values
+    add_translated_columns_from_projections
+    add_translated_columns_from_cores
+    add_translated_colunms_from_orders
+
+    @columns if @has_translated
+  end
+
+  private
+
+  def add_translated_columns_from_values
+    translated = @relation.instance_variable_get(:@values)[:translated]
+    return unless translated
+
+    translated.each do |column|
+      if column.is_a? Hash
+        @has_translated = true
+        column.each do |key, value|
+          @columns << "#{value} AS #{key}"
+        end
+      elsif (selection = translated_selection(column))
+        @columns << selection
+      else
+        @columns << column
+      end
+    end
+  end
+
+  def add_translated_columns_from_projections
+    return if @without_projections
+
+    @arel.projections.each do |column|
+      selection = arel_projection_translation(column)
+      @columns << selection if selection
+    end
+  end
+
+  def arel_projection_translation column
+    return column.name if column.is_a? Arel::Attributes::Attribute
+
+    return unless column.is_a? String
+
+    name = column.first == '"' ? column[1...-1] : column
+    selection = translated_selection name
+    return column unless selection
+
+    plural = @klass::TRANSLATED_PLURALS[name.to_sym]
+    column.replace plural if plural
+    selection
+  end
+
+  def add_translated_columns_from_cores
+    @arel.ast.cores.each do |core|
+      add_translated_columns_from_groups core
+      add_translated_columns_from_nodes core.wheres
+      add_translated_columns_from_nodes core.havings
+    end
+  end
+
+  def add_translated_columns_from_groups core
+    core.groups.each do |group|
+      expr = group.expr
+      name = expr[0] == '"' ? expr[1...-1] : expr
+      selection = translated_selection name
+      @columns << selection if selection
+    end
+  end
+
+  def add_translated_columns_from_nodes nodes
+    nodes.each do |node|
+      node.children.each do |child|
+        next unless child.respond_to? :left
+
+        name = child.left.name
+        selection = translated_selection name
+        @columns << selection if selection
+      end
+    end
+  end
+
+  def add_translated_colunms_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
+    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
+  end
+end

data/lib/from_clause_translate/version.rb

@@ -1,3 +1,3 @@
 module FromClauseTranslate
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/from_clause_translate.rb

@@ -1,148 +1,4 @@
-module ActiveRecord::Relation::Extended
-  def to_sql
-    apply_translates unless eager_loading?
-    super
-  end
-
-  def exec_queries &block
-    apply_translates
-    super(&block)
-  end
-
-  def pluck *columns
-    if !@translated_extra_columns && @klass.const_defined?(:TRANSLATED)
-      @translated_extra_columns = columns
-    end
-    super(*columns)
-  end
-
-  def arel aliases = nil
-    arel = super aliases
-    if @translated_extra_columns
-      add_translated_columns @translated_extra_columns
-      @translated_extra_columns = nil
-      apply_translates arel
-    end
-    arel
-  end
-
-  def add_translated_columns columns
-    (@values[:translated] ||= []).concat columns
-  end
-
-  def apply_translates arel = nil
-    arel ||= self.arel
-    return if @translates_applied || !@klass.const_defined?(:TRANSLATED)
-    @translates_applied = true
-    columns = translated_columns_get
-    return unless columns
-    from = @klass.select(columns).arel.to_sql
-    as = @klass.table_name
-    arel.from("(#{from}) #{as}")
-  end
-
-  def translated_columns_get without_projections = false
-    columns = []
-    has_translated = false
-
-    translated = @values[:translated]
-    if translated
-      translated.each do |column|
-        if column.is_a? Hash
-          has_translated = true
-          column.each do |key, value|
-            columns << "#{value} AS #{key}"
-          end
-        elsif @klass.translates? column
-          columns << @klass::TRANSLATED_SELECTION[I18n.locale][column.to_sym]
-          has_translated = true
-        else
-          columns << column
-        end
-      end
-    end
-
-    unless without_projections
-      arel.projections.each do |column|
-        if column.is_a? Arel::Attributes::Attribute
-          columns << column.name
-        elsif column.is_a? String
-          name = column.first == '"' ? column[1...-1] : column
-          if @klass.translates? name
-            has_translated = true
-            sym = name.to_sym
-            columns << @klass::TRANSLATED_SELECTION[I18n.locale][sym]
-            plural = @klass::TRANSLATED_PLURALS[sym]
-            if plural
-              column.replace plural
-            end
-          else
-            columns << column
-          end
-        end
-      end
-    end
-
-    arel.ast.cores.each do |core|
-      core.wheres.each do |where|
-        where.children.each do |child|
-          if child.respond_to? :left
-            name = child.left.name
-            if @klass.translates? name
-              has_translated = true
-              columns << @klass::TRANSLATED_SELECTION[I18n.locale][name.to_sym]
-            end
-          end
-        end
-      end
-
-      core.groups.each do |group|
-        expr = group.expr
-        name = expr[0] == '"' ? expr[1...-1] : expr
-        if @klass.translates? name
-          has_translated = true
-          columns << @klass::TRANSLATED_SELECTION[I18n.locale][name.to_sym]
-        end
-      end
-
-      core.havings.each do |having|
-        having.children.each do |child|
-          if child.respond_to? :left
-            name = child.left.name
-            if @klass.translates? name
-              has_translated = true
-              columns << @klass::TRANSLATED_SELECTION[I18n.locale][name.to_sym]
-            end
-          end
-        end
-      end
-    end
-
-    arel.ast.orders.each do |name|
-      name = name.respond_to?(:expr) ? name.expr.name : name.to_sym
-      if @klass.translates? name
-        has_translated = true
-        columns << @klass::TRANSLATED_SELECTION[I18n.locale][name.to_sym]
-      end
-    end
-
-    columns if has_translated
-  end
-
-  private
-
-  def perform_calculation operation, column_name
-    if column_name && !@translated_extra_columns &&
-       @klass.const_defined?(:TRANSLATED)
-      @translated_extra_columns = [column_name]
-    end
-    super operation, column_name
-  end
-end
-
-class ActiveRecord::Relation
-  prepend ActiveRecord::Relation::Extended
-end
+require 'from_clause_translate/active_record_relation'
 
 module FromClauseTranslate
   def self.included model
@@ -166,19 +22,22 @@ module FromClauseTranslate
         end
         define_translated_column_methods column
       end
-      plurals = options[:plurals]
-      if plurals
-        plurals.each do |plural|
-          plural = plural.to_sym
-          self::TRANSLATED[plural] = true
-          column = plural.to_s.singularize.to_sym
-          selection = I18n.available_locales.map do |locale|
-              "#{column}_#{locale}"
-            end.join ','
-          self::TRANSLATED_PLURALS[plural] = selection
-          I18n.available_locales.each do |locale|
-            self::TRANSLATED_SELECTION[locale][plural] = selection
-          end
+      translates_plurals options[:plurals]
+    end
+
+    def translates_plurals plurals
+      return unless plurals
+
+      plurals.each do |plural|
+        plural = plural.to_sym
+        self::TRANSLATED[plural] = true
+        column = plural.to_s.singularize.to_sym
+        selection = I18n.available_locales.map do |locale|
+          "#{column}_#{locale}"
+        end.join ','
+        self::TRANSLATED_PLURALS[plural] = selection
+        I18n.available_locales.each do |locale|
+          self::TRANSLATED_SELECTION[locale][plural] = selection
         end
       end
     end
@@ -202,48 +61,38 @@ module FromClauseTranslate
       end
     end
 
-    def define_translated_column_methods column
-      column = column.to_s
-      with_dash = "#{column}_"
-
-      define_method column do
-        if @attributes.key?(column)
-          self[column]
-        else
-          send(with_dash + I18n.locale.to_s)
-        end
-      end
-
-      define_method column + '=' do |value|
-        send "#{with_dash}#{I18n.locale}=", value
-      end
-
-      define_method column + '_changed?' do
-        send "#{with_dash}#{I18n.locale}_changed?"
-      end
-
-      define_method 'saved_change_to_' + column do
-        send "saved_change_to_#{with_dash}#{I18n.locale}"
-      end
+    def define_translated_column_methods col
+      col = col.to_s
+      dashed = "#{col}_"
+      define_translated_column_getter_and_setter col, dashed
+      define_translated_column_changing_methods col, dashed
+    end
 
-      define_method 'saved_change_to_' + column + '?' do
-        send "saved_change_to_#{with_dash}#{I18n.locale}?"
+    def define_translated_column_getter_and_setter col, dashed
+      define_method col do
+        @attributes.key?(col) ? self[col] : send("#{dashed}#{I18n.locale}")
       end
 
-      define_method column + '_before_last_save' do
-        send "#{with_dash}#{I18n.locale}_before_last_save"
+      define_method col + '=' do |val|
+        send "#{dashed}#{I18n.locale}=", val
       end
+    end
 
-      define_method 'will_save_change_to_' + column + '?' do
-        send "will_save_change_to_#{with_dash}#{I18n.locale}?"
+    def define_translated_column_changing_methods col, dashed
+      define_method 'saved_change_to_' + col do
+        send "saved_change_to_#{dashed}#{I18n.locale}"
       end
 
-      define_method with_dash + 'change_to_be_saved' do
-        send "#{with_dash}#{I18n.locale}_change_to_be_saved"
+      %w[changed? before_last_save change_to_be_saved in_database].each do |suf|
+        define_method dashed + suf do
+          send "#{dashed}#{I18n.locale}_#{suf}"
+        end
       end
 
-      define_method with_dash + 'in_database' do
-        send "#{with_dash}#{I18n.locale}_in_database"
+      %w[saved_change_to will_save_change_to].each do |prefix|
+        define_method "#{prefix}_#{col}?" do
+          send "#{prefix}_#{dashed}#{I18n.locale}?"
+        end
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Roman Kushin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-22 00:00:00.000000000 Z
+date: 2018-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -34,6 +34,8 @@ files:
 - MIT-LICENSE
 - README.md
 - lib/from_clause_translate.rb
+- lib/from_clause_translate/active_record_relation.rb
+- lib/from_clause_translate/translated_columns_builder.rb
 - lib/from_clause_translate/version.rb
 homepage: 
 licenses: