sphinx 0.9.10 → 0.9.10.2043

data/spec/spec_helper.rb

@@ -0,0 +1,24 @@
+require File.dirname(__FILE__) + '/../init'
+
+# Helper exception class to omit real dialogue between client and server
+class SphinxSpecError < StandardError; end
+
+# Runs PHP fixture to get request dump
+def sphinx_fixture(name)
+  `php #{File.dirname(__FILE__)}/fixtures/#{name}.php`
+end
+
+def sphinx_create_client
+  @sphinx = Sphinx::Client.new
+  @sock = mock('SocketMock')
+
+  servers = @sphinx.instance_variable_get(:@servers)
+  servers.first.stub(:get_socket => @sock, :free_socket => nil)
+  @sphinx.stub!(:parse_response).and_raise(SphinxSpecError)
+  return @sphinx
+end
+
+def sphinx_safe_call
+  yield
+rescue SphinxSpecError
+end

data/sphinx.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sphinx}
-  s.version = "0.9.10"
+  s.version = "0.9.10.2043"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dmytro Shteflyuk"]
-  s.date = %q{2009-11-04}
+  s.date = %q{2009-11-16}
   s.description = %q{An easy interface to Sphinx standalone full-text search engine. It is implemented as plugin for Ruby on Rails, but can be easily used as standalone library.}
   s.email = %q{kpumuk@kpumuk.info}
   s.extra_rdoc_files = [
@@ -21,13 +21,16 @@ Gem::Specification.new do |s|
      "Rakefile",
      "VERSION.yml",
      "init.rb",
-     "install.rb",
      "lib/sphinx.rb",
+     "lib/sphinx/buffered_io.rb",
      "lib/sphinx/client.rb",
      "lib/sphinx/request.rb",
      "lib/sphinx/response.rb",
+     "lib/sphinx/server.rb",
+     "lib/sphinx/timeout.rb",
      "spec/client_response_spec.rb",
      "spec/client_spec.rb",
+     "spec/client_validations_spec.rb",
      "spec/fixtures/default_search.php",
      "spec/fixtures/default_search_index.php",
      "spec/fixtures/excerpt_custom.php",
@@ -92,12 +95,11 @@ Gem::Specification.new do |s|
      "spec/fixtures/update_attributes.php",
      "spec/fixtures/update_attributes_mva.php",
      "spec/fixtures/weights.php",
+     "spec/spec_helper.rb",
      "spec/sphinx/sphinx-id64.conf",
      "spec/sphinx/sphinx.conf",
      "spec/sphinx/sphinx_test.sql",
-     "sphinx.gemspec",
-     "sphinx.yml.tpl",
-     "tasks/sphinx.rake"
+     "sphinx.gemspec"
   ]
   s.homepage = %q{http://github.com/kpumuk/sphinx}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -106,7 +108,9 @@ Gem::Specification.new do |s|
   s.summary = %q{Sphinx Client API for Ruby}
   s.test_files = [
     "spec/client_response_spec.rb",
-     "spec/client_spec.rb"
+     "spec/client_spec.rb",
+     "spec/client_validations_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sphinx
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.10.2043
 platform: ruby
 authors: 
 - Dmytro Shteflyuk
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-04 00:00:00 +02:00
+date: 2009-11-16 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -27,13 +27,16 @@ files:
 - Rakefile
 - VERSION.yml
 - init.rb
-- install.rb
 - lib/sphinx.rb
+- lib/sphinx/buffered_io.rb
 - lib/sphinx/client.rb
 - lib/sphinx/request.rb
 - lib/sphinx/response.rb
+- lib/sphinx/server.rb
+- lib/sphinx/timeout.rb
 - spec/client_response_spec.rb
 - spec/client_spec.rb
+- spec/client_validations_spec.rb
 - spec/fixtures/default_search.php
 - spec/fixtures/default_search_index.php
 - spec/fixtures/excerpt_custom.php
@@ -98,12 +101,11 @@ files:
 - spec/fixtures/update_attributes.php
 - spec/fixtures/update_attributes_mva.php
 - spec/fixtures/weights.php
+- spec/spec_helper.rb
 - spec/sphinx/sphinx-id64.conf
 - spec/sphinx/sphinx.conf
 - spec/sphinx/sphinx_test.sql
 - sphinx.gemspec
-- sphinx.yml.tpl
-- tasks/sphinx.rake
 has_rdoc: true
 homepage: http://github.com/kpumuk/sphinx
 licenses: []
@@ -135,3 +137,5 @@ summary: Sphinx Client API for Ruby
 test_files: 
 - spec/client_response_spec.rb
 - spec/client_spec.rb
+- spec/client_validations_spec.rb
+- spec/spec_helper.rb

data/install.rb

@@ -1,5 +0,0 @@
-require 'fileutils'
-
-sphinx_config = File.dirname(__FILE__) + '/../../../config/sphinx.yml'
-FileUtils.cp File.dirname(__FILE__) + '/sphinx.yml.tpl', sphinx_config unless File.exist?(sphinx_config)
-puts IO.read(File.join(File.dirname(__FILE__), 'README'))

data/sphinx.yml.tpl

@@ -1,3 +0,0 @@
-config_file: /opt/sphinx/etc/sphinx.conf
-root_dir: /opt/sphinx/bin
-indexes: test1 test2

data/tasks/sphinx.rake

@@ -1,75 +0,0 @@
-namespace :sphinx do
-  desc 'Run indexer for configured indexes'
-  task :index do
-    config = load_config
-    if config[:indexes]
-      system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" #{config[:indexes]}"
-    else
-      puts 'You should specify indexes in sphinx.yml'
-    end
-  end
-
-  desc 'Run indexer for all indexes'
-  task :index_all do
-    config = load_config
-    system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --all"
-  end
-
-  desc 'Rotate configured indexes and restart searchd server'
-  task :rotate do
-    config = load_config
-    if config[:indexes]
-      system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --rotate #{config[:indexes]}"
-    else
-      puts 'You should specify indexes in sphinx.yml'
-    end
-  end
-
-  desc 'Rotate all indexes and restart searchd server'
-  task :rotate_all do
-    config = load_config
-    system "#{config[:root_dir]}/indexer --config \"#{config[:config_file]}\" --rotate --all"
-  end
-  
-  desc 'Start searchd server'
-  task :start do
-    config = load_config
-    if File.exists?(config[:pid_file])
-      puts 'Sphinx searchd server is already started.'
-    else
-      system "#{config[:root_dir]}/searchd --config \"#{config[:config_file]}\""
-      puts 'Sphinx searchd server started.'
-    end
-  end
-  
-  desc 'Stop searchd server'
-  task :stop do
-    config = load_config
-    unless File.exists?(config[:pid_file])
-      puts 'Sphinx searchd server is not running.'
-    else
-      pid = File.read(config[:pid_file]).chomp
-      kill 'SIGHUP', pid
-      puts 'Sphinx searchd server stopped.'
-    end
-  end
-  
-  desc 'Restart searchd server'
-  task :restart => [:stop, :start]
-  
-  def load_config
-    return @sphinx_config if @sphinx_config
-
-    options = YAML.load_file(File.dirname(__FILE__) + '/../../../../config/sphinx.yml') rescue {}
-    @sphinx_config = {
-      :config_file => options['config_file'] || '/etc/sphinx.conf',
-      :root_dir => options['root_dir'] || '/usr/bin',
-      :indexes => options['indexes']
-    }
-    sphinx_config = File.read(@sphinx_config[:config_file]) rescue ''
-    
-    sphinx_config =~ /searchd\s*{.*pid_file\s*=\s*(.*?)\n.*}/m
-    @sphinx_config[:pid_file] = $1 || '/var/run/searchd.pid'
-    return @sphinx_config
-  end
-end