log/.gitignore tasks/solr.rake test/test_integration.rb @@ -45,7 +45,7 @@ module Sunspot def order_by(field_name, direction = nil) direction ||= :asc - @sort = "#{field(field_name).indexed_name} #{direction}" + @sort = [{ field(field_name).indexed_name.to_sym => (direction.to_s == 'asc' ? :ascending : :descending) }] #TODO should support multiple order columns attributes[:order] = "#{field_name} #{direction}" end lib/sunspot/query.rb @@ -122,7 +122,7 @@ class TestBuildSearch < Test::Unit::TestCase end test 'should order' do - connection.expects(:query).with('(type:Post)', :filter_queries => [], :sort => 'average_rating_f desc').times(2) + connection.expects(:query).with('(type:Post)', :filter_queries => [], :sort => [{ :average_rating_f => :descending }]).times(2) session.search Post, :order => 'average_rating desc' session.search Post do order_by :average_rating, :desc test/test_build_search.rb df618497d864347e4443edfb593bb72c49fe3250 Mat Brown mat@matbook.(none) http://github.com/outoftime/sunspot/commit/d9ff8b6cab1ce584d9c19a3ed611eaadfb1bc55b d9ff8b6cab1ce584d9c19a3ed611eaadfb1bc55b 2008-12-01T16:36:17-08:00 2008-12-01T16:36:17-08:00 Basic integration tests Basic integration tests - need to turn it into a much more robust suite. Also added solr:test:start task which starts Solr for use in the integration tests (you have to stop it yourself). 9c683c0ea5374aafe4dae11801a0a803f28aba59 Mat Brown mat@matbook.(none)