warp-thinking-sphinx 1.2.12 → 1.3.10

data/README.textile

@@ -14,16 +14,20 @@ To quickly see if your system is ready to run the thinking sphinx specs, run the
 
 To get the spec suite running, you will need to install the ginger gem:
 
-  sudo gem install ginger --source http://gemcutter.org
+<pre><code>sudo gem install ginger --source http://gemcutter.org</code></pre>
   
-Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install.
+Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install. Bluecloth is required for some of the yard documentation.
 
-  sudo gem install cucumber yard jeweler rspec
+<pre>
+  sudo gem install bluecloth cucumber yard jeweler rspec 
+</pre>
 
 Then set up your database:
 
-  cp spec/fixtures/database.yml.default spec/fixtures/database.yml
+<pre>
+  cp spec/fixtures/database.yml.default spec/fixtures/database.yml &&
   mysqladmin -u root create thinking_sphinx
+</pre>
   
 This last step can be done automatically by the contribute.rb script if all dependencies are met.
 
@@ -32,11 +36,15 @@ in the app root.
 
 You should now have a passing test suite from which to build your patch on.
 
+<pre>
   rake spec
+</pre>
 
 If you get the message "Failed to start searchd daemon", run the spec with sudo:
 
+<pre>
   sudo rake spec
+</pre>
 
 If you quit the spec suite before it's completed, you may be left with data in the test
 database, causing the next run to have failures. Let that run complete and then try again.
@@ -142,3 +150,12 @@ Since I first released this library, there's been quite a few people who have su
 * Christian Aust
 * Martin Sarasale
 * Édouard Brière
+* Steve Madsen
+* Justin DeWind
+* Chris Z
+* Chris Roos
+* Andrew Assarattanakul
+* Jonas von Andrian
+* Dimitri Krassovski
+* Sergey Kojin
+* Brad Sumersford

data/VERSION

@@ -0,0 +1 @@
+1.3.10

data/features/abstract_inheritance.feature

@@ -0,0 +1,10 @@
+Feature: Abstract inheritance
+  In order to use Thinking Sphinx in complex situations
+  As a developer
+  I want to define indexes on subclasses of abstract models
+
+  Scenario: Searching on subclasses of abstract models
+    Given Sphinx is running
+    And I am searching on music
+    When I search
+    Then I should get 3 results

data/features/alternate_primary_key.feature

@@ -23,5 +23,5 @@ Feature: Searching on a single model
     
     When I destroy robot Expendable
     And I wait for Sphinx to catch up
-    And I search for three
+    And I search for Expendable
     Then I should get 0 results

data/features/attribute_updates.feature

@@ -9,15 +9,21 @@ Feature: Update attributes directly to Sphinx
     When I filter by 3 on value
     Then I should get 1 result
     
-    When I change the value of alpha two to 13
-    And I wait for Sphinx to catch up    
+    When I change the value of alpha four to 13
+    And I wait for Sphinx to catch up
     And I filter by 13 on value
+    And I use index alpha_core
+    Then I should get 1 result
+    When I use index alternative_core
     Then I should get 1 result
     
-    When I change the value of alpha two to 3
-    And I wait for Sphinx to catch up    
+    When I change the value of alpha four to 4
+    And I wait for Sphinx to catch up
     And I filter by 13 on value
+    And I use index alpha_core
     Then I should get 0 results
+    When I use index alternative_core
+    Then I should get 0 result
 
   Scenario: Updating attributes in Sphinx with delta indexes
     Given Sphinx is running
@@ -30,4 +36,15 @@ Feature: Update attributes directly to Sphinx
     Then I should get 1 result
     
     When I search for the document id of beta eight in the beta_delta index
-    Then it should not exist
+    Then it should not exist
+
+  Scenario: Updating boolean attribute in Sphinx
+    Given Sphinx is running
+    And I am searching on alphas
+    When I filter by active alphas
+    Then I should get 10 results
+    
+    When I flag alpha five as inactive
+    And I wait for Sphinx to catch up
+    And I filter by active alphas
+    Then I should get 9 results

data/features/deleting_instances.feature

@@ -56,6 +56,9 @@ Feature: Keeping Sphinx in line with deleted model instances
     And I am searching on betas
     When I create a new beta named thirteen
     And I wait for Sphinx to catch up
+    And I search for thirteen
+    Then I should get 1 result
+    
     And I disable delta updates
     And I destroy beta thirteen
     And I wait for Sphinx to catch up

data/features/facets.feature

@@ -74,3 +74,9 @@ Feature: Search and browse models by their defined facets
     Then the Tags facet should have an "Australia" key
     Then the Tags facet should have an "Melbourne" key
     Then the Tags facet should have an "Victoria" key
+
+  Scenario: Requesting MVA facets from source queries
+    Given Sphinx is running
+    And I am searching on posts
+    When I am requesting facet results
+    Then the Comment Ids facet should have 9 keys

data/features/facets_across_model.feature

@@ -5,7 +5,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     Then I should have valid facet results
-    And I should have 10 facets
+    And I should have 11 facets
     And I should have the facet Class
     And the Class facet should have a "Person" key
     And I should have the facet Gender
@@ -19,7 +19,7 @@ Feature: Search and browse across models by their defined facets
     When I am requesting facet results
     And I want all possible attributes
     And I don't want classes included
-    Then I should have 9 facets
+    Then I should have 10 facets
     And I should not have the facet Class
   
   Scenario: Requesting facets common to all indexed models

data/features/searching_across_models.feature

@@ -17,4 +17,4 @@ Feature: Searching across multiple model
   Scenario: Retrieving results from multiple models
     Given Sphinx is running
     When I search for ten
-    Then I should get 6 results
+    Then I should get 4 results

data/features/searching_by_index.feature

@@ -0,0 +1,40 @@
+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
+    When I order by value
+    Then I should get 10 results
+
+  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 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
+    Then I should get 0 results

data/features/sphinx_scopes.feature

@@ -33,3 +33,10 @@ Feature: Sphinx Scopes
     And I am searching on people
     When I use the ids_only scope
     Then I should have an array of integers
+  
+  Scenario: Counts with scopes
+    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
+    Then I should get a value of 7

data/features/step_definitions/alpha_steps.rb

@@ -1,3 +1,16 @@
+When /^I create a new alpha named (\w+)$/ do |name|
+  Alpha.create!(:name => name, :value => 101)
+end
+
 When /^I change the (\w+) of alpha (\w+) to (\w+)$/ do |column, name, replacement|
   Alpha.find_by_name(name).update_attributes(column.to_sym => replacement)
-end
+end
+
+When /^I filter by active alphas$/ do
+  @results = nil
+  @with[:active] = true
+end
+
+When /^I flag alpha (\w+) as inactive$/ do |name|
+  Alpha.find_by_name(name).update_attributes(:active => false)
+end

data/features/step_definitions/beta_steps.rb

@@ -1,5 +1,5 @@
 When /^I create a new beta named (\w+)$/ do |name|
-  Beta.create(:name => name, :value => 101)
+  Beta.create!(:name => name, :value => 101)
 end
 
 When /^I change the (\w+) of beta (\w+) to (\w+)$/ do |column, name, replacement|

data/features/step_definitions/common_steps.rb

@@ -1,6 +1,5 @@
 Before do
   $queries_executed = []
-  ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
   
   @model      = nil
   @method     = :search
@@ -11,6 +10,8 @@ Before do
   @with_all   = {}
   @options    = {}
   @results    = nil
+  
+  Given "updates are enabled"
 end
 
 Given /^I am searching on (.+)$/ do |model|
@@ -26,6 +27,11 @@ When /^I am searching for ids$/ do
   @method = :search_for_ids
 end
 
+When /^I use index (.+)$/ do |index|
+  @results = nil
+  @options[:index] = index
+end
+
 When /^I am retrieving the result count$/ do
   @result = nil
   @method = @model ? :search_count : :count
@@ -50,6 +56,10 @@ When /^I search for (\w+) on (\w+)$/ do |query, field|
   @conditions[field.to_sym] = query
 end
 
+When /^I output the raw result data$/ do
+  puts results.results.inspect
+end
+
 When /^I clear existing filters$/ do
   @with     = {}
   @without  = {}
@@ -144,7 +154,7 @@ Then /^I can iterate by result and (\w+)$/ do |attribute|
   iteration = lambda { |result, attr_value|
     result.should be_kind_of(@model)
     unless attribute == "group" && attr_value.nil?
-      attr_value.should be_kind_of(Integer) 
+      attr_value.should be_kind_of(Integer)
     end
   }
   

data/features/step_definitions/facet_steps.rb

@@ -1,4 +1,4 @@
-When "I am requesting facet results$" do
+When /^I am requesting facet results$/ do
   @results = nil
   @method  = :facets
 end
@@ -87,6 +87,10 @@ Then /^the ([\w_\s]+) facet should have an? (\d+\.?\d*) key$/ do |name, key|
   results[facet_name(name)].keys.should include(key)
 end
 
+Then /^the ([\w\s]+) facet should have (\d+) keys$/ do |name, count|
+  results[facet_name(name)].keys.length.should == count.to_i
+end
+
 def facet_name(string)
   string.gsub(/\s/, '').underscore.to_sym
 end

data/features/step_definitions/scope_steps.rb

@@ -9,3 +9,7 @@ end
 When /^I use the ([\w]+) scope set to (\d+)$/ do |scope, int|
   @results = results.send(scope.to_sym, int.to_i)
 end
+
+When /^I am retrieving the scoped result count$/ do
+  @results = results.search_count
+end

data/features/step_definitions/sphinx_steps.rb

@@ -18,6 +18,14 @@ When "I stop Sphinx" do
   ThinkingSphinx::Configuration.instance.controller.stop
 end
 
+When /^I (enable|disable) delta updates$/ do |mode|
+  ThinkingSphinx.deltas_enabled = (mode == 'enable')
+end
+
+When /^I process the (\w+) index$/ do |index|
+  ThinkingSphinx::Configuration.instance.controller.index index
+end
+
 Then /^Sphinx should be running/ do
   ThinkingSphinx.sphinx_running?.should be_true
 end
@@ -25,7 +33,3 @@ end
 Then "Sphinx should not be running" do
   ThinkingSphinx.sphinx_running?.should be_false
 end
-
-When /^I (enable|disable) delta updates$/ do |mode|
-  ThinkingSphinx.deltas_enabled = (mode == 'enable')
-end

data/features/sti_searching.feature

@@ -12,3 +12,8 @@ Feature: Searching via STI model relationships
     Given Sphinx is running
     And I am searching on cats
     Then I should get as many results as there are cats
+
+  Scenario: Searching across super and subclass indexes
+    Given Sphinx is running
+    When I search for "fantastic"
+    Then I should get 1 result

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

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

data/features/support/db/fixtures/music.rb

@@ -0,0 +1,4 @@
+pop = Genre.create(:name => "Pop")
+Music.create :artist => "Gotye", :album => "Like Drawing Blood", :track => "Heart's A Mess", :genre => pop
+Music.create :artist => "The Whitlams", :album => "Eternal Nightcap", :track => "Melbourne", :genre => pop
+Music.create :artist => "Ben Folds", :album => "Ben Folds Live", :track => "Not The Same", :genre => pop

data/features/support/db/fixtures/robots.rb

@@ -1,6 +1,6 @@
 # Reset the primary key to allow us to create robots with specific internal_ids
 class Robot < ActiveRecord::Base
-  set_primary_key :id
+  set_primary_key :alternate_primary_key
 end
 
 Robot.create :name => 'Fritz',      :internal_id => 'F0001'

data/features/support/db/fixtures/tags.rb

@@ -24,4 +24,4 @@ Developer.find(:all).each do |developer|
   end
 end
 
-Tagging.create(:taggable => Developer.last)
+Tagging.create(:taggable => Developer.find(:all).last)

data/features/support/db/migrations/create_alphas.rb

@@ -1,6 +1,7 @@
 ActiveRecord::Base.connection.create_table :alphas, :force => true do |t|
   t.column :name,       :string,  :null => false
   t.column :value,      :integer, :null => false
+  t.column :active,     :boolean, :null => false, :default => true
   t.column :cost,       :decimal, :precision => 10, :scale => 6
   t.column :created_on, :date
   t.column :created_at, :timestamp

data/features/support/db/migrations/create_genres.rb

@@ -0,0 +1,3 @@
+ActiveRecord::Base.connection.create_table :genres, :force => true do |t|
+  t.column :name, :string
+end

data/features/support/db/migrations/create_music.rb

@@ -0,0 +1,6 @@
+ActiveRecord::Base.connection.create_table :music, :force => true do |t|
+  t.column :artist,   :string
+  t.column :album,    :string
+  t.column :track,    :string
+  t.column :genre_id, :integer
+end

data/features/support/db/migrations/create_robots.rb

@@ -1,5 +1,4 @@
-ActiveRecord::Base.connection.create_table :robots, :id => false, :force => true do |t|
-  t.column :alternate_primary_key,  "int(11) DEFAULT NULL auto_increment PRIMARY KEY"
+ActiveRecord::Base.connection.create_table :robots, :primary_key => :alternate_primary_key, :force => true do |t|
   t.column :name,                   :string,  :null => false
   t.column :internal_id,            :string,  :null => false
 end

data/features/support/env.rb

@@ -3,4 +3,19 @@ require 'cucumber'
 require 'spec'
 require 'fileutils'
 require 'ginger'
-require 'will_paginate'
+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'
+
+world = Cucumber::ThinkingSphinx::InternalWorld.new
+world.configure_database
+
+require "thinking_sphinx"
+
+world.setup

data/features/support/models/alpha.rb

@@ -4,7 +4,19 @@ class Alpha < ActiveRecord::Base
     
     has value, created_at, created_on
     has cost, :facet => true
+    has active
     
     set_property :field_weights => {"name" => 10}
   end
+  
+  define_index 'alternative' do
+    indexes :name, :as => :alternative_name, :sortable => true
+    
+    has value, created_at, created_on
+    has cost, :facet => true
+    
+    set_property :field_weights => {'alternative_name' => 10}
+    
+    where "value > 3"
+  end
 end