ninjudd-model_set 0.10.2 → 0.10.3

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 2
+:patch: 3
 :major: 0
 :minor: 10

data/lib/model_set/sql_query.rb

@@ -34,23 +34,25 @@ class ModelSet
       add_conditions!( ids_clause(ids, field) )
     end
 
-    def order_by!(order, joins = nil)
-      @sort_order = order ? order.to_s : nil
-      @sort_joins = joins
+    def order_by!(*args)
+      opts = args.last.kind_of?(Hash) ? args.pop : {}
+
+      @sort_join  = sanitize_condition(opts[:join])
+      @sort_order = args
       clear_cache!
     end
   
     def reverse!
       if @sort_order
-        @sort_order = @sort_order.split(/\s*,\s*/).collect do |sub_order|
+        @sort_order.collect! do |sub_order|
           if sub_order =~ / DESC$/i
             sub_order.slice(0..-6)
           else
             "#{sub_order} DESC"
           end
-        end.join(', ')
+        end
       else
-        @sort_order = "#{id_field_with_prefix} DESC"
+        @sort_order = ["#{id_field_with_prefix} DESC"]
       end
       clear_cache!
     end
@@ -76,14 +78,14 @@ class ModelSet
     def order_clause
       return unless @sort_order
       # Prevent SQL injection attacks.
-      "ORDER BY #{@sort_order.gsub(/[^\w_, \.\(\)'\"]/, '')}"
+      "ORDER BY #{@sort_order.join(', ').gsub(/[^\w_, \.\(\)'\"]/, '')}"
     end
         
     def join_clause
-      return unless @joins or @sort_joins
+      return unless @joins or @sort_join
       joins = []
       joins << @joins      if @joins
-      joins << @sort_joins if @sort_joins      
+      joins << @sort_join if @sort_join
       joins.join(' ')
     end
   end

data/test/model_set_test.rb

@@ -116,7 +116,7 @@ class ModelSetTest < Test::Unit::TestCase
       ids = [captain.id, ironman.id, phoenix.id, spidey.id, wolverine.id]
       set = HeroSet.with_universe('Marvel')
 
-      set.order_by!('name')      
+      set.order_by!('name')
       assert_equal ids, set.ids
 
       set.reverse!
@@ -127,6 +127,13 @@ class ModelSetTest < Test::Unit::TestCase
 
       set.reverse!
       assert_equal ids, set.ids
+
+      # Make sure that a comma in a function call works.
+      set.order_by!("lower(ltrim(name, 'C'))")
+      assert_equal ids, set.ids
+
+      set.reverse!
+      assert_equal ids.reverse, set.ids
     end
   
     should "have missing ids" do
@@ -171,7 +178,6 @@ class ModelSetTest < Test::Unit::TestCase
       assert_equal [invisibility.id, flying.id], set.ids
     end
   
-  
     should "allow set extensions" do
       hero = Hero.create(:name => 'Mr. Invisible')
       mighty_mouse = Superpet.create(:name => 'Mighty Mouse', :owner_id => hero.id, :species => 'mouse')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ninjudd-model_set
 version: !ruby/object:Gem::Version 
-  version: 0.10.2
+  version: 0.10.3
 platform: ruby
 authors: 
 - Justin Balthrop