DrMark-thinking-sphinx 0.9.8 → 0.9.9

data/spec/unit/thinking_sphinx/index_spec.rb

@@ -28,7 +28,7 @@ describe ThinkingSphinx::Index do
     end
     
     it "should call link!" do
-      @index.to_config(0, @database, "utf-8")
+      @index.to_config(Person, 0, @database, "utf-8", 0)
       
       @index.should have_received(:link!)
     end
@@ -36,17 +36,17 @@ describe ThinkingSphinx::Index do
     it "should raise an exception if the adapter isn't mysql or postgres" do
       @index.stub_method(:adapter => :sqlite)
       
-      lambda { @index.to_config(0, @database, "utf-8") }.should raise_error
+      lambda { @index.to_config(Person, 0, @database, "utf-8", 0) }.should raise_error
     end
     
     it "should set the core source name to {model}_{index}_core" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_core/
       )
     end
     
     it "should include the database config supplied" do
-      conf = @index.to_config(0, @database, "utf-8")
+      conf = @index.to_config(Person, 0, @database, "utf-8", 0)
       conf.should match(/type\s+= mysql/)
       conf.should match(/sql_host\s+= localhost/)
       conf.should match(/sql_user\s+= username/)
@@ -54,71 +54,96 @@ describe ThinkingSphinx::Index do
       conf.should match(/sql_db\s+= db/)
     end
     
+    it "should use 'user' if 'username' doesn't exist in database configuration" do
+      conf = @index.to_config(Person, 0,
+        @database.except(:username).merge(:user => "username"),
+        "utf-8", 0
+      )
+      conf.should match(/sql_user\s+= username/)
+    end
+    
+    it "should include the database socket if set" do
+      conf = @index.to_config(Person, 0, @database.merge(:socket => "dbsocket"), "utf-8", 0)
+      conf.should match(/sql_sock\s+= dbsocket/)
+    end
+    
+    it "should not include the database socket if not set" do
+      conf = @index.to_config(Person, 0, @database, "utf-8", 0)
+      conf.should_not match(/sql_sock/)
+    end
+    
     it "should have a pre query 'SET NAMES utf8' if using mysql and utf8 charset" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /sql_query_pre\s+= SET NAMES utf8/
       )
       
       @index.stub_method(:delta? => true)
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).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(
+      @index.to_config(Person, 0, @database, "non-utf-8", 0).should_not match(
         /SET NAMES utf8/
       )
       
       @index.stub_method(:adapter => :postgres)
-      @index.to_config(0, @database, "utf-8").should_not match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should_not match(
         /SET NAMES utf8/
       )
     end
     
     it "should use the pre query from the index" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /sql_query_pre\s+= sql_query_pre/
       )
     end
     
     it "should not set group_concat_max_len if not specified" do
-      @index.to_config(0, @database, "utf-8").should_not match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).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(
+      @index.to_config(Person, 0, @database, "utf-8", 0).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(
+      @index.to_config(Person, 0, @database, "utf-8", 0).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(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /sql_query\s+= SQL/
       )
     end
     
     it "should use the range query from the index" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /sql_query_range\s+= sql_query_range/
       )
     end
     
+    it "should pass the offset to the range query" do
+      @index.unstub_method(:to_sql_query_range)
+      @index.to_config(Person, 0, @database, "utf-8", 7).should include(
+        "sql_query_range  = SELECT MIN(`id` * 3 + 7), MAX(`id` * 3 + 7)"
+      )
+    end
+
     it "should use the info query from the index" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /sql_query_info\s+= sql_query_info/
       )
     end
     
     it "should include the attribute sources" do
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /attr a\n\s+attr b/
       )
     end
@@ -126,13 +151,13 @@ describe ThinkingSphinx::Index do
     it "should add a delta index with name {model}_{index}_delta if requested" do
       @index.stub_method(:delta? => true)
       
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_delta/
       )
     end
     
     it "should not add a delta index unless requested" do
-      @index.to_config(0, @database, "utf-8").should_not match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should_not match(
         /source person_0_delta/
       )
     end
@@ -140,7 +165,7 @@ describe ThinkingSphinx::Index do
     it "should have the delta index inherit from the core index" do
       @index.stub_method(:delta? => true)
       
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_delta : person_0_core/
       )
     end
@@ -148,7 +173,7 @@ describe ThinkingSphinx::Index do
     it "should redefine the main query for the delta index" do
       @index.stub_method(:delta? => true)
       
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_delta.+sql_query\s+= SQL/m
       )
     end
@@ -156,7 +181,7 @@ describe ThinkingSphinx::Index do
     it "should redefine the range query for the delta index" do
       @index.stub_method(:delta? => true)
       
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_delta.+sql_query_range\s+= sql_query_range/m
       )
     end
@@ -164,7 +189,7 @@ describe ThinkingSphinx::Index do
     it "should redefine the pre query for the delta index" do
       @index.stub_method(:delta? => true)
       
-      @index.to_config(0, @database, "utf-8").should match(
+      @index.to_config(Person, 0, @database, "utf-8", 0).should match(
         /source person_0_delta.+sql_query_pre\s+=\s*\n/m
       )
     end
@@ -238,7 +263,7 @@ describe ThinkingSphinx::Index do
     end
     
     after :each do
-      `rm #{@file_path}` if File.exists?(@file_path)
+      FileUtils.rm(@file_path, :force => true)
     end
     
     it "should return true if the core index files are empty" do

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -1,4 +1,5 @@
 require 'spec/spec_helper'
+require 'will_paginate/collection'
 
 describe ThinkingSphinx::Search do
   describe "search method" do
@@ -61,21 +62,29 @@ describe ThinkingSphinx::Search do
     it "should honour the :include option" do
       ThinkingSphinx::Search.send(
         :instance_from_result,
-        {:doc => 1, :attributes => {"class_crc" => 123}},
+        {
+          :doc => 1, :attributes => {
+            "sphinx_internal_id" => 2, "class_crc" => 123
+          }
+        },
         {:include => :assoc}
       )
 
-      Person.should have_received(:find).with(1, :include => :assoc, :select => nil)
+      Person.should have_received(:find).with(2, :include => :assoc, :select => nil)
     end
 
     it "should honour the :select option" do
       ThinkingSphinx::Search.send(
         :instance_from_result,
-        {:doc => 1, :attributes => {"class_crc" => 123}},
+        {
+          :doc => 1, :attributes => {
+            "sphinx_internal_id" => 2, "class_crc" => 123
+          }
+        },
         {:select => :columns}
       )
 
-      Person.should have_received(:find).with(1, :include => nil, :select => :columns)
+      Person.should have_received(:find).with(2, :include => nil, :select => :columns)
     end
 
   end
@@ -91,9 +100,9 @@ describe ThinkingSphinx::Search do
       @person_c.stub_method(:attributes => [])
       
       @results = [
-        {:doc => @person_a.id, :attributes => {'@geodist' => 10}},
-        {:doc => @person_b.id, :attributes => {'@geodist' => 10}},
-        {:doc => @person_c.id, :attributes => {'@geodist' => 10}}
+        {:attributes => {"sphinx_internal_id" => @person_a.id}},
+        {:attributes => {"sphinx_internal_id" => @person_b.id}},
+        {:attributes => {"sphinx_internal_id" => @person_c.id}}
       ]
       
       Person.stub_method(
@@ -113,13 +122,13 @@ describe ThinkingSphinx::Search do
       )
 
       ThinkingSphinx::Search.should have_received(:instance_from_result).with(
-        {:doc => @person_a.id, :attributes => {'@geodist' => 10}}, {}
+        {:attributes => {"sphinx_internal_id" => @person_a.id}}, {}
       )
       ThinkingSphinx::Search.should have_received(:instance_from_result).with(
-        {:doc => @person_b.id, :attributes => {'@geodist' => 10}}, {}
+        {:attributes => {"sphinx_internal_id" => @person_b.id}}, {}
       )
       ThinkingSphinx::Search.should have_received(:instance_from_result).with(
-        {:doc => @person_c.id, :attributes => {'@geodist' => 10}}, {}
+        {:attributes => {"sphinx_internal_id" => @person_c.id}}, {}
       )
     end
 
@@ -185,4 +194,65 @@ describe ThinkingSphinx::Search do
     
     it "should have a test for the append_distances function"
   end
+  
+  describe "count 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
+
+    it "should return query total" do
+      ThinkingSphinx::Search.count(42, "an_index").should == 50
+    end
+  end
+  
+  describe "search result" do
+    before :each do
+      @results = ThinkingSphinx::Search.search "nothing will match this"
+    end
+    
+    it "should respond to previous_page" do
+      @results.should respond_to(:previous_page)
+    end
+    
+    it "should respond to next_page" do
+      @results.should respond_to(:next_page)
+    end
+    
+    it "should respond to current_page" do
+      @results.should respond_to(:current_page)
+    end
+    
+    it "should respond to total_pages" do
+      @results.should respond_to(:total_pages)
+    end
+    
+    it "should respond to total_entries" do
+      @results.should respond_to(:total_entries)
+    end
+    
+    it "should respond to offset" do
+      @results.should respond_to(:offset)
+    end
+        
+    it "should be a subclass of Array" do
+      @results.should be_kind_of(Array)
+    end
+  end
 end

data/spec/unit/thinking_sphinx_spec.rb

@@ -40,6 +40,23 @@ describe ThinkingSphinx do
     ThinkingSphinx.deltas_enabled?.should be_true
   end
   
+  it "should update indexes by default" do
+    ThinkingSphinx.updates_enabled = nil
+    ThinkingSphinx.updates_enabled?.should be_true
+  end
+  
+  it "should disable index updating" do
+    ThinkingSphinx.updates_enabled = false
+    ThinkingSphinx.updates_enabled?.should be_false
+  end
+  
+  it "should enable index updating" do
+    ThinkingSphinx.updates_enabled = false
+    ThinkingSphinx.updates_enabled?.should be_false
+    ThinkingSphinx.updates_enabled = true
+    ThinkingSphinx.updates_enabled?.should be_true
+  end
+  
   describe "use_group_by_shortcut? method" do
     after :each do
       ::ActiveRecord::Base.connection.unstub_method(:select_all)
@@ -82,6 +99,10 @@ describe ThinkingSphinx do
     
     describe "if not using MySQL" do
       before :each do
+        unless ::ActiveRecord::ConnectionAdapters.const_defined?(:PostgreSQLAdapter)
+          pending "No PostgreSQL"
+          return
+        end
         @connection = ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.stub_instance(
           :select_all => true
         )

data/tasks/thinking_sphinx_tasks.rb

@@ -3,7 +3,7 @@ require 'fileutils'
 namespace :thinking_sphinx do
   task :app_env do
     Rake::Task[:environment].invoke if defined?(RAILS_ROOT)
-    Rake::Task[:merb_env].invoke    if defined?(Merb)
+    Rake::Task[:merb_init].invoke    if defined?(Merb)
   end
   
   desc "Start a Sphinx searchd daemon using Thinking Sphinx's settings"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: DrMark-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-08 00:00:00 -07:00
+date: 2008-08-22 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -34,6 +34,7 @@ files:
 - lib/thinking_sphinx/active_record.rb
 - lib/thinking_sphinx/association.rb
 - lib/thinking_sphinx/attribute.rb
+- lib/thinking_sphinx/collection.rb
 - lib/thinking_sphinx/configuration.rb
 - lib/thinking_sphinx/field.rb
 - lib/thinking_sphinx/index/builder.rb
@@ -46,6 +47,19 @@ files:
 - README
 - tasks/thinking_sphinx_tasks.rb
 - tasks/thinking_sphinx_tasks.rake
+- spec/unit/thinking_sphinx/active_record/delta_spec.rb
+- spec/unit/thinking_sphinx/active_record/has_many_association_spec.rb
+- spec/unit/thinking_sphinx/active_record/search_spec.rb
+- spec/unit/thinking_sphinx/active_record_spec.rb
+- spec/unit/thinking_sphinx/association_spec.rb
+- spec/unit/thinking_sphinx/attribute_spec.rb
+- spec/unit/thinking_sphinx/configuration_spec.rb
+- spec/unit/thinking_sphinx/field_spec.rb
+- spec/unit/thinking_sphinx/index/builder_spec.rb
+- spec/unit/thinking_sphinx/index/faux_column_spec.rb
+- spec/unit/thinking_sphinx/index_spec.rb
+- spec/unit/thinking_sphinx/search_spec.rb
+- spec/unit/thinking_sphinx_spec.rb
 has_rdoc: true
 homepage: http://ts.freelancing-gods.com
 post_install_message: