@@ -116,7 +116,9 @@ arguments are given it will default to @created_at DESC@: Article.ordered(:id) # Get all articles ordered by "id" Article.ordered("rank ASC") # Get all articles ordered by "rank ASC" Article.order_by(:id) # order_by and sort_by are alias to ordered - Article.order_by([:id, :desc], :popularity) # can take a hash as parameter + Article.order_by([:id, :desc], :popularity) # can take a array as parameter + Article.order_by(:id => :desc, :popularity => :asc) # can take a hash as parameter + # only available for jruby/ruby 1.9 Article.order_by_id # can be set as a sentence If you would like to specify a different default sort order you can do so on a per class basis README.textile @@ -8,9 +8,16 @@ module UtilityScopes base.class_eval do # Provide an ordered scope named_scope(:ordered, lambda { |*order| - { :order => order.empty? ? - self.default_ordering : - order.collect{|e| e.is_a?(Array) ? "#{e[0]} #{e[1].to_s.upcase}" : e}.join(', ') } + { :order => case + when order.empty? + self.default_ordering + # allow hash support for jruby or ruby 1.9 + when order.size == 1 && order[0].is_a?(Hash) && (PLATFORM=~/java/ || RUBY_VERSION=~/1\.9.*/) + order.first.collect{|(k,v)| "#{k} #{v.to_s.upcase}"}.join(', ') + else + order.collect{|e| e.is_a?(Array) ? "#{e[0]} #{e[1].to_s.upcase}" : e}.join(', ') + end + } }) class << self @@ -41,9 +48,16 @@ module UtilityScopes # Override named scope on AR::Base so we can access default_ordering # on subclass named_scope(:ordered, lambda { |*order| - { :order => order.empty? ? - self.default_ordering : - order.collect{|e| e.is_a?(Array) ? "#{e[0]} #{e[1].to_s.upcase}" : e}.join(', ') } + { :order => case + when order.empty? + self.default_ordering + # allow hash support for jruby or ruby 1.9 + when order.size == 1 && order[0].is_a?(Hash) && (PLATFORM=~/java/ || RUBY_VERSION=~/1\.9.*/) + order.first.collect{|(k,v)| "#{k} #{v.to_s.upcase}"}.join(', ') + else + order.collect{|e| e.is_a?(Array) ? "#{e[0]} #{e[1].to_s.upcase}" : e}.join(', ') + end + } }) metaclass.instance_eval do lib/utility_scopes/ordered.rb @@ -15,10 +15,16 @@ describe "Ordered scope" do Article.ordered('created_at ASC').proxy_options.should == {:order => 'created_at ASC'} end - it "should allow the order to arrays as arg" do + it "should allow the order to use arrays as arg" do Article.ordered([:popularity, :asc], [:second_param, :desc]).proxy_options.should == {:order => 'popularity ASC, second_param DESC'} end + it "should allow the order hash as arg" do + if (PLATFORM=~/java/ || RUBY_VERSION=~/1\.9.*/) + Article.ordered(:popularity => :asc, :second_param => :desc).proxy_options.should == {:order => 'popularity ASC, second_param DESC'} + end + end + it "should allow the order with several args" do Article.ordered(:popularity, :updated_at).proxy_options.should == {:order => 'popularity, updated_at'} end spec/ordered_spec.rb 464c8dc69ef3966be990a0eebca480c4cfa784b1 Jean-Sébastien Ney jeansebastien.ney@gmail.com http://github.com/yfactorial/utility_scopes/commit/8d51af960f91fc771a0e655c7cf9253144a4728c 8d51af960f91fc771a0e655c7cf9253144a4728c 2008-10-25T12:35:30-07:00 2008-10-25T12:35:30-07:00 added ordered hash support for jruby and ruby 1.9 963cc37b471ca4579fa7ffaea2b225fb9653c2a0 Jean-Sébastien Ney jeansebastien.ney@gmail.com