sort_this 1.0.1 → 1.0.2

data/CHANGELOG.md

@@ -7,4 +7,8 @@
 * column_name is now optional
 * added a table_name option to use when using joins
 * added default_sort class method
-* sort and default_sort are memoized
+* sort and default_sort are memoized
+
+## v1.0.2
+
+* fixing bug due to typo

data/lib/sort_this/active_record.rb

@@ -66,7 +66,19 @@ module SortThis
       end
       
       def default_sort
-        order(self.default_sort_columns.values.join(', '))
+        table_joins   = []
+        order_clauses = []
+        
+        self.default_sort_columns.each do |column_name, sort_clause|
+          join = sort_columns[column_name][:joins]
+          table_joins   << join unless join.nil?
+          order_clauses << sort_clause
+        end
+        
+        query = scoped
+        query = joins(table_joins.uniq!) unless table_joins.empty?
+        query = query.order(order_clauses.join(', '))
+        query
       end
       
       def sort(sort_column = nil, sort_direction = DEFAULT_SORT_DIRECTION)
@@ -91,7 +103,7 @@ module SortThis
         
         default_sorts.each do |column_name, sort_clause|
           join = sort_columns[column_name][:joins]
-          tables_joins  << join unless join.nil?
+          table_joins   << join unless join.nil?
           order_clauses << sort_clause
         end
         

data/lib/sort_this/version.rb

@@ -1,3 +1,3 @@
 module SortThis
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sort_this
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -92,7 +92,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2410530305062139336
+      hash: 3994324686683044989
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: