freelancing-god-thinking-sphinx 1.1.20 → 1.1.21

data/lib/thinking_sphinx.rb

@@ -37,7 +37,7 @@ module ThinkingSphinx
   module Version #:nodoc:
     Major = 1
     Minor = 1
-    Tiny  = 20
+    Tiny  = 21
     
     String = [Major, Minor, Tiny].join('.')
   end

data/lib/thinking_sphinx/configuration.rb

@@ -168,6 +168,8 @@ module ThinkingSphinx
             model_name.gsub!(/.*[\/\\]/, '').nil? ? next : retry
           rescue NameError
             next
+          rescue StandardError
+            puts "Warning: Error loading #{file}"
           end
         end
       end

data/lib/thinking_sphinx/facet.rb

@@ -92,7 +92,7 @@ module ThinkingSphinx
     
     def translate(object, attribute_value)
       column.__stack.each { |method|
-        object = object.send(method)
+        return nil unless object = object.send(method)
       }
       if object.is_a?(Array)
         object.collect { |item| item.send(column.__name) }

data/lib/thinking_sphinx/search/facets.rb

@@ -56,7 +56,8 @@ module ThinkingSphinx
         {
           :group_function => :attr,
           :limit          => max,
-          :max_matches    => max
+          :max_matches    => max,
+          :page           => 1
         }
       end
       

data/rails/init.rb

@@ -0,0 +1,14 @@
+require 'thinking_sphinx'
+require 'action_controller/dispatcher'
+
+ActionController::Dispatcher.to_prepare :thinking_sphinx do
+  # Force internationalisation to be loaded.
+  if Rails::VERSION::STRING.to_f > 2.2
+    I18n.backend.reload!
+    I18n.backend.available_locales
+  elsif Rails::VERSION::STRING.to_f > 2.1
+    I18n.backend.load_translations(*I18n.load_path)
+  end
+  
+  ThinkingSphinx::Configuration.instance.load_models
+end

data/spec/unit/thinking_sphinx/active_record/delta_spec.rb

@@ -80,7 +80,8 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
         :sphinx_document_id => 1
       )
       
-      @client = Riddle::Client.stub_instance(:update => true)
+      @client = Riddle::Client.new
+      @client.stub!(:update => true)
       Riddle::Client.stub_method(:new => @client)
     end
     
@@ -120,17 +121,16 @@ describe "ThinkingSphinx::ActiveRecord::Delta" do
     end
     
     it "shouldn't update the deleted attribute if not in the index" do
-      @person.send(:index_delta)
+      @client.should_not_receive(:update)
       
-      @client.should_not have_received(:update)
+      @person.send(:index_delta)
     end
     
     it "should update the deleted attribute if in the core index" do
       @person.stub_method(:in_both_indexes? => true)
+      @client.should_receive(:update)
       
       @person.send(:index_delta)
-      
-      @client.should have_received(:update)
     end
   end
 end

data/spec/unit/thinking_sphinx/active_record/search_spec.rb

@@ -2,19 +2,19 @@ require 'spec/spec_helper'
 
 describe "ThinkingSphinx::ActiveRecord::Search" do
   it "should add search_for_ids to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_for_ids")
+    ActiveRecord::Base.should respond_to("search_for_ids")
   end
   
   it "should add search_for_ids to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search")
+    ActiveRecord::Base.should respond_to("search")
   end
   
   it "should add search_count to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_count")
+    ActiveRecord::Base.should respond_to("search_count")
   end
 
   it "should add search_for_id to ActiveRecord::Base" do
-    ActiveRecord::Base.methods.should include("search_for_id")
+    ActiveRecord::Base.should respond_to("search_for_id")
   end
   
   describe "search_for_ids method" do

data/spec/unit/thinking_sphinx/active_record_spec.rb

@@ -3,7 +3,7 @@ require 'spec/spec_helper'
 describe "ThinkingSphinx::ActiveRecord" do
   describe "define_index method" do
     before :each do
-      module TestModule
+      module ::TestModule
         class TestModel < ActiveRecord::Base; end
       end
       
@@ -185,7 +185,8 @@ describe "ThinkingSphinx::ActiveRecord" do
         :address  => "an address",
         :port     => 123
       )
-      @client = Riddle::Client.stub_instance(:update => true)
+      @client = Riddle::Client.new
+      @client.stub!(:update => true)
       @person = Person.find(:first)
       
       Riddle::Client.stub_method(:new => @client)
@@ -202,87 +203,82 @@ describe "ThinkingSphinx::ActiveRecord" do
     end
     
     it "should update the core index's deleted flag if in core index" do
-      @person.toggle_deleted
-      
-      @client.should have_received(:update).with(
+      @client.should_receive(:update).with(
         "person_core", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+      
+      @person.toggle_deleted
     end
     
     it "shouldn't update the core index's deleted flag if the record isn't in it" do
       @person.stub_method(:in_core_index? => false)
-      
-      @person.toggle_deleted
-      
-      @client.should_not have_received(:update).with(
+      @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_method(:sphinx_running? => false)
+      @client.should_not_receive(:update)
       
       @person.toggle_deleted
       
       @person.should_not have_received(:in_core_index?)
-      @client.should_not have_received(:update)
     end
     
     it "should update the delta index's deleted flag if delta indexes are enabled and the instance's delta is true" do
       ThinkingSphinx.stub_method(:deltas_enabled? => true)
       Person.sphinx_indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = true
-      
-      @person.toggle_deleted
-      
-      @client.should have_received(:update).with(
+      @client.should_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+      
+      @person.toggle_deleted
     end
     
     it "should not update the delta index's deleted flag if delta indexes are enabled and the instance's delta is false" do
       ThinkingSphinx.stub_method(:deltas_enabled? => true)
       Person.sphinx_indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = false
-      
-      @person.toggle_deleted
-      
-      @client.should_not have_received(:update).with(
+      @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+      
+      @person.toggle_deleted
     end
     
     it "should not update the delta index's deleted flag if delta indexes are enabled and the instance's delta is equivalent to false" do
       ThinkingSphinx.stub_method(:deltas_enabled? => true)
       Person.sphinx_indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = 0
-
-      @person.toggle_deleted
-
-      @client.should_not have_received(:update).with(
+      @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+
+      @person.toggle_deleted
     end
 
     it "shouldn't update the delta index if delta indexes are disabled" do
       ThinkingSphinx.stub_method(:deltas_enabled? => true)
-      @person.toggle_deleted
-      
-      @client.should_not have_received(:update).with(
+      @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+      
+      @person.toggle_deleted
     end
     
     it "should not update the delta index if delta indexing is disabled" do
       ThinkingSphinx.stub_method(:deltas_enabled? => false)
       Person.sphinx_indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = true
-      
-      @person.toggle_deleted
-      
-      @client.should_not have_received(:update).with(
+      @client.should_not_receive(:update).with(
         "person_delta", ["sphinx_deleted"], {@person.sphinx_document_id => 1}
       )
+      
+      @person.toggle_deleted
     end
     
     it "should not update either index if updates are disabled" do
@@ -292,10 +288,9 @@ describe "ThinkingSphinx::ActiveRecord" do
       )
       Person.sphinx_indexes.each { |index| index.stub_method(:delta? => true) }
       @person.delta = true
+      @client.should_not_receive(:update)
       
       @person.toggle_deleted
-      
-      @client.should_not have_received(:update)
     end
   end
 

data/spec/unit/thinking_sphinx/association_spec.rb

@@ -79,7 +79,8 @@ describe ThinkingSphinx::Association do
     before :each do
       @parent_join = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.stub_instance
       @join = ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.stub_instance
-      @parent = ThinkingSphinx::Association.stub_instance(:join_to => true, :join => nil)
+      @parent = ThinkingSphinx::Association.new(nil, nil)
+      @parent.stub!(:join_to => true, :join => nil)
       @base_join = Object.stub_instance(:joins => [:a, :b, :c])
       
       ::ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.stub_method(:new => @join)
@@ -87,19 +88,17 @@ describe ThinkingSphinx::Association do
     
     it "should call the parent's join_to if parent has no join" do
       @assoc = ThinkingSphinx::Association.new(@parent, :ref)
+      @parent.should_receive(:join_to).with(@base_join)
       
       @assoc.join_to(@base_join)
-      
-      @parent.should have_received(:join_to).with(@base_join)
     end
     
     it "should not call the parent's join_to if it already has a join" do
       @assoc = ThinkingSphinx::Association.new(@parent, :ref)
       @parent.stub_method(:join => @parent_join)
+      @parent.should_not_receive(:join_to)
       
       @assoc.join_to(@base_join)
-      
-      @parent.should_not have_received(:join_to)
     end
     
     it "should define the join association with a JoinAssociation instance" do

data/spec/unit/thinking_sphinx/attribute_spec.rb

@@ -53,15 +53,15 @@ describe ThinkingSphinx::Attribute do
       @attribute.columns.each { |col| @attribute.associations[col] = [] }
       @attribute.model = Person
       
-      @first_join   = Object.stub_instance(:aliased_table_name => "tabular")
-      @second_join  = Object.stub_instance(:aliased_table_name => "data")
+      @first_join   = Object.new
+      @first_join.stub!(:aliased_table_name => "tabular")
+      @second_join  = Object.new
+      @second_join.stub!(:aliased_table_name => "data")
       
-      @first_assoc  = ThinkingSphinx::Association.stub_instance(
-        :join => @first_join, :has_column? => true
-      )
-      @second_assoc = ThinkingSphinx::Association.stub_instance(
-        :join => @second_join, :has_column? => true
-      )
+      @first_assoc  = ThinkingSphinx::Association.new nil, nil
+      @first_assoc.stub!(:join => @first_join, :has_column? => true)
+      @second_assoc = ThinkingSphinx::Association.new nil, nil
+      @second_assoc.stub!(:join => @second_join, :has_column? => true)
     end
     
     it "should return the column name if the column is a string" do

data/spec/unit/thinking_sphinx/collection_spec.rb

@@ -2,12 +2,13 @@ require 'spec/spec_helper'
 
 describe ThinkingSphinx::Collection do
   it "should behave like WillPaginate::Collection" do
-    ThinkingSphinx::Collection.instance_methods.should include("previous_page")
-    ThinkingSphinx::Collection.instance_methods.should include("next_page")
-    ThinkingSphinx::Collection.instance_methods.should include("current_page")
-    ThinkingSphinx::Collection.instance_methods.should include("total_pages")
-    ThinkingSphinx::Collection.instance_methods.should include("total_entries")
-    ThinkingSphinx::Collection.instance_methods.should include("offset")
+    instance_methods = ThinkingSphinx::Collection.instance_methods.collect { |m| m.to_s }
+    instance_methods.should include("previous_page")
+    instance_methods.should include("next_page")
+    instance_methods.should include("current_page")
+    instance_methods.should include("total_pages")
+    instance_methods.should include("total_entries")
+    instance_methods.should include("offset")
     
     ThinkingSphinx::Collection.ancestors.should include(Array)
   end

data/spec/unit/thinking_sphinx/configuration_spec.rb

@@ -10,11 +10,11 @@ describe ThinkingSphinx::Configuration do
     
     it "should use the Merb environment value if set" do
       unless defined?(Merb)
-        module Merb; end
+        module ::Merb; end
       end
             
       ThinkingSphinx::Configuration.stub_method(:defined? => true)
-      Merb.stub_method(:environment => "merb_production")
+      Merb.stub!(:environment => "merb_production")
       ThinkingSphinx::Configuration.environment.should == "merb_production"
       
       Object.send(:remove_const, :Merb)
@@ -121,6 +121,62 @@ describe ThinkingSphinx::Configuration do
     end
   end
   
+  describe "#load_models" do
+    before :each do
+      @config = ThinkingSphinx::Configuration.instance
+      @config.model_directories = ['']
+      
+      @file_name        = 'a.rb'
+      @model_name_lower = 'a'
+      @class_name       = 'A'
+      
+      @file_name.stub!(:gsub).and_return(@model_name_lower)
+      @model_name_lower.stub!(:camelize).and_return(@class_name)
+      Dir.stub(:[]).and_return([@file_name])
+    end
+    
+    it "should load the files by guessing the file name" do
+      @class_name.should_receive(:constantize).and_return(true)
+      
+      @config.load_models
+    end
+    
+    it "should not raise errors if the model name is nil" do
+      @file_name.stub!(:gsub).and_return(nil)
+      
+      lambda {
+        @config.load_models
+      }.should_not raise_error
+    end
+    
+    it "should not raise errors if the file name does not represent a class name" do
+      @class_name.should_receive(:constantize).and_raise(NameError)
+      
+      lambda {
+        @config.load_models
+      }.should_not raise_error
+    end
+    
+    it "should retry if the first pass fails and contains a directory" do
+      @model_name_lower.stub!(:gsub!).and_return(true, nil)
+      @class_name.stub(:constantize).and_raise(LoadError)
+      @model_name_lower.should_receive(:camelize).twice
+      
+      lambda {
+        @config.load_models
+      }.should_not raise_error
+    end
+    
+    it "should catch database errors with a warning" do
+      @class_name.should_receive(:constantize).and_raise(Mysql::Error)
+      @config.should_receive(:puts).with('Warning: Error loading a.rb')
+      
+      lambda {
+        @config.load_models
+      }.should_not raise_error
+    end
+  end
+  
   it "should insert set index options into the configuration file" do
     config = ThinkingSphinx::Configuration.instance
     ThinkingSphinx::Configuration::IndexOptions.each do |option|

data/spec/unit/thinking_sphinx/facet_spec.rb

@@ -275,4 +275,28 @@ describe ThinkingSphinx::Facet do
       ThinkingSphinx::Facet.new(attribute).type.should == :anything
     end
   end
+  
+  describe "#value" do
+    before :each do
+      @index  = ThinkingSphinx::Index.new(Friendship)
+      @source = ThinkingSphinx::Source.new(@index)
+      @field  = ThinkingSphinx::Field.new(
+        @source, ThinkingSphinx::Index::FauxColumn.new(:person, :first_name)
+      )
+      @facet  = ThinkingSphinx::Facet.new(@field)
+    end
+    
+    it "should return association values" do
+      person      = Person.find(:first)
+      friendship  = Friendship.new(:person => person)
+      
+      @facet.value(friendship, 1).should == person.first_name
+    end
+    
+    it "should return nil if the association is nil" do
+      friendship = Friendship.new(:person => nil)
+      
+      @facet.value(friendship, 1).should be_nil
+    end
+  end
 end

data/spec/unit/thinking_sphinx/field_spec.rb

@@ -85,15 +85,15 @@ describe ThinkingSphinx::Field do
       @field.columns.each { |col| @field.associations[col] = [] }
       @field.model = Person
       
-      @first_join   = Object.stub_instance(:aliased_table_name => "tabular")
-      @second_join  = Object.stub_instance(:aliased_table_name => "data")
+      @first_join   = Object.new
+      @first_join.stub!(:aliased_table_name => "tabular")
+      @second_join  = Object.new
+      @second_join.stub!(:aliased_table_name => "data")
       
-      @first_assoc  = ThinkingSphinx::Association.stub_instance(
-        :join => @first_join, :has_column? => true
-      )
-      @second_assoc = ThinkingSphinx::Association.stub_instance(
-        :join => @second_join, :has_column? => true
-      )
+      @first_assoc  = ThinkingSphinx::Association.new nil, nil
+      @first_assoc.stub!(:join => @first_join, :has_column? => true)
+      @second_assoc = ThinkingSphinx::Association.new nil, nil
+      @second_assoc.stub!(:join => @second_join, :has_column? => true)
     end
     
     it "should return the column name if the column is a string" do

data/spec/unit/thinking_sphinx/rails_additions_spec.rb

@@ -20,12 +20,16 @@ describe ThinkingSphinx::HashExcept do
   end
   
   describe "extends Hash" do
+    before :each do
+      @instance_methods = Hash.instance_methods.collect { |m| m.to_s }
+    end
+    
     it 'with except' do
-      Hash.instance_methods.include?('except').should be_true
+      @instance_methods.include?('except').should be_true
     end
 
     it 'with except!' do
-      Hash.instance_methods.include?('except!').should be_true
+      @instance_methods.include?('except!').should be_true
     end
   end
 end
@@ -45,7 +49,7 @@ describe ThinkingSphinx::ArrayExtractOptions do
   
   describe "extends Array" do
     it 'with extract_options!' do
-      Array.instance_methods.include?('extract_options!').should be_true
+      Array.instance_methods.collect { |m| m.to_s }.include?('extract_options!').should be_true
     end
   end
 end
@@ -61,7 +65,9 @@ describe ThinkingSphinx::AbstractQuotedTableName do
   
   describe "extends ActiveRecord::ConnectionAdapters::AbstractAdapter" do
     it 'with quote_table_name' do
-      ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_methods.include?('quote_table_name').should be_true
+      ActiveRecord::ConnectionAdapters::AbstractAdapter.instance_methods.collect { |m|
+        m.to_s
+      }.include?('quote_table_name').should be_true
     end
   end
 end
@@ -77,7 +83,9 @@ describe ThinkingSphinx::MysqlQuotedTableName do
   describe "extends ActiveRecord::ConnectionAdapters::MysqlAdapter" do
     it 'with quote_table_name' do
       adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :MysqlAdapter
-      ActiveRecord::ConnectionAdapters.const_get(adapter).instance_methods.include?("quote_table_name").should be_true
+      ActiveRecord::ConnectionAdapters.const_get(adapter).instance_methods.collect { |m|
+        m.to_s
+      }.include?("quote_table_name").should be_true
     end
   end  
 end

data/spec/unit/thinking_sphinx/search_spec.rb

@@ -5,7 +5,8 @@ describe ThinkingSphinx::Search do
   describe "search method" do
     describe ":star option" do
       before :each do
-        @client = Riddle::Client.stub_instance(
+        @client = Riddle::Client.new
+        @client.stub!(
           :filters    => [],
           :filters=   => true,
           :id_range=  => true,
@@ -26,25 +27,29 @@ describe ThinkingSphinx::Search do
       end
       
       it "should not apply by default" do
+        @client.should_receive(:query).with("foo bar",'*','')
+        
         ThinkingSphinx::Search.search "foo bar"
-        @client.should have_received(:query).with("foo bar",'*','')
       end
 
       it "should apply when passed, and handle full extended syntax" do
         input    = %{a b* c (d | e) 123 5&6 (f_f g) !h "i j" "k l"~10 "m n"/3 @o p -(q|r)}
         expected = %{*a* b* *c* (*d* | *e*) *123* *5*&*6* (*f_f* *g*) !*h* "i j" "k l"~10 "m n"/3 @o *p* -(*q*|*r*)}
+        @client.should_receive(:query).with(expected,'*','')
+        
         ThinkingSphinx::Search.search input, :star => true
-        @client.should have_received(:query).with(expected,'*','')
       end
 
       it "should default to /\w+/ as token" do
+        @client.should_receive(:query).with("*foo*@*bar*.*com*",'*','')
+        
         ThinkingSphinx::Search.search "foo@bar.com", :star => true
-        @client.should have_received(:query).with("*foo*@*bar*.*com*",'*','')
       end
 
       it "should honour custom token" do
+        @client.should_receive(:query).with("*foo@bar.com* -*foo-bar*",'*','')
+        
         ThinkingSphinx::Search.search "foo@bar.com -foo-bar", :star => /[\w@.-]+/u
-        @client.should have_received(:query).with("*foo@bar.com* -*foo-bar*",'*','')
       end
     end
     
@@ -182,6 +187,18 @@ describe ThinkingSphinx::Search do
       )
     end
     
+    it "should not use an explicit :page" do
+      ThinkingSphinx::Search.stub!(:search).and_return(@city_results, @birthday_results)
+      ThinkingSphinx::Search.should_receive(:search) do |options|
+        options[:page].should == 1
+      end
+      
+      ThinkingSphinx::Search.facets(
+        :all_attributes => true,
+        :page           => 3
+      )
+    end
+    
     describe "conflicting facets" do
       before :each do
         @index = ThinkingSphinx::Index::Builder.generate(Alpha) do

data/spec/unit/thinking_sphinx_spec.rb

@@ -105,12 +105,14 @@ describe ThinkingSphinx do
     
     describe "if not using MySQL" do
       before :each do
-        adapter = defined?(JRUBY_VERSION) ? :JdbcAdapter : :PostgreSQLAdapter
+        adapter = defined?(JRUBY_VERSION) ? 'JdbcAdapter' : 'PostgreSQLAdapter'
         unless ::ActiveRecord::ConnectionAdapters.const_defined?(adapter)
           pending "No PostgreSQL"
           return
         end
-        @connection = ::ActiveRecord::ConnectionAdapters.const_get(adapter).stub_instance(
+        
+        @connection = stub(adapter).as_null_object
+        @connection.stub!(
           :select_all => true,
           :config => {:adapter => defined?(JRUBY_VERSION) ? 'jdbcpostgresql' : 'postgresql'}
         )
@@ -124,9 +126,9 @@ describe ThinkingSphinx do
       end
     
       it "should not call select_all" do
-        ThinkingSphinx.use_group_by_shortcut?
+        @connection.should_not_receive(:select_all)
         
-        @connection.should_not have_received(:select_all)
+        ThinkingSphinx.use_group_by_shortcut?
       end
     end
   end

data/tasks/distribution.rb

@@ -27,6 +27,7 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = "thinking-sphinx"
   s.test_files        = FileList["spec/**/*_spec.rb"]
   s.files             = FileList[
+    "rails/*.rb",
     "lib/**/*.rb",
     "LICENCE",
     "README.textile",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: freelancing-god-thinking-sphinx
 version: !ruby/object:Gem::Version 
-  version: 1.1.20
+  version: 1.1.21
 platform: ruby
 authors: 
 - Pat Allan
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 -07:00
+date: 2009-06-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,6 +22,7 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- rails/init.rb
 - lib/thinking_sphinx/active_record/attribute_updates.rb
 - lib/thinking_sphinx/active_record/delta.rb
 - lib/thinking_sphinx/active_record/has_many_association.rb