sort_it_out 0.9.1 → 0.9.2

data/Histroy.txt

@@ -1,4 +1,14 @@
+= 0.9.2 2009-11-15
+
+* Added ability yo specify default sort as a string that is a SQL fragment.
+
+
 = 0.9.1 2009-11-15
 
+* Fixed bug when there is no mapping specified for sortable.
+
+
+= 0.9.0 2009-11-15
+
 * Ported from a lib in a project to this Gem.
 * No tests yet.

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/lib/sort_it_out.rb

@@ -4,7 +4,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'sort_it_out/sortable.rb'
 
 module SortItOut
-  VERSION = '0.9.1'
+  VERSION = '0.9.2'
 end
 
 ActionController::Base.send( :include, SortItOut::Sortable ) if defined?( ActionController::Base )

data/lib/sort_it_out/sortable.rb

@@ -30,7 +30,13 @@ module SortItOut
       def resolve_order_clause( order, dir="ASC" )
         translated = self.options[:map][order.to_sym] unless self.options[:map].nil?
         order = translated unless translated.nil?
-        return order.is_a?( Array ) ? order.map { |field| "#{field} #{dir}" }.join( ", " ) : "#{order} #{dir}"
+        if order.is_a?( Array )
+          return order.map { |field| "#{field} #{dir}" }.join( ", " )
+        elsif order.is_a?( String ) && (order.include?( "," ) || order.include?( "ASC") || order.include?( "DESC" ))
+          return order
+        else order.is_a?( Symbol )
+          return "#{order.to_s} #{dir}"
+        end
       end
     end
      

data/sort_it_out.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sort_it_out}
-  s.version = "0.9.1"
+  s.version = "0.9.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Harrelson"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sort_it_out
 version: !ruby/object:Gem::Version 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Jason Harrelson