riddle 1.4.0 → 1.5.0

data/spec/unit/configuration_spec.rb

@@ -3,20 +3,20 @@ require 'spec_helper'
 describe Riddle::Configuration do
   it "should render all given indexes and sources, plus the indexer and search sections" do
     config = Riddle::Configuration.new
-    
+
     config.searchd.port = 3312
     config.searchd.pid_file = "file.pid"
-    
+
     source = Riddle::Configuration::XMLSource.new("src1", "xmlpipe")
     source.xmlpipe_command = "ls /dev/null"
-    
+
     index = Riddle::Configuration::Index.new("index1")
     index.path = "/path/to/index1"
     index.sources << source
-    
-    config.indexes << index
+
+    config.indices << index
     generated_conf = config.render
-    
+
     generated_conf.should match(/index index1/)
     generated_conf.should match(/source src1/)
     generated_conf.should match(/indexer/)

metadata

@@ -1,72 +1,63 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: riddle
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.5.0
   prerelease: 
-  version: 1.4.0
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 +10:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: mysql2
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-11-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70319939317800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 0.3.2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: jeweler
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        version: 1.5.1
-  type: :development
-  prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70319939317800
+- !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70319939316860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *70319939316860
+- !ruby/object:Gem::Dependency
   name: yard
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70319939316300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.6.8
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
   type: :development
   prerelease: false
-  version_requirements: *id004
+  version_requirements: *70319939316300
 description: A Ruby API and configuration helper for the Sphinx search service.
-email: pat@freelancing-gods.com
+email:
+- pat@freelancing-gods.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.textile
-files: 
+extra_rdoc_files: []
+files:
+- .gitignore
+- .travis.yml
+- Gemfile
+- HISTORY
+- LICENCE
 - README.textile
+- Rakefile
 - lib/riddle.rb
 - lib/riddle/0.9.8.rb
 - lib/riddle/0.9.9.rb
@@ -98,6 +89,104 @@ files:
 - lib/riddle/query/delete.rb
 - lib/riddle/query/insert.rb
 - lib/riddle/query/select.rb
+- lib/riddle/version.rb
+- riddle.gemspec
+- spec/fixtures/.gitignore
+- spec/fixtures/data/0.9.9/anchor.bin
+- spec/fixtures/data/0.9.9/any.bin
+- spec/fixtures/data/0.9.9/boolean.bin
+- spec/fixtures/data/0.9.9/comment.bin
+- spec/fixtures/data/0.9.9/distinct.bin
+- spec/fixtures/data/0.9.9/field_weights.bin
+- spec/fixtures/data/0.9.9/filter.bin
+- spec/fixtures/data/0.9.9/filter_array.bin
+- spec/fixtures/data/0.9.9/filter_array_exclude.bin
+- spec/fixtures/data/0.9.9/filter_boolean.bin
+- spec/fixtures/data/0.9.9/filter_floats.bin
+- spec/fixtures/data/0.9.9/filter_floats_exclude.bin
+- spec/fixtures/data/0.9.9/filter_range.bin
+- spec/fixtures/data/0.9.9/filter_range_exclude.bin
+- spec/fixtures/data/0.9.9/group.bin
+- spec/fixtures/data/0.9.9/index.bin
+- spec/fixtures/data/0.9.9/index_weights.bin
+- spec/fixtures/data/0.9.9/keywords_with_hits.bin
+- spec/fixtures/data/0.9.9/keywords_without_hits.bin
+- spec/fixtures/data/0.9.9/overrides.bin
+- spec/fixtures/data/0.9.9/phrase.bin
+- spec/fixtures/data/0.9.9/rank_mode.bin
+- spec/fixtures/data/0.9.9/select.bin
+- spec/fixtures/data/0.9.9/simple.bin
+- spec/fixtures/data/0.9.9/sort.bin
+- spec/fixtures/data/0.9.9/update_simple.bin
+- spec/fixtures/data/0.9.9/weights.bin
+- spec/fixtures/data/1.10/anchor.bin
+- spec/fixtures/data/1.10/any.bin
+- spec/fixtures/data/1.10/boolean.bin
+- spec/fixtures/data/1.10/comment.bin
+- spec/fixtures/data/1.10/distinct.bin
+- spec/fixtures/data/1.10/field_weights.bin
+- spec/fixtures/data/1.10/filter.bin
+- spec/fixtures/data/1.10/filter_array.bin
+- spec/fixtures/data/1.10/filter_array_exclude.bin
+- spec/fixtures/data/1.10/filter_boolean.bin
+- spec/fixtures/data/1.10/filter_floats.bin
+- spec/fixtures/data/1.10/filter_floats_exclude.bin
+- spec/fixtures/data/1.10/filter_range.bin
+- spec/fixtures/data/1.10/filter_range_exclude.bin
+- spec/fixtures/data/1.10/group.bin
+- spec/fixtures/data/1.10/index.bin
+- spec/fixtures/data/1.10/index_weights.bin
+- spec/fixtures/data/1.10/keywords_with_hits.bin
+- spec/fixtures/data/1.10/keywords_without_hits.bin
+- spec/fixtures/data/1.10/overrides.bin
+- spec/fixtures/data/1.10/phrase.bin
+- spec/fixtures/data/1.10/rank_mode.bin
+- spec/fixtures/data/1.10/select.bin
+- spec/fixtures/data/1.10/simple.bin
+- spec/fixtures/data/1.10/sort.bin
+- spec/fixtures/data/1.10/update_simple.bin
+- spec/fixtures/data/1.10/weights.bin
+- spec/fixtures/data/2.0.1/anchor.bin
+- spec/fixtures/data/2.0.1/any.bin
+- spec/fixtures/data/2.0.1/boolean.bin
+- spec/fixtures/data/2.0.1/comment.bin
+- spec/fixtures/data/2.0.1/distinct.bin
+- spec/fixtures/data/2.0.1/field_weights.bin
+- spec/fixtures/data/2.0.1/filter.bin
+- spec/fixtures/data/2.0.1/filter_array.bin
+- spec/fixtures/data/2.0.1/filter_array_exclude.bin
+- spec/fixtures/data/2.0.1/filter_boolean.bin
+- spec/fixtures/data/2.0.1/filter_floats.bin
+- spec/fixtures/data/2.0.1/filter_floats_exclude.bin
+- spec/fixtures/data/2.0.1/filter_range.bin
+- spec/fixtures/data/2.0.1/filter_range_exclude.bin
+- spec/fixtures/data/2.0.1/group.bin
+- spec/fixtures/data/2.0.1/index.bin
+- spec/fixtures/data/2.0.1/index_weights.bin
+- spec/fixtures/data/2.0.1/keywords_with_hits.bin
+- spec/fixtures/data/2.0.1/keywords_without_hits.bin
+- spec/fixtures/data/2.0.1/overrides.bin
+- spec/fixtures/data/2.0.1/phrase.bin
+- spec/fixtures/data/2.0.1/rank_mode.bin
+- spec/fixtures/data/2.0.1/select.bin
+- spec/fixtures/data/2.0.1/simple.bin
+- spec/fixtures/data/2.0.1/sort.bin
+- spec/fixtures/data/2.0.1/update_simple.bin
+- spec/fixtures/data/2.0.1/weights.bin
+- spec/fixtures/data_generator.0.9.8.php
+- spec/fixtures/data_generator.0.9.9.php
+- spec/fixtures/data_generator.1.10.php
+- spec/fixtures/data_generator.2.0.1.php
+- spec/fixtures/data_generator.php
+- spec/fixtures/sphinx/configuration.erb
+- spec/fixtures/sphinxapi.0.9.8.php
+- spec/fixtures/sphinxapi.0.9.9.php
+- spec/fixtures/sphinxapi.1.10.php
+- spec/fixtures/sphinxapi.2.0.1.php
+- spec/fixtures/sql/conf.example.yml
+- spec/fixtures/sql/data.sql
+- spec/fixtures/sql/data.tsv
+- spec/fixtures/sql/structure.sql
 - spec/functional/connection_spec.rb
 - spec/functional/excerpt_spec.rb
 - spec/functional/keywords_spec.rb
@@ -115,7 +204,8 @@ files:
 - spec/riddle/query_spec.rb
 - spec/riddle_spec.rb
 - spec/spec_helper.rb
-- spec/sphinx_helper.rb
+- spec/support/binary_fixtures.rb
+- spec/support/sphinx.rb
 - spec/unit/client_spec.rb
 - spec/unit/configuration/distributed_index_spec.rb
 - spec/unit/configuration/index_spec.rb
@@ -130,38 +220,133 @@ files:
 - spec/unit/message_spec.rb
 - spec/unit/response_spec.rb
 - spec/unit/riddle_spec.rb
-has_rdoc: true
 homepage: http://freelancing-god.github.com/riddle/
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+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: 1550771664451883617
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3403053604125557779
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -3403053604125557779
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.6.2
+rubyforge_project: riddle
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: An API for Sphinx, written in and for Ruby.
-test_files: 
+test_files:
+- spec/fixtures/.gitignore
+- spec/fixtures/data/0.9.9/anchor.bin
+- spec/fixtures/data/0.9.9/any.bin
+- spec/fixtures/data/0.9.9/boolean.bin
+- spec/fixtures/data/0.9.9/comment.bin
+- spec/fixtures/data/0.9.9/distinct.bin
+- spec/fixtures/data/0.9.9/field_weights.bin
+- spec/fixtures/data/0.9.9/filter.bin
+- spec/fixtures/data/0.9.9/filter_array.bin
+- spec/fixtures/data/0.9.9/filter_array_exclude.bin
+- spec/fixtures/data/0.9.9/filter_boolean.bin
+- spec/fixtures/data/0.9.9/filter_floats.bin
+- spec/fixtures/data/0.9.9/filter_floats_exclude.bin
+- spec/fixtures/data/0.9.9/filter_range.bin
+- spec/fixtures/data/0.9.9/filter_range_exclude.bin
+- spec/fixtures/data/0.9.9/group.bin
+- spec/fixtures/data/0.9.9/index.bin
+- spec/fixtures/data/0.9.9/index_weights.bin
+- spec/fixtures/data/0.9.9/keywords_with_hits.bin
+- spec/fixtures/data/0.9.9/keywords_without_hits.bin
+- spec/fixtures/data/0.9.9/overrides.bin
+- spec/fixtures/data/0.9.9/phrase.bin
+- spec/fixtures/data/0.9.9/rank_mode.bin
+- spec/fixtures/data/0.9.9/select.bin
+- spec/fixtures/data/0.9.9/simple.bin
+- spec/fixtures/data/0.9.9/sort.bin
+- spec/fixtures/data/0.9.9/update_simple.bin
+- spec/fixtures/data/0.9.9/weights.bin
+- spec/fixtures/data/1.10/anchor.bin
+- spec/fixtures/data/1.10/any.bin
+- spec/fixtures/data/1.10/boolean.bin
+- spec/fixtures/data/1.10/comment.bin
+- spec/fixtures/data/1.10/distinct.bin
+- spec/fixtures/data/1.10/field_weights.bin
+- spec/fixtures/data/1.10/filter.bin
+- spec/fixtures/data/1.10/filter_array.bin
+- spec/fixtures/data/1.10/filter_array_exclude.bin
+- spec/fixtures/data/1.10/filter_boolean.bin
+- spec/fixtures/data/1.10/filter_floats.bin
+- spec/fixtures/data/1.10/filter_floats_exclude.bin
+- spec/fixtures/data/1.10/filter_range.bin
+- spec/fixtures/data/1.10/filter_range_exclude.bin
+- spec/fixtures/data/1.10/group.bin
+- spec/fixtures/data/1.10/index.bin
+- spec/fixtures/data/1.10/index_weights.bin
+- spec/fixtures/data/1.10/keywords_with_hits.bin
+- spec/fixtures/data/1.10/keywords_without_hits.bin
+- spec/fixtures/data/1.10/overrides.bin
+- spec/fixtures/data/1.10/phrase.bin
+- spec/fixtures/data/1.10/rank_mode.bin
+- spec/fixtures/data/1.10/select.bin
+- spec/fixtures/data/1.10/simple.bin
+- spec/fixtures/data/1.10/sort.bin
+- spec/fixtures/data/1.10/update_simple.bin
+- spec/fixtures/data/1.10/weights.bin
+- spec/fixtures/data/2.0.1/anchor.bin
+- spec/fixtures/data/2.0.1/any.bin
+- spec/fixtures/data/2.0.1/boolean.bin
+- spec/fixtures/data/2.0.1/comment.bin
+- spec/fixtures/data/2.0.1/distinct.bin
+- spec/fixtures/data/2.0.1/field_weights.bin
+- spec/fixtures/data/2.0.1/filter.bin
+- spec/fixtures/data/2.0.1/filter_array.bin
+- spec/fixtures/data/2.0.1/filter_array_exclude.bin
+- spec/fixtures/data/2.0.1/filter_boolean.bin
+- spec/fixtures/data/2.0.1/filter_floats.bin
+- spec/fixtures/data/2.0.1/filter_floats_exclude.bin
+- spec/fixtures/data/2.0.1/filter_range.bin
+- spec/fixtures/data/2.0.1/filter_range_exclude.bin
+- spec/fixtures/data/2.0.1/group.bin
+- spec/fixtures/data/2.0.1/index.bin
+- spec/fixtures/data/2.0.1/index_weights.bin
+- spec/fixtures/data/2.0.1/keywords_with_hits.bin
+- spec/fixtures/data/2.0.1/keywords_without_hits.bin
+- spec/fixtures/data/2.0.1/overrides.bin
+- spec/fixtures/data/2.0.1/phrase.bin
+- spec/fixtures/data/2.0.1/rank_mode.bin
+- spec/fixtures/data/2.0.1/select.bin
+- spec/fixtures/data/2.0.1/simple.bin
+- spec/fixtures/data/2.0.1/sort.bin
+- spec/fixtures/data/2.0.1/update_simple.bin
+- spec/fixtures/data/2.0.1/weights.bin
+- spec/fixtures/data_generator.0.9.8.php
+- spec/fixtures/data_generator.0.9.9.php
+- spec/fixtures/data_generator.1.10.php
+- spec/fixtures/data_generator.2.0.1.php
+- spec/fixtures/data_generator.php
+- spec/fixtures/sphinx/configuration.erb
+- spec/fixtures/sphinxapi.0.9.8.php
+- spec/fixtures/sphinxapi.0.9.9.php
+- spec/fixtures/sphinxapi.1.10.php
+- spec/fixtures/sphinxapi.2.0.1.php
+- spec/fixtures/sql/conf.example.yml
+- spec/fixtures/sql/data.sql
+- spec/fixtures/sql/data.tsv
+- spec/fixtures/sql/structure.sql
 - spec/functional/connection_spec.rb
 - spec/functional/excerpt_spec.rb
 - spec/functional/keywords_spec.rb
@@ -179,7 +364,8 @@ test_files:
 - spec/riddle/query_spec.rb
 - spec/riddle_spec.rb
 - spec/spec_helper.rb
-- spec/sphinx_helper.rb
+- spec/support/binary_fixtures.rb
+- spec/support/sphinx.rb
 - spec/unit/client_spec.rb
 - spec/unit/configuration/distributed_index_spec.rb
 - spec/unit/configuration/index_spec.rb

data/spec/sphinx_helper.rb

@@ -1,96 +0,0 @@
-require 'erb'
-require 'yaml'
-
-class SphinxHelper
-  attr_accessor :host, :username, :password
-  attr_reader   :path
-  
-  def initialize
-    @host     = "localhost"
-    @username = "anonymous"
-    @password = ""
-
-    if File.exist?("spec/fixtures/sql/conf.yml")
-      config    = YAML.load(File.open("spec/fixtures/sql/conf.yml"))
-      @host     = config["host"]
-      @username = config["username"]
-      @password = config["password"]
-    end
-    
-    @path = File.expand_path(File.dirname(__FILE__))
-  end
-  
-  def setup_mysql
-    client = Mysql2::Client.new(
-      :host => @host,
-      :username => @username,
-      :password => @password
-    )
-
-    databases = client.query('SHOW DATABASES', :as => :array).to_a.flatten
-    unless databases.include?('riddle')
-      client.query 'CREATE DATABASE riddle'
-    end
-
-    client.query "USE riddle"
-    
-    structure = File.open("spec/fixtures/sql/structure.sql") { |f| f.read }
-    structure.split(/;/).each { |sql| client.query sql }
-    client.query <<-SQL
-      LOAD DATA INFILE '#{@path}/fixtures/sql/data.tsv' INTO TABLE
-      `riddle`.`people` FIELDS TERMINATED BY ',' ENCLOSED BY "'" (gender,
-      first_name, middle_initial, last_name, street_address, city, state,
-      postcode, email, birthday)
-    SQL
-
-    client.close
-  end
-  
-  def reset
-    setup_mysql
-    index
-  end
-  
-  def generate_configuration
-    template = File.open("spec/fixtures/sphinx/configuration.erb") { |f| f.read }
-    File.open("spec/fixtures/sphinx/spec.conf", "w") { |f|
-      f.puts ERB.new(template).result(binding)
-    }
-  end
-  
-  def index
-    cmd = "indexer --config #{@path}/fixtures/sphinx/spec.conf --all"
-    cmd << " --rotate" if running?
-    `#{cmd}`
-  end
-  
-  def start
-    return if running?
-
-    cmd = "searchd --config #{@path}/fixtures/sphinx/spec.conf"
-    `#{cmd}`
-
-    sleep(1)
-
-    unless running?
-      puts "Failed to start searchd daemon. Check fixtures/sphinx/searchd.log."
-    end
-  end
-  
-  def stop
-    return unless running?
-    `kill #{pid}`
-  end
-  
-  def pid
-    if File.exists?("#{@path}/fixtures/sphinx/searchd.pid")
-      `cat #{@path}/fixtures/sphinx/searchd.pid`[/\d+/]
-    else
-      nil
-    end
-  end
-
-  def running?
-    pid && `ps #{pid} | wc -l`.to_i > 1
-  end
-end