thinking-sphinx 1.5.0 → 2.0.0.rc1

data/features/searching_across_models.feature

@@ -7,7 +7,7 @@ Feature: Searching across multiple model
     Given Sphinx is running
     When I search for James
     And I am retrieving the result count
-    Then I should get a value of 6
+    Then I should get a value of 3
   
   Scenario: Confirming existance of a document id in a given index
     Given Sphinx is running

data/features/searching_by_index.feature

@@ -2,21 +2,21 @@ Feature: Searching within a single index
   In order to use Thinking Sphinx's core functionality
   A developer
   Should be able to search on a single index
-
+ 
   Scenario: Searching with alternative index
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     And I use index alternative_core
     Then I should get 7 results
-
+ 
   Scenario: Searching with default index
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     And I use index alpha_core
     Then I should get 10 results
-
+ 
   Scenario: Searching without specified index
     Given Sphinx is running
     And I am searching on alphas
@@ -26,15 +26,14 @@ Feature: Searching within a single index
   Scenario: Deleting instances from the core index
     Given Sphinx is running
     And I am searching on alphas
-
+    
     When I create a new alpha named eleven
     And I process the alpha_core index
     And I process the alternative_core index
     And I wait for Sphinx to catch up
-    And I clear the connection pool
     And I search for eleven
     Then I should get 1 result
-
+    
     When I destroy alpha eleven
     And I wait for Sphinx to catch up
     And I search for eleven

data/features/searching_by_model.feature

@@ -2,19 +2,19 @@ Feature: Searching on a single model
   In order to use Thinking Sphinx's core functionality
   A developer
   Should be able to search on a single model
-
+  
   Scenario: Searching using a basic query
     Given Sphinx is running
     And I am searching on people
     When I search for James
     Then I should get 3 results
-
+  
   Scenario: Searching on a specific field
     Given Sphinx is running
     And I am searching on people
     When I search for James on first_name
     Then I should get 2 results
-
+  
   Scenario: Searching on multiple fields
     Given Sphinx is running
     And I am searching on people
@@ -25,32 +25,32 @@ Feature: Searching on a single model
   Scenario: Searching on association content
 	  Given Sphinx is running
 	  And I am searching on posts
-
+	
 	  When I search for "Waffles"
 	  Then I should get 1 result
 
 	  When I search for "Turtle"
 	  Then I should get 1 result
-
+  
   Scenario: Searching with a filter
     Given Sphinx is running
     And I am searching on alphas
     When I filter by 1 on value
     Then I should get 1 result
-
+  
   Scenario: Searching with multiple filters
     Given Sphinx is running
     And I am searching on boxes
     When I filter by 2 on width
     And I filter by 2 on length
     Then I should get 1 result
-
+  
   Scenario: Searching with a ranged time filter
     Given Sphinx is running
     And I am searching on people
     When I filter by birthday between 1975 and 1976
     Then I should get 16 results
-
+    
   Scenario: Searching to filter multiple values on an MVA
     Given Sphinx is running
     And I am searching on boxes
@@ -59,25 +59,25 @@ Feature: Searching on a single model
     When I clear existing filters
     And I filter by both 11 and 12 on dimensions
     Then I should get 1 result
-
+  
   Scenario: Filtering on timestamp MVAs
     Given Sphinx is running
     And I am searching on posts
     When I filter by 2001-01-01 on comments_created_at
     Then I should get 1 result
-
+  
   Scenario: Searching by NULL/0 values in MVAs
     Given Sphinx is running
     And I am searching on boxes
     When I filter by 0 on dimensions
     Then I should get 1 result
-
+    
     Given Sphinx is running
     And I am searching on developers
     When I clear existing filters
     And I filter by 0 on tag_ids
     Then I should get 1 result
-
+  
   Scenario: Searching on a MVA configured as ranged_query
     Given Sphinx is running
     And I am searching on posts
@@ -89,59 +89,66 @@ Feature: Searching on a single model
     When I clear existing filters
     And I filter by 10 on comment_ids
     Then I should get 0 results
-
+  
   Scenario: Searching with ordering by attribute
     Given Sphinx is running
     And I am searching on alphas
     When I order by value
     Then I should get 10 results
     And the value of each result should indicate order
-
+  
+  Scenario: Searching with ordering on a sortable field
+    Given Sphinx is running
+    And I am searching on people
+    And I order by first_name
+    Then I should get 20 results
+    And the first_name of each result should indicate order
+  
   Scenario: Intepreting Sphinx Internal Identifiers
     Given Sphinx is running
     And I am searching on people
     Then I should get 20 results
     And each result id should match the corresponding sphinx internal id
-
+  
   Scenario: Retrieving weightings
     Given Sphinx is running
     And I am searching on people
     When I search for "Ellie Ford"
     And I set match mode to any
     Then I can iterate by result and weighting
-
+  
   Scenario: Retrieving group counts
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and count
-
+  
   Scenario: Retrieving group values
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and group
-
+  
   Scenario: Retrieving both group values and counts
     Given Sphinx is running
     And I am searching on people
     When I group results by the birthday attribute
     Then I can iterate by result and group and count
-
+  
   Scenario: Searching for ids
     Given Sphinx is running
     And I am searching on people
     When I search for Ellie
     And I am searching for ids
     Then I should have an array of integers
-
+  
   Scenario: Search results should match Sphinx's order
     Given Sphinx is running
     And I am searching on people
     When I search for Ellie
     And I order by "sphinx_internal_id DESC"
     Then searching for ids should match the record ids of the normal search results
-
+  
   Scenario: Retrieving total result count when total is less than a page
     Given Sphinx is running
     And I am searching on people
@@ -154,7 +161,7 @@ Feature: Searching on a single model
     And I am searching on people
     When I am retrieving the result count
     Then I should get a value of 1000
-
+  
   Scenario: Searching with Unicode Characters
     Given Sphinx is running
     And I am searching on people
@@ -166,10 +173,3 @@ Feature: Searching on a single model
     And I am searching on posts
     When I search for "Shakespeare"
     Then I should get 1 result
-
-  Scenario: Searching on content from file field
-    Given Sphinx is running
-    And I am searching on posts
-    When I search for "foo bar baz"
-    Then I should get 1 result
-

data/features/sphinx_scopes.feature

@@ -40,29 +40,3 @@ Feature: Sphinx Scopes
     When I use the with_first_name scope set to "Andrew"
     And I am retrieving the scoped result count
     Then I should get a value of 7
-
-  Scenario: Counts with scopes and additional query terms
-    Given Sphinx is running
-    And I am searching on people
-    When I use the with_first_name scope set to "Andrew"
-    And I am retrieving the scoped result count for "Byrne"
-    Then I should get a value of 1
-  
-  Scenario: Default Scope
-    Given Sphinx is running
-    And I am searching on andrews
-    Then I should get 7 results
-  
-  Scenario: Default Scope and additional query terms
-    Given Sphinx is running
-    And I am searching on andrews
-    When I search for "Byrne"
-    Then I should get 1 result
-  
-  Scenario: Explicit scope plus search over a default scope
-    Given Sphinx is running
-    And I am searching on andrews
-    When I use the locked_last_name scope
-    And I search for "Cecil"
-    Then I should get 1 result
-  

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,6 @@
 Before do
   $queries_executed = []
-
+  
   @model      = nil
   @method     = :search
   @query      = ""
@@ -10,7 +10,7 @@ Before do
   @with_all   = {}
   @options    = {}
   @results    = nil
-
+  
   Given "updates are enabled"
 end
 
@@ -46,10 +46,6 @@ When /^I search for (\w+)$/ do |query|
   @query = query
 end
 
-When /^I clear the connection pool$/ do
-  ThinkingSphinx::Connection.pool.clear
-end
-
 When /^I search for "([^\"]*)"$/ do |query|
   @results = nil
   @query = query
@@ -99,13 +95,9 @@ When /^I filter between ([\d\.]+) and ([\d\.]+) on (\w+)$/ do |first, last, attr
   end
 end
 
-When /^I filter between (\d+) and (\d+) days ago on (\w+)(?: by (date))?$/ do |last, first, attribute, by_date|
+When /^I filter between (\d+) and (\d+) days ago on (\w+)$/ do |last, first, attribute|
   @results = nil
-
-  first, last = first.to_i.days.ago, last.to_i.days.ago
-  first, last = first.to_date, last.to_date if by_date
-
-  @with[attribute.to_sym] = first..last
+  @with[attribute.to_sym] = first.to_i.days.ago..last.to_i.days.ago
 end
 
 When /^I filter by (\w+) between (\d+) and (\d+)$/ do |attribute, first, last|
@@ -158,15 +150,11 @@ Then /^the (\w+) of each result should indicate order$/ do |attribute|
     unless prev.nil?
       current.send(attribute.to_sym).should >= prev.send(attribute.to_sym)
     end
-
+    
     current
   end
 end
 
-Then /^the first result's "([^"]*)" should be "([^"]*)"$/ do |attribute, value|
-  results.first.send(attribute.to_sym).should == value
-end
-
 Then /^I can iterate by result and (\w+)$/ do |attribute|
   iteration = lambda { |result, attr_value|
     result.should be_kind_of(@model)
@@ -174,7 +162,7 @@ Then /^I can iterate by result and (\w+)$/ do |attribute|
       attr_value.should be_kind_of(Integer)
     end
   }
-
+  
   results.send("each_with_#{attribute}", &iteration)
 end
 

data/features/step_definitions/scope_steps.rb

@@ -13,7 +13,3 @@ end
 When /^I am retrieving the scoped result count$/ do
   @results = results.search_count
 end
-
-When /^I am retrieving the scoped result count for "([^"]*)"$/ do |query|
-  @results = results.search_count query
-end

data/features/step_definitions/search_steps.rb

@@ -11,24 +11,24 @@ When /^I search for the document id of (\w+) (\w+) in the (\w+) index$/ do |mode
 end
 
 Then "it should exist" do
-  ThinkingSphinx.search_for_id(@id, @index).should == true
+  ThinkingSphinx::Search.search_for_id(@id, @index).should == true
 end
 
 Then "it should not exist" do
-  ThinkingSphinx.search_for_id(@id, @index).should == false
+  ThinkingSphinx::Search.search_for_id(@id, @index).should == false
 end
 
 Then "it should exist if using Rails 2.1 or newer" do
   require 'active_record/version'
   unless ActiveRecord::VERSION::STRING.to_f < 2.1
-    ThinkingSphinx.search_for_id(@id, @index).should == true
+    ThinkingSphinx::Search.search_for_id(@id, @index).should == true
   end
 end
 
 Then "it should not exist if using Rails 2.1 or newer" do
   require 'active_record/version'
   unless ActiveRecord::VERSION::STRING.to_f < 2.1
-    ThinkingSphinx.search_for_id(@id, @index).should == false
+    ThinkingSphinx::Search.search_for_id(@id, @index).should == false
   end
 end
 
@@ -87,8 +87,3 @@ end
 Then /^the first result should have a (\w+\s?\w*) of (\d+)$/ do |attribute, value|
   results.first.sphinx_attributes[attribute.gsub(/\s+/, '_')].should == value.to_i
 end
-
-Given /^I provide excerpt option "([a-z_]*)" with value "([^"]*)"$/ do |k, v|
-  @options[:excerpt_options] ||= {}
-  @options[:excerpt_options][k.to_sym] = v
-end

data/features/support/env.rb

@@ -1,10 +1,15 @@
 require 'rubygems'
+require 'cucumber'
+require 'rspec'
 require 'fileutils'
-require 'bundler'
-
-Bundler.require :default, :development
+require 'ginger'
+require 'will_paginate'
+require 'active_record'
 
 $:.unshift File.dirname(__FILE__) + '/../../lib'
+Dir[File.join(File.dirname(__FILE__), '../../vendor/*/lib')].each do |path|
+  $:.unshift path
+end
 
 require 'cucumber/thinking_sphinx/internal_world'
 
@@ -13,4 +18,6 @@ world.configure_database
 
 require "thinking_sphinx"
 
+ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
+
 world.setup

data/features/thinking_sphinx/db/fixtures/alphas.rb

@@ -1,8 +1,10 @@
-%w(
-  one two three four five six seven eight nine ten
-).each_with_index do |number, index|
-  value = index + 1
-  cost  = value.to_f + 0.5 + (value * 0.01)
-  Alpha.create :name => number, :value => value, :cost => cost,
-    :created_on => value.days.ago.to_date, :created_at => value.days.ago
-end
+Alpha.create :name => "one",    :value =>  1, :cost =>  1.51, :created_on =>  1.day.ago.to_date, :created_at =>  1.day.ago
+Alpha.create :name => "two",    :value =>  2, :cost =>  2.52, :created_on =>  2.day.ago.to_date, :created_at =>  2.day.ago
+Alpha.create :name => "three",  :value =>  3, :cost =>  3.53, :created_on =>  3.day.ago.to_date, :created_at =>  3.day.ago
+Alpha.create :name => "four",   :value =>  4, :cost =>  4.54, :created_on =>  4.day.ago.to_date, :created_at =>  4.day.ago
+Alpha.create :name => "five",   :value =>  5, :cost =>  5.55, :created_on =>  5.day.ago.to_date, :created_at =>  5.day.ago
+Alpha.create :name => "six",    :value =>  6, :cost =>  6.56, :created_on =>  6.day.ago.to_date, :created_at =>  6.day.ago
+Alpha.create :name => "seven",  :value =>  7, :cost =>  7.57, :created_on =>  7.day.ago.to_date, :created_at =>  7.day.ago
+Alpha.create :name => "eight",  :value =>  8, :cost =>  8.58, :created_on =>  8.day.ago.to_date, :created_at =>  8.day.ago
+Alpha.create :name => "nine",   :value =>  9, :cost =>  9.59, :created_on =>  9.day.ago.to_date, :created_at =>  9.day.ago
+Alpha.create :name => "ten",    :value => 10, :cost => 10.50, :created_on => 10.day.ago.to_date, :created_at => 10.day.ago

data/features/thinking_sphinx/db/fixtures/cats.rb

@@ -1,3 +1,3 @@
 %w( rogue nat molly jasper moggy ).each do |name|
-  Cat.new(:name => name).save(false)
+  Cat.create :name => name
 end

data/features/thinking_sphinx/db/fixtures/dogs.rb

@@ -1,3 +1,3 @@
 %w( rover lassie gaspode ).each do |name|
-  Dog.new(:name => name).save(false)
+  Dog.create :name => name
 end

data/features/thinking_sphinx/db/fixtures/foxes.rb

@@ -1,3 +1,3 @@
 %w( fantastic ).each do |name|
-  Fox.new(:name => name).save(false)
+  Fox.create :name => name
 end