sql_search_n_sort 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afc438625d2512c3ae20d67d7f82ed5d986d5e52
-  data.tar.gz: 88a999dfc9b2702973f2f847502e819bfc6f707f
+  metadata.gz: 03e83d0cfb7a3e84a681a5905cbd1fbf7a40a996
+  data.tar.gz: 14d29c20d503653a279e6c47dea3f82117e0a2d9
 SHA512:
-  metadata.gz: 1f18546a8864fb5661aa16e9d8c25bb3710853c9a58f8b4ccdbc2017ddd8901830669838525370eedce880f96b42b17a3b4938ea052fa8a41cef3b2c4a4ec980
-  data.tar.gz: 44531721f8db45913def98ed376ac437c65464dedf004c585b3faf3dbe82418a2f68fd52eb12ab0f25c958b6410762e954f30fb4883a22c6f1585665889b05a9
+  metadata.gz: 8c8dd28d7ef5f0d70b1f677d564450e19e8a10d77796fdccfdcc5643e1044e0567512b54868c1197cc2d865dfdd09e66241d296bc1b688a6ca03a00f07ad9b68
+  data.tar.gz: 11927189b6f4f2164167e527d0c0bc1d56078dae828cf76ad123d1a9ddfc199f01f0a5bee385bf2b0066bfde0dc2349f78dba21b9425fef8c503b306707da863

data/lib/sql_search_n_sort/sql_searchable_sortable.rb

@@ -51,12 +51,7 @@ module SqlSearchableSortable
 	end
 	
 	def sort_cols_for_dropdown
-		self.sort_config ||= []
-		return sort_config.inject([]) do |m, col_conf|
-			m << ["#{col_conf.display_text || col_conf.column.to_s.humanize}",        "#{col_conf.column.to_s}"]      if col_conf.show_asc
-			m << ["#{col_conf.display_text || col_conf.column.to_s.humanize} [desc]", "#{col_conf.column.to_s} desc"] if col_conf.show_desc
-			m
-		end 
+		sort_config.select_opts 
 	end
 
 	class ModelSortConfig < Array
@@ -83,6 +78,12 @@ module SqlSearchableSortable
 		def contains_column(col)
 			self.any? { |sc| sc.column == col }
 		end
+
+		def select_opts
+			return self.inject([]) do |m, sort_col|
+				m + sort_col.select_opts
+			end 
+		end
 	end
 	
 	class SortColumn
@@ -93,6 +94,18 @@ module SqlSearchableSortable
 			@show_asc = show_asc
 			@show_desc = show_desc
 		end
+		def name
+			column.to_s
+		end
+		def human_name
+			name.humanize
+		end
+		def select_opts
+			arr = []
+			arr << ["#{display_text || human_name}",        "#{name}"]      if show_asc
+			arr << ["#{display_text || human_name} [desc]", "#{name} desc"] if show_desc
+			return arr
+		end
 	end
 
 end

data/lib/sql_search_n_sort/sql_sort_setup.rb

@@ -3,10 +3,10 @@ module SqlSortSetup
 	def setup_sql_sort
 		model = controller_name.classify.constantize
     if model.is_a? SqlSearchableSortable
-			if params[:sort_by]
-				@sort_by = (params[:sort_by].split(' ').length > 1) ? 
-											params[:sort_by].split(' ').first.to_sym : params[:sort_by].to_sym
-				dir = (params[:sort_by].split(' ').length > 1) ? params[:sort_by].split(' ')[1].to_sym : nil
+			if sort_by
+				@sort_by = (sort_by.split.length > 1) ? 
+											sort_by.split.first.to_sym : sort_by.to_sym
+				dir = (sort_by.split.length > 1) ? sort_by.split[1].to_sym : nil
 				if [:asc, :desc].include?(dir)
 					@sort_dir = dir
 				else
@@ -17,12 +17,18 @@ module SqlSortSetup
 				end
 			else
 				sort_by_param = model.default_sort_col.to_s
-				sort_by_param += " #{model.default_sort_dir}" unless model.default_sort_dir.nil?
-				#TODO: I'm not sure its adviseable to set a params value like this
+				sort_by_param += " #{model.default_sort_dir}" if model.default_sort_dir
+				#unless model.default_sort_dir.nil?
 				params[:sort_by] = sort_by_param
 			end
 			@sort_dropdown_opts = model.sort_cols_for_dropdown #for the view
 			@sort_dir ||= :asc
 		end
   end
-end
+
+  private
+  	def sort_by
+  		params[:sort_by]
+  	end
+end
+

data/lib/sql_search_n_sort/version.rb

@@ -1,3 +1,3 @@
 module SqlSearchNSort
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end