has_localization_table 0.3.6 → 0.3.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTA1YWMxMTY1ODUxODQ4ZDVkZjU3Yjk2OTkyZmEwNmM1NzU2NWY4OQ==
+    Yzc3NzlkNWU5NWExNjhhZWM1YmVmOWM5YTI2YmQxYjk4ZDk2M2JlYQ==
   data.tar.gz: !binary |-
-    OGYwY2ZkNDFkY2E0YTg1OWMyN2FlNGNmMmRjOTM2YTRkMTI3NjViOA==
+    MjY5YzZlZGRlYWQ1ZGYyYmUwYTI1MDJlYzI5ZGQwZDM1NDVkODkxYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZWUzMTFjZDg0ZDZlMjUwMTMyYTFiOWQ4ZDczMTZlMTQ1NTRmMzk0NGY4NzBh
-    NGM2NTcxYzk4ODc1ZjlmNDBjNjdlYzE2Y2M5MTRhOTliMTY1NGJiY2U2N2Rj
-    N2Q2ODNhZGU3ZmMwNDgyOGI5NjA2ODlmMjljOGFmMjQzZjk0MTU=
+    ZmRlZDE3OGI2MDA3ZDllZjk0MDcwNzhjYjkwYjk3NGE4NDdlMTkzYjBjYzE2
+    ZGQyZDZhZmZmOGMxMDRkZjNjN2Q5YTUxODAxOTAxN2Q4ODQ4NTQ3ODIyOTgy
+    ZDM1MmViN2U2NzkzNjgyYWQ1YzViN2MxYzJkMTRmOGIwMzk0Nzk=
   data.tar.gz: !binary |-
-    MGZlNWM1MmMzOGQ4OTJhYzQ2OWU2ZDVkNzc1MjBmYTQ5YmY0YTRlZDg5MTVh
-    Y2JkYzU5ZGRiMjc5MjY1MGFkYWNjNzhlODM0ZjJkYjkwYjAzZDE0ZDU1OWQy
-    YzU0MDJlMTAyNmQ0YjU4MDY4YmJiNjFiYWEzYWI0MGEyZjc1NTI=
+    Mzk3ZjRkNTIzMWU5MTA1OTg5ZjYyMjM4MTBlNzI0MmZmZWRhNGEzMzA0N2I0
+    NWEwODYzOTAwNmVlYjE0YWFhZmE1NTg4MmQyMzBmYjBhNzc1YmNiZDlhM2U3
+    OTY4MmY5OGM2ZGM2YjYwZmZkYzMwMmMyMTZlMWZlNWViMDdjMmY=

data/lib/has_localization_table/active_record/ordered_by.rb

@@ -21,7 +21,20 @@ module HasLocalizationTable
     private
       # Order records by localization value
       def ordered_by_localized_attribute(attribute, asc = true, locale = HasLocalizationTable.current_locale)
-        with_localizations.order("#{localization_class.table_name}.#{attribute} #{asc ? "ASC" : "DESC"}")
+        if locale != HasLocalizationTable.primary_locale
+          with_localizations.order(<<-EOQ)
+            COALESCE(
+              #{localization_class.table_name}.#{attribute}, (
+                SELECT #{attribute}
+                FROM #{localization_class.table_name}
+                WHERE #{reflect_on_association(localization_association_name).foreign_key} = #{self.table_name}.id
+                  AND #{HasLocalizationTable.locale_foreign_key} = #{HasLocalizationTable.primary_locale.id}
+              )
+            ) #{asc ? "ASC" : "DESC"}
+          EOQ
+        else
+          with_localizations.order("#{localization_class.table_name}.#{attribute} #{asc ? "ASC" : "DESC"}")
+        end
       end
     end
   end

data/lib/has_localization_table/version.rb

@@ -1,3 +1,3 @@
 module HasLocalizationTable
-  VERSION = "0.3.6"
+  VERSION = "0.3.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: has_localization_table
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Daniel Vandersluis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-06 00:00:00.000000000 Z
+date: 2014-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :runtime