thinking-sphinx 1.4.6 → 1.4.7

data/README.textile

@@ -122,7 +122,6 @@ Since I first released this library, there's been quite a few people who have su
 * Andrei Bocan
 * László Bácsi
 * Peter Wagenet
-* Max Lapshin
 * Martin Emde
 * David Wennergren
 * Mark Lane
@@ -192,3 +191,9 @@ Since I first released this library, there's been quite a few people who have su
 * Ryan Mohr
 * Alex Chee
 * Bruno Santschi
+* Lars Weiler
+* Andrey Deryabin
+* Andrew White
+* Rémi Prévost
+* Justin Tanner
+* Josh Goebel

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,31 +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: Filtering on a wordcount attribute
-    Given Sphinx is running
-    And I am searching on developers
-    When I filter between 0 and 1 on state_wordcount
-    Then I should get 5 results
-  
+
   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
@@ -95,59 +89,59 @@ 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: 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
@@ -160,7 +154,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
@@ -172,10 +166,10 @@ 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/thinking_sphinx/db/.gitignore

@@ -0,0 +1 @@
+database.yml

data/features/thinking_sphinx/db/fixtures/post_keywords.txt

@@ -0,0 +1 @@
+foo bar baz

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -7,7 +7,7 @@ module Cucumber
         :models_directory, :fixtures_directory, :database_file
       attr_accessor :adapter, :database, :username,
         :password, :host
-      
+
       def initialize
         pwd = Dir.pwd
         @temporary_directory  = "#{pwd}/tmp"
@@ -15,55 +15,55 @@ module Cucumber
         @models_directory     = "#{pwd}/features/thinking_sphinx/models"
         @fixtures_directory   = "#{pwd}/features/thinking_sphinx/db/fixtures"
         @database_file        = "#{pwd}/features/thinking_sphinx/database.yml"
-        
-        @adapter  = ENV['DATABASE'] || 'mysql'
+
+        @adapter  = (ENV['DATABASE'] || 'mysql').gsub /^mysql$/, 'mysql2'
         @database = 'thinking_sphinx'
-        @username = 'thinking_sphinx'
+        @username = @adapter[/mysql/] ? 'root' : 'postgres'
         # @password = 'thinking_sphinx'
         @host     = 'localhost'
       end
-      
+
       def setup
         make_temporary_directory
-        
+
         configure_cleanup
         configure_thinking_sphinx
         configure_active_record
-        
+
         prepare_data
         setup_sphinx
-        
+
         self
       end
-      
+
       def configure_database
         ActiveRecord::Base.establish_connection database_settings
         self
       end
-      
+
       private
-      
+
       def config
         @config ||= ::ThinkingSphinx::Configuration.instance
       end
-      
+
       def make_temporary_directory
         FileUtils.mkdir_p temporary_directory
         Dir["#{temporary_directory}/*"].each do |file|
           FileUtils.rm_rf file
         end
       end
-      
+
       def configure_thinking_sphinx
         config.config_file        = "#{temporary_directory}/sphinx.conf"
         config.searchd_log_file   = "#{temporary_directory}/searchd.log"
         config.query_log_file     = "#{temporary_directory}/searchd.query.log"
         config.pid_file           = "#{temporary_directory}/searchd.pid"
         config.searchd_file_path  = "#{temporary_directory}/indexes/"
-        
+
         ::ThinkingSphinx.suppress_delta_output = true
       end
-      
+
       def configure_cleanup
         Kernel.at_exit do
           ::ThinkingSphinx::Configuration.instance.controller.stop
@@ -71,13 +71,13 @@ module Cucumber
           ActiveRecord::Base.logger.close
         end
       end
-      
+
       def yaml_database_settings
         return {} unless File.exist?(@database_file)
-        
+
         YAML.load open(@database_file)
       end
-      
+
       def database_settings
         {
           'adapter'  => @adapter,
@@ -87,37 +87,37 @@ module Cucumber
           'host'     => @host
         }.merge yaml_database_settings
       end
-      
+
       def configure_active_record
         ActiveRecord::Base.logger = Logger.new(
           open("#{temporary_directory}/active_record.log", "a")
         )
-        
+
         ActiveRecord::Base.connection.class.send(
           :include, Cucumber::ThinkingSphinx::SqlLogger
         )
       end
-      
+
       def prepare_data
         ::ThinkingSphinx.deltas_enabled = false
-        
+
         load_files migrations_directory
         load_files models_directory
         load_files fixtures_directory
-        
+
         ::ThinkingSphinx.deltas_enabled = true
       end
-      
+
       def load_files(path)
         files = Dir["#{path}/*.rb"].sort!
         files.each do |file|
           require file.gsub(/\.rb$/, '')
         end
       end
-      
+
       def setup_sphinx
         FileUtils.mkdir_p config.searchd_file_path
-        
+
         config.build
         config.controller.index
         config.controller.start

data/lib/thinking_sphinx.rb

@@ -38,7 +38,7 @@ Merb::Plugins.add_rakefiles(
 
 module ThinkingSphinx
   mattr_accessor :database_adapter
-  
+
   # A ConnectionError will get thrown when a connection to Sphinx can't be
   # made.
   class ConnectionError < StandardError
@@ -52,7 +52,7 @@ module ThinkingSphinx
       self.ids = ids
     end
   end
-  
+
   # A SphinxError occurs when Sphinx responds with an error due to problematic
   # queries or indexes.
   class SphinxError < RuntimeError
@@ -62,17 +62,7 @@ module ThinkingSphinx
       self.results = results
     end
   end
-  
-  # The current version of Thinking Sphinx.
-  # 
-  # @return [String] The version number as a string
-  # 
-  def self.version
-    open(File.join(File.dirname(__FILE__), '../VERSION')) { |f|
-      f.read.strip
-    }
-  end
-  
+
   # The collection of indexed models. Keep in mind that Rails lazily loads
   # its classes, so this may not actually be populated with _all_ the models
   # that have Sphinx indexes.
@@ -84,11 +74,11 @@ module ThinkingSphinx
   @@suppress_delta_output = false
   @@remote_sphinx         = false
   @@use_group_by_shortcut = nil
-  
+
   def self.mutex
     @@sphinx_mutex
   end
-  
+
   def self.context
     if @@context.nil?
       mutex.synchronize do
@@ -98,10 +88,10 @@ module ThinkingSphinx
         end
       end
     end
-    
+
     @@context
   end
-  
+
   def self.reset_context!(context = nil)
     mutex.synchronize do
       @@context = context
@@ -127,7 +117,7 @@ module ThinkingSphinx
       @@define_indexes = value
     end
   end
-  
+
   # Check if delta indexing is enabled/disabled.
   #
   def self.deltas_enabled?
@@ -140,10 +130,10 @@ module ThinkingSphinx
         end
       end
     end
-    
+
     @@deltas_enabled && !deltas_suspended?
   end
-  
+
   # Enable/disable delta indexing.
   #
   #   ThinkingSphinx.deltas_enabled = false
@@ -160,7 +150,7 @@ module ThinkingSphinx
     if Thread.current[:thinking_sphinx_deltas_suspended].nil?
       Thread.current[:thinking_sphinx_deltas_suspended] = false
     end
-    
+
     Thread.current[:thinking_sphinx_deltas_suspended]
   end
 
@@ -185,7 +175,7 @@ module ThinkingSphinx
         end
       end
     end
-    
+
     @@updates_enabled
   end
 
@@ -208,7 +198,7 @@ module ThinkingSphinx
       @@suppress_delta_output = value
     end
   end
-  
+
   # Checks to see if MySQL will allow simplistic GROUP BY statements. If not,
   # or if not using MySQL, this will return false.
   #
@@ -226,10 +216,10 @@ module ThinkingSphinx
         end
       end
     end
-    
+
     @@use_group_by_shortcut
   end
-  
+
   def self.reset_use_group_by_shortcut
     mutex.synchronize do
       @@use_group_by_shortcut = nil
@@ -298,11 +288,12 @@ module ThinkingSphinx
 
   def self.mysql?
     ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlAdapter" ||
+    ::ActiveRecord::Base.connection.class.name.demodulize == "Mysql2Adapter" ||
     ::ActiveRecord::Base.connection.class.name.demodulize == "MysqlplusAdapter" || (
       jruby? && ::ActiveRecord::Base.connection.config[:adapter] == "jdbcmysql"
     )
   end
-  
+
   extend ThinkingSphinx::SearchMethods::ClassMethods
 end