freelancing-god-thinking-sphinx 0.9.7 → 0.9.8

data/spec/unit/thinking_sphinx/configuration_spec.rb

@@ -59,13 +59,13 @@ describe ThinkingSphinx::Configuration do
       })
       
       @person_index_a = ThinkingSphinx::Index.stub_instance(
-        :to_config => "", :adapter => :mysql, :delta? => false
+        :to_config => "", :adapter => :mysql, :delta? => false, :name => "person"
       )
       @person_index_b = ThinkingSphinx::Index.stub_instance(
-        :to_config => "", :adapter => :mysql, :delta? => false
+        :to_config => "", :adapter => :mysql, :delta? => false, :name => "person"
       )
       @friendship_index_a = ThinkingSphinx::Index.stub_instance(
-        :to_config => "", :adapter => :mysql, :delta? => false
+        :to_config => "", :adapter => :mysql, :delta? => false, :name => "friendship"
       )
       
       Person.stub_method(:indexes => [@person_index_a, @person_index_b])
@@ -212,6 +212,8 @@ describe ThinkingSphinx::Configuration do
           "address"           => "127.0.0.1",
           "port"              => 3333,
           "allow_star"        => true,
+          "min_prefix_len"    => 2,
+          "min_infix_len"     => 3,
           "mem_limit"         => "128M",
           "max_matches"       => 1001,
           "morphology"        => "stem_ru",
@@ -238,21 +240,20 @@ describe ThinkingSphinx::Configuration do
     before :each do
       @config = ThinkingSphinx::Configuration.new
       @model  = Class.stub_instance(
-        :indexes  => [],
-        :name     => "SpecModel"
+        :indexes  => [ThinkingSphinx::Index.new(Person)]
       )
     end
     
     it "should take its name from the model, with _core appended" do
       @config.send(:core_index_for_model, @model, "my sources").should match(
-        /index specmodel_core/
+        /index person_core/
       )
     end
     
     it "should set the path to follow the name" do
       @config.searchd_file_path = "/my/file/path"
       @config.send(:core_index_for_model, @model, "my sources").should match(
-        /path = \/my\/file\/path\/specmodel_core/
+        /path = \/my\/file\/path\/person_core/
       )
     end
     
@@ -319,6 +320,16 @@ describe ThinkingSphinx::Configuration do
       text.should match(/min_infix_len\s+= 1/)
     end
     
+    it "should use the configuration's infix and prefix length values if set" do
+      @config.allow_star     = true
+      @config.min_prefix_len = 3
+      @config.min_infix_len  = 2
+      text =  @config.send(:core_index_for_model, @model, "my sources")
+      
+      text.should match(/min_prefix_len\s+= 3/)
+      text.should match(/min_infix_len\s+= 2/)
+    end
+    
     it "should not include the star-related settings when allow_star is false" do
       @config.allow_star = false
       text =  @config.send(:core_index_for_model, @model, "my sources")
@@ -329,11 +340,10 @@ describe ThinkingSphinx::Configuration do
     end
     
     it "should set prefix_fields if any fields are flagged explicitly" do
-      @index = ThinkingSphinx::Index.stub_instance(
+      @model.indexes.first.stub_methods(
         :prefix_fields => ["a", "b", "c"],
         :infix_fields  => ["d", "e", "f"]
       )
-      @model.stub_method(:indexes => [@index])
       
       @config.send(:core_index_for_model, @model, "my sources").should match(
         /prefix_fields\s+= a, b, c/
@@ -347,11 +357,10 @@ describe ThinkingSphinx::Configuration do
     end
     
     it "should set infix_fields if any fields are flagged explicitly" do
-      @index = ThinkingSphinx::Index.stub_instance(
+      @model.indexes.first.stub_methods(
         :prefix_fields => ["a", "b", "c"],
         :infix_fields  => ["d", "e", "f"]
       )
-      @model.stub_method(:indexes => [@index])
       
       @config.send(:core_index_for_model, @model, "my sources").should match(
         /infix_fields\s+= d, e, f/
@@ -363,32 +372,54 @@ describe ThinkingSphinx::Configuration do
         /infix_fields\s+=/
       )
     end
+
+    it "should include html_strip if value is set" do
+      @config.html_strip = 1
+      text = @config.send(:core_index_for_model, @model, "my sources")
+      text.should match(/html_strip\s+= 1/)
+    end
+
+    it "shouldn't include html_strip if value is not set" do
+      text = @config.send(:core_index_for_model, @model, "my sources")
+      text.should_not match(/html_strip/)
+    end
+
+    it "should include html_remove_elements if values are set" do
+      @config.html_remove_elements = 'script'
+      text = @config.send(:core_index_for_model, @model, "my sources")
+      text.should match(/html_remove_elements\s+= script/)
+    end
+
+    it "shouldn't include html_remove_elements if no values are set" do
+      text = @config.send(:core_index_for_model, @model, "my sources")
+      text.should_not match(/html_remove_elements/)
+    end
   end
   
   describe "delta_index_for_model method" do
     before :each do
       @config = ThinkingSphinx::Configuration.new
       @model  = Class.stub_instance(
-        :name     => "SpecModel"
+        :indexes => [ThinkingSphinx::Index.new(Person)]
       )
     end
     
     it "should take its name from the model, with _delta appended" do
       @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /index specmodel_delta/
+        /index person_delta/
       )
     end
     
     it "should inherit from the equivalent core index" do
       @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /index specmodel_delta : specmodel_core/
+        /index person_delta : person_core/
       )
     end
     
     it "should set the path to follow the name" do
       @config.searchd_file_path = "/my/file/path"
       @config.send(:delta_index_for_model, @model, "delta_sources").should match(
-        /path = \/my\/file\/path\/specmodel_delta/
+        /path = \/my\/file\/path\/person_delta/
       )
     end
   end
@@ -397,14 +428,13 @@ describe ThinkingSphinx::Configuration do
     before :each do
       @config = ThinkingSphinx::Configuration.new
       @model  = Class.stub_instance(
-        :name     => "SpecModel",
-        :indexes  => []
+        :indexes  => [ThinkingSphinx::Index.new(Person)]
       )
     end
     
     it "should take its name from the model" do
       @config.send(:distributed_index_for_model, @model).should match(
-        /index specmodel/
+        /index person/
       )
     end
     
@@ -416,18 +446,26 @@ describe ThinkingSphinx::Configuration do
     
     it "should include the core as a local source" do
       @config.send(:distributed_index_for_model, @model).should match(
-        /local = specmodel_core/
+        /local = person_core/
       )
     end
     
     it "should only include the delta as a local source if an index is flagged to be delta" do
       @config.send(:distributed_index_for_model, @model).should_not match(
-        /local = specmodel_delta/
+        /local = person_delta/
+      )
+      
+      @model.indexes.first.stub_method(:delta? => true)
+      @config.send(:distributed_index_for_model, @model).should match(
+        /local = person_delta/
       )
+    end
+    
+    it "should handle namespaced models correctly" do
+      Person.stub_method(:name => "Namespaced::Model")
       
-      @model.stub_method(:indexes => [ThinkingSphinx::Index.stub_instance(:delta? => true)])
       @config.send(:distributed_index_for_model, @model).should match(
-        /local = specmodel_delta/
+        /index namespaced_model/
       )
     end
   end

data/spec/unit/thinking_sphinx/index_spec.rb

@@ -59,6 +59,12 @@ describe ThinkingSphinx::Index do
         /sql_query_pre\s+= SET NAMES utf8/
       )
       
+      @index.stub_method(:delta? => true)
+      @index.to_config(0, @database, "utf-8").should match(
+        /source person_0_delta.+sql_query_pre\s+= SET NAMES utf8/m
+      )
+      
+      @index.stub_method(:delta? => false)
       @index.to_config(0, @database, "non-utf-8").should_not match(
         /SET NAMES utf8/
       )
@@ -75,6 +81,24 @@ describe ThinkingSphinx::Index do
       )
     end
     
+    it "should not set group_concat_max_len if not specified" do
+      @index.to_config(0, @database, "utf-8").should_not match(
+        /group_concat_max_len/
+      )
+    end
+
+    it "should set group_concat_max_len if specified" do
+      @index.options.merge! :group_concat_max_len => 2056
+      @index.to_config(0, @database, "utf-8").should match(
+        /sql_query_pre\s+= SET SESSION group_concat_max_len = 2056/
+      )
+      
+      @index.stub_method(:delta? => true)
+      @index.to_config(0, @database, "utf-8").should match(
+        /source person_0_delta.+sql_query_pre\s+= SET SESSION group_concat_max_len = 2056/m
+      )
+    end
+    
     it "should use the main query from the index" do
       @index.to_config(0, @database, "utf-8").should match(
         /sql_query\s+= SQL/
@@ -146,6 +170,22 @@ describe ThinkingSphinx::Index do
     end
   end
   
+  describe "to_sql_query_range method" do
+    before :each do
+      @index = ThinkingSphinx::Index.new(Person)
+    end
+    
+    it "should add COALESCE around MIN and MAX calls if using PostgreSQL" do
+      @index.stub_method(:adapter => :postgres)
+      
+      @index.to_sql_query_range.should match(/COALESCE\(MIN.+COALESCE\(MAX/)
+    end
+    
+    it "shouldn't add COALESCE if using MySQL" do
+      @index.to_sql_query_range.should_not match(/COALESCE/)
+    end
+  end
+  
   describe "prefix_fields method" do
     before :each do
       @index = ThinkingSphinx::Index.new(Person)
@@ -167,7 +207,7 @@ describe ThinkingSphinx::Index do
     end
   end
   
-  describe "infix_fields" do
+  describe "infix_fields method" do
     before :each do
       @index = ThinkingSphinx::Index.new(Person)
       
@@ -187,4 +227,41 @@ describe ThinkingSphinx::Index do
       @index.infix_fields.should_not include(@field_b)
     end
   end
+  
+  describe "empty? method" do
+    before :each do
+      @index = ThinkingSphinx::Index.new(Person)
+      config = ThinkingSphinx::Configuration.new
+      
+      `mkdir -p #{config.searchd_file_path}`
+      @file_path = "#{config.searchd_file_path}/#{@index.name}_core.spa"
+    end
+    
+    after :each do
+      `rm #{@file_path}` if File.exists?(@file_path)
+    end
+    
+    it "should return true if the core index files are empty" do
+      `touch #{@file_path}`
+      @index.should be_empty
+    end
+    
+    it "should return true if the core index files don't exist" do
+      @index.should be_empty
+    end
+    
+    it "should return false if the core index files aren't empty" do
+      `echo 'a' > #{@file_path}`
+      @index.should_not be_empty
+    end
+    
+    it "should check the delta files if specified" do
+      @index.should be_empty(:delta)
+      
+      `echo 'a' > #{@file_path.gsub(/_core.spa$/, '_delta.spa')}`
+      @index.should_not be_empty(:delta)
+      
+      `rm #{@file_path}` if File.exists?(@file_path.gsub(/_core.spa$/, '_delta.spa'))
+    end
+  end
 end

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -1,6 +1,48 @@
 require 'spec/spec_helper'
 
 describe ThinkingSphinx::Search do
+  describe "search_for_id method" do
+    before :each do
+      @client = Riddle::Client.stub_instance(
+        :filters    => [],
+        :filters=   => true,
+        :id_range=  => true,
+        :query      => {
+          :matches  => []
+        }
+      )
+      
+      ThinkingSphinx::Search.stub_methods(
+        :client_from_options => @client,
+        :search_conditions   => ["", []]
+      )
+    end
+    
+    it "should set the client id range to focus on the given id" do
+      ThinkingSphinx::Search.search_for_id 42, "an_index"
+      
+      @client.should have_received(:id_range=).with(42..42)
+    end
+    
+    it "should query on the given index" do
+      ThinkingSphinx::Search.search_for_id 42, "an_index"
+      
+      @client.should have_received(:query).with("", "an_index")
+    end
+    
+    it "should return true if a record is returned" do
+      @client.stub_method(:query => {
+        :matches => [24]
+      })
+      
+      ThinkingSphinx::Search.search_for_id(42, "an_index").should be_true
+    end
+    
+    it "should return false if no records are returned" do
+      ThinkingSphinx::Search.search_for_id(42, "an_index").should be_false
+    end
+  end
+  
   describe "instance_from_result method" do
     before :each do
       Person.stub_method(:find => true)

data/spec/unit/thinking_sphinx_spec.rb

@@ -24,6 +24,7 @@ describe ThinkingSphinx do
   end
   
   it "should index deltas by default" do
+    ThinkingSphinx.deltas_enabled = nil
     ThinkingSphinx.deltas_enabled?.should be_true
   end
   
@@ -104,4 +105,4 @@ describe ThinkingSphinx do
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-05 00:00:00 -07:00
+date: 2008-07-08 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.