from_clause_translate 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f799d086bb331e73f238a80b3dd0f80a424e6c60e5f7b13c6b2d08d665b710aa
-  data.tar.gz: fa9662898e142adf41b13d3445540ecebd98f81033431f644d86d17c348d5437
+  metadata.gz: 0e5e3a351d526478381b634465400c2cfe21d90594e186d01f777f191d359d75
+  data.tar.gz: 8c2013900c68f207e78356aec170259a6ec7af0b7452fdd8c6c5f7f65a795b0a
 SHA512:
-  metadata.gz: 72419315fd701a8343e571768ff8a631c8fba5a54c89df33d8aa7e59058fb88d8d3a2396aed7cc38a64852817973c883080d0c13984a8a29b6592ae2edda6fcf
-  data.tar.gz: 75ab580aed864a8d938e4b6662312c6a7b01a20dea5b35cec30fcecbfba02735d3a15807cb789906b0cfc9f183f89de4de842fa1a866de67bc56203c6c8dd381
+  metadata.gz: 11b1eca1c3a40f9da9caef0db97fd410508cf7d46838e3dd40ba03bdad26e0e323749f7d65a48d9d852880c5a4aedcfac601263303e3c5f76f2ce6abc54b040d
+  data.tar.gz: 86f01a64692ecec354a4c55a5d74c0b8455e0721366fbdd0d5b1ef58fc08c3661f8e4aad0616a207723382400030de21b049a4ef6070b785c7177d21fa1dce5c

data/lib/from_clause_translate.rb

@@ -8,92 +8,6 @@ module FromClauseTranslate
       I18n.available_locales.map { |locale| [locale, {}] }
     ]
   end
-
-  module ClassMethods
-    def translates *columns
-      options = columns.extract_options!
-      filter_translated_columns(columns).each do |column|
-        self::TRANSLATED[column] = true
-        I18n.available_locales.each do |locale|
-          self::TRANSLATED_SELECTION[locale][column] =
-            "#{column}_#{locale} AS #{column}"
-        end
-        define_translated_column_methods column
-      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
-
-    def translates? column
-      self::TRANSLATED[column.to_sym]
-    end
-
-    def translated *columns
-      scope = current_scope || all
-      scope.add_translated_columns columns
-      scope
-    end
-
-    private
-
-    def filter_translated_columns columns
-      columns.keep_if do |column|
-        !translates?(column) &&
-          column_names.include?("#{column}_#{I18n.locale}")
-      end
-    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
-
-    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 col + '=' do |val|
-        send "#{dashed}#{I18n.locale}=", val
-      end
-    end
-
-    def define_translated_column_changing_methods col, dashed
-      define_method 'saved_change_to_' + col do
-        send "saved_change_to_#{dashed}#{I18n.locale}"
-      end
-
-      %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
-
-      %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
 end
 
 require 'from_clause_translate/active_record_relation'

data/lib/from_clause_translate/class_methods.rb

@@ -0,0 +1,105 @@
+module ClassMethods
+  include Fallbacks
+
+  def translates *columns
+    options = columns.extract_options!
+    filter_translated_columns(
+      map_translated_columns(columns)
+    ).each do |hash|
+      column = hash[:column]
+      self::TRANSLATED[column] = true
+      define_translated_selection column, hash
+      define_translated_column_methods column
+    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
+
+  def translates? column
+    self::TRANSLATED[column.to_sym]
+  end
+
+  def translated *columns
+    scope = current_scope || all
+    scope.add_translated_columns columns
+    scope
+  end
+
+  private
+
+  def map_translated_columns columns
+    columns.map! do |column|
+      hash = column.is_a?(Hash) ? column : {column: column}
+      translated_fallbacks_set hash
+      hash
+    end
+  end
+
+  def filter_translated_columns columns
+    columns.keep_if do |hash|
+      !translates?(hash[:column]) &&
+        column_names.include?("#{hash[:column]}_#{I18n.locale}")
+    end
+  end
+
+  def define_translated_selection column, hash
+    fallback = hash[:fallback]
+    I18n.available_locales.each do |locale|
+      selection = "#{column}_#{locale}"
+      selection = translated_fallbacks_wrap selection, fallback[locale]
+      selection = translated_fallbacks_wrap selection, fallback[:_]
+      self::TRANSLATED_SELECTION[locale][column] = "#{selection} AS #{column}"
+    end
+  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
+
+  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 col + '=' do |val|
+      send "#{dashed}#{I18n.locale}=", val
+    end
+  end
+
+  def define_translated_column_changing_methods col, dashed
+    define_method 'saved_change_to_' + col do
+      send "saved_change_to_#{dashed}#{I18n.locale}"
+    end
+
+    %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
+
+    %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

data/lib/from_clause_translate/class_methods/fallbacks.rb

@@ -0,0 +1,32 @@
+module Fallbacks
+  private
+
+  def translated_fallbacks_set hash
+    fallback = hash[:fallback]
+    return hash[:fallback] = {} unless hash[:fallback]
+    return if fallback.is_a? Hash
+
+    hash[:fallback] = {_: fallback}
+  end
+
+  def translated_fallbacks_wrap selection, fallbacks
+    return selection unless fallbacks
+
+    if fallbacks.is_a?(String) || fallbacks.is_a?(Symbol)
+      translated_selection_fallback_wrap selection, fallbacks
+    else
+      fallbacks.each do |fallback|
+        selection = translated_selection_fallback_wrap selection, fallback
+      end
+      selection
+    end
+  end
+
+  def translated_selection_fallback_wrap selection, fallback
+    if fallback.is_a? String
+      "COALESCE(#{selection}, #{fallback})"
+    else
+      "COALESCE(#{selection}, #{table_name}.#{fallback})"
+    end
+  end
+end

data/lib/from_clause_translate/version.rb

@@ -1,3 +1,3 @@
 module FromClauseTranslate
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.4'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: from_clause_translate
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Roman Kushin
@@ -35,6 +35,8 @@ files:
 - README.md
 - lib/from_clause_translate.rb
 - lib/from_clause_translate/active_record_relation.rb
+- lib/from_clause_translate/class_methods.rb
+- lib/from_clause_translate/class_methods/fallbacks.rb
 - lib/from_clause_translate/translated_columns_builder.rb
 - lib/from_clause_translate/version.rb
 homepage: