ximate 0.2.0 → 0.2.1

data/lib/ximate/activerecord/relation.rb

@@ -13,12 +13,16 @@ module ActiveRecord
     end
 
     def order(*args)
-      if !@ranks.empty? && args[0] =~ /^rank/i
-        tokens = args[0].split(' ')
-        verse = tokens[1] if tokens[1] =~ /^(asc|desc)$/i
-        verse ||= 'ASC'
-        id_ordered = @ranks.keys.sort{|x,y| @ranks[x] <=> @ranks[y]}
-        orig_order("FIELD(id,#{id_ordered.join(',')}) #{verse}")
+      if args[0] =~ /^rank/i
+        unless @ranks.empty?
+          tokens = args[0].split(' ')
+          verse = tokens[1] if tokens[1] =~ /^(asc|desc)$/i
+          verse ||= 'ASC'
+          id_ordered = @ranks.keys.sort{|x,y| @ranks[x] <=> @ranks[y]}
+          orig_order("FIELD(id,#{id_ordered.join(',')}) #{verse}")
+        else
+          scoped
+        end
       else
         orig_order(args)
       end

data/lib/ximate/version.rb

@@ -1,3 +1,3 @@
 module Ximate
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: ximate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Enrico Pilotto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-13 00:00:00 +02:00
+date: 2011-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: []