thinking-sphinx 1.4.7 → 1.4.8

data/lib/thinking_sphinx/tasks.rb

@@ -37,12 +37,22 @@ namespace :thinking_sphinx do
 
     Dir["#{config.searchd_file_path}/*.spl"].each { |file| File.delete(file) }
 
-    config.controller.start
-
-    if sphinx_running?
-      puts "Started successfully (pid #{sphinx_pid})."
+    if ENV["NODETACH"] == "true"
+      unless pid = fork
+        config.controller.start(:nodetach => true)
+      end
+      Signal.trap('TERM') { Process.kill(:QUIT, pid) }
+      Signal.trap('INT')  { Process.kill(:QUIT, pid) }
+      Process.wait(pid)
     else
-      puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
+      config.controller.start
+
+      if sphinx_running?
+        puts "Started successfully (pid #{sphinx_pid})."
+      else
+        puts "Failed to start searchd daemon. Check #{config.searchd_log_file}"
+        puts "Be sure to run thinking_sphinx:index before thinking_sphinx:start"
+      end
     end
   end
 

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '1.4.7'
+  Version = '1.4.8'
 end

data/spec/thinking_sphinx/configuration_spec.rb

@@ -4,7 +4,7 @@ describe ThinkingSphinx::Configuration do
   describe "environment class method" do
     before :each do
       ThinkingSphinx::Configuration.reset_environment
-      
+
       ENV["RAILS_ENV"] = nil
     end
 
@@ -19,12 +19,12 @@ describe ThinkingSphinx::Configuration do
 
       Object.send :remove_const, :Merb
     end
-    
+
     it "should use RAILS_ENV if set" do
       RAILS_ENV = 'global_rails'
-      
+
       ThinkingSphinx::Configuration.environment.should == 'global_rails'
-      
+
       Object.send :remove_const, :RAILS_ENV
     end
 
@@ -37,31 +37,31 @@ describe ThinkingSphinx::Configuration do
       ThinkingSphinx::Configuration.environment.should == "development"
     end
   end
-  
+
   describe '#version' do
     before :each do
       @config = ThinkingSphinx::Configuration.instance
       @config.reset
     end
-    
+
     it "should use the given version from sphinx.yml if there is one" do
       open("#{RAILS_ROOT}/config/sphinx.yml", "w") do |f|
         f.write  YAML.dump({'development' => {'version' => '0.9.7'}})
       end
       @config.reset
-      
+
       @config.version.should == '0.9.7'
-      
+
       FileUtils.rm "#{RAILS_ROOT}/config/sphinx.yml"
     end
-    
+
     it "should detect the version from Riddle otherwise" do
       controller = @config.controller
       controller.stub!(:sphinx_version => '0.9.6')
-      
+
       Riddle::Controller.stub!(:new => controller)
       @config.reset
-      
+
       @config.version.should == '0.9.6'
     end
   end
@@ -118,7 +118,7 @@ describe ThinkingSphinx::Configuration do
         config.app_root = "/here/somewhere"
       end
       ThinkingSphinx::Configuration.instance.app_root.should == "/here/somewhere"
-      
+
       ThinkingSphinx::Configuration.instance.reset
     end
   end
@@ -171,7 +171,7 @@ describe ThinkingSphinx::Configuration do
 
   it "should insert set index options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
-    
+
     ThinkingSphinx::Configuration::IndexOptions.each do |option|
       config.reset
       config.index_options[option.to_sym] = "something"
@@ -187,7 +187,7 @@ describe ThinkingSphinx::Configuration do
   it "should insert set source options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
     config.reset
-    
+
     config.source_options[:sql_query_pre] = ["something"]
     ThinkingSphinx::Configuration::SourceOptions.each do |option|
       config.source_options[option.to_sym] ||= "something"
@@ -198,21 +198,21 @@ describe ThinkingSphinx::Configuration do
 
       config.source_options.delete option.to_sym
     end
-    
-    config.source_options[:sql_query_pre] = nil  
+
+    config.source_options[:sql_query_pre] = nil
   end
-  
+
   it "should not blow away delta or utf options if sql pre is specified in config" do
     config = ThinkingSphinx::Configuration.instance
     config.reset
-    
+
     config.source_options[:sql_query_pre] = ["a pre query"]
     config.build
     file = open(config.config_file) { |f| f.read }
-    
+
     file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = UPDATE `\w+` SET `delta` = 0 WHERE `delta` = 1/im)
     file.should match(/sql_query_pre = a pre query\n\s*sql_query_pre = \n/im)
-    
+
     config.source_options[:sql_query_pre] = nil
   end
 
@@ -230,24 +230,24 @@ describe ThinkingSphinx::Configuration do
     }
     file.should_not match(/index alpha_core\s+\{\s+[^\}]*prefix_fields\s+=[^\}]*\}/m)
   end
-  
+
   describe '#generate' do
     let(:config) { ThinkingSphinx::Configuration.instance }
-    
+
     it "should set all sphinx_internal_id attributes to bigints if one is" do
       config.reset
       config.generate
-      
+
       config.configuration.indexes.each do |index|
         next if index.is_a? Riddle::Configuration::DistributedIndex
-        
+
         index.sources.each do |source|
           source.sql_attr_bigint.should include(:sphinx_internal_id)
         end
       end
     end
   end
-  
+
   describe '#client' do
     before :each do
       @config = ThinkingSphinx::Configuration.instance
@@ -256,19 +256,19 @@ describe ThinkingSphinx::Configuration do
       @config.configuration.searchd.max_matches = 100
       @config.timeout = 1
     end
-    
+
     it "should return an instance of Riddle::Client" do
       @config.client.should be_a(Riddle::Client)
     end
-    
+
     it "should use the configuration address" do
       @config.client.server.should == 'domain.url'
     end
-    
+
     it "should use the configuration port" do
       @config.client.port.should == 3333
     end
-    
+
     it "should use the configuration max matches" do
       @config.client.max_matches.should == 100
     end
@@ -276,17 +276,55 @@ describe ThinkingSphinx::Configuration do
     it "should use the configuration timeout" do
       @config.client.timeout.should == 1
     end
+
+    describe 'when shuffle is enabled' do
+      let(:client) { double('client', :max_matches= => nil, :timeout= => nil) }
+
+      before :each do
+        @config.shuffle = true
+      end
+
+      it "should shuffle client servers" do
+        @config.address = ['1.1.1.1', '2.2.2.2']
+        @config.address.stub!(:shuffle => ['2.2.2.2', '1.1.1.1'])
+
+        Riddle::Client.should_receive(:new) do |addresses, port, key|
+          addresses.should == ['2.2.2.2', '1.1.1.1']
+          client
+        end
+        @config.client
+      end
+    end
+
+    describe 'when shuffle is disabled' do
+      let(:client) { double('client', :max_matches= => nil, :timeout= => nil) }
+
+      before :each do
+        @config.shuffle = false
+      end
+
+      it "should not shuffle client servers" do
+        @config.address = ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
+
+        @config.address.should_not_receive(:shuffle)
+        Riddle::Client.should_receive(:new) do |addresses, port, key|
+          addresses.should == ['1.1.1.1', '2.2.2.2.', '3.3.3.3', '4.4.4.4', '5.5.5.5']
+          client
+        end
+        @config.client
+      end
+    end
   end
-  
+
   describe '#models_by_crc' do
     before :each do
       @config = ThinkingSphinx::Configuration.instance
     end
-    
+
     it "should return a hash" do
       @config.models_by_crc.should be_a(Hash)
     end
-    
+
     it "should pair class names to their crc codes" do
       @config.models_by_crc[Person.to_crc32].should == 'Person'
       @config.models_by_crc[Alpha.to_crc32].should  == 'Alpha'

data/spec/thinking_sphinx/context_spec.rb

@@ -31,18 +31,20 @@ describe ThinkingSphinx::Context do
       }.should_not raise_error
     end
 
-    it "should not raise errors if the file name does not represent a class name" do
-      class_name.should_receive(:constantize).and_raise(NameError)
+    it "should report name errors but not raise them" do
+      class_name.stub(:constantize).and_raise(NameError)
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
 
       lambda {
         ts_context.prepare
       }.should_not raise_error
     end
 
-    # Fails in Ruby 1.9 (or maybe it's an RSpec update). Not sure why.
-    it "should retry if the first pass fails and contains a directory" do
+    it "should report load errors but not raise them" do
       class_name.stub(:constantize).and_raise(LoadError)
-      model_name_lower.should_receive(:gsub!).twice.and_return(true, nil)
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
 
       lambda {
         ts_context.prepare

metadata

@@ -1,141 +1,148 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: thinking-sphinx
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.4.8
   prerelease: 
-  version: 1.4.7
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-28 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70247840819240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - <
-      - !ruby/object:Gem::Version 
+      - !ruby/object:Gem::Version
         version: 3.0.0
-    - - ">="
-      - !ruby/object:Gem::Version 
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.15.6
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840819240
+- !ruby/object:Gem::Dependency
   name: after_commit
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70247840830120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.7
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840830120
+- !ruby/object:Gem::Dependency
   name: riddle
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70247840827220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840827220
+- !ruby/object:Gem::Dependency
+  name: builder
+  requirement: &70247840841860 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70247840841860
+- !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70247840840300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.0.2
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840840300
+- !ruby/object:Gem::Dependency
   name: faker
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70247840839480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.3.1
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840839480
+- !ruby/object:Gem::Dependency
   name: ginger
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70247840837960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840837960
+- !ruby/object:Gem::Dependency
   name: rake
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70247840836280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840836280
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70247840834860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840834860
+- !ruby/object:Gem::Dependency
   name: will_paginate
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70247840860800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 2.3.15
   type: :development
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70247840860800
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70247840858980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *id010
-description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
-email: 
+  version_requirements: *70247840858980
+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: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/cucumber/thinking_sphinx/external_world.rb
 - lib/cucumber/thinking_sphinx/internal_world.rb
 - lib/cucumber/thinking_sphinx/sql_logger.rb
@@ -306,44 +313,42 @@ files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: true
 homepage: http://freelancing-god.github.com/ts/en/
 licenses: []
+post_install_message: ! 'If you''re upgrading, you should read this:
 
-post_install_message: |+
-  If you're upgrading, you should read this:
   http://freelancing-god.github.com/ts/en/upgrading.html
-  
-rdoc_options: []
 
-require_paths: 
+
+'
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3481790220577304341
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 213269573816291082
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3481790220577304341
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 213269573816291082
 requirements: []
-
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
-test_files: 
+test_files:
 - features/abstract_inheritance.feature
 - features/alternate_primary_key.feature
 - features/attribute_transformation.feature