refactoring sortable_attributes

lib/sortable_table/app/controllers/application_controller.rb

@@ -12,8 +12,8 @@ def self.included(base)
 
         module ClassMethods
           def sortable_attributes(*args)
-            mappings           = args.last.is_a?(Hash) ? args.pop : {}
-            acceptable_columns = args.collect(&:to_s) + mappings.keys.collect(&:to_s)
+            mappings           = pop_hash_from_list(args)
+            acceptable_columns = join_array_and_hash_keys(args, mappings)
 
             define_method(:sort_order) do |*default| 
               direction = params[:order] == 'ascending' ? 'asc' : 'desc'
@@ -26,6 +26,19 @@ def sortable_attributes(*args)
               end
             end
           end
+
+          def pop_hash_from_list(*args)
+            if args.last.is_a?(Hash)
+              args.pop
+            else
+              {}
+            end
+          end
+
+          def join_array_and_hash_keys(array, hash)
+            array.collect { |each| each.to_s } + 
+              hash.keys.collect { |each| each.to_s }
+          end
         end
 
         module InstanceMethods

test/rails_root/app/controllers/users_controller.rb

@@ -1,9 +1,12 @@
 class UsersController < ApplicationController
 
-  sortable_attributes :name, :age, :email => 'users.email'
+  sortable_attributes :name, 
+                      :age, 
+                      :email, 
+                      :group => "groups.name"
 
   def index
-    @users = User.find :all, :order => sort_order('ascending')
+    @users = User.find :all, :order => sort_order("ascending")
   end
 
 end

test/rails_root/test/functional/users_controller_test.rb

@@ -5,7 +5,9 @@ class UsersControllerTest < ActionController::TestCase
   context "enough Users to sort" do
     setup { 2.times { Factory :user } }
 
-    should_sort_by_attributes :name, :email, :age do |sort, order|
+    should_sort_by_attributes(:name, 
+                              :age, 
+                              :email) do |sort, order|
       get :index, :sort => sort, :order => order
     end