thinking-sphinx 2.0.4 → 2.0.5

data/README.textile

@@ -208,3 +208,5 @@ Since I first released this library, there's been quite a few people who have su
 * Clemens Kofler
 * Ryan Mohr
 * Alex Chee
+* Florent Piteau
+* Bruno Santschi

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/features/searching_by_model.feature

@@ -66,6 +66,12 @@ Feature: Searching on a single model
     When I filter by 2001-01-01 on comments_created_at
     Then I should get 1 result
   
+  Scenario: Filtering on a wordcount attribute
+    Given Sphinx is running
+    And I am searching on developers
+    When I filter between 0 and 1 on state_wordcount
+    Then I should get 5 results
+  
   Scenario: Searching by NULL/0 values in MVAs
     Given Sphinx is running
     And I am searching on boxes
@@ -166,3 +172,10 @@ Feature: Searching on a single model
     And I am searching on posts
     When I search for "Shakespeare"
     Then I should get 1 result
+  
+  Scenario: Searching on content from file field
+    Given Sphinx is running
+    And I am searching on posts
+    When I search for "foo bar baz"
+    Then I should get 1 result
+  

data/features/support/env.rb

@@ -9,13 +9,14 @@ Dir[File.join(File.dirname(__FILE__), '../../vendor/*/lib')].each do |path|
   $:.unshift path
 end
 
+require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_record'
 require 'cucumber/thinking_sphinx/internal_world'
 
 world = Cucumber::ThinkingSphinx::InternalWorld.new
 world.configure_database
 
-require "thinking_sphinx"
+require 'thinking_sphinx'
 
 ActiveRecord::Base.send(:include, ThinkingSphinx::ActiveRecord)
 

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

@@ -1,3 +1,3 @@
 %w( rogue nat molly jasper moggy ).each do |name|
-  Cat.new(:name => name).save(false)
+  Cat.new(:name => name).save(:validate => false)
 end

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

@@ -1,3 +1,3 @@
 %w( rover lassie gaspode ).each do |name|
-  Dog.new(:name => name).save(false)
+  Dog.new(:name => name).save(:validate => false)
 end

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

@@ -1,3 +1,3 @@
 %w( fantastic ).each do |name|
-  Fox.new(:name => name).save(false)
+  Fox.new(:name => name).save(:validate => false)
 end

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

@@ -1,5 +1,9 @@
 post = Post.create(
-  :subject => "Hello World", :content => "Um Text", :id => 1, :category_id => 1
+  :subject => "Hello World",
+  :content => "Um Text",
+  :id => 1,
+  :category_id => 1,
+  :keywords_file => (File.dirname(__FILE__) + '/post_keywords.txt')
 )
 
 post.authors << Author.find(:first)

data/features/thinking_sphinx/db/migrations/create_posts.rb

@@ -2,4 +2,5 @@ ActiveRecord::Base.connection.create_table :posts, :force => true do |t|
   t.column :subject, :string,  :null => false
   t.column :content, :text
   t.column :category_id, :integer, :null => false
+  t.column :keywords_file, :string
 end

data/features/thinking_sphinx/models/developer.rb

@@ -12,6 +12,7 @@ class Developer < ActiveRecord::Base
     
     has age,                              :facet => true
     has tags(:id),      :as => :tag_ids,  :facet => true
+    has state,          :as => :state_wordcount, :type => :wordcount
     
     facet "LOWER(city)", :as => :city, :type => :string, :value => :city
     

data/features/thinking_sphinx/models/music.rb

@@ -2,7 +2,9 @@ class Music < Medium
   set_table_name 'music'
   
   define_index do
-    indexes artist, track, album
+    indexes artist, :with => :attribute
+    indexes track
+    indexes album, :with => :wordcount
     indexes genre(:name), :as => :genre
   end
 end

data/features/thinking_sphinx/models/post.rb

@@ -11,6 +11,7 @@ class Post < ActiveRecord::Base
     indexes tags.text, :as => :tags
     indexes comments.content, :as => :comments
     indexes authors.name, :as => :authors
+    indexes keywords_file, :as => :keywords, :file => true
     
     has comments(:id), :as => :comment_ids, :source => :ranged_query,
       :facet => true

data/lib/thinking_sphinx.rb

@@ -102,8 +102,8 @@ module ThinkingSphinx
     end
   end
 
-  def self.unique_id_expression(offset = nil)
-    "* #{context.indexed_models.size} + #{offset || 0}"
+  def self.unique_id_expression(adapter, offset = nil)
+    "* #{adapter.cast_to_int context.indexed_models.size} + #{offset || 0}"
   end
 
   # Check if index definition is disabled.

data/lib/thinking_sphinx/active_record.rb

@@ -13,7 +13,11 @@ module ThinkingSphinx
   module ActiveRecord
     def self.included(base)
       base.class_eval do
-        class_inheritable_array :sphinx_indexes, :sphinx_facets
+        if defined?(class_attribute)
+          class_attribute :sphinx_indexes, :sphinx_facets
+        else
+          class_inheritable_array :sphinx_indexes, :sphinx_facets
+        end
         
         extend ThinkingSphinx::ActiveRecord::ClassMethods
         
@@ -202,7 +206,6 @@ module ThinkingSphinx
       
       def insert_sphinx_index(index)
         self.sphinx_indexes << index
-        descendants.each { |klass| klass.insert_sphinx_index(index) }
       end
       
       def has_sphinx_indexes?
@@ -272,6 +275,33 @@ module ThinkingSphinx
           index eldest_indexed_ancestor
       end
       
+      # Temporarily disable delta indexing inside a block, then perform a
+      # single rebuild of index at the end.
+      #
+      # Useful when performing updates to batches of models to prevent
+      # the delta index being rebuilt after each individual update.
+      #
+      # In the following example, the delta index will only be rebuilt
+      # once, not 10 times.
+      #
+      #   SomeModel.suspended_delta do
+      #     10.times do
+      #       SomeModel.create( ... )
+      #     end
+      #   end
+      #
+      def suspended_delta(reindex_after = true, &block)
+        define_indexes
+        original_setting = ThinkingSphinx.deltas_suspended?
+        ThinkingSphinx.deltas_suspended = true
+        begin
+          yield
+        ensure
+          ThinkingSphinx.deltas_suspended = original_setting
+          self.index_delta if reindex_after
+        end
+      end
+      
       private
             
       def local_sphinx_indexes

data/lib/thinking_sphinx/active_record/delta.rb

@@ -22,33 +22,6 @@ module ThinkingSphinx
             def delta_objects
               self.sphinx_indexes.collect(&:delta_object).compact
             end
-            
-            # Temporarily disable delta indexing inside a block, then perform a
-            # single rebuild of index at the end.
-            #
-            # Useful when performing updates to batches of models to prevent
-            # the delta index being rebuilt after each individual update.
-            #
-            # In the following example, the delta index will only be rebuilt
-            # once, not 10 times.
-            #
-            #   SomeModel.suspended_delta do
-            #     10.times do
-            #       SomeModel.create( ... )
-            #     end
-            #   end
-            #
-            def suspended_delta(reindex_after = true, &block)
-              define_indexes
-              original_setting = ThinkingSphinx.deltas_suspended?
-              ThinkingSphinx.deltas_suspended = true
-              begin
-                yield
-              ensure
-                ThinkingSphinx.deltas_suspended = original_setting
-                self.index_delta if reindex_after
-              end
-            end
           end
           
           def toggled_delta?

data/lib/thinking_sphinx/adapters/mysql_adapter.rb

@@ -28,6 +28,10 @@ module ThinkingSphinx
       "CAST(#{clause} AS UNSIGNED)"
     end
     
+    def cast_to_int(clause)
+      "CAST(#{clause} AS SIGNED)"
+    end
+    
     def convert_nulls(clause, default = '')
       default = "'#{default}'" if default.is_a?(String)
       

data/lib/thinking_sphinx/adapters/postgresql_adapter.rb

@@ -35,6 +35,10 @@ module ThinkingSphinx
       clause
     end
     
+    def cast_to_int(clause)
+      "#{clause}::INT8"
+    end
+    
     def convert_nulls(clause, default = '')
       default = case default
       when String

data/lib/thinking_sphinx/association.rb

@@ -58,16 +58,14 @@ module ThinkingSphinx
     def join_to(base_join)
       parent.join_to(base_join) if parent && parent.join.nil?
       
-      @join ||= ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.new(
-        @reflection, base_join, parent ? parent.join : base_join.joins.first
+      @join ||= join_association_class.new(
+        @reflection, base_join, parent ? parent.join : join_parent(base_join)
       )
     end
     
     def arel_join
       @join.join_type = Arel::OuterJoin
-      @join.options[:conditions].gsub!(/::ts_join_alias::/,
-        "#{@reflection.klass.connection.quote_table_name(@join.parent.aliased_table_name)}"
-      ) if @join.options[:conditions].is_a?(String)
+      rewrite_conditions
       
       @join
     end
@@ -165,5 +163,57 @@ module ThinkingSphinx
       
       options
     end
+    
+    def join_association_class
+      if rails_3_1?
+        ::ActiveRecord::Associations::JoinDependency::JoinAssociation
+      else
+        ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation
+      end
+    end
+    
+    def join_parent(join)
+      if rails_3_1?
+        join.join_parts.first
+      else
+        join.joins.first
+      end
+    end
+    
+    def rails_3_1?
+      ::ActiveRecord::Associations.constants.include?(:JoinDependency) ||
+      ::ActiveRecord::Associations.constants.include?('JoinDependency')
+    end
+    
+    def rewrite_conditions
+      @join.options[:conditions] = case @join.options[:conditions]
+      when String
+        rewrite_condition @join.options[:conditions]
+      when Array
+        @join.options[:conditions].collect { |condition|
+          rewrite_condition condition
+        }
+      else
+        @join.options[:conditions]
+      end
+    end
+    
+    def rewrite_condition(condition)
+      return condition unless condition.is_a?(String)
+      
+      if defined?(ActsAsTaggableOn) &&
+        @reflection.klass == ActsAsTaggableOn::Tagging &&
+        @reflection.name.to_s[/_taggings$/]
+        condition = condition.gsub /taggings\./, "#{quoted_alias @join}."
+      end
+      
+      condition.gsub /::ts_join_alias::/, quoted_alias(@join.parent)
+    end
+    
+    def quoted_alias(join)
+      @reflection.klass.connection.quote_table_name(
+        join.aliased_table_name
+      )
+    end
   end
 end

data/lib/thinking_sphinx/attribute.rb

@@ -11,6 +11,21 @@ module ThinkingSphinx
   class Attribute < ThinkingSphinx::Property
     attr_accessor :query_source
     
+    SphinxTypeMappings = {
+      :multi     => :sql_attr_multi,
+      :datetime  => :sql_attr_timestamp,
+      :string    => :sql_attr_str2ordinal,
+      :float     => :sql_attr_float,
+      :boolean   => :sql_attr_bool,
+      :integer   => :sql_attr_uint,
+      :bigint    => :sql_attr_bigint,
+      :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.
     #
@@ -117,15 +132,7 @@ module ThinkingSphinx
     end
     
     def type_to_config
-      {
-        :multi    => :sql_attr_multi,
-        :datetime => :sql_attr_timestamp,
-        :string   => :sql_attr_str2ordinal,
-        :float    => :sql_attr_float,
-        :boolean  => :sql_attr_bool,
-        :integer  => :sql_attr_uint,
-        :bigint   => :sql_attr_bigint
-      }[type]
+      SphinxTypeMappings[type]
     end
     
     def include_as_association?
@@ -231,7 +238,7 @@ module ThinkingSphinx
           on(*join.association_join)
       end
       
-      relation = relation.project "#{foreign_key_for_mva base_assoc} #{ThinkingSphinx.unique_id_expression(offset)} AS #{quote_column('id')}, #{primary_key_for_mva(end_assoc)} AS #{quote_column(unique_name)}"
+      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.to_sql
     end

data/lib/thinking_sphinx/auto_version.rb

@@ -7,7 +7,7 @@ module ThinkingSphinx
         require "riddle/#{version}"
       when /1.10/
         require 'riddle/1.10'
-      when /2.0.1/
+      when /2.0.\d/
         require 'riddle/2.0.1'
       else
         documentation_link = %Q{

data/lib/thinking_sphinx/class_facet.rb

@@ -5,12 +5,16 @@ module ThinkingSphinx
     end
     
     def attribute_name
-      "class_crc"
+      Riddle.loaded_version.to_i < 2 ? 'class_crc' : 'sphinx_internal_class'
     end
     
     def value(object, attribute_hash)
-      crc = attribute_hash['class_crc']
-      ThinkingSphinx::Configuration.instance.models_by_crc[crc]
+      if Riddle.loaded_version.to_i < 2
+        crc = attribute_hash['class_crc']
+        ThinkingSphinx::Configuration.instance.models_by_crc[crc]
+      else
+        attribute_hash['sphinx_internal_class']
+      end
     end
   end
 end

data/lib/thinking_sphinx/configuration.rb

@@ -91,9 +91,9 @@ module ThinkingSphinx
       if custom_app_root
         self.app_root = custom_app_root
       else
-        self.app_root   = Rails.root                 if defined?(Rails)
         self.app_root   = Merb.root                  if defined?(Merb)
         self.app_root   = Sinatra::Application.root  if defined?(Sinatra)
+        self.app_root   = Rails.root                 if defined?(Rails)
         self.app_root ||= app_root
       end
 
@@ -132,10 +132,10 @@ module ThinkingSphinx
         ThinkingSphinx.mutex.synchronize do
           @@environment ||= if defined?(Merb)
             Merb.environment
-          elsif defined?(Sinatra)
-            Sinatra::Application.environment.to_s
           elsif defined?(Rails)
             Rails.env
+          elsif defined?(Sinatra)
+            Sinatra::Application.environment.to_s
           else
             ENV['RAILS_ENV'] || 'development'
           end

data/lib/thinking_sphinx/facet.rb

@@ -16,6 +16,7 @@ module ThinkingSphinx
       when Facet
         facet.name
       when String, Symbol
+        return :class if facet.to_s == 'sphinx_internal_class'
         facet.to_s.gsub(/(_facet|_crc)$/,'').to_sym
       end
     end

data/lib/thinking_sphinx/facet_search.rb

@@ -29,7 +29,7 @@ module ThinkingSphinx
         names = options[:all_facets] ?
           facet_names_for_all_classes : facet_names_common_to_all_classes
         
-        names.delete "class_crc" unless options[:class_facet]
+        names.delete class_facet unless options[:class_facet]
         names
       end
     end
@@ -162,5 +162,9 @@ module ThinkingSphinx
         facet.name == name
       }
     end
+    
+    def class_facet
+      Riddle.loaded_version.to_i < 2 ? 'class_crc' : 'sphinx_internal_class'
+    end
   end
 end