thinking-sphinx-099 1.2.12 → 1.2.13

data/features/support/post_database.rb

@@ -0,0 +1,43 @@
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+
+require 'lib/thinking_sphinx'
+
+%w( tmp/config tmp/log tmp/db/sphinx/development ).each do |path|
+  FileUtils.mkdir_p "#{Dir.pwd}/#{path}"
+end
+
+Kernel.const_set :RAILS_ROOT, "#{Dir.pwd}/tmp" unless defined?(RAILS_ROOT)
+
+at_exit do
+  ThinkingSphinx::Configuration.instance.controller.stop
+  sleep(1) # Ensure Sphinx has shut down completely
+  ActiveRecord::Base.logger.close
+  FileUtils.rm_r "#{Dir.pwd}/tmp"
+end
+
+# Add log file
+ActiveRecord::Base.logger = Logger.new open("tmp/active_record.log", "a")
+
+# Set up database tables
+Dir["features/support/db/migrations/*.rb"].each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+# Load Models
+Dir["features/support/models/*.rb"].sort.each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+ThinkingSphinx.deltas_enabled = false
+
+# Load Fixtures
+Dir["features/support/db/fixtures/*.rb"].each do |file|
+  require file.gsub(/\.rb$/, '')
+end
+
+ThinkingSphinx.deltas_enabled = true
+ThinkingSphinx.suppress_delta_output = true
+
+ThinkingSphinx::Configuration.instance.build
+ThinkingSphinx::Configuration.instance.controller.index
+ThinkingSphinx::Configuration.instance.controller.start

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -0,0 +1,125 @@
+require 'cucumber/thinking_sphinx/sql_logger'
+
+module Cucumber
+  module ThinkingSphinx
+    class InternalWorld
+      attr_accessor :temporary_directory, :migrations_directory,
+        :models_directory, :fixtures_directory, :database_file
+      attr_accessor :adapter, :database, :username,
+        :password, :host
+      
+      def initialize
+        @temporary_directory  = "#{Dir.pwd}/tmp"
+        @migrations_directory = "features/support/db/migrations"
+        @models_directory     = "features/support/models"
+        @fixtures_directory   = "features/support/db/fixtures"
+        @database_file        = "features/support/database.yml"
+        
+        @adapter  = ENV['DATABASE'] || 'mysql'
+        @database = 'thinking_sphinx'
+        @username = 'thinking_sphinx'
+        # @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
+          sleep(0.5) # Ensure Sphinx has shut down completely
+          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,
+          :database => @database,
+          :username => @username,
+          :password => @password,
+          :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)
+        Dir["#{path}/*.rb"].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
+      end
+    end
+  end
+end

data/lib/cucumber/thinking_sphinx/sql_logger.rb

@@ -0,0 +1,20 @@
+module Cucumber
+  module ThinkingSphinx
+    module SqlLogger
+      def self.included(base)
+        base.send :alias_method_chain, :execute, :query_record
+      end
+      
+      IGNORED_SQL = [
+        /^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/,
+        /^SELECT @@ROWCOUNT/, /^SHOW FIELDS/
+      ]
+      
+      def execute_with_query_record(sql, name = nil, &block)
+        $queries_executed ||= []
+        $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
+        execute_without_query_record(sql, name, &block)
+      end
+    end
+  end
+end

data/lib/thinking_sphinx.rb

@@ -6,6 +6,7 @@ require 'active_record'
 require 'riddle'
 require 'after_commit'
 require 'yaml'
+require 'cgi'
 
 require 'thinking_sphinx/core/array'
 require 'thinking_sphinx/core/string'
@@ -130,12 +131,13 @@ module ThinkingSphinx
   def self.suppress_delta_output=(value)
     @@suppress_delta_output = value
   end
-
+  
+  @@use_group_by_shortcut = nil
   # Checks to see if MySQL will allow simplistic GROUP BY statements. If not,
   # or if not using MySQL, this will return false.
   #
   def self.use_group_by_shortcut?
-    !!(
+    @@use_group_by_shortcut ||= !!(
       mysql? && ::ActiveRecord::Base.connection.select_all(
         "SELECT @@global.sql_mode, @@session.sql_mode;"
       ).all? { |key,value| value.nil? || value[/ONLY_FULL_GROUP_BY/].nil? }

data/lib/thinking_sphinx/active_record.rb

@@ -276,8 +276,7 @@ module ThinkingSphinx
         "#{self.class.sphinx_indexes.first.name}_delta",
         ['sphinx_deleted'],
         {self.sphinx_document_id => [1]}
-      ) if ThinkingSphinx.deltas_enabled? &&
-        self.class.sphinx_indexes.any? { |index| index.delta? } &&
+      ) if self.class.sphinx_indexes.any? { |index| index.delta? } &&
         self.toggled_delta?
     rescue ::ThinkingSphinx::ConnectionError
       # nothing

data/lib/thinking_sphinx/adapters/mysql_adapter.rb

@@ -13,7 +13,7 @@ module ThinkingSphinx
     end
     
     def group_concatenate(clause, separator = ' ')
-      "GROUP_CONCAT(DISTINCT #{clause} SEPARATOR '#{separator}')"
+      "GROUP_CONCAT(DISTINCT IFNULL(#{clause}, '0') SEPARATOR '#{separator}')"
     end
     
     def cast_to_string(clause)

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -10,18 +10,17 @@ module ThinkingSphinx
     end
     
     def concatenate(clause, separator = ' ')
-      clause.split(', ').collect { |field|
-        case field
-        when /COALESCE/, "'')"
-          field
-        else
-          "COALESCE(CAST(#{field} as varchar), '')"
-        end
-      }.join(" || '#{separator}' || ")
+      if clause[/^COALESCE/]
+        clause.split('), ').join(") || '#{separator}' || ")
+      else
+        clause.split(', ').collect { |field|
+          "CAST(COALESCE(#{field}, '') as varchar)"
+        }.join(" || '#{separator}' || ")
+      end
     end
     
     def group_concatenate(clause, separator = ' ')
-      "array_to_string(array_accum(#{clause}), '#{separator}')"
+      "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
     end
     
     def cast_to_string(clause)
@@ -37,8 +36,16 @@ module ThinkingSphinx
     end
     
     def convert_nulls(clause, default = '')
-      default = "'#{default}'"  if default.is_a?(String)
-      default = 'NULL'          if default.nil?
+      default = case default
+      when String
+        "'#{default}'"
+      when NilClass
+        'NULL'
+      when Fixnum
+        "#{default}::bigint"
+      else
+        default
+      end
       
       "COALESCE(#{clause}, #{default})"
     end

data/lib/thinking_sphinx/attribute.rb

@@ -101,13 +101,14 @@ module ThinkingSphinx
         when :datetime
           adapter.cast_to_datetime(part)
         when :multi
-          adapter.convert_nulls(part, 0)
+          part = adapter.cast_to_datetime(part)   if is_many_datetimes?
+          part = adapter.convert_nulls(part, '0') if is_many_ints?
+          part
         else
           part
         end
       }.join(', ')
       
-      # clause = adapter.cast_to_datetime(clause)             if type == :datetime
       clause = adapter.crc(clause)                          if @crc
       clause = adapter.concatenate(clause, separator)       if concat_ws?
       clause = adapter.group_concatenate(clause, separator) if is_many?
@@ -153,8 +154,6 @@ module ThinkingSphinx
     def type
       @type ||= begin
         base_type = case
-        when is_many_datetimes?
-          :datetime
         when is_many?, is_many_ints?
           :multi
         when @associations.values.flatten.length > 1

data/lib/thinking_sphinx/excerpter.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
     end
     
     def method_missing(method, *args, &block)
-      string = @instance.send(method, *args, &block).to_s
+      string = CGI::escapeHTML @instance.send(method, *args, &block).to_s
       
       @search.excerpt_for(string, @instance.class)
     end

data/lib/thinking_sphinx/search.rb

@@ -192,6 +192,7 @@ module ThinkingSphinx
           match[:attributes]["@count"]
       end
     end
+    alias_method :each_with_group_and_count, :each_with_groupby_and_count
     
     def each_with_weighting(&block)
       populate

data/lib/thinking_sphinx/source.rb

@@ -33,7 +33,7 @@ module ThinkingSphinx
     end
     
     def name
-      @model.name.underscore.tr(':/\\', '_')
+      @model.sphinx_name
     end
     
     def to_riddle_for_core(offset, index)

data/spec/lib/thinking_sphinx/active_record_spec.rb

@@ -268,17 +268,6 @@ describe ThinkingSphinx::ActiveRecord do
       @person.toggle_deleted
     end
     
-    it "should not update the delta index if delta indexing is disabled" do
-      ThinkingSphinx.deltas_enabled = false
-      Person.sphinx_indexes.each { |index| index.stub!(:delta? => true) }
-      @person.delta = true
-      @client.should_not_receive(:update).with(
-        "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
-      )
-      
-      @person.toggle_deleted
-    end
-    
     it "should not update either index if updates are disabled" do
       ThinkingSphinx.updates_enabled = false
       ThinkingSphinx.deltas_enabled  = true

data/spec/lib/thinking_sphinx/attribute_spec.rb

@@ -22,7 +22,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "unique_name method" do
+  describe '#unique_name' do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new @source, [
         stub('column', :__stack => [], :__name => "col_name")
@@ -47,7 +47,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "column_with_prefix method" do
+  describe '#column_with_prefix' do
     before :each do
       @attribute = ThinkingSphinx::Attribute.new @source, [
         ThinkingSphinx::Index::FauxColumn.new(:col_name)
@@ -101,7 +101,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "is_many? method" do
+  describe '#is_many?' do
     before :each do
       @assoc_a = stub('assoc', :is_many? => true)
       @assoc_b = stub('assoc', :is_many? => true)
@@ -135,7 +135,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "is_string? method" do
+  describe '#is_string?' do
     before :each do
       @col_a = ThinkingSphinx::Index::FauxColumn.new("a")
       @col_b = ThinkingSphinx::Index::FauxColumn.new("b")
@@ -163,7 +163,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "type method" do
+  describe '#type' do
     before :each do
       @column = ThinkingSphinx::Index::FauxColumn.new(:col_name)
       @attribute = ThinkingSphinx::Attribute.new(@source, [@column])
@@ -193,9 +193,16 @@ describe ThinkingSphinx::Attribute do
       @column.send(:instance_variable_set, :@name, "id")
       @attribute.send(:type).should == :integer
     end
+    
+    it "should return :multi if the columns return multiple datetimes" do
+      @attribute.stub!(:is_many? => true)
+      @attribute.stub!(:all_datetimes? => true)
+      
+      @attribute.type.should == :multi
+    end
   end
   
-  describe "all_ints? method" do
+  describe '#all_ints?' do
     it "should return true if all columns are integers" do
       attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:id),
@@ -230,7 +237,7 @@ describe ThinkingSphinx::Attribute do
     end
   end
   
-  describe "all_datetimes? method" do
+  describe '#all_datetimes?' do
     it "should return true if all columns are datetimes" do
       attribute = ThinkingSphinx::Attribute.new(@source,
         [ ThinkingSphinx::Index::FauxColumn.new(:created_at),

data/spec/lib/thinking_sphinx/deltas/job_spec.rb

@@ -0,0 +1,32 @@
+require 'spec/spec_helper'
+
+describe ThinkingSphinx::Deltas::Job do
+  describe '.cancel_thinking_sphinx_jobs' do
+    before :each do
+      ThinkingSphinx::Deltas::Job.stub!(:delete_all => true)
+    end
+    
+    it "should not delete any rows if the delayed_jobs table does not exist" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => [])
+      ThinkingSphinx::Deltas::Job.should_not_receive(:delete_all)
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+    
+    it "should delete rows if the delayed_jobs table does exist" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
+      ThinkingSphinx::Deltas::Job.should_receive(:delete_all)
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+    
+    it "should delete only Thinking Sphinx jobs" do
+      ThinkingSphinx::Deltas::Job.connection.stub!(:tables => ['delayed_jobs'])
+      ThinkingSphinx::Deltas::Job.should_receive(:delete_all) do |sql|
+        sql.should match(/handler LIKE '--- !ruby\/object:ThinkingSphinx::Deltas::\%'/)
+      end
+      
+      ThinkingSphinx::Deltas::Job.cancel_thinking_sphinx_jobs
+    end
+  end
+end