more refactoring of shoulda macros to small, intention-revealing methods

shoulda_macros/sortable_table.rb

@@ -4,14 +4,9 @@ module Shoulda
     def should_sort_by(attribute, options = {}, &block)
       collection       = get_collection_name_from_test_name
       model_under_test = get_model_under_test_from_test_name
-
-      unless block
-        block = handle_boolean_attribute(model_under_test, attribute)
-        block ||= attribute
-      end
-
-      action = options[:action]
-      action ||= default_sorting_action
+
+      block  = block || default_sorting_block(model_under_test, attribute)
+      action = options[:action] || default_sorting_action
 
       %w(ascending descending).each do |direction|
         should "sort by #{attribute.to_s} #{direction}" do
@@ -59,20 +54,18 @@ def get_collection_name_from_test_name
       collection.to_sym
     end
 
-    def get_model_under_test_from_test_name
-      self.name.gsub(/ControllerTest/, '').singularize.constantize
-    end
-
     def remove_namespacing(string)
       string.slice!(0..string.rindex('/')) if string.include?('/')
       string
     end
 
-    def attribute_is_boolean?(model_under_test, attribute)
-      db_column = model_under_test.columns.select { |each| 
-        each.name == attribute.to_s 
-      }.first
-      db_column.type == :boolean
+    def get_model_under_test_from_test_name
+      self.name.gsub(/ControllerTest/, '').singularize.constantize
+    end
+
+    def default_sorting_block(model_under_test, attribute)
+      block = handle_boolean_attribute(model_under_test, attribute)
+      block ||= attribute
     end
 
     def handle_boolean_attribute(model_under_test, attribute)
@@ -81,6 +74,13 @@ def handle_boolean_attribute(model_under_test, attribute)
       end
     end
 
+    def attribute_is_boolean?(model_under_test, attribute)
+      db_column = model_under_test.columns.select { |each| 
+        each.name == attribute.to_s 
+      }.first
+      db_column.type == :boolean
+    end
+
     def default_sorting_action
       lambda do |sort, direction|
         get :index, :sort => sort, :order => direction