freelancing-god-thinking-sphinx 1.1.15 → 1.1.16

data/README.textile

@@ -125,3 +125,5 @@ Since I first released this library, there's been quite a few people who have su
 * Eric Lindvall
 * Lawrence Pit
 * Mike Bailey
+* Bill Leeper
+* Michael Reinsch

data/lib/thinking_sphinx.rb

@@ -37,7 +37,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 15
+    Tiny  = 16
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/search.rb

@@ -684,7 +684,7 @@ module ThinkingSphinx
             client.sort_by = order.to_s
           end
         when String
-          client.sort_mode = :extended
+          client.sort_mode = :extended unless options[:sort_mode]
           client.sort_by   = sorted_fields_to_attributes(order, fields)
         else
           # do nothing

data/lib/thinking_sphinx/tasks.rb

@@ -6,6 +6,11 @@ namespace :thinking_sphinx do
     Rake::Task[:merb_env].invoke    if defined?(Merb)
   end
   
+  desc "Output the current Thinking Sphinx version"
+  task :version => :app_env do
+    puts "Thinking Sphinx v" + ThinkingSphinx::Version::String
+  end
+  
   desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :running_start => :app_env do
     Rake::Task["thinking_sphinx:stop"].invoke if sphinx_running?
@@ -96,6 +101,8 @@ namespace :thinking_sphinx do
 end
 
 namespace :ts do
+  desc "Output the current Thinking Sphinx version"
+  task :version => "thinking_sphinx:version"
   desc "Stop if running, then start a Sphinx searchd daemon using Thinking Sphinx's settings"
   task :run     => "thinking_sphinx:running_start"
   desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -3,28 +3,27 @@ require 'will_paginate/collection'
 
 describe ThinkingSphinx::Search do
   describe "search method" do
-    before :each do
-      @client = Riddle::Client.stub_instance(
-        :filters    => [],
-        :filters=   => true,
-        :id_range=  => true,
-        :sort_mode  => :asc,
-        :limit      => 5,
-        :offset=    => 0,
-        :sort_mode= => true,
-        :query      => {
-          :matches  => [],
-          :total    => 50
-        }
-      )
-      
-      ThinkingSphinx::Search.stub_methods(
-        :client_from_options => @client,
-        :search_conditions   => ["", []]
-      )
-    end
-    
     describe ":star option" do
+      before :each do
+        @client = Riddle::Client.stub_instance(
+          :filters    => [],
+          :filters=   => true,
+          :id_range=  => true,
+          :sort_mode  => :asc,
+          :limit      => 5,
+          :offset=    => 0,
+          :sort_mode= => true,
+          :query      => {
+            :matches  => [],
+            :total    => 50
+          }
+        )
+
+        ThinkingSphinx::Search.stub_methods(
+          :client_from_options => @client,
+          :search_conditions   => ["", []]
+        )
+      end
       
       it "should not apply by default" do
         ThinkingSphinx::Search.search "foo bar"
@@ -47,7 +46,44 @@ describe ThinkingSphinx::Search do
         ThinkingSphinx::Search.search "foo@bar.com -foo-bar", :star => /[\w@.-]+/u
         @client.should have_received(:query).with("*foo@bar.com* -*foo-bar*")
       end
-
+    end
+    
+    describe "sort modes" do
+      before :each do
+        @client = Riddle::Client.new
+        @client.stub_method(:query => {:matches => []})
+        Riddle::Client.stub_method(:new => @client)
+      end
+      
+      it "should use :relevance as a default" do
+        ThinkingSphinx::Search.search "foo"
+        @client.sort_mode.should == :relevance
+      end
+      
+      it "should use :attr_asc if a symbol is supplied to :order" do
+        ThinkingSphinx::Search.search "foo", :order => :created_at
+        @client.sort_mode.should == :attr_asc
+      end
+      
+      it "should use :attr_desc if a symbol is supplied and :desc is the mode" do
+        ThinkingSphinx::Search.search "foo", :order => :created_at, :sort_mode => :desc
+        @client.sort_mode.should == :attr_desc
+      end
+      
+      it "should use :extended if a string is supplied to :order" do
+        ThinkingSphinx::Search.search "foo", :order => "created_at ASC"
+        @client.sort_mode.should == :extended
+      end
+      
+      it "should use :expr if explicitly requested with a string supplied to :order" do
+        ThinkingSphinx::Search.search "foo", :order => "created_at ASC", :sort_mode => :expr
+        @client.sort_mode.should == :expr
+      end
+      
+      it "should use :attr_desc if explicitly requested with a string supplied to :order" do
+        ThinkingSphinx::Search.search "foo", :order => "created_at", :sort_mode => :desc
+        @client.sort_mode.should == :attr_desc
+      end
     end
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.15
+  version: 1.1.16
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -07:00
+date: 2009-05-23 00:00:00 -07:00
 default_executable: 
 dependencies: []