freelancing-god-thinking-sphinx 1.1.17 → 1.1.18

data/README.textile

@@ -128,3 +128,5 @@ Since I first released this library, there's been quite a few people who have su
 * Bill Leeper
 * Michael Reinsch
 * Anderson Dias
+* Jerome Riga
+* Tien Dung

data/lib/thinking_sphinx.rb

@@ -37,7 +37,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 17
+    Tiny  = 18
     
     String = [Major, Minor, Tiny].join('.')
   end
@@ -175,7 +175,8 @@ module ThinkingSphinx
   end
   
   def self.mysql?
-    ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlAdapter" || (
+    ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlAdapter" ||
+    ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlplusAdapter" || (
       jruby? && ::ActiveRecord::Base.connection.config[:adapter] == "jdbcmysql"
     )
   end

data/lib/thinking_sphinx/configuration.rb

@@ -19,7 +19,7 @@ module ThinkingSphinx
   # min infix length::      1
   # mem limit::             64M
   # max matches::           1000
-  # morphology::            stem_en
+  # morphology::            nil
   # charset type::          utf-8
   # charset table::         nil
   # ignore chars::          nil
@@ -103,8 +103,7 @@ module ThinkingSphinx
       
       self.source_options  = {}
       self.index_options   = {
-        :charset_type => "utf-8",
-        :morphology   => "stem_en"
+        :charset_type => "utf-8"
       }
             
       parse_config

data/lib/thinking_sphinx/search.rb

@@ -461,10 +461,10 @@ module ThinkingSphinx
         page          = options[:page] ? options[:page].to_i : 1
         page          = 1 if page <= 0
         client.offset = (page - 1) * client.limit
-
+        
         begin
           log "Sphinx: #{query}"
-          results = client.query query
+          results = client.query(query, '*', options[:comment] || '')
           log "Sphinx Result:"
           log results[:matches].collect { |m|
             m[:attributes]["sphinx_internal_id"]

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -27,24 +27,24 @@ describe ThinkingSphinx::Search do
       
       it "should not apply by default" do
         ThinkingSphinx::Search.search "foo bar"
-        @client.should have_received(:query).with("foo bar")
+        @client.should have_received(:query).with("foo bar",'*','')
       end
 
       it "should apply when passed, and handle full extended syntax" do
         input    = %{a b* c (d | e) 123 5&6 (f_f g) !h "i j" "k l"~10 "m n"/3 @o p -(q|r)}
         expected = %{*a* b* *c* (*d* | *e*) *123* *5*&*6* (*f_f* *g*) !*h* "i j" "k l"~10 "m n"/3 @o *p* -(*q*|*r*)}
         ThinkingSphinx::Search.search input, :star => true
-        @client.should have_received(:query).with(expected)
+        @client.should have_received(:query).with(expected,'*','')
       end
 
       it "should default to /\w+/ as token" do
         ThinkingSphinx::Search.search "foo@bar.com", :star => true
-        @client.should have_received(:query).with("*foo*@*bar*.*com*")
+        @client.should have_received(:query).with("*foo*@*bar*.*com*",'*','')
       end
 
       it "should honour custom token" do
         ThinkingSphinx::Search.search "foo@bar.com -foo-bar", :star => /[\w@.-]+/u
-        @client.should have_received(:query).with("*foo@bar.com* -*foo-bar*")
+        @client.should have_received(:query).with("*foo@bar.com* -*foo-bar*",'*','')
       end
     end
     
@@ -85,6 +85,24 @@ describe ThinkingSphinx::Search do
         @client.sort_mode.should == :attr_desc
       end
     end
+    
+    describe ":comment option" do
+      before :each do
+        @client = Riddle::Client.new
+        @client.stub_method(:query => {:matches => []})
+        Riddle::Client.stub_method(:new => @client)
+      end
+      
+      it "should add comment to log" do
+        ThinkingSphinx::Search.search 'foo bar', :comment => 'custom log'
+        @client.should have_received(:query).with('foo bar', '*', 'custom log')
+      end
+      
+      it "should use a blank string when no comment is specified" do
+        ThinkingSphinx::Search.search 'foo bar'
+        @client.should have_received(:query).with('foo bar', '*', '')
+      end
+    end
   end
   
   describe "facets method" do

data/tasks/distribution.rb

@@ -34,6 +34,24 @@ spec = Gem::Specification.new do |s|
     "tasks/**/*.rake",
     "vendor/**/*"
   ]
+  s.post_install_message = <<-MESSAGE
+With the release of Thinking Sphinx 1.1.18, there is one important change to
+note: previously, the default morphology for indexing was 'stem_en'. The new
+default is nil, to avoid any unexpected behavior. If you wish to keep the old
+value though, you will need to add the following settings to your
+config/sphinx.yml file:
+
+development:
+  morphology: stem_en
+test:
+  morphology: stem_en
+production:
+  morphology: stem_en
+
+To understand morphologies/stemmers better, visit the following link:
+http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+
+MESSAGE
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/vendor/riddle/lib/riddle.rb

@@ -18,7 +18,7 @@ module Riddle #:nodoc:
     Rev     = 1533
     # Release number to mark my own fixes, beyond feature parity with
     # Sphinx itself.
-    Release = 4
+    Release = 5
     
     String      = [Major, Minor, Tiny].join('.')
     GemVersion  = [Major, Minor, Tiny, Rev, Release].join('.')

data/vendor/riddle/lib/riddle/configuration/section.rb

@@ -30,7 +30,13 @@ module Riddle
       
       def setting_to_array(setting)
         value = send(setting)
-        value.is_a?(Array) ? value : [value]
+        case value
+        when Array      then value
+        when TrueClass  then [1]
+        when FalseClass then [0]
+        else
+          [value]
+        end
       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.17
+  version: 1.1.18
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-24 00:00:00 -07:00
+date: 2009-05-27 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -125,7 +125,23 @@ files:
 - spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
-post_install_message: 
+post_install_message: |+
+  With the release of Thinking Sphinx 1.1.18, there is one important change to
+  note: previously, the default morphology for indexing was 'stem_en'. The new
+  default is nil, to avoid any unexpected behavior. If you wish to keep the old
+  value though, you will need to add the following settings to your
+  config/sphinx.yml file:
+  
+  development:
+    morphology: stem_en
+  test:
+    morphology: stem_en
+  production:
+    morphology: stem_en
+  
+  To understand morphologies/stemmers better, visit the following link:
+  http://www.sphinxsearch.com/docs/manual-0.9.8.html#conf-morphology
+  
 rdoc_options: 
 - --title
 - Thinking Sphinx -- Rails/Merb Sphinx Plugin