thinking-sphinx 3.0.5 → 3.0.6

data/lib/thinking_sphinx/masks/group_enumerators_mask.rb

@@ -9,19 +9,20 @@ class ThinkingSphinx::Masks::GroupEnumeratorsMask
 
   def each_with_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['@count']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.count]
     end
   end
 
   def each_with_group(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['@groupby']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by]
     end
   end
 
   def each_with_group_and_count(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['@groupby'], row['@count']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.group_by],
+        row[ThinkingSphinx::SphinxQL.count]
     end
   end
 end

data/lib/thinking_sphinx/masks/scopes_mask.rb

@@ -19,6 +19,11 @@ class ThinkingSphinx::Masks::ScopesMask
     ThinkingSphinx::Search::Merger.new(@search).merge! query, options
   end
 
+  def search_for_ids(query = nil, options = {})
+    query, options = nil, query if query.is_a?(Hash)
+    search query, options.merge(:ids_only => true)
+  end
+
   private
 
   def apply_scope(scope, *args)

data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb

@@ -9,7 +9,7 @@ class ThinkingSphinx::Masks::WeightEnumeratorMask
 
   def each_with_weight(&block)
     @search.raw.each_with_index do |row, index|
-      yield @search[index], row['@weight']
+      yield @search[index], row[ThinkingSphinx::SphinxQL.weight]
     end
   end
 end

data/lib/thinking_sphinx/middlewares/active_record_translator.rb

@@ -18,7 +18,12 @@ class ThinkingSphinx::Middlewares::ActiveRecordTranslator <
 
     def call
       results_for_models # load now to avoid segfaults
-      context[:results] = context[:results].collect { |row| result_for(row) }
+
+      context[:results] = if sql_options[:order]
+        results_for_models.values.first
+      else
+        context[:results].collect { |row| result_for(row) }
+      end
     end
 
     private

data/lib/thinking_sphinx/middlewares/geographer.rb

@@ -31,25 +31,30 @@ class ThinkingSphinx::Middlewares::Geographer <
 
     delegate :geo, :latitude, :longitude, :to => :geolocation_attributes
 
+    def fixed_format(float)
+      ThinkingSphinx::FloatFormatter.new(float).fixed
+    end
+
     def geolocation_attributes
       @geolocation_attributes ||= GeolocationAttributes.new(context)
     end
 
     def geodist_clause
-      "GEODIST(#{geo.first}, #{geo.last}, #{latitude}, #{longitude}) AS geodist"
+      "GEODIST(#{fixed_format geo.first}, #{fixed_format geo.last}, #{latitude}, #{longitude}) AS geodist"
     end
 
     class GeolocationAttributes
+      attr_accessor :latitude, :longitude
+
       def initialize(context)
-        self.context = context
-        self.latitude = latitude_attr if latitude_attr
+        self.context   = context
+        self.latitude  = latitude_attr if latitude_attr
         self.longitude = longitude_attr if longitude_attr
       end
 
       def geo
         search_context_options[:geo]
       end
-      attr_accessor :latitude, :longitude
 
       def latitude
         @latitude ||= names.detect { |name| %w[lat latitude].include?(name) } || 'lat'
@@ -60,6 +65,7 @@ class ThinkingSphinx::Middlewares::Geographer <
       end
 
       private
+
       attr_accessor :context
 
       def latitude_attr

data/lib/thinking_sphinx/middlewares/sphinxql.rb

@@ -3,7 +3,8 @@ class ThinkingSphinx::Middlewares::SphinxQL <
 
   SELECT_OPTIONS = [:ranker, :max_matches, :cutoff, :max_query_time,
     :retry_count, :retry_delay, :field_weights, :index_weights, :reverse_scan,
-    :comment]
+    :comment, :agent_query_timeout, :boolean_simplify, :global_idf, :idf,
+    :sort_method]
 
   def call(contexts)
     contexts.each do |context|
@@ -29,6 +30,10 @@ class ThinkingSphinx::Middlewares::SphinxQL <
 
     attr_reader :context
 
+    delegate :search, :configuration, :to => :context
+    delegate :options,                :to => :search
+    delegate :settings,               :to => :configuration
+
     def classes
       options[:classes] || []
     end
@@ -75,9 +80,9 @@ class ThinkingSphinx::Middlewares::SphinxQL <
     end
 
     def indices_match_classes?
-      indices.collect(&:reference).uniq == classes.collect { |klass|
+      indices.collect(&:reference).uniq.sort == classes.collect { |klass|
         klass.name.underscore.to_sym
-      }
+      }.sort
     end
 
     def inheritance_column_select(klass)
@@ -127,12 +132,13 @@ SQL
     end
 
     def indices
-      @indices ||= ThinkingSphinx::IndexSet.new classes, options[:indices]
+      @indices ||= begin
+        set = ThinkingSphinx::IndexSet.new classes, options[:indices]
+        raise ThinkingSphinx::NoIndicesError if set.empty?
+        set
+      end
     end
 
-    delegate :search, :to => :context
-    delegate :options, :to => :search
-
     def order_clause
       order_by = options[:order]
       order_by = "#{order_by} ASC" if order_by.is_a? Symbol
@@ -148,11 +154,8 @@ SQL
       end
     end
 
-    delegate :configuration, :to => :context
-    delegate :settings, :to => :configuration
-
     def values
-      options[:select] ||= '*, @groupby, @count' if group_attribute.present?
+      options[:select] ||= "*, #{ThinkingSphinx::SphinxQL.group_by}, #{ThinkingSphinx::SphinxQL.count}" if group_attribute.present?
       options[:select]
     end
 

data/lib/thinking_sphinx/middlewares/utf8.rb

@@ -5,7 +5,7 @@ class ThinkingSphinx::Middlewares::UTF8 <
     contexts.each do |context|
       context[:results].each { |row| update_row row }
       update_row context[:meta]
-    end
+    end unless ThinkingSphinx::Configuration.instance.settings['utf8']
 
     app.call contexts
   end
@@ -16,8 +16,7 @@ class ThinkingSphinx::Middlewares::UTF8 <
     row.each do |key, value|
       next unless value.is_a?(String)
 
-      value.encode!("ISO-8859-1")
-      row[key] = value.force_encoding("UTF-8")
+      row[key] = ThinkingSphinx::UTF8.encode value
     end
   end
 end

data/lib/thinking_sphinx/panes/weight_pane.rb

@@ -4,6 +4,6 @@ class ThinkingSphinx::Panes::WeightPane
   end
 
   def weight
-    @raw['@weight']
+    @raw[ThinkingSphinx::SphinxQL.weight]
   end
 end

data/lib/thinking_sphinx/rake_interface.rb

@@ -14,22 +14,24 @@ class ThinkingSphinx::RakeInterface
   end
 
   def generate
-    configuration.preload_indices
-    configuration.render
-
-    FileUtils.mkdir_p configuration.indices_location
-
     indices = configuration.indices.select { |index| index.type == 'rt' }
     indices.each do |index|
       ThinkingSphinx::RealTime::Populator.populate index
     end
   end
 
-  def index(reconfigure = true)
+  def index(reconfigure = true, verbose = true)
     configure if reconfigure
     FileUtils.mkdir_p configuration.indices_location
     ThinkingSphinx.before_index_hooks.each { |hook| hook.call }
-    controller.index :verbose => true
+    controller.index :verbose => verbose
+  end
+
+  def prepare
+    configuration.preload_indices
+    configuration.render
+
+    FileUtils.mkdir_p configuration.indices_location
   end
 
   def start

data/lib/thinking_sphinx/real_time/interpreter.rb

@@ -13,6 +13,8 @@ class ThinkingSphinx::RealTime::Interpreter <
     @index.fields += columns.collect { |column|
       ::ThinkingSphinx::RealTime::Field.new column, options
     }
+
+    append_sortable_attributes columns, options if options[:sortable]
   end
 
   def scope(&block)
@@ -28,4 +30,20 @@ class ThinkingSphinx::RealTime::Interpreter <
   def where(condition)
     @index.conditions << condition
   end
+
+  private
+
+  def append_sortable_attributes(columns, options)
+    options = options.except(:sortable).merge(:type => :string)
+
+    @index.attributes += columns.collect { |column|
+      aliased_name   = options[:as]
+      aliased_name ||= column.__name.to_sym if column.respond_to?(:__name)
+      aliased_name ||= column
+
+      options[:as] = "#{aliased_name}_sort".to_sym
+
+      ::ThinkingSphinx::RealTime::Attribute.new column, options
+    }
+  end
 end

data/lib/thinking_sphinx/real_time/property.rb

@@ -1,10 +1,12 @@
 class ThinkingSphinx::RealTime::Property
   include ThinkingSphinx::Core::Property
 
-  attr_reader :options
+  attr_reader :column, :options
 
   def initialize(column, options = {})
-    @column, @options = column, options
+    @options = options
+    @column  = column.respond_to?(:__name) ? column :
+      ThinkingSphinx::ActiveRecord::Column.new(column)
   end
 
   def name

data/lib/thinking_sphinx/search.rb

@@ -18,14 +18,12 @@ class ThinkingSphinx::Search < Array
     undef_method method
   }
 
-  attr_reader   :options, :masks
+  attr_reader   :options
   attr_accessor :query
 
   def initialize(query = nil, options = {})
     query, options   = nil, query if query.is_a?(Hash)
     @query, @options = query, options
-    @masks           = @options.delete(:masks) || DEFAULT_MASKS.clone
-    @middleware      = @options.delete(:middleware)
 
     populate if options[:populate]
   end
@@ -40,6 +38,10 @@ class ThinkingSphinx::Search < Array
     options[:page].to_i
   end
 
+  def masks
+    @masks ||= @options[:masks] || DEFAULT_MASKS.clone
+  end
+
   def meta
     populate
     context[:meta]
@@ -94,6 +96,11 @@ class ThinkingSphinx::Search < Array
 
   private
 
+  def default_middleware
+    options[:ids_only] ? ThinkingSphinx::Middlewares::IDS_ONLY :
+      ThinkingSphinx::Middlewares::DEFAULT
+  end
+
   def mask_stack
     @mask_stack ||= masks.collect { |klass| klass.new self }
   end
@@ -109,13 +116,7 @@ class ThinkingSphinx::Search < Array
   end
 
   def middleware
-    @middleware ||= begin
-      if options[:ids_only]
-        ThinkingSphinx::Middlewares::IDS_ONLY
-      else
-        ThinkingSphinx::Middlewares::DEFAULT
-      end
-    end
+    @options[:middleware] || default_middleware
   end
 end
 

data/lib/thinking_sphinx/sphinxql.rb

@@ -0,0 +1,17 @@
+module ThinkingSphinx::SphinxQL
+  mattr_accessor :weight, :group_by, :count
+
+  def self.functions!
+    self.weight   = 'weight()'
+    self.group_by = 'groupby()'
+    self.count    = 'count(*)'
+  end
+
+  def self.variables!
+    self.weight   = '@weight'
+    self.group_by = '@groupby'
+    self.count    = '@count'
+  end
+
+  self.variables!
+end

data/lib/thinking_sphinx/tasks.rb

@@ -6,7 +6,10 @@ namespace :ts do
 
   desc 'Generate the Sphinx configuration file and process all indices'
   task :index => :environment do
-    interface.index(ENV['INDEX_ONLY'] != 'true')
+    interface.index(
+      ENV['INDEX_ONLY'] != 'true',
+      !Rake.application.options.silent
+    )
   end
 
   desc 'Clear out Sphinx files'
@@ -16,6 +19,7 @@ namespace :ts do
 
   desc 'Generate fresh index files for real-time indices'
   task :generate => :environment do
+    interface.prepare
     interface.generate
   end
 

data/lib/thinking_sphinx/utf8.rb

@@ -0,0 +1,16 @@
+class ThinkingSphinx::UTF8
+  attr_reader :string
+
+  def self.encode(string)
+    new(string).encode
+  end
+
+  def initialize(string)
+    @string = string
+  end
+
+  def encode
+    string.encode!('ISO-8859-1')
+    string.force_encoding('UTF-8')
+  end
+end

data/spec/acceptance/attribute_access_spec.rb

@@ -15,7 +15,8 @@ describe 'Accessing attributes directly via search results', :live => true do
     Book.create! :title => 'American Gods', :year => 2001
     index
 
-    search = Book.search('gods', :select => '*, @weight')
+    search = Book.search 'gods',
+      :select => "*, #{ThinkingSphinx::SphinxQL.weight}"
     search.context[:panes] << ThinkingSphinx::Panes::WeightPane
 
     search.first.weight.should == 2500
@@ -25,7 +26,8 @@ describe 'Accessing attributes directly via search results', :live => true do
     gods = Book.create! :title => 'American Gods', :year => 2001
     index
 
-    search = Book.search('gods', :select => '*, @weight')
+    search = Book.search 'gods',
+      :select => "*, #{ThinkingSphinx::SphinxQL.weight}"
     search.masks << ThinkingSphinx::Masks::WeightEnumeratorMask
 
     expectations = [[gods, 2500]]

data/spec/acceptance/searching_within_a_model_spec.rb

@@ -65,6 +65,12 @@ describe 'Searching within a model', :live => true do
       User.recent.search
     }.should raise_error(ThinkingSphinx::MixedScopesError)
   end
+
+  it "raises an error if the model has no indices defined" do
+    lambda {
+      Category.search.to_a
+    }.should raise_error(ThinkingSphinx::NoIndicesError)
+  end
 end
 
 describe 'Searching within a model with a realtime index', :live => true do

data/spec/acceptance/sorting_search_results_spec.rb

@@ -28,6 +28,13 @@ describe 'Sorting search results', :live => true do
     Book.search(:order => :title).to_a.should == [gods, boys, grave]
   end
 
+  it "sorts by a given sortable field with real-time indices" do
+    widgets = Product.create! :name => 'Widgets'
+    gadgets = Product.create! :name => 'Gadgets'
+
+    Product.search(:order => "name_sort ASC").to_a.should == [gadgets, widgets]
+  end
+
   it "can sort with a provided expression" do
     gods  = Book.create! :title => 'American Gods',      :year => 2001
     grave = Book.create! :title => 'The Graveyard Book', :year => 2009

data/spec/acceptance/support/sphinx_controller.rb

@@ -9,6 +9,11 @@ class SphinxController
 
     ThinkingSphinx::Configuration.reset
 
+    if ENV['SPHINX_VERSION'].try :[], /2.1.\d/
+      ThinkingSphinx::SphinxQL.functions!
+      ThinkingSphinx::Configuration.instance.settings['utf8'] = true
+    end
+
     ActiveSupport::Dependencies.loaded.each do |path|
       $LOADED_FEATURES.delete "#{path}.rb"
     end

data/spec/internal/app/indices/city_index.rb

@@ -3,4 +3,5 @@ ThinkingSphinx::Index.define :city, :with => :active_record do
   has lat, lng
 
   set_property :charset_table => '0..9, A..Z->a..z, _, a..z, U+410..U+42F->U+430..U+44F, U+430..U+44F, U+0130'
+  set_property :utf8? => true
 end