thinking-sphinx 2.0.9 → 2.0.10

data/HISTORY

@@ -1,3 +1,6 @@
+2.0.10 - November 4th 2011
+* 1.4.10 changes.
+
 2.0.9 - October 10th 2011
 * 1.4.9 changes (fixed invalid gemspec).
 
@@ -50,6 +53,11 @@
 * Rails 3 support.
 * 1.4.0 changes.
 
+1.4.10 - November 4th 2011
+* Updating Riddle references for impending 1.5.0 release of Riddle.
+* Handle out-of-date indexed_models references.
+* Fixing STI model handling during context index loading (Kenn Ejima).
+
 1.4.9 - October 10th 2011
 * Fixing invalid gemspec.
 

data/README.textile

@@ -224,3 +224,4 @@ Since I first released this library, there's been quite a few people who have su
 * Pete Deffendol
 * Eduardo Casanova
 * Tony Pitale
+* Kenn Ejima

data/lib/thinking_sphinx/active_record.rb

@@ -310,7 +310,7 @@ module ThinkingSphinx
       private
 
       def local_sphinx_indexes
-        sphinx_indexes.select { |index|
+        (sphinx_indexes || []).select { |index|
           index.model == self
         }
       end

data/lib/thinking_sphinx/configuration.rb

@@ -151,12 +151,12 @@ module ThinkingSphinx
     end
 
     def generate
-      @configuration.indexes.clear
+      @configuration.indices.clear
 
       ThinkingSphinx.context.indexed_models.each do |model|
         model = model.constantize
         model.define_indexes
-        @configuration.indexes.concat model.to_riddle
+        @configuration.indices.concat model.to_riddle
 
         enforce_common_attribute_types
       end
@@ -316,7 +316,7 @@ module ThinkingSphinx
     end
 
     def enforce_common_attribute_types
-      sql_indexes = configuration.indexes.reject { |index|
+      sql_indexes = configuration.indices.reject { |index|
         index.is_a? Riddle::Configuration::DistributedIndex
       }
 

data/lib/thinking_sphinx/context.rb

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

data/lib/thinking_sphinx/index.rb

@@ -4,7 +4,7 @@ require 'thinking_sphinx/index/faux_column'
 module ThinkingSphinx
   class Index
     attr_accessor :name, :model, :sources, :delta_object
-    
+
     # Create a new index instance by passing in the model it is tied to, and
     # a block to build it with (optional but recommended). For documentation
     # on the syntax for inside the block, the Builder class is what you want.
@@ -13,9 +13,9 @@ module ThinkingSphinx
     #
     #   Index.new(User) do
     #     indexes login, email
-    #     
+    #
     #     has created_at
-    #     
+    #
     #     set_property :delta => true
     #   end
     #
@@ -26,46 +26,46 @@ module ThinkingSphinx
       @options      = {}
       @delta_object = nil
     end
-    
+
     def fields
       @sources.collect { |source| source.fields }.flatten
     end
-    
+
     def attributes
       @sources.collect { |source| source.attributes }.flatten
     end
-    
+
     def core_name
       "#{name}_core"
     end
-    
+
     def delta_name
       "#{name}_delta"
     end
-    
+
     def all_names
       names  = [core_name]
       names << delta_name if delta?
-      
+
       names
     end
-    
+
     def self.name_for(model)
       model.name.underscore.tr(':/\\', '_')
     end
-    
+
     def prefix_fields
       fields.select { |field| field.prefixes }
     end
-    
+
     def infix_fields
       fields.select { |field| field.infixes }
     end
-    
+
     def local_options
       @options
     end
-    
+
     def options
       all_index_options = config.index_options.clone
       @options.keys.select { |key|
@@ -74,82 +74,82 @@ module ThinkingSphinx
       }.each { |key| all_index_options[key.to_sym] = @options[key] }
       all_index_options
     end
-    
+
     def delta?
       !@delta_object.nil?
     end
-    
+
     def to_riddle(offset)
       indexes = [to_riddle_for_core(offset)]
       indexes << to_riddle_for_delta(offset) if delta?
       indexes << to_riddle_for_distributed
     end
-    
+
     private
-    
+
     def adapter
       @adapter ||= @model.sphinx_database_adapter
     end
-    
+
     def utf8?
       options[:charset_type] == "utf-8"
     end
-    
+
     def sql_query_pre_for_delta
       [""]
     end
-    
+
     def config
       @config ||= ThinkingSphinx::Configuration.instance
     end
-    
+
     def to_riddle_for_core(offset)
       index = Riddle::Configuration::Index.new core_name
       index.path = File.join config.searchd_file_path, index.name
-      
+
       set_configuration_options_for_indexes index
       set_field_settings_for_indexes        index
-      
+
       sources.each_with_index do |source, i|
         index.sources << source.to_riddle_for_core(offset, i)
       end
-      
+
       index
     end
-    
+
     def to_riddle_for_delta(offset)
       index = Riddle::Configuration::Index.new delta_name
       index.parent = core_name
       index.path = File.join config.searchd_file_path, index.name
-      
+
       sources.each_with_index do |source, i|
         index.sources << source.to_riddle_for_delta(offset, i)
       end
-      
+
       index
     end
-    
+
     def to_riddle_for_distributed
       index = Riddle::Configuration::DistributedIndex.new name
-      index.local_indexes << core_name
-      index.local_indexes.unshift delta_name if delta?
+      index.local_indices << core_name
+      index.local_indices.unshift delta_name if delta?
       index
     end
-    
+
     def set_configuration_options_for_indexes(index)
       config.index_options.each do |key, value|
         method = "#{key}=".to_sym
         index.send(method, value) if index.respond_to?(method)
       end
-      
+
       options.each do |key, value|
         index.send("#{key}=".to_sym, value) if ThinkingSphinx::Configuration::IndexOptions.include?(key.to_s) && !value.nil?
       end
     end
-    
+
     def set_field_settings_for_indexes(index)
       field_names = lambda { |field| field.unique_name.to_s }
-      
+
       index.prefix_field_names += prefix_fields.collect(&field_names)
       index.infix_field_names  += infix_fields.collect(&field_names)
     end

data/lib/thinking_sphinx/version.rb

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

data/spec/thinking_sphinx/configuration_spec.rb

@@ -231,7 +231,7 @@ describe ThinkingSphinx::Configuration do
       config.reset
       config.generate
 
-      config.configuration.indexes.each do |index|
+      config.configuration.indices.each do |index|
         next if index.is_a? Riddle::Configuration::DistributedIndex
 
         index.sources.each do |source|

data/spec/thinking_sphinx/context_spec.rb

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

data/spec/thinking_sphinx/index_spec.rb

@@ -4,179 +4,179 @@ describe ThinkingSphinx::Index do
   describe "prefix_fields method" do
     before :each do
       @index = ThinkingSphinx::Index.new(Person)
-      
+
       @field_a = stub('field', :prefixes => true)
       @field_b = stub('field', :prefixes => false)
       @field_c = stub('field', :prefixes => true)
-      
+
       @index.stub!(:fields => [@field_a, @field_b, @field_c])
     end
-    
+
     it "should return fields that are flagged as prefixed" do
       @index.prefix_fields.should include(@field_a)
       @index.prefix_fields.should include(@field_c)
     end
-    
+
     it "should not return fields that aren't flagged as prefixed" do
       @index.prefix_fields.should_not include(@field_b)
     end
   end
-  
+
   describe "infix_fields method" do
     before :each do
       @index = ThinkingSphinx::Index.new(Person)
-      
+
       @field_a = stub('field', :infixes => true)
       @field_b = stub('field', :infixes => false)
       @field_c = stub('field', :infixes => true)
-      
+
       @index.stub!(:fields => [@field_a, @field_b, @field_c])
     end
-    
+
     it "should return fields that are flagged as infixed" do
       @index.infix_fields.should include(@field_a)
       @index.infix_fields.should include(@field_c)
     end
-    
+
     it "should not return fields that aren't flagged as infixed" do
       @index.infix_fields.should_not include(@field_b)
     end
   end
-  
+
   describe '.name_for' do
     it "should return the model's name downcased" do
       ThinkingSphinx::Index.name_for(Alpha).should == 'alpha'
     end
-    
+
     it "should separate words by underscores" do
       ThinkingSphinx::Index.name_for(ActiveRecord).should == 'active_record'
     end
-    
+
     it "should separate namespaces by underscores" do
       ThinkingSphinx::Index.name_for(ActiveRecord::Base).
         should == 'active_record_base'
     end
   end
-  
+
   describe '#name' do
     it "should return the downcased name of the index's model" do
       ThinkingSphinx::Index.new(Alpha).name.should == 'alpha'
     end
-    
+
     it "should return a custom name if one is set" do
       index = ThinkingSphinx::Index.new(Alpha)
       index.name = 'custom'
       index.name.should == 'custom'
     end
   end
-  
+
   describe '#core_name' do
     it "should take the index's name and append _core" do
       ThinkingSphinx::Index.new(Alpha).core_name.should == 'alpha_core'
     end
   end
-  
+
   describe '#delta_name' do
     it "should take the index's name and append _delta" do
       ThinkingSphinx::Index.new(Alpha).delta_name.should == 'alpha_delta'
     end
   end
-  
+
   describe '#all_names' do
     it "should return the core index name by default" do
       ThinkingSphinx::Index.new(Alpha).all_names.should == ['alpha_core']
     end
-    
+
     it "should return both core and delta names if deltas are enabled" do
       index = ThinkingSphinx::Index.new(Alpha)
       index.delta_object = stub('delta')
-      
+
       index.all_names.should == ['alpha_core', 'alpha_delta']
     end
-    
+
     it "should respect custom names" do
       index = ThinkingSphinx::Index.new(Alpha)
       index.name = 'custom'
-      
+
       index.all_names.should == ['custom_core']
     end
-    
+
     it "should respect custom names when deltas are enabled" do
       index = ThinkingSphinx::Index.new(Alpha)
       index.name = 'custom'
       index.delta_object = stub('delta')
-      
+
       index.all_names.should == ['custom_core', 'custom_delta']
     end
   end
-  
+
   describe '#to_riddle' do
     it "should return two Riddle indexes if deltas are disabled" do
       index = ThinkingSphinx::Index.new(Alpha)
-      
+
       index.to_riddle(0).length.should == 2
     end
-    
+
     it "should return three Riddle indexes if deltas are enabled" do
       index = ThinkingSphinx::Index.new(Beta)
       index.delta_object = stub('delta')
-      
+
       index.to_riddle(0).length.should == 3
     end
-    
+
     it "should include a distributed index" do
       index = ThinkingSphinx::Index.new(Alpha)
-      
+
       index.to_riddle(0).last.
         should be_a(Riddle::Configuration::DistributedIndex)
     end
-    
+
     context 'core index' do
       it "should use the core name" do
         @index = ThinkingSphinx::Index.new(Alpha).to_riddle(0).first
         @index.name.should == 'alpha_core'
       end
-      
+
       it "should not try to set disable_range on the index" do
         ThinkingSphinx::Configuration.instance.
           index_options[:disable_range] = true
-        
+
         lambda {
           @index = ThinkingSphinx::Index.new(Alpha).to_riddle(0).first
         }.should_not raise_error(NoMethodError)
       end
     end
-    
+
     context 'delta index' do
       before :each do
         index = ThinkingSphinx::Index.new(Beta)
         index.delta_object = stub('delta')
         @index = index.to_riddle(0)[1]
       end
-      
+
       it "should use the delta name" do
         @index.name.should == 'beta_delta'
       end
     end
-    
+
     context 'distributed index' do
       it "should use the index's name" do
         index = ThinkingSphinx::Index.new(Alpha)
 
         index.to_riddle(0).last.name.should == 'alpha'
       end
-      
+
       it "should add the core index" do
         index = ThinkingSphinx::Index.new(Alpha)
 
-        index.to_riddle(0).last.local_indexes.should include('alpha_core')
+        index.to_riddle(0).last.local_indices.should include('alpha_core')
       end
-      
+
       it "should add the delta index if there is one" do
         index = ThinkingSphinx::Index.new(Beta)
         index.delta_object = stub('delta')
 
-        index.to_riddle(0).last.local_indexes.should include('beta_delta')
+        index.to_riddle(0).last.local_indices.should include('beta_delta')
       end
     end
   end