thinking-sphinx 2.0.7 → 2.0.8

data/HISTORY

@@ -1,3 +1,15 @@
+2.0.8 - October 10th 2011
+* Actually looking at Rails engines paths for models (Eduardo Casanova).
+* Ensuring associations for acts-as-taggable-on are tweaked for Rails 3.1 (Anthony).
+* Bug fix for association collection proxies in Rails 3.1 (Pavel Forkert).
+* References all known Rails model paths - better for Rails 3 Engines.
+* Don't reload I18n anymore - the load order isn't an issue in Rails 3 or 3.1.
+* Fixing attribute source queries for Rails 3.1.
+* 1.4.8 changes
+
+2.0.7 - August 29th 2011
+* Making sure lib directory is actually a part of the gem. Oops.
+
 2.0.6 - August 28th 2011
 * Don't change superclass index definitions (otherwise sibling subclasses can end up with each others' index definitions).
 * Improved scope support (Andrew White).
@@ -35,6 +47,17 @@
 * Rails 3 support.
 * 1.4.0 changes.
 
+1.4.8 - October 10th 2011
+* Adding smart default (id) for primary key column name.
+* Making error message when daemon fails to start a little more helpful (Tony Pitale).
+* Adding ThinkingSphinx::Search#last_page? for Kaminari (Pete Deffendol).
+* If ENV['NODETACH'] is set when calling ts:start, pass that flag through to Riddle to start Sphinx in the foreground (Aaron Gibralter).
+* Catch and report all errors when models are loaded (Martin Gordon).
+* Bringing in builder gem's BlankSlate for our Builder - better at keeping global Rake methods out of the way.
+* Use PostgreSQL's array_agg function if it exists, instead of array_accum (PG v8.4 or newer).
+* Shuffle multiple Sphinx addresses by default, but allow that to be turned off (Ngan Pham).
+* Fix string attributes when using Sphinx 2.0.1 and bin_path.
+
 1.4.7 - August 28th 2011
 * Don't search for objects when updating attributes on every save - if the object isn't there, then the error will be caught anyway.
 * Extra flexibility for association attribute references (Andrew White).

data/README.textile

@@ -19,11 +19,11 @@ To quickly see if your system is ready to run the thinking sphinx specs, run the
 To get the spec suite running, you will need to install the ginger gem:
 
 <pre><code>sudo gem install ginger --source http://gemcutter.org</code></pre>
-  
+
 Then install the cucumber, yard, jeweler and rspec gems. Make sure you have a git install version 1.6.0.0 or higher, otherwise the jeweler gem won't install. Bluecloth is required for some of the yard documentation.
 
 <pre>
-  sudo gem install bluecloth cucumber yard jeweler rspec 
+  sudo gem install bluecloth cucumber yard jeweler rspec
 </pre>
 
 Then set up your database:
@@ -32,7 +32,7 @@ Then set up your database:
   cp spec/fixtures/database.yml.default spec/fixtures/database.yml &&
   mysqladmin -u root create thinking_sphinx
 </pre>
-  
+
 This last step can be done automatically by the contribute.rb script if all dependencies are met.
 
 Make sure you don't have another Sphinx daemon (searchd) running. If you do, quit it with "rake ts:stop"
@@ -216,3 +216,11 @@ Since I first released this library, there's been quite a few people who have su
 * Justin Tanner
 * Josh Goebel
 * Jonathan Viney
+* Ngan Pham
+* Martin Gordon
+* Aaron Gibralter
+* Pavel Forkert
+* Anthony Byram
+* Pete Deffendol
+* Eduardo Casanova
+* Tony Pitale

data/features/attribute_transformation.feature

@@ -2,19 +2,19 @@ Feature: Handle not-quite-supported column types as attributes
   In order for Thinking Sphinx to be more understanding with model structures
   The plugin
   Should be able to use translatable columns as attributes
-  
+
   Scenario: Decimals as floats
     Given Sphinx is running
     And I am searching on alphas
     When I filter between 1.0 and 3.0 on cost
     Then I should get 2 results
-  
+
   Scenario: Dates as Datetimes
     Given Sphinx is running
     And I am searching on alphas
-    When I filter between 1 and 3 days ago on created_on
+    When I filter between 1 and 3 days ago on created_on by date
     Then I should get 2 results
-  
+
   Scenario: Timestamps as Datetimes
     Given Sphinx is running
     And I am searching on alphas

data/features/step_definitions/common_steps.rb

@@ -95,9 +95,13 @@ When /^I filter between ([\d\.]+) and ([\d\.]+) on (\w+)$/ do |first, last, attr
   end
 end
 
-When /^I filter between (\d+) and (\d+) days ago on (\w+)$/ do |last, first, attribute|
+When /^I filter between (\d+) and (\d+) days ago on (\w+)(?: by (date))?$/ do |last, first, attribute, by_date|
   @results = nil
-  @with[attribute.to_sym] = first.to_i.days.ago..last.to_i.days.ago
+
+  first, last = first.to_i.days.ago, last.to_i.days.ago
+  first, last = first.to_date, last.to_date if by_date
+
+  @with[attribute.to_sym] = first..last
 end
 
 When /^I filter by (\w+) between (\d+) and (\d+)$/ do |attribute, first, last|

data/features/thinking_sphinx/db/fixtures/robots.rb

@@ -1,14 +1,8 @@
-# Reset the primary key to allow us to create robots with specific internal_ids
-class Robot < ActiveRecord::Base
-  set_primary_key :alternate_primary_key
-end
-
-Robot.create :name => 'Fritz',      :internal_id => 'F0001'
-Robot.create :name => 'Sizzle',     :internal_id => 'S0001'
-Robot.create :name => 'Sizzle Jr.', :internal_id => 'S0002'
-Robot.create :name => 'Expendable', :internal_id => 'E0001'
-
-# Annnnnnnnnnd we're back
-class Robot < ActiveRecord::Base
-  set_primary_key :internal_id
+{
+  'F0001' => 'Fritz',
+  'S0001' => 'Sizzle',
+  'S0002' => 'Sizzle Jr.',
+  'E0001' => 'Expendable'
+}.each do |internal_id, name|
+  Robot.connection.execute "INSERT INTO robots (name, internal_id) VALUES ('#{name}', '#{internal_id}')"
 end

data/lib/cucumber/thinking_sphinx/internal_world.rb

@@ -69,6 +69,7 @@ module Cucumber
           ::ThinkingSphinx::Configuration.instance.controller.stop
           sleep(0.5) # Ensure Sphinx has shut down completely
           ::ThinkingSphinx::ActiveRecord::LogSubscriber.logger.close
+          ::ActiveRecord::Base.logger.close
         end
       end
 
@@ -89,6 +90,10 @@ module Cucumber
       end
 
       def configure_active_record
+        ::ActiveRecord::Base.logger = Logger.new(
+          open("#{temporary_directory}/active_record.log", "a")
+        )
+
         ::ThinkingSphinx::ActiveRecord::LogSubscriber.logger = Logger.new(
           open("#{temporary_directory}/active_record.log", "a")
         )

data/lib/cucumber/thinking_sphinx/sql_logger.rb

@@ -1,19 +1,15 @@
 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)
+
+      def log(sql, name = 'SQL', binds = [])
         $queries_executed ||= []
         $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
-        execute_without_query_record(sql, name, &block)
+        super sql, name, binds
       end
     end
   end

data/lib/thinking_sphinx/active_record.rb

@@ -36,7 +36,7 @@ module ThinkingSphinx
                 @sphinx_primary_key_attribute ||
                 superclass.primary_key_for_sphinx
               else
-                primary_key
+                primary_key || 'id'
               end
             end
           end

data/lib/thinking_sphinx/active_record/collection_proxy_with_scopes.rb

@@ -19,7 +19,7 @@ module ThinkingSphinx
 
       def respond_to_with_sphinx_scopes?(method)
         proxy_association.klass.respond_to?(:sphinx_scopes) &&
-        proxy_association.klass.sphinx_scopes.include?(scope) ||
+        proxy_association.klass.sphinx_scopes.include?(method) ||
         respond_to_without_sphinx_scopes?(method)
       end
     end

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -20,7 +20,11 @@ module ThinkingSphinx
     end
 
     def group_concatenate(clause, separator = ' ')
-      "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      if connection.raw_connection.server_version >= 80400
+        "array_to_string(array_agg(COALESCE(#{clause}, '0')), '#{separator}')"
+      else
+        "array_to_string(array_accum(COALESCE(#{clause}, '0')), '#{separator}')"
+      end
     end
 
     def cast_to_string(clause)
@@ -105,7 +109,11 @@ module ThinkingSphinx
     end
 
     def create_array_accum_function
-      if connection.raw_connection.respond_to?(:server_version) && connection.raw_connection.server_version > 80200
+      if connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version >= 80400
+        return
+      elsif connection.raw_connection.respond_to?(:server_version) &&
+        connection.raw_connection.server_version > 80200
         execute <<-SQL
           CREATE AGGREGATE array_accum (anyelement)
           (

data/lib/thinking_sphinx/association.rb

@@ -214,6 +214,7 @@ module ThinkingSphinx
       if defined?(ActsAsTaggableOn) &&
         @reflection.klass == ActsAsTaggableOn::Tagging &&
         @reflection.name.to_s[/_taggings$/]
+        condition.gsub! /taggings\.tag_id = tags\.id AND/, "" if ThinkingSphinx.rails_3_1?
         condition = condition.gsub /taggings\./, "#{quoted_alias @join}."
       end
       

data/lib/thinking_sphinx/attribute.rb

@@ -22,10 +22,6 @@ module ThinkingSphinx
       :wordcount => :sql_attr_str2wordcount
     }
 
-    if Riddle.loaded_version.to_i > 1
-      SphinxTypeMappings[:string] = :sql_attr_string
-    end
-
     # To create a new attribute, you'll need to pass in either a single Column
     # or an array of them, and some (optional) options.
     #
@@ -234,14 +230,16 @@ module ThinkingSphinx
       end_assoc  = end_association_for_mva
       raise "Could not determine SQL for MVA" if base_assoc.nil?
 
-      relation = Arel::Table.new(base_assoc.table)
+      relation = ::ActiveRecord::Relation.new(
+        base_assoc.reflection.klass, Arel::Table.new(base_assoc.table)
+      )
 
       association_joins.each do |join|
-        relation = relation.join(join.relation, Arel::OuterJoin).
-          on(*join.association_join)
+        join.join_type = Arel::OuterJoin
+        relation = relation.joins(join)
       end
 
-      relation = relation.project "#{foreign_key_for_mva base_assoc} #{ThinkingSphinx.unique_id_expression(adapter, offset)} AS #{quote_column('id')}, #{primary_key_for_mva(end_assoc)} AS #{quote_column(unique_name)}"
+      relation = relation.select "#{foreign_key_for_mva base_assoc} #{ThinkingSphinx.unique_id_expression(adapter, offset)} AS #{quote_column('id')}, #{primary_key_for_mva(end_assoc)} AS #{quote_column(unique_name)}"
 
       relation.to_sql
     end

data/lib/thinking_sphinx/configuration.rb

@@ -49,7 +49,7 @@ module ThinkingSphinx
   #
   class Configuration
     include Singleton
-    
+
     SourceOptions = Riddle::Configuration::SQLSource.settings.map { |setting|
       setting.to_s
     } - %w( type sql_query_pre sql_query sql_joined_field sql_file_field
@@ -61,17 +61,17 @@ module ThinkingSphinx
       setting.to_s
     } - %w( source prefix_fields infix_fields )
     CustomOptions = %w( disable_range use_64_bit )
-    
+
     attr_accessor :searchd_file_path, :allow_star, :app_root,
       :model_directories, :delayed_job_priority, :indexed_models, :use_64_bit,
-      :touched_reindex_file, :stop_timeout, :version
-    
+      :touched_reindex_file, :stop_timeout, :version, :shuffle
+
     attr_accessor :source_options, :index_options
-    
+
     attr_reader :configuration, :controller
-    
+
     @@environment = nil
-    
+
     # Load in the configuration settings - this will look for config/sphinx.yml
     # and parse it according to the current environment.
     #
@@ -107,11 +107,11 @@ module ThinkingSphinx
       self.searchd_file_path    = "#{self.app_root}/db/sphinx/#{environment}"
       self.allow_star           = false
       self.stop_timeout         = 5
-      self.model_directories    = ["#{app_root}/app/models/"] +
-        Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
+      self.model_directories    = initial_model_directories
       self.delayed_job_priority = 0
       self.indexed_models       = []
-      
+      self.shuffle              = true
+
       self.source_options  = {}
       self.index_options   = {
         :charset_type => "utf-8"
@@ -121,6 +121,10 @@ module ThinkingSphinx
       parse_config
       self.version ||= @controller.sphinx_version
 
+      ThinkingSphinx::Attribute::SphinxTypeMappings.merge!(
+        :string => :sql_attr_string
+      ) if Riddle.loaded_version.to_i > 1
+
       self
     end
 
@@ -135,7 +139,7 @@ module ThinkingSphinx
         ENV['RAILS_ENV'] || 'development'
       end
     end
-    
+
     def self.reset_environment
       ThinkingSphinx.mutex.synchronize do
         @@environment = nil
@@ -145,7 +149,7 @@ module ThinkingSphinx
     def environment
       self.class.environment
     end
-    
+
     def generate
       @configuration.indexes.clear
 
@@ -153,20 +157,20 @@ module ThinkingSphinx
         model = model.constantize
         model.define_indexes
         @configuration.indexes.concat model.to_riddle
-        
+
         enforce_common_attribute_types
       end
     end
-    
+
     # Generate the config file for Sphinx by using all the settings defined and
     # looping through all the models with indexes to build the relevant
     # indexer and searchd configuration, and sources and indexes details.
     #
     def build(file_path=nil)
       file_path ||= "#{self.config_file}"
-      
+
       generate
-      
+
       open(file_path, "w") do |file|
         file.write @configuration.render
       end
@@ -245,11 +249,11 @@ module ThinkingSphinx
     def indexer_binary_name=(name)
       @controller.indexer_binary_name = name
     end
-    
+
     attr_accessor :timeout
-    
+
     def client
-      client = Riddle::Client.new address, port,
+      client = Riddle::Client.new shuffled_addresses, port,
         configuration.searchd.client_key
       client.max_matches = configuration.searchd.max_matches || 1000
       client.timeout = timeout || 0
@@ -310,26 +314,51 @@ module ThinkingSphinx
         send("#{key}=", value) if self.respond_to?("#{key}")
       end
     end
-    
+
     def enforce_common_attribute_types
       sql_indexes = configuration.indexes.reject { |index|
         index.is_a? Riddle::Configuration::DistributedIndex
       }
-      
+
       return unless sql_indexes.any? { |index|
         index.sources.any? { |source|
           source.sql_attr_bigint.include? :sphinx_internal_id
         }
       }
-      
+
       sql_indexes.each { |index|
         index.sources.each { |source|
           next if source.sql_attr_bigint.include? :sphinx_internal_id
-          
+
           source.sql_attr_bigint << :sphinx_internal_id
           source.sql_attr_uint.delete :sphinx_internal_id
         }
       }
     end
+
+    def shuffled_addresses
+      return address unless shuffle
+
+      addresses = Array(address)
+      if addresses.respond_to?(:shuffle)
+        addresses.shuffle
+      else
+        address.sort_by { rand }
+      end
+    end
+
+    def initial_model_directories
+      directories = ["#{app_root}/app/models/"] +
+        Dir.glob("#{app_root}/vendor/plugins/*/app/models/")
+
+      if defined?(Rails)
+        directories += Rails.application.paths['app/models'].to_a
+        directories += Rails.application.railties.engines.collect { |engine|
+          engine.paths['app/models'].to_a
+	      }.flatten
+      end
+
+      directories
+    end
   end
 end

data/lib/thinking_sphinx/context.rb

@@ -62,11 +62,7 @@ class ThinkingSphinx::Context
 
         begin
           camelized_model.constantize
-        rescue LoadError
-          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
-        rescue NameError
-          next
-        rescue StandardError => err
+        rescue Exception => err
           STDERR.puts "Warning: Error loading #{file}:"
           STDERR.puts err.message
           STDERR.puts err.backtrace.join("\n"), ''