thinking-sphinx 1.4.12 → 1.4.13

data/lib/thinking_sphinx/active_record/has_many_association.rb

@@ -2,16 +2,23 @@ module ThinkingSphinx
   module ActiveRecord
     module HasManyAssociation
       def search(*args)
-        options   = args.extract_options!
+        @reflection.klass.search(*association_args(args))
+      end
+
+      def facets(*args)
+        @reflection.klass.facets(*association_args(args))
+      end
+
+      private
+
+      def association_args(args)
+        options = args.extract_options!
         options[:with] ||= {}
         options[:with].merge! default_filter
-        
-        args << options
-        @reflection.klass.search(*args)
+
+        args + [options]
       end
 
-      private
-      
       def attribute_for_foreign_key
         foreign_key = @reflection.primary_key_name
         stack = [@reflection.options[:through]].compact

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -33,9 +33,9 @@ module ThinkingSphinx
 
     def cast_to_datetime(clause)
       if ThinkingSphinx::Configuration.instance.use_64_bit
-        "cast(extract(epoch from #{clause}) as bigint)"
+        "cast(floor(extract(epoch from #{clause})) as bigint)"
       else
-        "cast(extract(epoch from #{clause}) as int)"
+        "cast(floor(extract(epoch from #{clause})) as int)"
       end
     end
 
@@ -109,7 +109,7 @@ module ThinkingSphinx
     end
 
     def create_array_accum_function
-      if server_version >= 80400
+      if server_version >= 80311
         return
       elsif server_version > 80200
         execute <<-SQL

data/lib/thinking_sphinx/auto_version.rb

@@ -9,7 +9,7 @@ module ThinkingSphinx
         require 'riddle/1.10'
       when /2.0.[12]/
         require 'riddle/2.0.1'
-      when /2.0.3/, /2.0.4/, /2.1.\d/
+      when /2.0.[^12]/, /2.1.\d/
         require 'riddle/2.1.0'
       else
         documentation_link = %Q{

data/lib/thinking_sphinx/bundled_search.rb

@@ -1,41 +1,41 @@
 module ThinkingSphinx
   class BundledSearch
     attr_reader :client
-    
+
     def initialize
       @searches = []
     end
-    
+
     def search(*args)
       @searches << ThinkingSphinx.search(*args)
       @searches.last.append_to client
     end
-    
+
     def search_for_ids(*args)
       @searches << ThinkingSphinx.search_for_ids(*args)
       @searches.last.append_to client
     end
-    
+
     def searches
       populate
       @searches
     end
-    
+
     private
-    
+
     def client
       @client ||= ThinkingSphinx::Configuration.instance.client
     end
-    
+
     def populated?
       @populated
     end
-    
+
     def populate
       return if populated?
-      
+
       @populated = true
-      
+
       client.run.each_with_index do |results, index|
         searches[index].populate_from_queue results
       end

data/lib/thinking_sphinx/configuration.rb

@@ -28,6 +28,7 @@ module ThinkingSphinx
   # html remove elements::  ''
   # searchd_binary_name::   searchd
   # indexer_binary_name::   indexer
+  # hard_retry_count::      0
   #
   # If you want to change these settings, create a YAML file at
   # config/sphinx.yml with settings for each environment, in a similar
@@ -64,7 +65,8 @@ module ThinkingSphinx
 
     attr_accessor :searchd_file_path, :allow_star, :app_root,
       :model_directories, :delayed_job_priority, :indexed_models, :use_64_bit,
-      :touched_reindex_file, :stop_timeout, :version, :shuffle
+      :touched_reindex_file, :stop_timeout, :version, :shuffle,
+      :hard_retry_count
 
     attr_accessor :source_options, :index_options
 
@@ -112,6 +114,7 @@ module ThinkingSphinx
       self.delayed_job_priority = 0
       self.indexed_models       = []
       self.shuffle              = false
+      self.hard_retry_count     = 0
 
       self.source_options  = {}
       self.index_options   = {

data/lib/thinking_sphinx/search.rb

@@ -405,28 +405,41 @@ module ThinkingSphinx
     def populate
       return if @populated
       @populated = true
+      retries    = hard_retries
 
-      retry_on_stale_index do
-        begin
-          log "Querying: '#{query}'"
-          runtime = Benchmark.realtime {
-            @results = client.query query, indexes, comment
-          }
-          log "Found #{@results[:total_found]} results", :debug,
-            "Sphinx (#{sprintf("%f", runtime)}s)"
-
-          log "Sphinx Daemon returned warning: #{warning}", :error if warning?
-
-          if error?
-            log "Sphinx Daemon returned error: #{error}", :error
-            raise SphinxError.new(error, @results) unless options[:ignore_errors]
+      begin
+        retry_on_stale_index do
+          begin
+            log "Querying: '#{query}'"
+            runtime = Benchmark.realtime {
+              @results = client.query query, indexes, comment
+            }
+            log "Found #{@results[:total_found]} results", :debug,
+              "Sphinx (#{sprintf("%f", runtime)}s)"
+
+            log "Sphinx Daemon returned warning: #{warning}", :error if warning?
+
+            if error?
+              log "Sphinx Daemon returned error: #{error}", :error
+              raise SphinxError.new(error, @results) unless options[:ignore_errors]
+            end
+          rescue Errno::ECONNREFUSED => err
+            raise ThinkingSphinx::ConnectionError,
+              'Connection to Sphinx Daemon (searchd) failed.'
           end
-        rescue Errno::ECONNREFUSED => err
-          raise ThinkingSphinx::ConnectionError,
-            'Connection to Sphinx Daemon (searchd) failed.'
-        end
 
-        compose_results
+          compose_results
+        end
+      rescue => e
+        log 'Caught Sphinx exception: %s (%s %s left)' % [
+          e.message, retries, (retries == 1 ? 'try' : 'tries')
+        ]
+        retries -= 1
+        if retries >= 0
+          retry
+        else
+          raise e
+        end
       end
     end
 
@@ -847,6 +860,10 @@ module ThinkingSphinx
       end
     end
 
+    def hard_retries
+      options[:hard_retry_count] || config.hard_retry_count
+    end
+
     def include_for_class(klass)
       includes = options[:include] || klass.sphinx_index_options[:include]
 

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '1.4.12'
+  Version = '1.4.13'
 end

data/spec/thinking_sphinx/active_record/has_many_association_spec.rb

@@ -41,6 +41,46 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
     end
   end
   
+  describe "facets method" do
+    before :each do
+      Friendship.stub!(:facets => true)
+
+      @person = Person.find(:first)
+      @index  = Friendship.sphinx_indexes.first
+    end
+
+    it "should raise an error if the required attribute doesn't exist" do
+      @index.stub!(:attributes => [])
+
+      lambda { @person.friendships.facets "test" }.should raise_error(RuntimeError)
+    end
+
+    it "should add a filter for the attribute into a normal facets call" do
+      Friendship.should_receive(:facets) do |query, options|
+        options[:with][:person_id].should == @person.id
+      end
+
+      @person.friendships.facets "test"
+    end
+
+    it "should add a filter for an aliased attribute into a normal facets call" do
+      @team = CricketTeam.new
+      @team.stub!(:id => 1)
+
+      Person.should_receive(:facets).with do |query, options|
+        options[:with][:team_id].should == @team.id
+      end
+
+      @team.people.facets "test"
+    end
+
+    it "should define indexes for the reflection class" do
+      Friendship.should_receive(:define_indexes)
+
+      @person.friendships.facets 'test'
+    end
+  end
+
   describe "search method for has_many :through" do
     before :each do
       Person.stub!(:search => true)
@@ -75,6 +115,40 @@ describe 'ThinkingSphinx::ActiveRecord::HasManyAssociation' do
     end
   end
   
+  describe "facets method for has_many :through" do
+    before :each do
+      Person.stub!(:facets => true)
+
+      @person = Person.find(:first)
+      @index  = Person.sphinx_indexes.first
+    end
+
+    it "should raise an error if the required attribute doesn't exist" do
+      @index.stub!(:attributes => [])
+
+      lambda { @person.friends.facets "test" }.should raise_error(RuntimeError)
+    end
+
+    it "should add a filter for the attribute into a normal facets call" do
+      Person.should_receive(:facets).with do |query, options|
+        options[:with][:friendly_ids].should == @person.id
+      end
+
+      @person.friends.facets "test"
+    end
+
+    it "should add a filter for an aliased attribute into a normal facets call" do
+      @team = FootballTeam.new
+      @team.stub!(:id => 1)
+
+      Person.should_receive(:facets).with do |query, options|
+        options[:with][:football_team_id].should == @team.id
+      end
+
+      @team.people.facets "test"
+    end
+  end
+
   describe 'filtering sphinx scopes' do
     before :each do
       Friendship.stub!(:search => Friendship)

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -62,6 +62,22 @@ describe ThinkingSphinx::AutoVersion do
       ThinkingSphinx::AutoVersion.detect
     end
 
+    it "should require 2.1.0 if using Sphinx 2.0.3" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.1.0')
+
+      @config.stub!(:version => '2.0.4-release')
+      ThinkingSphinx::AutoVersion.detect
+    end
+
+    it "should require 2.1.0 if using Sphinx 2.0.3" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.1.0')
+
+      @config.stub!(:version => '2.0.5-release')
+      ThinkingSphinx::AutoVersion.detect
+    end
+
     it "should require 2.1.0 if using Sphinx 2.1.0 dev" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/2.1.0')

data/spec/thinking_sphinx/search_spec.rb

@@ -411,6 +411,38 @@ describe ThinkingSphinx::Search do
           'baz @foo bar @(foo,bar) baz', :star => true
         ).first
       end
+
+      it "should try retry query up to the hard_retry_count option times if it catches an exception" do
+        @client.should_receive(:query).exactly(4).and_raise("Test Exception")
+
+        expect { ThinkingSphinx::Search.new(:hard_retry_count => 3).first }.
+          to raise_error("Test Exception")
+      end
+
+      it "should not retry query if hard_retry_count option is not set" do
+        @client.should_receive(:query).exactly(1).and_raise("Test Exception")
+
+        expect { ThinkingSphinx::Search.new.first }.
+          to raise_error("Test Exception")
+      end
+
+      it "should allow the hard_retry_count to be globally set as a configuration option" do
+        @config.hard_retry_count = 2
+
+        @client.should_receive(:query).exactly(3).and_raise("Test Exception")
+
+        expect { ThinkingSphinx::Search.new.first }.
+          to raise_error("Test Exception")
+      end
+
+      it "should give priority to the hard_retry_count search option over the globally configured option" do
+        @config.hard_retry_count = 4
+
+        @client.should_receive(:query).exactly(2).and_raise("Test Exception")
+
+        expect { ThinkingSphinx::Search.new(:hard_retry_count => 1).first }.
+          to raise_error("Test Exception")
+      end
     end
 
     describe 'comment' do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 4
-  - 12
-  version: 1.4.12
+  - 13
+  version: 1.4.13
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-08-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -64,12 +64,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 5
         segments: 
         - 1
         - 5
-        - 2
-        version: 1.5.2
+        - 3
+        version: 1.5.3
   version_requirements: *id003
   prerelease: false
   name: riddle