thinking-sphinx 3.0.2 → 3.0.3

data/Appraisals

@@ -7,5 +7,5 @@ appraise 'rails_3_2' do
 end
 
 appraise 'rails_4_0' do
-  gem 'rails', '~> 4.0.0.beta1'
+  gem 'rails', '~> 4.0.0.rc1'
 end

data/HISTORY

@@ -1,3 +1,20 @@
+2013-05-07: 3.0.3
+* [CHANGE] Updating Riddle dependency to be >= 1.5.6
+* [FEATURE] INDEX_ONLY environment flag is passed through when invoked through Capistrano (Demian Ferreiro).
+* [FEATURE] use_64_bit option returns as cast_to_timestamp instead (Denis Abushaev).
+* [FIX] Update to association handling for Rails/ActiveRecord 4.0.0.rc1.
+* [CHANGE] Delta jobs get common classes to allow third-party delta behaviours to leverage Thinking Sphinx.
+* [FEATURE] Collection of hooks (lambdas) that get called before indexing. Useful for delta libraries.
+* [FIX] Cast and concatenate multi-column attributes correctly.
+* [FIX] Don't load fields or attributes when building a real-time index - otherwise the index is translated before it has a chance to be built.
+* [CHANGE] Raise ThinkingSphinx::MixedScopesError if a search is called through an ActiveRecord scope.
+* [FIX] Default search panes are cloned for each search.
+* [FIX] Index-level settings (via set_property) are now applied consistently after global settings (in thinking_sphinx.yml).
+* [FIX] All string values returned from Sphinx are now properly converted to UTF8.
+* [CHANGE] GroupEnumeratorsMask is now a default mask, as masks need to be in place before search results are populated/the middleware is called (and previously it was being added within a middleware call).
+* [FIX] The default search masks are now cloned for each search, instead of referring to the constant (and potentially modifying it often).
+* [CHANGE] The current_page method is now a part of ThinkingSphinx::Search, as it is used when populating results.
+
 2013-03-23: 3.0.2
 * [CHANGE] per_page now accepts an optional paging limit, to match WillPaginate's behaviour. If none is supplied, it just returns the page size.
 * [FEATURE] Ruby 2.0 support.

data/README.textile

@@ -75,7 +75,7 @@ end</code></pre>
   :skip_sti => true,
   :classes => [User, AdminUser, SupportUser]</code></pre>
 
-* The option @:rank_mode@ has now become @:ranker@ - and the options (as strings or symbols) are as follows: proximity_bm25, bm25, none, wordcount, proximity, matchany, and fieldmask.
+* The option @:rank_mode@ has now become @:ranker@ - and the options (as strings or symbols) are as follows: proximity_bm25, bm25, none, wordcount, proximity, matchany, fieldmask, sph04 and expr.
 * There are no explicit sorting modes - all sorting must be on attributes followed by ASC or DESC. For example: <code>:order => '@weight DESC, created_at ASC'</code>.
 * If you specify just an attribute name as a symbol for the @:order@ option, it will be given the ascending direction by default. So, @:order => :created_at@ is equivalent to @:order => 'created_at ASC'@.
 * If you want to use a calculated expression for sorting, you must specify the expression as a new attribute, then use that attribute in your @:order@ option. This is done using the @:select@ option to specify extra columns available in the underlying SphinxQL (_not_ ActiveRecord/SQL) query.

data/gemfiles/rails_4_0.gemfile

@@ -6,6 +6,6 @@ gem "mysql2", "~> 0.3.12b4", :platform=>:ruby
 gem "pg", "~> 0.11.0", :platform=>:ruby
 gem "activerecord-jdbcmysql-adapter", "~> 1.1.3", :platform=>:jruby
 gem "activerecord-jdbcpostgresql-adapter", "~> 1.1.3", :platform=>:jruby
-gem "rails", "~> 4.0.0.beta1"
+gem "rails", "~> 4.0.0.rc1"
 
 gemspec :path=>"../"

data/lib/thinking_sphinx.rb

@@ -28,6 +28,12 @@ module ThinkingSphinx
     search = ThinkingSphinx::Search.new query, options
     ThinkingSphinx::Search::Merger.new(search).merge! nil, :ids_only => true
   end
+
+  def self.before_index_hooks
+    @before_index_hooks
+  end
+
+  @before_index_hooks = []
 end
 
 # Core

data/lib/thinking_sphinx/active_record/association_proxy.rb

@@ -2,11 +2,17 @@ module ThinkingSphinx::ActiveRecord::AssociationProxy
   extend ActiveSupport::Concern
 
   def search(query = nil, options = {})
+    query, options = nil, query if query.is_a?(Hash)
+    options[:ignore_scopes] = true
+
     ThinkingSphinx::Search::Merger.new(super).merge! nil,
       :with => association_filter
   end
 
   def search_for_ids(query = nil, options = {})
+    query, options = nil, query if query.is_a?(Hash)
+    options[:ignore_scopes] = true
+
     ThinkingSphinx::Search::Merger.new(super).merge! nil,
       :with => association_filter
   end

data/lib/thinking_sphinx/active_record/associations.rb

@@ -75,7 +75,10 @@ class ThinkingSphinx::ActiveRecord::Associations
   end
 
   def reflection_for(stack)
-    parent_for(stack).active_record.reflections[stack.last]
+    parent = parent_for(stack)
+    klass  = parent.respond_to?(:base_klass) ? parent.base_klass :
+      parent.active_record
+    klass.reflections[stack.last]
   end
 
   def rewrite_conditions_for(join)

data/lib/thinking_sphinx/active_record/base.rb

@@ -24,6 +24,12 @@ module ThinkingSphinx::ActiveRecord::Base
 
       merger.merge! *default_sphinx_scope_response if default_sphinx_scope?
       merger.merge! query, options
+
+      if current_scope && !merger.search.options[:ignore_scopes]
+        raise ThinkingSphinx::MixedScopesError,
+          'You cannot search with Sphinx through ActiveRecord scopes'
+      end
+
       merger.merge! nil, :classes => [self]
     end
 

data/lib/thinking_sphinx/active_record/database_adapters/mysql_adapter.rb

@@ -5,6 +5,10 @@ class ThinkingSphinx::ActiveRecord::DatabaseAdapters::MySQLAdapter <
     value ? 1 : 0
   end
 
+  def cast_to_string(clause)
+    "CAST(#{clause} AS char)"
+  end
+
   def cast_to_timestamp(clause)
     "UNIX_TIMESTAMP(#{clause})"
   end

data/lib/thinking_sphinx/active_record/database_adapters/postgresql_adapter.rb

@@ -5,8 +5,16 @@ class ThinkingSphinx::ActiveRecord::DatabaseAdapters::PostgreSQLAdapter <
     value ? 'TRUE' : 'FALSE'
   end
 
+  def cast_to_string(clause)
+    "#{clause}::varchar"
+  end
+
   def cast_to_timestamp(clause)
-    "extract(epoch from #{clause})::int"
+    if ThinkingSphinx::Configuration.instance.settings['64bit_timestamps']
+      "extract(epoch from #{clause})::bigint"
+    else
+      "extract(epoch from #{clause})::int"
+    end
   end
 
   def concatenate(clause, separator = ' ')

data/lib/thinking_sphinx/active_record/property_sql_presenter.rb

@@ -30,7 +30,7 @@ class ThinkingSphinx::ActiveRecord::PropertySQLPresenter
   def casted_column_with_table
     clause = columns_with_table
     clause = adapter.cast_to_timestamp(clause) if property.type == :timestamp
-    clause = adapter.concatenate(clause, ' ')  if concatenating?
+    clause = concatenate clause
     if aggregate?
       clause = adapter.group_concatenate(clause, aggregate_separator)
     end
@@ -60,6 +60,19 @@ class ThinkingSphinx::ActiveRecord::PropertySQLPresenter
     property.columns.length > 1
   end
 
+  def concatenate(clause)
+    return clause unless concatenating?
+
+    if property.type.nil?
+      adapter.concatenate clause, ' '
+    else
+      clause = clause.split(', ').collect { |part|
+        adapter.cast_to_string part
+      }.join(', ')
+      adapter.concatenate clause, ','
+    end
+  end
+
   def group?
     !(aggregate? || property.columns.any?(&:string?))
   end

data/lib/thinking_sphinx/active_record/sql_source.rb

@@ -25,6 +25,8 @@ class ThinkingSphinx::ActiveRecord::SQLSource < Riddle::Configuration::SQLSource
     name = "#{options[:name] || model.name.downcase}_#{options[:position]}"
 
     super name, type
+
+    apply_defaults
   end
 
   def adapter
@@ -57,11 +59,6 @@ class ThinkingSphinx::ActiveRecord::SQLSource < Riddle::Configuration::SQLSource
   end
 
   def render
-    self.class.settings.each do |setting|
-      value = config.settings[setting.to_s]
-      send("#{setting}=", value) unless value.nil?
-    end
-
     prepare_for_render unless @prepared
 
     super
@@ -80,6 +77,13 @@ class ThinkingSphinx::ActiveRecord::SQLSource < Riddle::Configuration::SQLSource
 
   private
 
+  def apply_defaults
+    self.class.settings.each do |setting|
+      value = config.settings[setting.to_s]
+      send("#{setting}=", value) unless value.nil?
+    end
+  end
+
   def attribute_array_for(type)
     instance_variable_get "@sql_attr_#{type}".to_sym
   end

data/lib/thinking_sphinx/capistrano.rb

@@ -56,6 +56,7 @@ if you alter the structure of your indexes.
     def rake(tasks)
       rails_env = fetch(:rails_env, 'production')
       rake = fetch(:rake, 'rake')
+      tasks += ' INDEX_ONLY=true' if ENV['INDEX_ONLY'] == 'true'
 
       run "if [ -d #{release_path} ]; then cd #{release_path}; else cd #{current_path}; fi; if [ -f Rakefile ]; then #{rake} RAILS_ENV=#{rails_env} #{tasks}; fi;"
     end

data/lib/thinking_sphinx/core/index.rb

@@ -25,10 +25,15 @@ module ThinkingSphinx::Core::Index
   end
 
   def interpret_definition!
-    return if @interpreted_definition || @definition_block.nil?
+    return if @interpreted_definition
+
+    self.class.settings.each do |setting|
+      value = config.settings[setting.to_s]
+      send("#{setting}=", value) unless value.nil?
+    end
 
     @interpreted_definition = true
-    interpreter.translate! self, @definition_block
+    interpreter.translate! self, @definition_block if @definition_block
   end
 
   def model
@@ -59,11 +64,6 @@ module ThinkingSphinx::Core::Index
   end
 
   def pre_render
-    self.class.settings.each do |setting|
-      value = config.settings[setting.to_s]
-      send("#{setting}=", value) unless value.nil?
-    end
-
     interpret_definition!
   end
 end

data/lib/thinking_sphinx/deltas.rb

@@ -2,7 +2,7 @@ module ThinkingSphinx::Deltas
   def self.config
     ThinkingSphinx::Configuration.instance
   end
-  
+
   def self.processor_for(delta)
     case delta
     when TrueClass
@@ -40,3 +40,5 @@ module ThinkingSphinx::Deltas
 end
 
 require 'thinking_sphinx/deltas/default_delta'
+require 'thinking_sphinx/deltas/delete_job'
+require 'thinking_sphinx/deltas/index_job'

data/lib/thinking_sphinx/deltas/default_delta.rb

@@ -10,16 +10,13 @@ class ThinkingSphinx::Deltas::DefaultDelta
   end
 
   def delete(index, instance)
-    ThinkingSphinx::Connection.new.execute Riddle::Query.update(
-      index.name, index.document_id_for_key(instance.id),
-      :sphinx_deleted => true
-    )
-  rescue Mysql2::Error => error
-    # This isn't vital, so don't raise the error.
+    ThinkingSphinx::Deltas::DeleteJob.new(
+      index.name, index.document_id_for_key(instance.id)
+    ).perform
   end
 
   def index(index)
-    controller.index index.name, :verbose => !config.settings['quiet_deltas']
+    ThinkingSphinx::Deltas::IndexJob.new(index.name).perform
   end
 
   def reset_query

data/lib/thinking_sphinx/deltas/delete_job.rb

@@ -0,0 +1,15 @@
+class ThinkingSphinx::Deltas::DeleteJob
+  def initialize(index_name, document_id)
+    @index_name, @document_id = index_name, document_id
+  end
+
+  def perform
+    ThinkingSphinx::Connection.pool.take do |connection|
+      connection.execute Riddle::Query.update(
+        @index_name, @document_id, :sphinx_deleted => true
+      )
+    end
+  rescue Mysql2::Error => error
+    # This isn't vital, so don't raise the error.
+  end
+end

data/lib/thinking_sphinx/deltas/index_job.rb

@@ -0,0 +1,16 @@
+class ThinkingSphinx::Deltas::IndexJob
+  def initialize(index_name)
+    @index_name = index_name
+  end
+
+  def perform
+    configuration.controller.index @index_name,
+      :verbose => !configuration.settings['quiet_deltas']
+  end
+
+  private
+
+  def configuration
+    @configuration ||= ThinkingSphinx::Configuration.instance
+  end
+end

data/lib/thinking_sphinx/errors.rb

@@ -24,3 +24,6 @@ end
 
 class ThinkingSphinx::ParseError < ThinkingSphinx::QueryError
 end
+
+class ThinkingSphinx::MixedScopesError < StandardError
+end

data/lib/thinking_sphinx/excerpter.rb

@@ -13,8 +13,10 @@ class ThinkingSphinx::Excerpter
   end
 
   def excerpt!(text)
-    connection.query(Riddle::Query.snippets(text, index, words, options)).
-      first['snippet']
+    result = connection.query(statement_for(text)).first['snippet']
+
+    result.encode!("ISO-8859-1")
+    result.force_encoding("UTF-8")
   end
 
   private
@@ -22,4 +24,8 @@ class ThinkingSphinx::Excerpter
   def connection
     @connection ||= ThinkingSphinx::Connection.new
   end
+
+  def statement_for(text)
+    Riddle::Query.snippets(text, index, words, options)
+  end
 end

data/lib/thinking_sphinx/masks/pagination_mask.rb

@@ -7,13 +7,8 @@ class ThinkingSphinx::Masks::PaginationMask
     public_methods(false).include?(method)
   end
 
-  def current_page
-    search.options[:page] = 1 if search.options[:page].blank?
-    search.options[:page].to_i
-  end
-
   def first_page?
-    current_page == 1
+    search.current_page == 1
   end
 
   def last_page?
@@ -21,7 +16,7 @@ class ThinkingSphinx::Masks::PaginationMask
   end
 
   def next_page
-    current_page >= total_pages ? nil : current_page + 1
+    search.current_page >= total_pages ? nil : search.current_page + 1
   end
 
   def next_page?
@@ -39,7 +34,7 @@ class ThinkingSphinx::Masks::PaginationMask
   end
 
   def previous_page
-    current_page == 1 ? nil : current_page - 1
+    search.current_page == 1 ? nil : search.current_page - 1
   end
 
   def total_entries

data/lib/thinking_sphinx/middlewares.rb

@@ -11,12 +11,14 @@ require 'thinking_sphinx/middlewares/inquirer'
 require 'thinking_sphinx/middlewares/sphinxql'
 require 'thinking_sphinx/middlewares/stale_id_checker'
 require 'thinking_sphinx/middlewares/stale_id_filter'
+require 'thinking_sphinx/middlewares/utf8'
 
 ThinkingSphinx::Middlewares::DEFAULT = ::Middleware::Builder.new do
   use ThinkingSphinx::Middlewares::StaleIdFilter
   use ThinkingSphinx::Middlewares::SphinxQL
   use ThinkingSphinx::Middlewares::Geographer
   use ThinkingSphinx::Middlewares::Inquirer
+  use ThinkingSphinx::Middlewares::UTF8
   use ThinkingSphinx::Middlewares::ActiveRecordTranslator
   use ThinkingSphinx::Middlewares::StaleIdChecker
   use ThinkingSphinx::Middlewares::Glazier
@@ -26,6 +28,7 @@ ThinkingSphinx::Middlewares::RAW_ONLY = ::Middleware::Builder.new do
   use ThinkingSphinx::Middlewares::SphinxQL
   use ThinkingSphinx::Middlewares::Geographer
   use ThinkingSphinx::Middlewares::Inquirer
+  use ThinkingSphinx::Middlewares::UTF8
 end
 
 ThinkingSphinx::Middlewares::IDS_ONLY = ::Middleware::Builder.new do

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -23,10 +23,6 @@ class ThinkingSphinx::Middlewares::SphinxQL <
     def call
       context[:indices]  = indices
       context[:sphinxql] = statement
-
-      if group_attribute.present?
-        context.search.masks << ThinkingSphinx::Masks::GroupEnumeratorsMask
-      end
     end
 
     private

data/lib/thinking_sphinx/middlewares/utf8.rb

@@ -0,0 +1,23 @@
+class ThinkingSphinx::Middlewares::UTF8 <
+  ThinkingSphinx::Middlewares::Middleware
+
+  def call(contexts)
+    contexts.each do |context|
+      context[:results].each { |row| update_row row }
+      update_row context[:meta]
+    end
+
+    app.call contexts
+  end
+
+  private
+
+  def update_row(row)
+    row.each do |key, value|
+      next unless value.is_a?(String)
+
+      value.encode!("ISO-8859-1")
+      row[key] = value.force_encoding("UTF-8")
+    end
+  end
+end

data/lib/thinking_sphinx/rake_interface.rb

@@ -30,6 +30,7 @@ class ThinkingSphinx::RakeInterface
   def index(reconfigure = true)
     configure if reconfigure
     FileUtils.mkdir_p configuration.indices_location
+    ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
     controller.index :verbose => true
   end
 

data/lib/thinking_sphinx/real_time/index.rb

@@ -13,6 +13,14 @@ class ThinkingSphinx::RealTime::Index < Riddle::Configuration::RealtimeIndex
     super reference, options
   end
 
+  def add_attribute(attribute)
+    @attributes << attribute
+  end
+
+  def add_field(field)
+    @fields << field
+  end
+
   def attributes
     interpret_definition!
 

data/lib/thinking_sphinx/real_time/index/template.rb

@@ -16,14 +16,14 @@ class ThinkingSphinx::RealTime::Index::Template
   private
 
   def add_attribute(column, name, type, options = {})
-    index.attributes << ThinkingSphinx::RealTime::Attribute.new(
+    index.add_attribute ThinkingSphinx::RealTime::Attribute.new(
       ThinkingSphinx::ActiveRecord::Column.new(*column),
       options.merge(:as => name, :type => type)
     )
   end
 
   def add_field(column, name)
-    index.fields << ThinkingSphinx::RealTime::Field.new(
+    index.add_field ThinkingSphinx::RealTime::Field.new(
       ThinkingSphinx::ActiveRecord::Column.new(*column), :as => name
     )
   end

data/lib/thinking_sphinx/search.rb

@@ -8,7 +8,8 @@ class ThinkingSphinx::Search < Array
     send class )
   DEFAULT_MASKS = [
     ThinkingSphinx::Masks::PaginationMask,
-    ThinkingSphinx::Masks::ScopesMask
+    ThinkingSphinx::Masks::ScopesMask,
+    ThinkingSphinx::Masks::GroupEnumeratorsMask
   ]
 
   instance_methods.select { |method|
@@ -23,7 +24,7 @@ class ThinkingSphinx::Search < Array
   def initialize(query = nil, options = {})
     query, options   = nil, query if query.is_a?(Hash)
     @query, @options = query, options
-    @masks           = @options.delete(:masks) || DEFAULT_MASKS
+    @masks           = @options.delete(:masks) || DEFAULT_MASKS.clone
     @middleware      = @options.delete(:middleware)
 
     populate if options[:populate]
@@ -34,6 +35,11 @@ class ThinkingSphinx::Search < Array
       ThinkingSphinx::Configuration.instance
   end
 
+  def current_page
+    options[:page] = 1 if options[:page].blank?
+    options[:page].to_i
+  end
+
   def meta
     populate
     context[:meta]

data/lib/thinking_sphinx/search/context.rb

@@ -6,7 +6,7 @@ class ThinkingSphinx::Search::Context
     @configuration = configuration || ThinkingSphinx::Configuration.instance
     @memory        = {
       :results => [],
-      :panes   => ThinkingSphinx::Configuration::Defaults::PANES
+      :panes   => ThinkingSphinx::Configuration::Defaults::PANES.clone
     }
   end
 

data/lib/thinking_sphinx/search/merger.rb

@@ -1,4 +1,6 @@
 class ThinkingSphinx::Search::Merger
+  attr_reader :search
+
   def initialize(search)
     @search = search
   end

data/spec/acceptance/excerpts_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'acceptance/spec_helper'
 
 describe 'Accessing excerpts for methods on a search result', :live => true do
@@ -11,4 +13,15 @@ describe 'Accessing excerpts for methods on a search result', :live => true do
     search.first.excerpts.title.
       should == 'American <span class="match">Gods</span>'
   end
+
+  it "handles UTF-8 text for excerpts" do
+    Book.create! :title => 'Война и миръ', :year => 1869
+    index
+
+    search = Book.search 'миръ'
+    search.context[:panes] << ThinkingSphinx::Panes::ExcerptsPane
+
+    search.first.excerpts.title.
+      should == 'Война и <span class="match">миръ</span>'
+  end
 end

data/spec/acceptance/facets_spec.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'acceptance/spec_helper'
 
 describe 'Faceted searching', :live => true do
@@ -35,10 +37,11 @@ describe 'Faceted searching', :live => true do
     Book.create! :title => 'American Gods', :author => 'Neil Gaiman'
     Book.create! :title => 'Anansi Boys',   :author => 'Neil Gaiman'
     Book.create! :title => 'Snuff',         :author => 'Terry Pratchett'
+    Book.create! :title => '1Q84',          :author => '村上 春樹'
     index
 
     Book.facets.to_hash[:author].should == {
-      'Neil Gaiman' => 2, 'Terry Pratchett' => 1
+      'Neil Gaiman' => 2, 'Terry Pratchett' => 1, '村上 春樹' => 1
     }
   end
 

data/spec/acceptance/index_options_spec.rb

@@ -109,4 +109,44 @@ describe 'Index options' do
       index.sources.first.sql_query_pre.should == ["DO STUFF"]
     end
   end
+
+  context 'respecting index options over core configuration' do
+    before :each do
+      ThinkingSphinx::Configuration.instance.settings['min_infix_len'] = 2
+      ThinkingSphinx::Configuration.instance.settings['sql_range_step'] = 2
+
+      index.definition_block = Proc.new {
+        indexes title
+
+        set_property :min_infix_len => 1
+        set_property :sql_range_step => 20
+      }
+      index.render
+    end
+
+    after :each do
+      ThinkingSphinx::Configuration.instance.settings.delete 'min_infix_len'
+      ThinkingSphinx::Configuration.instance.settings.delete 'sql_range_step'
+    end
+
+    it "prioritises index-level options over YAML options" do
+      index.min_infix_len.should == 1
+    end
+
+    it "prioritises index-level source options" do
+      index.sources.first.sql_range_step.should == 20
+    end
+
+    it "keeps index-level options prioritised when rendered again" do
+      index.render
+
+      index.min_infix_len.should == 1
+    end
+
+    it "keeps index-level options prioritised when rendered again" do
+      index.render
+
+      index.sources.first.sql_range_step.should == 20
+    end
+  end
 end

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -47,6 +47,24 @@ describe 'Searching within a model', :live => true do
 
     Admin::Person.search('Bond').to_a.should == [person]
   end
+
+  it "raises an error if searching through an ActiveRecord scope" do
+    lambda {
+      City.ordered.search
+    }.should raise_error(ThinkingSphinx::MixedScopesError)
+  end
+
+  it "does not raise an error when searching with a default ActiveRecord scope" do
+    lambda {
+      User.search
+    }.should_not raise_error(ThinkingSphinx::MixedScopesError)
+  end
+
+  it "raises an error when searching with default and applied AR scopes" do
+    lambda {
+      User.recent.search
+    }.should raise_error(ThinkingSphinx::MixedScopesError)
+  end
 end
 
 describe 'Searching within a model with a realtime index', :live => true do

data/spec/internal/app/models/city.rb

@@ -1,2 +1,3 @@
 class City < ActiveRecord::Base
+  scope :ordered, order(:name)
 end

data/spec/internal/app/models/user.rb

@@ -1,3 +1,6 @@
 class User < ActiveRecord::Base
   has_many :articles
-end
+
+  default_scope { order(:id) }
+  scope :recent, lambda { where('created_at > ?', 1.week.ago) }
+end

data/spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb

@@ -14,6 +14,12 @@ describe ThinkingSphinx::ActiveRecord::DatabaseAdapters::MySQLAdapter do
     adapter.boolean_value(false).should == 0
   end
 
+  describe '#cast_to_string' do
+    it "casts the clause to characters" do
+      adapter.cast_to_string('foo').should == "CAST(foo AS char)"
+    end
+  end
+
   describe '#cast_to_timestamp' do
     it "converts to unix timestamps" do
       adapter.cast_to_timestamp('created_at').

data/spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb

@@ -16,11 +16,24 @@ describe ThinkingSphinx::ActiveRecord::DatabaseAdapters::PostgreSQLAdapter do
     end
   end
 
+  describe '#cast_to_string' do
+    it "casts the clause to characters" do
+      adapter.cast_to_string('foo').should == 'foo::varchar'
+    end
+  end
+
   describe '#cast_to_timestamp' do
-    it "converts to unix timestamps" do
+    it "converts to int unix timestamps" do
       adapter.cast_to_timestamp('created_at').
         should == 'extract(epoch from created_at)::int'
     end
+
+    it "converts to bigint unix timestamps" do
+      ThinkingSphinx::Configuration.instance.settings['64bit_timestamps'] = true
+      
+      adapter.cast_to_timestamp('created_at').
+        should == 'extract(epoch from created_at)::bigint'
+    end
   end
 
   describe '#concatenate' do

data/spec/thinking_sphinx/active_record/property_sql_presenter_spec.rb

@@ -174,12 +174,27 @@ describe ThinkingSphinx::ActiveRecord::PropertySQLPresenter do
         adapter.stub :concatenate do |clause, separator|
           "CONCAT_WS('#{separator}', #{clause})"
         end
+        adapter.stub :cast_to_string do |clause|
+          "CAST(#{clause} AS varchar)"
+        end
 
         attribute.stub!(:columns => [column, double('column',
           :string? => false, :__stack => [], :__name => 'updated_at')])
 
-        presenter.to_select.
-          should == "CONCAT_WS(' ', articles.created_at) AS created_at"
+        presenter.to_select.should == "CONCAT_WS(',', CAST(articles.created_at AS varchar)) AS created_at"
+      end
+
+      it "casts and concatenates multiple columns for attributes" do
+        adapter.stub :concatenate do |clause, separator|
+          "CONCAT_WS('#{separator}', #{clause})"
+        end
+        adapter.stub :cast_to_string do |clause|
+          "CAST(#{clause} AS varchar)"
+        end
+
+        attribute.stub!(:columns => [column, column])
+
+        presenter.to_select.should == "CONCAT_WS(',', CAST(articles.created_at AS varchar), CAST(articles.created_at AS varchar)) AS created_at"
       end
     end
   end

data/spec/thinking_sphinx/configuration_spec.rb

@@ -82,6 +82,9 @@ describe ThinkingSphinx::Configuration do
 
   describe '#indices_for_references' do
     it "selects from the full index set those with matching references" do
+      config.preload_indices
+      config.indices.clear
+
       config.indices << double('index', :reference => :article)
       config.indices << double('index', :reference => :book)
       config.indices << double('index', :reference => :page)

data/spec/thinking_sphinx/deltas/default_delta_spec.rb

@@ -23,10 +23,12 @@ describe ThinkingSphinx::Deltas::DefaultDelta do
     let(:index)      { double('index', :name => 'foo_core',
       :document_id_for_key => 14) }
     let(:instance)   { double('instance', :id => 7) }
+    let(:pool)       { double }
 
     before :each do
-      ThinkingSphinx::Connection.stub :new => connection
+      ThinkingSphinx::Connection.stub :pool => pool
       Riddle::Query.stub :update => 'UPDATE STATEMENT'
+      pool.stub(:take).and_yield(connection)
     end
 
     it "updates the deleted flag to false" do

data/spec/thinking_sphinx/masks/pagination_mask_spec.rb

@@ -7,7 +7,7 @@ require 'thinking_sphinx/masks/pagination_mask'
 
 describe ThinkingSphinx::Masks::PaginationMask do
   let(:search) { double('search', :options => {}, :meta => {},
-    :per_page => 20) }
+    :per_page => 20, :current_page => 1) }
   let(:mask)   { ThinkingSphinx::Masks::PaginationMask.new search }
 
   describe '#first_page?' do
@@ -16,7 +16,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "returns false on other pages" do
-      search.options[:page] = 2
+      search.stub :current_page => 2
 
       mask.should_not be_first_page
     end
@@ -28,7 +28,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "is true when there's no more pages" do
-      search.options[:page] = 3
+      search.stub :current_page => 3
 
       mask.should be_last_page
     end
@@ -48,7 +48,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "should return nil if on the last page" do
-      search.options[:page] = 3
+      search.stub :current_page => 3
 
       mask.next_page.should be_nil
     end
@@ -64,7 +64,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "is false when there's no more pages" do
-      search.options[:page] = 3
+      search.stub :current_page => 3
 
       mask.next_page?.should be_false
     end
@@ -76,7 +76,7 @@ describe ThinkingSphinx::Masks::PaginationMask do
     end
 
     it "should return one less than the current page" do
-      search.options[:page] = 2
+      search.stub :current_page => 2
 
       mask.previous_page.should == 1
     end

data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb

@@ -26,7 +26,6 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
   before :each do
     stub_const 'Riddle::Query::Select', double(:new => sphinx_sql)
     stub_const 'ThinkingSphinx::Search::Query', double(:new => query)
-    stub_const 'ThinkingSphinx::Masks::GroupEnumeratorsMask', double
     stub_const 'ThinkingSphinx::IndexSet', double(:new => index_set)
 
     context.stub :search => search, :configuration => configuration
@@ -228,16 +227,6 @@ describe ThinkingSphinx::Middlewares::SphinxQL do
       middleware.call [context]
     end
 
-    it "adds the group enumerator mask when using :group_by" do
-      search.options[:group_by] = :foreign_id
-      search.stub :masks => []
-      sphinx_sql.stub :group_by => sphinx_sql, :values => sphinx_sql
-
-      middleware.call [context]
-
-      search.masks.should include(ThinkingSphinx::Masks::GroupEnumeratorsMask)
-    end
-
     it "appends a sort within group clause to the query" do
       search.options[:order_group_by] = :title
 

data/spec/thinking_sphinx/rake_interface_spec.rb

@@ -37,6 +37,7 @@ describe ThinkingSphinx::RakeInterface do
     let(:controller) { double('controller', :index => true) }
 
     before :each do
+      ThinkingSphinx.stub :before_index_hooks => []
       configuration.stub(
         :configuration_file => '/path/to/foo.conf',
         :render_to_file     => true,
@@ -64,6 +65,15 @@ describe ThinkingSphinx::RakeInterface do
       interface.index
     end
 
+    it "calls all registered hooks" do
+      called = false
+      ThinkingSphinx.before_index_hooks << Proc.new { called = true }
+
+      interface.index
+
+      called.should be_true
+    end
+
     it "indexes all indices verbosely" do
       controller.should_receive(:index).with(:verbose => true)
 

data/thinking-sphinx.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'thinking-sphinx'
-  s.version     = '3.0.2'
+  s.version     = '3.0.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Pat Allan"]
   s.email       = ["pat@freelancing-gods.com"]
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'builder',      '>= 2.1.2'
   s.add_runtime_dependency 'middleware',   '>= 0.1.0'
   s.add_runtime_dependency 'innertube',    '>= 1.0.2'
-  s.add_runtime_dependency 'riddle',       '>= 1.5.4'
+  s.add_runtime_dependency 'riddle',       '>= 1.5.6'
 
   s.add_development_dependency 'appraisal',        '~> 0.4.0'
   s.add_development_dependency 'combustion',       '~> 0.4.0'

metadata

@@ -1,88 +1,100 @@
 --- !ruby/object:Gem::Specification
 name: thinking-sphinx
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
+  prerelease: 
 platform: ruby
 authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: innertube
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: riddle
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.4
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: combustion
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -202,6 +221,8 @@ files:
 - lib/thinking_sphinx/core/property.rb
 - lib/thinking_sphinx/deltas.rb
 - lib/thinking_sphinx/deltas/default_delta.rb
+- lib/thinking_sphinx/deltas/delete_job.rb
+- lib/thinking_sphinx/deltas/index_job.rb
 - lib/thinking_sphinx/errors.rb
 - lib/thinking_sphinx/excerpter.rb
 - lib/thinking_sphinx/facet.rb
@@ -226,6 +247,7 @@ files:
 - lib/thinking_sphinx/middlewares/sphinxql.rb
 - lib/thinking_sphinx/middlewares/stale_id_checker.rb
 - lib/thinking_sphinx/middlewares/stale_id_filter.rb
+- lib/thinking_sphinx/middlewares/utf8.rb
 - lib/thinking_sphinx/panes.rb
 - lib/thinking_sphinx/panes/attributes_pane.rb
 - lib/thinking_sphinx/panes/distance_pane.rb
@@ -371,26 +393,33 @@ files:
 - thinking-sphinx.gemspec
 homepage: http://pat.github.com/ts/en
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4005802565131001666
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4005802565131001666
 requirements: []
 rubyforge_project: thinking-sphinx
-rubygems_version: 2.0.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A smart wrapper over Sphinx for ActiveRecord
 test_files:
 - spec/acceptance/association_scoping_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 2825535169716d44b3c2a897d70bdd6c44638b17
-  data.tar.gz: 30d74a154abf22f00795be4eaae8cb69e16fff19
-SHA512:
-  metadata.gz: 4f33cf2627e2944ecee27c689a60770a201a4eb54de9fd97354b3eec27cd07d0d847d79a003b4df8e188f5dc3ecdf2a36ac7003cb8cb63f158f4486f3f75f1cc
-  data.tar.gz: a66b7764fcb538650f61931d4a5bddaf9d708098db223606a120f503a1eecbbe533e6b048b942a10fe157b8a11b593b0ff4e27a80e7934378597cfe2f6fd284a