moneypools-thinking-sphinx 1.2.11 → 1.2.12

data/vendor/riddle/lib/riddle/client.rb

@@ -405,7 +405,7 @@ module Riddle
             "Connection to #{@server} on #{@port} timed out after #{@timeout} seconds"
         end
       end
-      
+
       begin
         yield socket
       ensure
@@ -414,8 +414,8 @@ module Riddle
     end
     
     def initialise_connection
-      socket = TCPSocket.new @server, @port
-      
+      socket = initialise_socket
+
       # Checking version
       version = socket.recv(4).unpack('N*').first
       if version < 1
@@ -429,6 +429,19 @@ module Riddle
       socket
     end
     
+    def initialise_socket
+      tries = 0
+      begin
+        socket = TCPSocket.new @server, @port
+      rescue Errno::ECONNREFUSED => e
+        retry if (tries += 1) < 5
+        raise Riddle::ConnectionError,
+          "Connection to #{@server} on #{@port} failed. #{e.message}"
+      end
+      
+      socket
+    end
+    
     # Send a collection of messages, for a command type (eg, search, excerpts,
     # update), to the Sphinx daemon.
     def request(command, messages)

data/vendor/riddle/lib/riddle/controller.rb

@@ -4,38 +4,38 @@ module Riddle
       @configuration  = configuration
       @path           = path
     end
-
+    
     def index
       cmd = "indexer --config #{@path} --all"
       cmd << " --rotate" if running?
       `#{cmd}`
     end
-
+    
     def start
       return if running?
-
+      
       cmd = "searchd --pidfile --config #{@path}"
-
+      
       if RUBY_PLATFORM =~ /mswin/
         system("start /B #{cmd} 1> NUL 2>&1")
       else
         `#{cmd}`
       end
-
+      
       sleep(1)
-
+      
       unless running?
         puts "Failed to start searchd daemon. Check #{@configuration.searchd.log}."
       end
     end
-
+    
     def stop
       return unless running?
       Process.kill('SIGTERM', pid.to_i)
     rescue Errno::EINVAL
       Process.kill('SIGKILL', pid.to_i)
     end
-
+    
     def pid
       if File.exists?(@configuration.searchd.pid_file)
         File.read(@configuration.searchd.pid_file)[/\d+/]
@@ -43,12 +43,11 @@ module Riddle
         nil
       end
     end
-
+    
     def running?
       !!pid && !!Process.kill(0, pid.to_i)
     rescue
       false
     end
-
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: moneypools-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.2.11
+  version: 1.2.12
 platform: ruby
 authors: 
 - Pat Allan
@@ -22,7 +22,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.15.6
     version: 
-description: 
+description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: pat@freelancing-gods.com
 executables: []
 
@@ -143,8 +143,102 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
+summary: ActiveRecord/Rails Sphinx library
 test_files: 
+- features/a.rb
+- features/alternate_primary_key.feature
+- features/attribute_transformation.feature
+- features/attribute_updates.feature
+- features/datetime_deltas.feature
+- features/delayed_delta_indexing.feature
+- features/deleting_instances.feature
+- features/direct_attributes.feature
+- features/excerpts.feature
+- features/extensible_delta_indexing.feature
+- features/facets.feature
+- features/facets_across_model.feature
+- features/handling_edits.feature
+- features/retry_stale_indexes.feature
+- features/searching_across_models.feature
+- features/searching_by_model.feature
+- features/searching_with_find_arguments.feature
+- features/sphinx_detection.feature
+- features/sphinx_scopes.feature
+- features/step_definitions/alpha_steps.rb
+- features/step_definitions/beta_steps.rb
+- features/step_definitions/common_steps.rb
+- features/step_definitions/datetime_delta_steps.rb
+- features/step_definitions/delayed_delta_indexing_steps.rb
+- features/step_definitions/extensible_delta_indexing_steps.rb
+- features/step_definitions/facet_steps.rb
+- features/step_definitions/find_arguments_steps.rb
+- features/step_definitions/gamma_steps.rb
+- features/step_definitions/scope_steps.rb
+- features/step_definitions/search_steps.rb
+- features/step_definitions/sphinx_steps.rb
+- features/sti_searching.feature
+- features/support/db/active_record.rb
+- features/support/db/database.example.yml
+- features/support/db/fixtures/alphas.rb
+- features/support/db/fixtures/authors.rb
+- features/support/db/fixtures/betas.rb
+- features/support/db/fixtures/boxes.rb
+- features/support/db/fixtures/categories.rb
+- features/support/db/fixtures/cats.rb
+- features/support/db/fixtures/comments.rb
+- features/support/db/fixtures/delayed_betas.rb
+- features/support/db/fixtures/developers.rb
+- features/support/db/fixtures/dogs.rb
+- features/support/db/fixtures/extensible_betas.rb
+- features/support/db/fixtures/gammas.rb
+- features/support/db/fixtures/people.rb
+- features/support/db/fixtures/posts.rb
+- features/support/db/fixtures/robots.rb
+- features/support/db/fixtures/tags.rb
+- features/support/db/fixtures/thetas.rb
+- features/support/db/migrations/create_alphas.rb
+- features/support/db/migrations/create_animals.rb
+- features/support/db/migrations/create_authors.rb
+- features/support/db/migrations/create_authors_posts.rb
+- features/support/db/migrations/create_betas.rb
+- features/support/db/migrations/create_boxes.rb
+- features/support/db/migrations/create_categories.rb
+- features/support/db/migrations/create_comments.rb
+- features/support/db/migrations/create_delayed_betas.rb
+- features/support/db/migrations/create_developers.rb
+- features/support/db/migrations/create_extensible_betas.rb
+- features/support/db/migrations/create_gammas.rb
+- features/support/db/migrations/create_people.rb
+- features/support/db/migrations/create_posts.rb
+- features/support/db/migrations/create_robots.rb
+- features/support/db/migrations/create_taggings.rb
+- features/support/db/migrations/create_tags.rb
+- features/support/db/migrations/create_thetas.rb
+- features/support/db/mysql.rb
+- features/support/db/postgresql.rb
+- features/support/env.rb
+- features/support/lib/generic_delta_handler.rb
+- features/support/models/alpha.rb
+- features/support/models/animal.rb
+- features/support/models/author.rb
+- features/support/models/beta.rb
+- features/support/models/box.rb
+- features/support/models/cat.rb
+- features/support/models/category.rb
+- features/support/models/comment.rb
+- features/support/models/delayed_beta.rb
+- features/support/models/developer.rb
+- features/support/models/dog.rb
+- features/support/models/extensible_beta.rb
+- features/support/models/gamma.rb
+- features/support/models/person.rb
+- features/support/models/post.rb
+- features/support/models/robot.rb
+- features/support/models/tag.rb
+- features/support/models/tagging.rb
+- features/support/models/theta.rb
+- features/support/post_database.rb
+- features/support/z.rb
 - spec/lib/thinking_sphinx/active_record/delta_spec.rb
 - spec/lib/thinking_sphinx/active_record/has_many_association_spec.rb
 - spec/lib/thinking_sphinx/active_record/scopes_spec.rb
@@ -154,6 +248,7 @@ test_files:
 - spec/lib/thinking_sphinx/configuration_spec.rb
 - spec/lib/thinking_sphinx/core/array_spec.rb
 - spec/lib/thinking_sphinx/core/string_spec.rb
+- spec/lib/thinking_sphinx/deltas/job_spec.rb
 - spec/lib/thinking_sphinx/excerpter_spec.rb
 - spec/lib/thinking_sphinx/facet_search_spec.rb
 - spec/lib/thinking_sphinx/facet_spec.rb