thinking-sphinx 2.0.13 → 2.0.14

data/HISTORY

@@ -1,3 +1,8 @@
+2.0.14 - January 2nd 2012
+* Fix model loading for Rails 3.2.9 when subdirectories exist (Kenn Ejima).
+* Use BasicObject instead of BlankSlate when running on 1.9 (Steve Purcell).
+* 1.4.14 changes.
+
 2.0.13 - August 10th 2012
 * 1.4.13 changes.
 
@@ -64,6 +69,15 @@
 * Rails 3 support.
 * 1.4.0 changes.
 
+1.4.14 - January 2nd 2013
+* Allow sql_query_pre values to come through from config/sphinx.yml (George Ogata).
+* ThinkingSphinx::Search#tap doesn't delegate through to the underlying array.
+* Use fire_delta? instance method in the model (if it exists) to decide whether indexing should happen.
+* Use full query in excerpts so double-stemming of terms is avoided (Jason Rust).
+* Fix thinking_sphinx:version rake task.
+* Directly compare non-string non-nil facet values for facet filters.
+* Don't bother checking with Sphinx whether documents exist when trying to update them. We're catching failures already (and Sphinx usually doesn't care anyway).
+
 1.4.13 - August 10th 2012
 * Sphinx 2.0.5 support.
 * Hard retries for Sphinx exceptions (Andrew Hunter).

data/README.textile

@@ -232,3 +232,5 @@ Since I first released this library, there's been quite a few people who have su
 * Simon Hürlimann
 * Nathan Smith
 * Cedric Maion
+* Steve Purcell
+* George Ogata

data/lib/thinking_sphinx.rb

@@ -23,6 +23,7 @@ require 'thinking_sphinx/source'
 require 'thinking_sphinx/search'
 require 'thinking_sphinx/search_methods'
 require 'thinking_sphinx/deltas'
+require 'thinking_sphinx/version'
 
 require 'thinking_sphinx/adapters/abstract_adapter'
 require 'thinking_sphinx/adapters/mysql_adapter'

data/lib/thinking_sphinx/active_record.rb

@@ -268,14 +268,13 @@ module ThinkingSphinx
       end
 
       def delete_in_index(index, document_id)
-        return unless ThinkingSphinx.sphinx_running? &&
-          search_for_id(document_id, index)
+        return unless ThinkingSphinx.sphinx_running?
 
         ThinkingSphinx::Configuration.instance.client.update(
           index, ['sphinx_deleted'], {document_id => [1]}
         )
       rescue Riddle::ConnectionError, Riddle::ResponseError,
-        ThinkingSphinx::SphinxError, Errno::ETIMEDOUT
+        ThinkingSphinx::SphinxError, Errno::ETIMEDOUT, Timeout::Error
         # Not the end of the world if Sphinx isn't running.
       end
 

data/lib/thinking_sphinx/active_record/delta.rb

@@ -3,7 +3,7 @@ module ThinkingSphinx
     # This module contains all the delta-related code for models. There isn't
     # really anything you need to call manually in here - except perhaps
     # index_delta, but not sure what reason why.
-    # 
+    #
     module Delta
       # Code for after_commit callback is written by Eli Miller:
       # http://elimiller.blogspot.com/2007/06/proper-cache-expiry-with-aftercommit.html
@@ -18,38 +18,40 @@ module ThinkingSphinx
             def index_delta(instance = nil)
               delta_objects.each { |obj| obj.index(self, instance) }
             end
-            
+
             def delta_objects
               self.sphinx_indexes.collect(&:delta_object).compact
             end
           end
-          
+
           def toggled_delta?
             self.class.delta_objects.any? { |obj| obj.toggled(self) }
           end
-          
+
           private
-          
+
           # Set the delta value for the model to be true.
           def toggle_delta
             self.class.delta_objects.each { |obj|
               obj.toggle(self)
             } if should_toggle_delta?
           end
-          
+
           # Build the delta index for the related model. This won't be called
           # if running in the test environment.
-          # 
+          #
           def index_delta
             self.class.index_delta(self) if self.class.delta_objects.any? { |obj|
               obj.toggled(self)
             }
           end
-          
+
           def should_toggle_delta?
+            return fire_delta? if respond_to?(:fire_delta?)
+
             self.new_record? || indexed_data_changed?
           end
-          
+
           def indexed_data_changed?
             sphinx_indexes.any? { |index|
               index.fields.any? { |field| field.changed?(self) } ||

data/lib/thinking_sphinx/auto_version.rb

@@ -14,7 +14,7 @@ module ThinkingSphinx
       else
         documentation_link = %Q{
 For more information, read the documentation:
-http://freelancing-god.github.com/ts/en/advanced_config.html
+http://pat.github.com/ts/en/advanced_config.html
 }
 
         if version.nil? || version.empty?

data/lib/thinking_sphinx/configuration.rb

@@ -53,7 +53,7 @@ module ThinkingSphinx
 
     SourceOptions = Riddle::Configuration::SQLSource.settings.map { |setting|
       setting.to_s
-    } - %w( type sql_query_pre sql_query sql_joined_field sql_file_field
+    } - %w( type sql_query sql_joined_field sql_file_field
       sql_query_range sql_attr_uint sql_attr_bool sql_attr_bigint sql_query_info
       sql_attr_timestamp sql_attr_str2ordinal sql_attr_float sql_attr_multi
       sql_attr_string sql_attr_str2wordcount sql_column_buffers sql_field_string

data/lib/thinking_sphinx/context.rb

@@ -62,9 +62,14 @@ class ThinkingSphinx::Context
 
         begin
           camelized_model.constantize
-        rescue LoadError
+        rescue LoadError, NameError
           # Make sure that STI subclasses in subfolders are loaded.
-          model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
+          if camelized_model.gsub!(/.+::/, '').nil?
+            STDERR.puts "ThinkingSphinx: error loading #{file}"
+            next
+          else
+            retry
+          end
         rescue Exception => err
           STDERR.puts "Warning: Error loading #{file}:"
           STDERR.puts err.message

data/lib/thinking_sphinx/facet.rb

@@ -104,7 +104,14 @@ module ThinkingSphinx
       method = value_source || column.__name
       object = objects.one? ? objects.first : objects.detect { |item|
         result = item.send(method)
-        result && result.to_crc32 == attribute_value
+        case result
+        when String
+          result.to_crc32 == attribute_value
+        when NilClass
+          false
+        else
+          result == attribute_value
+        end
       }
 
       object.try(method)

data/lib/thinking_sphinx/index/builder.rb

@@ -1,4 +1,4 @@
-require 'blankslate'
+require 'blankslate' unless defined?(::BasicObject)
 
 module ThinkingSphinx
   class Index
@@ -14,14 +14,14 @@ module ThinkingSphinx
     # set_property allows you to set some settings on a per-index basis. Check
     # out each method's documentation for better ideas of usage.
     #
-    class Builder < BlankSlate
+    class Builder < (defined?(::BasicObject) ? ::BasicObject : BlankSlate)
       def self.generate(model, name = nil, &block)
-        index  = ThinkingSphinx::Index.new(model)
+        index  = ::ThinkingSphinx::Index.new(model)
         index.name = name unless name.nil?
 
-        Builder.new(index, &block) if block_given?
+        new(index, &block) if block_given?
 
-        index.delta_object = ThinkingSphinx::Deltas.parse index
+        index.delta_object = ::ThinkingSphinx::Deltas.parse index
         index
       end
 
@@ -38,7 +38,7 @@ module ThinkingSphinx
 
       def define_source(&block)
         if @explicit_source
-          @source = ThinkingSphinx::Source.new(@index)
+          @source = ::ThinkingSphinx::Source.new(@index)
           @index.sources << @source
         else
           @explicit_source = true
@@ -101,7 +101,8 @@ module ThinkingSphinx
       def indexes(*args)
         options = args.extract_options!
         args.each do |columns|
-          field = Field.new(source, FauxColumn.coerce(columns), options)
+          field = ::ThinkingSphinx::Field.new(source,
+            ::ThinkingSphinx::Index::FauxColumn.coerce(columns), options)
 
           add_sort_attribute  field, options   if field.sortable
           add_facet_attribute field, options   if field.faceted
@@ -147,7 +148,8 @@ module ThinkingSphinx
       def has(*args)
         options = args.extract_options!
         args.each do |columns|
-          attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
+          attribute = ::ThinkingSphinx::Attribute.new(source,
+            ::ThinkingSphinx::Index::FauxColumn.coerce(columns), options)
 
           add_facet_attribute attribute, options if attribute.faceted
         end
@@ -158,7 +160,8 @@ module ThinkingSphinx
         options[:facet] = true
 
         args.each do |columns|
-          attribute = Attribute.new(source, FauxColumn.coerce(columns), options)
+          attribute = ::ThinkingSphinx::Attribute.new(source,
+            ::ThinkingSphinx::Index::FauxColumn.coerce(columns), options)
 
           add_facet_attribute attribute, options
         end
@@ -166,7 +169,7 @@ module ThinkingSphinx
 
       def join(*args)
         args.each do |association|
-          Join.new(source, association)
+          ::ThinkingSphinx::Join.new(source, association)
         end
       end
 
@@ -238,7 +241,7 @@ module ThinkingSphinx
       # definitions.
       #
       def method_missing(method, *args)
-        FauxColumn.new(method, *args)
+        ::ThinkingSphinx::Index::FauxColumn.new(method, *args)
       end
 
       # A method to allow adding fields from associations which have names
@@ -248,7 +251,7 @@ module ThinkingSphinx
       # Example: indexes assoc(:properties).column
       #
       def assoc(assoc, *args)
-        FauxColumn.new(assoc, *args)
+        ::ThinkingSphinx::Index::FauxColumn.new(assoc, *args)
       end
 
       # Use this method to generate SQL for your attributes, conditions, etc.
@@ -265,14 +268,14 @@ module ThinkingSphinx
 
       def source
         @source ||= begin
-          source = ThinkingSphinx::Source.new(@index)
+          source = ::ThinkingSphinx::Source.new(@index)
           @index.sources << source
           source
         end
       end
 
       def set_single_property(key, value)
-        source_options = ThinkingSphinx::Configuration::SourceOptions
+        source_options = ::ThinkingSphinx::Configuration::SourceOptions
         if source_options.include?(key.to_s)
           source.options.merge! key => value
         else
@@ -290,12 +293,12 @@ module ThinkingSphinx
       end
 
       def add_internal_attribute(property, options, suffix, crc = false)
-        return unless ThinkingSphinx::Facet.translate?(property)
+        return unless ::ThinkingSphinx::Facet.translate?(property)
 
-        Attribute.new(source,
+        ::ThinkingSphinx::Attribute.new(source,
           property.columns.collect { |col| col.clone },
           options.merge(
-            :type => property.is_a?(Field) ? :string : options[:type],
+            :type => property.is_a?(::ThinkingSphinx::Field) ? :string : options[:type],
             :as   => property.unique_name.to_s.concat(suffix).to_sym,
             :crc  => crc
           ).except(:facet)

data/lib/thinking_sphinx/search.rb

@@ -12,7 +12,7 @@ module ThinkingSphinx
       instance_of? instance_values instance_variable_defined?
       instance_variable_get instance_variable_set instance_variables is_a?
       kind_of? member? method methods nil? object_id respond_to?
-      respond_to_missing? send should type )
+      respond_to_missing? send should tap type )
     SafeMethods = %w( partition private_methods protected_methods
       public_methods send class )
 
@@ -362,7 +362,7 @@ module ThinkingSphinx
       client.excerpts(
         {
           :docs   => [string.to_s],
-          :words  => results[:words].keys.join(' '),
+          :words  => query,
           :index  => index.split(',').first.strip
         }.merge(options[:excerpt_options] || {})
       ).first

data/lib/thinking_sphinx/version.rb

@@ -1,3 +1,3 @@
 module ThinkingSphinx
-  Version = '2.0.13'
+  Version = '2.0.14'
 end

data/spec/thinking_sphinx/active_record/delta_spec.rb

@@ -112,12 +112,6 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
       @person.send(:index_delta)
     end
 
-    it "shouldn't update the deleted attribute if not in the index" do
-      @client.should_not_receive(:update)
-
-      @person.send(:index_delta)
-    end
-
     it "should update the deleted attribute if in the core index" do
       Person.stub!(:search_for_id => true)
       @client.should_receive(:update)

data/spec/thinking_sphinx/active_record_spec.rb

@@ -273,7 +273,6 @@ describe ThinkingSphinx::ActiveRecord do
 
       @configuration.stub!(:client => @client)
       Person.sphinx_indexes.each { |index| index.stub!(:delta? => false) }
-      Person.stub!(:search_for_id => true)
     end
 
     it "should update the core index's deleted flag if in core index" do
@@ -284,19 +283,9 @@ describe ThinkingSphinx::ActiveRecord do
       @person.toggle_deleted
     end
 
-    it "shouldn't update the core index's deleted flag if the record isn't in it" do
-      Person.stub!(:search_for_id => false)
-      @client.should_not_receive(:update).with(
-        "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => [1]}
-      )
-
-      @person.toggle_deleted
-    end
-
     it "shouldn't attempt to update the deleted flag if sphinx isn't running" do
       ThinkingSphinx.stub!(:sphinx_running? => false)
       @client.should_not_receive(:update)
-      Person.should_not_receive(:search_for_id)
 
       @person.toggle_deleted
     end
@@ -493,14 +482,6 @@ describe ThinkingSphinx::ActiveRecord do
       @client = stub('client')
       ThinkingSphinx.stub!(:sphinx_running? => true)
       ThinkingSphinx::Configuration.instance.stub!(:client => @client)
-      Alpha.stub!(:search_for_id => true)
-    end
-
-    it "should not update if the document isn't in the given index" do
-      Alpha.stub!(:search_for_id => false)
-      @client.should_not_receive(:update)
-
-      Alpha.delete_in_index('alpha_core', 42)
     end
 
     it "should direct the update to the supplied index" do

data/spec/thinking_sphinx/context_spec.rb

@@ -34,16 +34,17 @@ describe ThinkingSphinx::Context do
     it "should report name errors but not raise them" do
       class_name.stub(:constantize).and_raise(NameError)
       STDERR.stub!(:puts => '')
-      STDERR.should_receive(:puts).with('Warning: Error loading a.rb:')
+      STDERR.should_receive(:puts).with('ThinkingSphinx: error loading a.rb')
 
       lambda {
         ts_context.prepare
       }.should_not raise_error
     end
 
-    it "should retry if the first load fails and contains a directory" do
-      model_name_lower.should_receive(:gsub!).twice.and_return(true, nil)
+    it "should report load errors but not raise them" do
       class_name.stub(:constantize).and_raise(LoadError)
+      STDERR.stub!(:puts => '')
+      STDERR.should_receive(:puts).with('ThinkingSphinx: error loading a.rb')
 
       lambda {
         ts_context.prepare

data/spec/thinking_sphinx/search_spec.rb

@@ -1309,7 +1309,7 @@ describe ThinkingSphinx::Search do
         :matches => [],
         :words => {'one' => {}, 'two' => {}}
       })
-      @search = ThinkingSphinx::Search.new(:classes => [Alpha])
+      @search = ThinkingSphinx::Search.new('reading comprehension', :classes => [Alpha])
     end
 
     it "should return the Sphinx excerpt value" do
@@ -1341,9 +1341,9 @@ describe ThinkingSphinx::Search do
       @search.excerpt_for('string', Beta)
     end
 
-    it "should join the words together" do
+    it "should use the query string" do
       @client.should_receive(:excerpts) do |options|
-        options[:words].should == @search.results[:words].keys.join(' ')
+        options[:words].should == 'reading comprehension'
       end
 
       @search.excerpt_for('string', Beta)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: thinking-sphinx
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 2
   - 0
-  - 13
-  version: 2.0.13
+  - 14
+  version: 2.0.14
 platform: ruby
 authors: 
 - Pat Allan
@@ -15,10 +15,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-08-10 00:00:00 Z
+date: 2013-01-02 00:00:00 +11:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,10 +31,10 @@ dependencies:
         - 3
         version: 3.0.3
   version_requirements: *id001
-  prerelease: false
   name: activerecord
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -47,10 +47,10 @@ dependencies:
         - 3
         version: 1.5.3
   version_requirements: *id002
-  prerelease: false
   name: riddle
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -63,10 +63,10 @@ dependencies:
         - 2
         version: 2.1.2
   version_requirements: *id003
-  prerelease: false
   name: builder
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -79,10 +79,10 @@ dependencies:
         - 3
         version: 3.0.3
   version_requirements: *id004
-  prerelease: false
   name: actionpack
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -95,10 +95,10 @@ dependencies:
         - 0
         version: 0.4.0
   version_requirements: *id005
-  prerelease: false
   name: appraisal
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -111,10 +111,10 @@ dependencies:
         - 2
         version: 1.0.2
   version_requirements: *id006
-  prerelease: false
   name: cucumber
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -127,10 +127,10 @@ dependencies:
         - 1
         version: 0.3.1
   version_requirements: *id007
-  prerelease: false
   name: faker
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -143,10 +143,10 @@ dependencies:
         - 2
         version: 0.9.2
   version_requirements: *id008
-  prerelease: false
   name: rake
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -159,10 +159,10 @@ dependencies:
         - 0
         version: 2.6.0
   version_requirements: *id009
-  prerelease: false
   name: rspec
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -174,10 +174,10 @@ dependencies:
         - 0
         version: "3.0"
   version_requirements: *id010
-  prerelease: false
   name: will_paginate
-- !ruby/object:Gem::Dependency 
+  prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency 
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -190,8 +190,9 @@ dependencies:
         - 2
         version: 0.7.2
   version_requirements: *id011
-  prerelease: false
   name: yard
+  prerelease: false
+  type: :development
 description: A concise and easy-to-use Ruby library that connects ActiveRecord to the Sphinx search daemon, managing configuration, indexing and searching.
 email: 
 - pat@freelancing-gods.com
@@ -376,12 +377,13 @@ files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
-homepage: http://freelancing-god.github.com/ts/en/
+has_rdoc: true
+homepage: http://pat.github.com/ts/en/
 licenses: []
 
 post_install_message: |+
   If you're upgrading, you should read this:
-  http://freelancing-god.github.com/ts/en/upgrading.html
+  http://pat.github.com/ts/en/upgrading.html
   
 rdoc_options: []
 
@@ -408,7 +410,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: thinking-sphinx
-rubygems_version: 1.8.16
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: ActiveRecord/Rails Sphinx library
@@ -536,4 +538,3 @@ test_files:
 - spec/thinking_sphinx/source_spec.rb
 - spec/thinking_sphinx/test_spec.rb
 - spec/thinking_sphinx_spec.rb
-has_rdoc: