thinking-sphinx 2.0.10 → 2.0.11

data/HISTORY

@@ -1,3 +1,7 @@
+2.0.11 - January 2nd 2011
+* Call #all on search results to force population of results, matching ActiveRecord::Relation#all in essence. (Adrian Macneil).
+* 1.4.11 changes.
+
 2.0.10 - November 4th 2011
 * 1.4.10 changes.
 
@@ -53,6 +57,14 @@
 * Rails 3 support.
 * 1.4.0 changes.
 
+1.4.11 - January 2nd 2011
+* Handle no results for total_pages and total_entries with defaults of 0.
+* No longer shuffle Sphinx addresses by default.
+* Fix coalescing of non-char values in PostgreSQL (Matthew Barnett).
+* Default database user for Sphinx configuration is now ENV['USER'], not root.
+* Alias offset to offset_value for Kaminari.
+* Sphinx 2.1.0-dev support.
+
 1.4.10 - November 4th 2011
 * Updating Riddle references for impending 1.5.0 release of Riddle.
 * Handle out-of-date indexed_models references.

data/README.textile

@@ -225,3 +225,5 @@ Since I first released this library, there's been quite a few people who have su
 * Eduardo Casanova
 * Tony Pitale
 * Kenn Ejima
+* Matthew Barnett
+* Adrian Macneil

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
         clause.split('), ').join(") || '#{separator}' || ")
       else
         clause.split(', ').collect { |field|
-          "CAST(COALESCE(#{field}, '') as varchar)"
+          "CAST(COALESCE(#{field}::varchar, '') as varchar)"
         }.join(" || '#{separator}' || ")
       end
     end

data/lib/thinking_sphinx/auto_version.rb

@@ -9,10 +9,12 @@ module ThinkingSphinx
         require 'riddle/1.10'
       when /2.0.\d/
         require 'riddle/2.0.1'
+      when /2.1.\d/
+        require 'riddle/2.1.0'
       else
         documentation_link = %Q{
 For more information, read the documentation:
-http://freelancing-god.github.com/ts/en/advanced_config.html          
+http://freelancing-god.github.com/ts/en/advanced_config.html
 }
 
         if version.nil? || version.empty?

data/lib/thinking_sphinx/configuration.rb

@@ -110,7 +110,7 @@ module ThinkingSphinx
       self.model_directories    = initial_model_directories
       self.delayed_job_priority = 0
       self.indexed_models       = []
-      self.shuffle              = true
+      self.shuffle              = false
 
       self.source_options  = {}
       self.index_options   = {
@@ -351,7 +351,7 @@ module ThinkingSphinx
       directories = ["#{app_root}/app/models/"] +
         Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
 
-      if defined?(Rails)
+      if defined?(Rails) && Rails.application
         directories += Rails.application.paths['app/models'].to_a
         directories += Rails.application.railties.engines.collect { |engine|
           engine.paths['app/models'].to_a

data/lib/thinking_sphinx/search.rb

@@ -100,6 +100,12 @@ module ThinkingSphinx
       @array
     end
 
+    # Populates the search result set
+    def all
+      populate
+      self
+    end
+
     def freeze
       populate
       @array.freeze
@@ -224,7 +230,7 @@ module ThinkingSphinx
     def next_page?
       !next_page.nil?
     end
-    
+
     def last_page?
       next_page.nil?
     end
@@ -263,7 +269,7 @@ module ThinkingSphinx
     #
     def total_pages
       populate
-      return 0 if @results[:total].nil?
+      return 0 if @results.nil? || @results[:total].nil?
 
       @total_pages ||= (@results[:total] / per_page.to_f).ceil
     end
@@ -288,7 +294,7 @@ module ThinkingSphinx
     #
     def total_entries
       populate
-      return 0 if @results[:total_found].nil?
+      return 0 if @results.nil? || @results[:total_found].nil?
 
       @total_entries ||= @results[:total_found]
     end
@@ -305,6 +311,8 @@ module ThinkingSphinx
       @options[:offset] || ((current_page - 1) * per_page)
     end
 
+    alias_method :offset_value, :offset
+
     def indexes
       return options[:index] if options[:index]
       return '*' if classes.empty?

data/lib/thinking_sphinx/source.rb

@@ -5,11 +5,11 @@ module ThinkingSphinx
   class Source
     include ThinkingSphinx::Source::InternalProperties
     include ThinkingSphinx::Source::SQL
-    
+
     attr_accessor :model, :fields, :attributes, :joins, :conditions, :groupings,
       :options
     attr_reader :base, :index, :database_configuration
-    
+
     def initialize(index, options = {})
       @index        = index
       @model        = index.model
@@ -22,83 +22,83 @@ module ThinkingSphinx
       @associations = {}
       @database_configuration = @model.connection.
         instance_variable_get(:@config).clone
-      
+
       @base = join_dependency_class.new(
         @model, [], initial_joins
       )
-      
+
       unless @model.descends_from_active_record?
         stored_class = @model.store_full_sti_class ? @model.name : @model.name.demodulize
         @conditions << "#{@model.quoted_table_name}.#{quote_column(@model.inheritance_column)} = '#{stored_class}'"
       end
-      
+
       add_internal_attributes_and_facets
     end
-    
+
     def name
       index.name
     end
-    
+
     def to_riddle_for_core(offset, position)
       source = Riddle::Configuration::SQLSource.new(
         "#{index.core_name}_#{position}", adapter.sphinx_identifier
       )
-      
+
       set_source_database_settings  source
       set_source_fields             source
       set_source_attributes         source, offset
       set_source_settings           source
       set_source_sql                source, offset
-      
+
       source
     end
-    
+
     def to_riddle_for_delta(offset, position)
       source = Riddle::Configuration::SQLSource.new(
         "#{index.delta_name}_#{position}", adapter.sphinx_identifier
       )
       source.parent = "#{index.core_name}_#{position}"
-      
+
       set_source_database_settings  source
       set_source_fields             source
       set_source_attributes         source, offset, true
       set_source_settings           source
       set_source_sql                source, offset, true
-      
+
       source
     end
-    
+
     def delta?
       !@index.delta_object.nil?
     end
-    
+
     # Gets the association stack for a specific key.
-    # 
+    #
     def association(key)
       @associations[key] ||= Association.children(@model, key)
     end
-    
+
     private
-    
+
     def adapter
       @adapter ||= @model.sphinx_database_adapter
     end
-    
+
     def available_attributes
       attributes.select { |attrib| attrib.available? }
     end
-    
+
     def set_source_database_settings(source)
       config = @database_configuration
-      
+
       source.sql_host = config[:host]           || "localhost"
-      source.sql_user = config[:username]       || config[:user] || 'root'
+      source.sql_user = config[:username]       || config[:user] || ENV['USER']
       source.sql_pass = (config[:password].to_s || "").gsub('#', '\#')
       source.sql_db   = config[:database]
       source.sql_port = config[:port]
       source.sql_sock = config[:socket]
     end
-    
+
     def set_source_fields(source)
       fields.each do |field|
         source.sql_file_field   << field.unique_name if field.file?
@@ -106,34 +106,34 @@ module ThinkingSphinx
         source.sql_field_str2wordcount << field.unique_name if field.with_wordcount?
       end
     end
-    
+
     def set_source_attributes(source, offset, delta = false)
       available_attributes.each do |attrib|
         source.send(attrib.type_to_config) << attrib.config_value(offset, delta)
       end
     end
-    
+
     def set_source_sql(source, offset, delta = false)
       source.sql_query        = to_sql(:offset => offset, :delta => delta).gsub(/\n/, ' ')
       source.sql_query_range  = to_sql_query_range(:delta => delta)
       source.sql_query_info   = to_sql_query_info(offset)
-      
+
       source.sql_query_pre += send(!delta ? :sql_query_pre_for_core : :sql_query_pre_for_delta)
-      
+
       if @index.local_options[:group_concat_max_len]
         source.sql_query_pre << "SET SESSION group_concat_max_len = #{@index.local_options[:group_concat_max_len]}"
       end
-      
+
       source.sql_query_pre += [adapter.utf8_query_pre].compact if utf8?
       source.sql_query_pre << adapter.utc_query_pre
     end
-    
+
     def set_source_settings(source)
       config = ThinkingSphinx::Configuration.instance
       config.source_options.each do |key, value|
         source.send("#{key}=".to_sym, value)
       end
-      
+
       source_options = ThinkingSphinx::Configuration::SourceOptions
       @options.each do |key, value|
         if source_options.include?(key.to_s) && !value.nil?
@@ -141,11 +141,11 @@ module ThinkingSphinx
         end
       end
     end
-    
+
     # Returns all associations used amongst all the fields and attributes.
     # This includes all associations between the model and what the actual
     # columns are from.
-    # 
+    #
     def all_associations
       @all_associations ||= (
         # field associations
@@ -165,11 +165,11 @@ module ThinkingSphinx
         assoc.ancestors
       }.flatten.uniq
     end
-    
+
     def utf8?
       @index.options[:charset_type] =~ /utf-8|zh_cn.utf-8/
     end
-    
+
     def join_dependency_class
       if rails_3_1?
         ::ActiveRecord::Associations::JoinDependency
@@ -177,7 +177,7 @@ module ThinkingSphinx
         ::ActiveRecord::Associations::ClassMethods::JoinDependency
       end
     end
-    
+
     def initial_joins
       if rails_3_1?
         []
@@ -185,7 +185,7 @@ module ThinkingSphinx
         nil
       end
     end
-    
+
     def rails_3_1?
       ::ActiveRecord::Associations.constants.include?(:JoinDependency) ||
       ::ActiveRecord::Associations.constants.include?('JoinDependency')

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.10'
+  Version = '2.0.11'
 end

data/spec/thinking_sphinx/auto_version_spec.rb

@@ -5,65 +5,73 @@ describe ThinkingSphinx::AutoVersion do
     before :each do
       @config = ThinkingSphinx::Configuration.instance
     end
-    
+
     it "should require 0.9.8 if that is the detected version" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/0.9.8')
-      
+
       @config.stub!(:version => '0.9.8')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should require 0.9.9 if that is the detected version" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/0.9.9')
-      
+
       @config.stub!(:version => '0.9.9')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should require 1.10-beta if that is the detected version" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/1.10')
-      
+
       @config.stub!(:version => '1.10-beta')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should require 1.10-beta if using 1.10-beta compiled with id64 support" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/1.10')
-      
+
       @config.stub!(:version => '1.10-id64-beta')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should require 2.0.1 if using Sphinx 2.0.1 beta" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/2.0.1')
-      
+
       @config.stub!(:version => '2.0.1-beta')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should require 2.0.1 if using Sphinx 2.0.2 dev" do
       ThinkingSphinx::AutoVersion.should_receive(:require).
         with('riddle/2.0.1')
-      
+
       @config.stub!(:version => '2.0.2-dev')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
+    it "should require 2.1.0 if using Sphinx 2.1.0 dev" do
+      ThinkingSphinx::AutoVersion.should_receive(:require).
+        with('riddle/2.1.0')
+
+      @config.stub!(:version => '2.1.0-dev')
+      ThinkingSphinx::AutoVersion.detect
+    end
+
     it "should output a warning if the detected version is unsupported" do
       STDERR.should_receive(:puts).with(/unsupported/i)
-      
+
       @config.stub!(:version => '0.9.7')
       ThinkingSphinx::AutoVersion.detect
     end
-    
+
     it "should output a warning if the version cannot be determined" do
       STDERR.should_receive(:puts).at_least(:once)
-      
+
       @config.stub!(:version => nil)
       ThinkingSphinx::AutoVersion.detect
     end

data/spec/thinking_sphinx/search_spec.rb

@@ -1346,6 +1346,21 @@ describe ThinkingSphinx::Search do
     end
   end
 
+  describe '#all' do
+    before :each do
+      @search = ThinkingSphinx::Search.new
+    end
+
+    it "should populate the result set" do
+      @search.all
+      @search.should be_populated
+    end
+
+    it "should return the Search object" do
+      @search.all.should be_a(ThinkingSphinx::Search)
+    end
+  end
+
   describe '#freeze' do
     before :each do
       @search = ThinkingSphinx::Search.new

data/spec/thinking_sphinx/source_spec.rb

@@ -5,36 +5,36 @@ describe ThinkingSphinx::Source do
     @index  = ThinkingSphinx::Index.new(Person)
     @source = ThinkingSphinx::Source.new(@index, :sql_range_step => 1000)
   end
-  
+
   describe '#initialize' do
     it "should store the current connection details" do
       config = Person.connection.instance_variable_get(:@config)
       @source.database_configuration.should == config
     end
   end
-  
+
   it "should generate the name from the model" do
     @source.name.should == "person"
   end
-  
+
   it "should handle namespaced models for name generation" do
     index  = ThinkingSphinx::Index.new(Admin::Person)
     source = ThinkingSphinx::Source.new(index)
     source.name.should == "admin_person"
   end
-  
+
   describe "#to_riddle_for_core" do
     before :each do
       config = ThinkingSphinx::Configuration.instance
       config.source_options[:sql_ranged_throttle] = 100
-      
+
       ThinkingSphinx::Field.new(
         @source, ThinkingSphinx::Index::FauxColumn.new(:first_name)
       )
       ThinkingSphinx::Field.new(
         @source, ThinkingSphinx::Index::FauxColumn.new(:last_name)
       )
-      
+
       ThinkingSphinx::Attribute.new(
         @source, ThinkingSphinx::Index::FauxColumn.new(:id), :as => :internal_id
       )
@@ -52,31 +52,31 @@ describe ThinkingSphinx::Source do
         @source, ThinkingSphinx::Index::FauxColumn.new(:source, :id),
         :as => :source_id, :type => :integer
       )
-      
+
       ThinkingSphinx::Join.new(
         @source, ThinkingSphinx::Index::FauxColumn.new(:links)
       )
-      
+
       @source.conditions << "`birthday` <= NOW()"
       @source.groupings  << "`first_name`"
-      
+
       @index.local_options[:group_concat_max_len] = 1024
-      
+
       @riddle = @source.to_riddle_for_core(1, 0)
     end
-    
+
     it "should generate a Riddle Source object" do
       @riddle.should be_a_kind_of(Riddle::Configuration::SQLSource)
     end
-    
+
     it "should use the index and name its own name" do
       @riddle.name.should == "person_core_0"
     end
-    
+
     it "should use the model's database connection to determine type" do
       @riddle.type.should == "mysql"
     end
-    
+
     it "should match the model's database settings" do
       config = Person.connection.instance_variable_get(:@config)
       @riddle.sql_db.should   == config[:database]
@@ -86,123 +86,123 @@ describe ThinkingSphinx::Source do
       @riddle.sql_port.should == config[:port]
       @riddle.sql_sock.should == config[:socket]
     end
-    
-    it "should use a default username of root if nothing else is provided" do
+
+    it "should use a environment user if nothing else is provided" do
       Person.connection.stub!(:instance_variable_get => {
         :user     => nil,
         :username => nil
       })
       @source = ThinkingSphinx::Source.new(@index)
-      
+
       riddle = @source.to_riddle_for_core(1, 0)
-      riddle.sql_user.should == 'root'
+      riddle.sql_user.should == ENV['USER']
     end
-    
+
     it "should assign attributes" do
       # 3 internal attributes plus the one requested
       @riddle.sql_attr_uint.length.should == 4
       @riddle.sql_attr_uint.last.should == :internal_id
-      
+
       @riddle.sql_attr_timestamp.length.should == 1
       @riddle.sql_attr_timestamp.first.should == :birthday
     end
-    
+
     it "should not include an attribute definition for polymorphic references without data" do
       @riddle.sql_attr_uint.select { |uint|
         uint == :source_id
       }.should be_empty
     end
-    
+
     it "should set Sphinx Source options" do
       @riddle.sql_range_step.should      == 1000
       @riddle.sql_ranged_throttle.should == 100
     end
-    
+
     describe "#sql_query" do
       before :each do
         @query = @riddle.sql_query
       end
-      
+
       it "should select data from the model table" do
         @query.should match(/FROM\s+`people`/)
       end
-      
+
       it "should select each of the fields" do
         @query.should match(/`first_name`.+FROM/)
         @query.should match(/`last_name`.+FROM/)
       end
-      
+
       it "should select each of the attributes" do
         @query.should match(/`id` AS `internal_id`.+FROM/)
         @query.should match(/`birthday`.+FROM/)
         @query.should match(/`tags`.`id`.+ AS `tag_ids`.+FROM/)
       end
-      
+
       it "should not match the sourced MVA attribute" do
         @query.should_not match(/contact_ids/)
       end
-      
+
       it "should include joins for required associations" do
         @query.should match(/LEFT OUTER JOIN `tags`/)
       end
-      
+
       it "should not include joins for the sourced MVA attribute" do
         @query.should_not match(/LEFT OUTER JOIN `contacts`/)
       end
-      
+
       it "should include explicitly requested joins" do
         @query.should match(/LEFT OUTER JOIN `links`/)
       end
-      
+
       it "should include any defined conditions" do
         @query.should match(/WHERE.+`birthday` <= NOW()/)
       end
-      
+
       it "should include any defined groupings" do
         @query.should match(/GROUP BY.+`first_name`/)
       end
     end
-    
+
     describe "#sql_query_range" do
       before :each do
         @query = @riddle.sql_query_range
       end
-      
+
       it "should select data from the model table" do
         @query.should match(/FROM `people`/)
       end
-      
+
       it "should select the minimum and the maximum ids" do
         @query.should match(/SELECT.+MIN.+MAX.+FROM/)
       end
     end
-    
+
     describe "#sql_query_info" do
       before :each do
         @query = @riddle.sql_query_info
       end
-      
+
       it "should select all fields from the model table" do
         @query.should match(/SELECT \* FROM `people`/)
       end
-      
+
       it "should filter the primary key with the offset" do
         model_count = ThinkingSphinx.context.indexed_models.size
         @query.should match(/WHERE `id` = \(\(\$id - 1\) \/ #{model_count}\)/)
       end
     end
-    
+
     describe "#sql_query_pre" do
       before :each do
         @queries = @riddle.sql_query_pre
       end
-      
+
       it "should default to just the UTF8 statement" do
         @queries.detect { |query|
           query == "SET NAMES utf8"
         }.should_not be_nil
       end
-      
+
       it "should set the group_concat_max_len session value for MySQL if requested" do
         @queries.detect { |query|
           query == "SET SESSION group_concat_max_len = 1024"
@@ -210,41 +210,41 @@ describe ThinkingSphinx::Source do
       end
     end
   end
-  
+
   describe "#to_riddle_for_core with range disabled" do
     before :each do
       ThinkingSphinx::Field.new(
         @source, ThinkingSphinx::Index::FauxColumn.new(:first_name)
       )
     end
-    
+
     describe "set per-index" do
       before :each do
         @index.local_options[:disable_range] = true
         @riddle = @source.to_riddle_for_core(1, 0)
       end
-      
+
       it "should not have the range in the sql_query" do
         @riddle.sql_query.should_not match(/`people`.`id` >= \$start/)
         @riddle.sql_query.should_not match(/`people`.`id` <= \$end/)
       end
-    
+
       it "should not have a sql_query_range" do
         @riddle.sql_query_range.should be_nil
       end
     end
-    
+
     describe "set globally" do
       before :each do
         ThinkingSphinx::Configuration.instance.index_options[:disable_range] = true
         @riddle = @source.to_riddle_for_core(1, 0)
       end
-      
+
       it "should not have the range in the sql_query" do
         @riddle.sql_query.should_not match(/`people`.`id` >= \$start/)
         @riddle.sql_query.should_not match(/`people`.`id` <= \$end/)
       end
-    
+
       it "should not have a sql_query_range" do
         @riddle.sql_query_range.should be_nil
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 0
-  - 10
-  version: 2.0.10
+  - 11
+  version: 2.0.11
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-04 00:00:00 +02:00
+date: 2012-01-02 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency